jon48 / webtrees-lib

src/Webtrees/Module/AdminTasks/Views/AdminConfigView.php

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $table_id = $this->data->get('table_id');
-        ?>        
+		$table_id = $this->data->get('table_id');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -68,7 +68,7 @@ 
     	</table>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 			<?php echo I18N::translate('In order to do so, use the following URL, with the optional parameter <em>%s</em> if you only want to force the execution of one task: ', 'task'); ?>
 		</p>
 		<p>
-			<code><?php echo $this->data->get('trigger_url_root') .'&force=<span id="token_url">'. $this->data->get('trigger_token') .'</span>[&task='. I18N::translate('task_name').']'; ?></code>
+			<code><?php echo $this->data->get('trigger_url_root').'&force=<span id="token_url">'.$this->data->get('trigger_token').'</span>[&task='.I18N::translate('task_name').']'; ?></code>
 		</p>
 		<p>
 			<button id="bt_genforcetoken" class="bt bt-primary" onClick="generate_force_token();">

src/Webtrees/Module/Sosa/SosaConfigController.php

Indentation +110 added lines, -110 removed lines

@@ -29,66 +29,66 @@ 
  */
 class SosaConfigController extends MvcController
 {      
-    /**
-     * Check if the user can update the sosa ancestors list
-     * 
-     * @return bool
-     */
-    protected function canUpdate() {
-        global $WT_TREE;
+	/**
+	 * Check if the user can update the sosa ancestors list
+	 * 
+	 * @return bool
+	 */
+	protected function canUpdate() {
+		global $WT_TREE;
         
-        $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
-        return Auth::check() && 
-            ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
-                ($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
-             );
-    }
+		$user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
+		return Auth::check() && 
+			( 
+				$user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+				($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
+			 );
+	}
     
-    /**
-     * Saves Sosa's user preferences (root individual for the user).
-     * 
-     * @param BaseController $controller
-     * @return bool True is saving successfull
-     */
-    protected function update(BaseController $controller) {
-        global $WT_TREE;          
-        if($this->canUpdate() && Filter::checkCsrf()) 
-        {            
-            $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
-            $user = User::find(Filter::postInteger('userid', -1));
+	/**
+	 * Saves Sosa's user preferences (root individual for the user).
+	 * 
+	 * @param BaseController $controller
+	 * @return bool True is saving successfull
+	 */
+	protected function update(BaseController $controller) {
+		global $WT_TREE;          
+		if($this->canUpdate() && Filter::checkCsrf()) 
+		{            
+			$indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
+			$user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
-                $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
-                $controller->addInlineJavascript('
+			if($user  && $indi) {
+				$WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
+				$controller->addInlineJavascript('
                     $( document ).ready(function() {
                         majComputeSosa('.$user->getUserId().');
                     });');
-                FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
-                return true;
-            }
-        }
-        FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
-        return false;
-    }
+				FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
+				return true;
+			}
+		}
+		FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
+		return false;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaConfig@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * SosaConfig@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Sosa Configuration'))
-        ->restrictAccess(Auth::check())
-        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-        ->addInlineJavascript('autocomplete();')
-        ->addInlineJavascript('
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Sosa Configuration'))
+		->restrictAccess(Auth::check())
+		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+		->addInlineJavascript('autocomplete();')
+		->addInlineJavascript('
             $( document ).ready(function() {
                 $("#bt_sosa_compute").click(function() {
                     majComputeSosa($("#maj_sosa_input_userid, #maj-sosa-config-select option:selected").val());
@@ -105,83 +105,83 @@ 
                   });
             }');
         
-        $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+		$action = Filter::post('action');
+		if($action === 'update') $this->update($controller);
         
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('tree', $WT_TREE);
-        $view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$WT_TREE->getNameUrl());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('tree', $WT_TREE);
+		$view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$WT_TREE->getNameUrl());
         
-        $users_root = array();
-        $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
-            $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+		$users_root = array();
+		$users_js_array = 'var users_array = [];';
+		if(Auth::check()) {
+			$root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
+			$users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
+			$users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
             
-            if(Auth::isManager($WT_TREE)) {
-                $default_user = User::find(-1);
-                $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
-            }
-        }
-        $view_bag->set('users_settings', $users_root);       
+			if(Auth::isManager($WT_TREE)) {
+				$default_user = User::find(-1);
+				$default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
+				$users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
+				$users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+			}
+		}
+		$view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+		$controller->addInlineJavascript($users_js_array . '            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
              ');
         
-        ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * SosaConfig@computeAll
-     */
-    public function computeAll() {
-        global $WT_TREE;
+	/**
+	 * SosaConfig@computeAll
+	 */
+	public function computeAll() {
+		global $WT_TREE;
         
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
         
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
         
-        $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
-            $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
-        }
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		$user = User::find(Filter::getInteger('userid', -1));
+		if($user) {
+			$calculator = new SosaCalculator($WT_TREE, $user);
+			if($calculator->computeAll()) $view_bag->set('is_success', true);
+		}
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
-    /**
-     * SosaConfig@computePartial
-     */
-    public function computePartial() {
-        global $WT_TREE;
+	/**
+	 * SosaConfig@computePartial
+	 */
+	public function computePartial() {
+		global $WT_TREE;
     
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
     
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
     
-        $user = User::find(Filter::getInteger('userid', -1));
-        $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
+		$user = User::find(Filter::getInteger('userid', -1));
+		$indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
         
-        if($user && $indi) {
-            $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
-            $view_bag->set('error', I18N::translate('Non existing individual'));
-        }
+		if($user && $indi) {
+			$calculator = new SosaCalculator($WT_TREE, $user);
+			if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+		}
+		else {
+			$view_bag->set('error', I18N::translate('Non existing individual'));
+		}
             
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -40,7 +40,7 @@ 
         $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
         return Auth::check() && 
             ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+                $user_id == Auth::user()->getUserId() || // Allow update for yourself
                 ($user_id == -1 && Auth::isManager($WT_TREE))   // Allow a manager to update the default user
              );
     }
@@ -53,12 +53,12 @@ 
      */
     protected function update(BaseController $controller) {
         global $WT_TREE;          
-        if($this->canUpdate() && Filter::checkCsrf()) 
+        if ($this->canUpdate() && Filter::checkCsrf()) 
         {            
             $indi = Individual::getInstance(Filter::post('rootid'), $WT_TREE);
             $user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
+            if ($user && $indi) {
                 $WT_TREE->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
                 $controller->addInlineJavascript('
                     $( document ).ready(function() {
@@ -97,7 +97,7 @@ 
             
             function majComputeSosa(user_id) {
                 jQuery("#bt_sosa_compute").prop( "disabled", true );
-                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...') .'");
+                jQuery("#bt_sosa_computing").empty().html("<i class=\"icon-loading-small\"></i>&nbsp;'. I18N::translate('Computing...').'");
                 jQuery("#bt_sosa_computing").load(
 		          "module.php?mod='.$this->module->getName().'&mod_action=SosaConfig@computeAll&ged='.$WT_TREE->getNameUrl().'&userid=" + user_id,
 		          function() {
@@ -106,7 +106,7 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if ($action === 'update') $this->update($controller);
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -115,21 +115,21 @@ 
         
         $users_root = array();
         $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
+        if (Auth::check()) {
             $root_id = $WT_TREE->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+            $users_root[] = array('user' => Auth::user(), 'rootid' => $root_id);
+            $users_js_array .= 'users_array["'.Auth::user()->getUserId().'"] = "'.$root_id.'";';
             
-            if(Auth::isManager($WT_TREE)) {
+            if (Auth::isManager($WT_TREE)) {
                 $default_user = User::find(-1);
                 $default_root_id = $WT_TREE->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+                $users_root[] = array('user' => $default_user, 'rootid' => $default_root_id);
+                $users_js_array .= 'users_array["'.$default_user->getUserId().'"] = "'.$default_root_id.'";';
             }
         }
         $view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+        $controller->addInlineJavascript($users_js_array.'            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
@@ -151,9 +151,9 @@ 
         $view_bag->set('is_success', false);
         
         $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
+        if ($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if ($calculator->computeAll()) $view_bag->set('is_success', true);
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -173,9 +173,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $WT_TREE);
         
-        if($user && $indi) {
+        if ($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+            if ($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
         }
         else {
             $view_bag->set('error', I18N::translate('Non existing individual'));

Braces +10 added lines, -5 removed lines

@@ -106,7 +106,9 @@ 
             }');
         
         $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+        if($action === 'update') {
+        	$this->update($controller);
+        }
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -153,7 +155,9 @@ 
         $user = User::find(Filter::getInteger('userid', -1));
         if($user) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
+            if($calculator->computeAll()) {
+            	$view_bag->set('is_success', true);
+            }
         }
         ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
     }
@@ -175,9 +179,10 @@ 
         
         if($user && $indi) {
             $calculator = new SosaCalculator($WT_TREE, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
+            if($calculator->computeFromIndividual($indi)) {
+            	$view_bag->set('is_success', true);
+            }
+        } else {
             $view_bag->set('error', I18N::translate('Non existing individual'));
         }
             

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

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
         $this->tree = $tree;
         $this->user = $user;
         
-        $this->sosa_provider = new SosaProvider($this->tree, $this->user);;
+        $this->sosa_provider = new SosaProvider($this->tree, $this->user); ;
     }
     
     /**
@@ -68,7 +68,7 @@ 
     public function computeAll() {
         $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
         $indi = Individual::getInstance($root_id, $this->tree);
-        if($indi){
+        if ($indi) {
             $this->sosa_provider->deleteAll();
             $tmp_sosatable = array();
             $this->addNode($indi, 1);
@@ -87,7 +87,7 @@ 
         $tmp_sosatable = array();
         $dindi = new \MyArtJaub\Webtrees\Individual($indi);
         $current_sosas = $dindi->getSosaNumbers();
-        foreach($current_sosas as $current_sosa => $gen) {
+        foreach ($current_sosas as $current_sosa => $gen) {
             $this->sosa_provider->deleteAncestors($current_sosa);
             $this->addNode($indi, $current_sosa);
         }
@@ -113,9 +113,9 @@ 
         
         $this->flushTmpSosaTable();
         
-        if($fam = $indi->getPrimaryChildFamily()) {
-            if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
+        if ($fam = $indi->getPrimaryChildFamily()) {
+            if ($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
+            if ($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
         }
     }
     
@@ -125,8 +125,8 @@ 
      * @param bool $force Should the flush be forced
      */
     protected function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 && 
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
+        if (count($this->tmp_sosa_table) > 0 && 
+            ($force || count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)) {            
                 $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
                 $this->tmp_sosa_table = array();
         }

Braces +6 added lines, -2 removed lines

@@ -114,8 +114,12 @@
         $this->flushTmpSosaTable();
         
         if($fam = $indi->getPrimaryChildFamily()) {
-            if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
+            if($husb = $fam->getHusband()) {
+            	$this->addNode($husb, 2 * $sosa);
+            }
+            if($wife = $fam->getWife()) {
+            	$this->addNode($wife, 2 * $sosa + 1);
+            }
         }
     }
     

Indentation +97 added lines, -97 removed lines

@@ -19,116 +19,116 @@
  */
 class SosaCalculator {
     
-    /**
-     * Maximium size for the temporary Sosa table
-     * @var int TMP_SOSA_TABLE_LIMIT
-     */
-    const TMP_SOSA_TABLE_LIMIT = 1000;
+	/**
+	 * Maximium size for the temporary Sosa table
+	 * @var int TMP_SOSA_TABLE_LIMIT
+	 */
+	const TMP_SOSA_TABLE_LIMIT = 1000;
     
-    /**
-     * Reference user
-     * @var Fisharebest\Webtrees\User $user
-     */
-    protected $user;
+	/**
+	 * Reference user
+	 * @var Fisharebest\Webtrees\User $user
+	 */
+	protected $user;
     
-    /**
-     * Reference tree
-     * @var Fisharebest\Webtrees\Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Fisharebest\Webtrees\Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Sosa Provider for the calculator
-     * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the calculator
+	 * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Temporary Sosa table, used during construction
-     * @var array $tmp_sosa_table
-     */
-    protected $tmp_sosa_table;
+	/**
+	 * Temporary Sosa table, used during construction
+	 * @var array $tmp_sosa_table
+	 */
+	protected $tmp_sosa_table;
     
-    /**
-     * Constructor for the Sosa Calculator
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user) {        
-        $this->tree = $tree;
-        $this->user = $user;
+	/**
+	 * Constructor for the Sosa Calculator
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user) {        
+		$this->tree = $tree;
+		$this->user = $user;
         
-        $this->sosa_provider = new SosaProvider($this->tree, $this->user);;
-    }
+		$this->sosa_provider = new SosaProvider($this->tree, $this->user);;
+	}
     
-    /**
-     * Compute all Sosa ancestors from the user's root individual.
-     * @return bool Result of the computation
-     */
-    public function computeAll() {
-        $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
-        $indi = Individual::getInstance($root_id, $this->tree);
-        if($indi){
-            $this->sosa_provider->deleteAll();
-            $this->addNode($indi, 1);
-            $this->flushTmpSosaTable(true);
-            return true;
-        }     
-        return false;
-    }
+	/**
+	 * Compute all Sosa ancestors from the user's root individual.
+	 * @return bool Result of the computation
+	 */
+	public function computeAll() {
+		$root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
+		$indi = Individual::getInstance($root_id, $this->tree);
+		if($indi){
+			$this->sosa_provider->deleteAll();
+			$this->addNode($indi, 1);
+			$this->flushTmpSosaTable(true);
+			return true;
+		}     
+		return false;
+	}
     
-    /**
-     * Compute all Sosa Ancestors from a specified Individual
-     * @param Individual $indi
-     * @return bool Result of the computation
-     */
-    public function computeFromIndividual(Individual $indi) {
-        $dindi = new \MyArtJaub\Webtrees\Individual($indi);
-        $current_sosas = $dindi->getSosaNumbers();
-        foreach($current_sosas as $current_sosa => $gen) {
-            $this->sosa_provider->deleteAncestors($current_sosa);
-            $this->addNode($indi, $current_sosa);
-        }
-        $this->flushTmpSosaTable(true);
-        return true;
-    }
+	/**
+	 * Compute all Sosa Ancestors from a specified Individual
+	 * @param Individual $indi
+	 * @return bool Result of the computation
+	 */
+	public function computeFromIndividual(Individual $indi) {
+		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
+		$current_sosas = $dindi->getSosaNumbers();
+		foreach($current_sosas as $current_sosa => $gen) {
+			$this->sosa_provider->deleteAncestors($current_sosa);
+			$this->addNode($indi, $current_sosa);
+		}
+		$this->flushTmpSosaTable(true);
+		return true;
+	}
     
-    /**
-     * Recursive method to add individual to the Sosa table, and flush it regularly
-     * @param Individual $indi Individual to add
-     * @param int $sosa Individual's sosa
-     */
-    protected function addNode(Individual $indi, $sosa) {                
-        $birth_year = $indi->getEstimatedBirthDate()->gregorianYear();
-        $death_year = $indi->getEstimatedDeathDate()->gregorianYear();
+	/**
+	 * Recursive method to add individual to the Sosa table, and flush it regularly
+	 * @param Individual $indi Individual to add
+	 * @param int $sosa Individual's sosa
+	 */
+	protected function addNode(Individual $indi, $sosa) {                
+		$birth_year = $indi->getEstimatedBirthDate()->gregorianYear();
+		$death_year = $indi->getEstimatedDeathDate()->gregorianYear();
         
-        $this->tmp_sosa_table[] = array(
-            'indi' => $indi->getXref(), 
-            'sosa' => $sosa, 
-            'birth_year' => $birth_year,
-            'death_year' => $death_year
-        );
+		$this->tmp_sosa_table[] = array(
+			'indi' => $indi->getXref(), 
+			'sosa' => $sosa, 
+			'birth_year' => $birth_year,
+			'death_year' => $death_year
+		);
         
-        $this->flushTmpSosaTable();
+		$this->flushTmpSosaTable();
         
-        if($fam = $indi->getPrimaryChildFamily()) {
-            if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
-        }
-    }
+		if($fam = $indi->getPrimaryChildFamily()) {
+			if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
+			if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
+		}
+	}
     
-    /**
-     * Write sosas in the table, if the number of items is superior to the limit, or if forced.
-     *
-     * @param bool $force Should the flush be forced
-     */
-    protected function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 && 
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
-                $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
-                $this->tmp_sosa_table = array();
-        }
-    }
+	/**
+	 * Write sosas in the table, if the number of items is superior to the limit, or if forced.
+	 *
+	 * @param bool $force Should the flush be forced
+	 */
+	protected function flushTmpSosaTable($force = false) {
+		if( count($this->tmp_sosa_table)> 0 && 
+			($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
+				$this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
+				$this->tmp_sosa_table = array();
+		}
+	}
                
 }
  
\ No newline at end of file

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

Braces +74 added lines, -29 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(!$this->getRootIndi()) {
             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->getRootIndi() === null;
             }            
@@ -129,7 +133,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 ')
@@ -145,7 +151,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`'.
@@ -165,7 +173,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();
@@ -212,7 +222,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'
@@ -229,7 +241,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'
@@ -250,7 +264,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' .
@@ -270,9 +286,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])){
@@ -301,9 +320,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])){
@@ -337,7 +359,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'.
@@ -375,7 +399,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()) {
@@ -401,7 +427,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')
@@ -415,7 +443,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')
@@ -432,7 +462,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'.
@@ -451,7 +483,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'.
@@ -469,7 +503,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')
@@ -486,7 +522,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'.
@@ -509,7 +547,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`' .
@@ -529,7 +569,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();
         }
@@ -575,7 +617,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 ('.

Spacing +77 added lines, -77 removed lines

@@ -84,18 +84,18 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_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;
+        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
+        if (empty($this->getRootIndiId())) {
+            if ($this->user == self::$default_user) {  // If the default user is not setup
                 $this->is_setup = false;
             }
             else {
@@ -127,7 +127,7 @@ 
      */
     public function getRootIndi() {
         $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
+        if (!empty($root_indi_id)) {
             return Individual::getInstance($root_indi_id, $this->tree);
         }
         return null;
@@ -141,7 +141,7 @@ 
      * 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,12 +157,12 @@ 
      * @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`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
+            ' 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(), 
@@ -177,7 +177,7 @@ 
      * @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();
@@ -185,9 +185,9 @@ 
         $values_table = array();
         
         $i = 0;
-        foreach  ($sosa_records as $row) {
+        foreach ($sosa_records as $row) {
             $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
+            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(
@@ -206,9 +206,9 @@ 
             $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);
+        $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);
     }
     
@@ -224,7 +224,7 @@ 
      * @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 +241,7 @@ 
      * @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,13 +261,13 @@ 
      * @param int $ged_id ID of the gedcom file
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+    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' .
+            '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(),
@@ -281,13 +281,13 @@ 
      * @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)
+    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])){
+        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`'.
@@ -312,13 +312,13 @@ 
      * @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)
+    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])){
+        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`'.
@@ -348,9 +348,9 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
+    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'.
@@ -387,10 +387,10 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
+        if (!$this->is_setup) return array();
+        if (!$this->statistics_tab) {
             $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
+            if ($maxGeneration = $this->getLastGeneration()) {
                 for ($gen = 1; $gen <= $maxGeneration; $gen++) {
                     $birthStats = $this->getStatsBirthYearInGeneration($gen);
                     $this->statistics_tab[$gen] = array(
@@ -413,9 +413,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`' .
+	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`'.
 	        ' WHERE i_file = :tree_id')
 	        ->execute(array('tree_id' => $this->tree->getTreeId()))
 	        ->fetchOne() ?: 0;
@@ -426,10 +426,10 @@ 
      *
      * @return number Number of Sosas
      */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            '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(), 
@@ -443,10 +443,10 @@ 
      * @param number $gen Generation
      * @return number Number of Sosas in generation
      */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountAtGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            '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(
@@ -462,10 +462,10 @@ 
      * @param number $gen Generation
      * @return number Total number of Sosas up to generation
      */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            '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(
@@ -480,10 +480,10 @@ 
      *
      * @return number Total number of distinct individual
      */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            '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(), 
@@ -497,10 +497,10 @@ 
      * @param number $gen Generation
      * @return number Number of distinct Sosa individuals up to generation
      */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            '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(
@@ -520,11 +520,11 @@ 
      * @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);
+    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`' .
+            ' 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(
@@ -540,26 +540,26 @@ 
      *
      * @return number|NULL Mean generation time
      */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
+    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;
+        $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);
+        $denom = ($n * $sum_x2) - ($sum_x * $sum_x);
+        if ($denom != 0) {
+            return -(($n * $sum_xy) - ($sum_x * $sum_y)) / ($denom);
         }
         return null;
     }
@@ -587,14 +587,14 @@ 
      * @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 ('.
             '   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
+            '           ELSE -1'.// We put all ancestors shared between some branches in the same bucket
             '       END branches'.
             '   FROM ('.
             '       SELECT DISTINCT majs_i_id i_id,'.

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/Module/Sosa/SosaListController.php

Braces +2 added lines, -4 removed lines

@@ -431,8 +431,7 @@ 
                         ) {
                         $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
                     }
-                }
-                else {
+                } else {
                     $birth_dates[0]=new Date('');
                 }
                 if ($death_dates = $person->getAllDeathDates()) {
@@ -443,8 +442,7 @@ 
                         ) {
                         $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
-                }
-                else {
+                } else {
                     $death_dates[0] = new Date('');
                 }
                 $age = Date::getAge($birth_dates[0], $death_dates[0], 0);

Indentation +271 added lines, -271 removed lines

@@ -36,70 +36,70 @@ 
  */
 class SosaListController extends MvcController
 {
-    /**
-     * Sosa Provider for the controller
-     * @var SosaProvider $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the controller
+	 * @var SosaProvider $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Generation used for the controller
-     * @var int $generation
-     */
-    protected $generation;
+	/**
+	 * Generation used for the controller
+	 * @var int $generation
+	 */
+	protected $generation;
     
-    /**
-     * ViewBag to hold data for the controller
-     * @var ViewBag $view_bag
-     */
-    protected $view_bag;
+	/**
+	 * ViewBag to hold data for the controller
+	 * @var ViewBag $view_bag
+	 */
+	protected $view_bag;
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
-     */
-    public function __construct(AbstractModule $module) {
-        global $WT_TREE;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
+	 */
+	public function __construct(AbstractModule $module) {
+		global $WT_TREE;
         
-        parent::__construct($module);
+		parent::__construct($module);
 
-        $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
+		$this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
 
-        $this->generation = Filter::getInteger('gen');
+		$this->generation = Filter::getInteger('gen');
         
-        $this->view_bag = new ViewBag();
-        $this->view_bag->set('generation', $this->generation);
-        $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+		$this->view_bag = new ViewBag();
+		$this->view_bag->set('generation', $this->generation);
+		$this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
+		$this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
         
-    }
+	}
     
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaList@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * SosaList@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Sosa Ancestors'));            
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Sosa Ancestors'));            
 
-        $this->view_bag->set('title', $controller->getPageTitle());
+		$this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
-            $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
-            $this->view_bag->set('url_module', $this->module->getName());
-            $this->view_bag->set('url_action', 'SosaList');
-            $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); 
-            $this->view_bag->set('min_gen', 1);
+		if($this->view_bag->get('is_setup', false)) {
+			$this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
+			$this->view_bag->set('url_module', $this->module->getName());
+			$this->view_bag->set('url_action', 'SosaList');
+			$this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); 
+			$this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
-                $controller->addInlineJavascript('
+			if($this->view_bag->get('has_sosa', false)) {            
+				$controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
                 
@@ -153,44 +153,44 @@ 
             		);
                 
             	');            
-            }
-        }
+			}
+		}
                 
-        ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render();   
-    }    
+		ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render();   
+	}    
     
 
-    /**
-     * SosaList@missing
-     */
-    public function missing() {
-        global $WT_TREE;
+	/**
+	 * SosaList@missing
+	 */
+	public function missing() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Missing Ancestors'));
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Missing Ancestors'));
         
-        $this->view_bag->set('title', $controller->getPageTitle());
+		$this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
-            $this->view_bag->set('url_module', $this->module->getName());
-            $this->view_bag->set('url_action', 'SosaList@missing');
-            $this->view_bag->set('url_ged', $WT_TREE->getNameUrl());
-            $this->view_bag->set('min_gen', 2);
+		if($this->view_bag->get('is_setup', false)) {
+			$this->view_bag->set('url_module', $this->module->getName());
+			$this->view_bag->set('url_action', 'SosaList@missing');
+			$this->view_bag->set('url_ged', $WT_TREE->getNameUrl());
+			$this->view_bag->set('min_gen', 2);
             
-            $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
-            $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
+			$missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
+			$this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
-            $this->view_bag->set('perc_sosa', $perc_sosa);
+			$perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+			$this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
-                $this->view_bag->set('table_id', $table_id);
+			if($this->view_bag->get('has_missing', false)) {
+				$table_id = 'table-sosa-missing-' . Uuid::uuid4();
+				$this->view_bag->set('table_id', $table_id);
                 
-                $controller
-                ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-                ->addInlineJavascript('
+				$controller
+				->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+				->addInlineJavascript('
     				/* Initialise datatables */
     				jQuery.fn.dataTableExt.oSort["unicode-asc"  ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
     				jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
@@ -250,77 +250,77 @@ 
     				jQuery(".loading-image").css("display", "none");
     			');
                         
-                $unique_indis = array();
-                $sum_missing_different = 0;
-                $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
-                        unset($missing_list[$num]);
-                        continue;
-                    }
-                    $sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
-                    $person = Individual::getInstance($missing_tab['indi'], $WT_TREE);
-                    if (!$person || !$person->canShowName()) {
-                        unset($missing_list[$num]);
-                        continue;
-                    }  
-                    $sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
-                    $unique_indis[$person->getXref()] = true;
-                    $missing_tab['indi'] = $person;
-                    $missing_list[$num] = $missing_tab;
-                }
-                $this->view_bag->set('missing_list', $missing_list);
-                $this->view_bag->set('missing_diff_count', $sum_missing_different);
-                $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
-                $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
-            }            
-        }
+				$unique_indis = array();
+				$sum_missing_different = 0;
+				$sum_missing_different_without_hidden = 0;
+				foreach($missing_list as $num => $missing_tab) {
+					if(isset($unique_indis[$missing_tab['indi']])) {
+						unset($missing_list[$num]);
+						continue;
+					}
+					$sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
+					$person = Individual::getInstance($missing_tab['indi'], $WT_TREE);
+					if (!$person || !$person->canShowName()) {
+						unset($missing_list[$num]);
+						continue;
+					}  
+					$sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
+					$unique_indis[$person->getXref()] = true;
+					$missing_tab['indi'] = $person;
+					$missing_list[$num] = $missing_tab;
+				}
+				$this->view_bag->set('missing_list', $missing_list);
+				$this->view_bag->set('missing_diff_count', $sum_missing_different);
+				$this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
+				$perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+				$this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
+			}            
+		}
         
-        ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render();
-    }
+		ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render();
+	}
     
-    /**
-     * SosaList@sosalist
-     */
-    public function sosalist() {
+	/**
+	 * SosaList@sosalist
+	 */
+	public function sosalist() {
                 
-        $type = Filter::get('type', 'indi|fam', null);
+		$type = Filter::get('type', 'indi|fam', null);
         
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->generation > 0 || !is_null($type));
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
-            case 'indi':
-                $this->renderSosaListIndi($controller);
-                break;
-            case 'fam':
-                $this->renderFamSosaListIndi($controller);
-                break;
-            default:
-                break;
-        }
+		switch ($type){
+			case 'indi':
+				$this->renderSosaListIndi($controller);
+				break;
+			case 'fam':
+				$this->renderFamSosaListIndi($controller);
+				break;
+			default:
+				break;
+		}
 
-    }
+	}
     
-    /**
-     * Render the Ajax response for the sortable table of Sosa individuals
-     * @param AjaxController $controller
-     */
-    protected function renderSosaListIndi(AjaxController $controller) {
-        global $WT_TREE;
+	/**
+	 * Render the Ajax response for the sortable table of Sosa individuals
+	 * @param AjaxController $controller
+	 */
+	protected function renderSosaListIndi(AjaxController $controller) {
+		global $WT_TREE;
         
-        $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
-        $this->view_bag->set('has_sosa', false);
+		$listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
+		$this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
-            $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
-            $this->view_bag->set('table_id', $table_id);
+		if(count($listSosa) > 0) {
+			$this->view_bag->set('has_sosa', true);
+			$table_id = 'table-sosa-indi-' . Uuid::uuid4();
+			$this->view_bag->set('table_id', $table_id);
                      
-            $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addInlineJavascript('
+			$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addInlineJavascript('
                 jQuery.fn.dataTableExt.oSort["unicode-asc"  ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 				jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 				jQuery.fn.dataTableExt.oSort["num-html-asc" ]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a<b) ? -1 : (a>b ? 1 : 0);};
@@ -396,96 +396,96 @@ 
 				jQuery("#btn-toggle-statistics-'.$table_id.'").click();
            ');
             
-            $stats = new Stats($WT_TREE);         
+			$stats = new Stats($WT_TREE);         
             
-            // Bad data can cause "longest life" to be huge, blowing memory limits
-            $max_age = min($WT_TREE->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1;
-            // Inititialise chart data
-            $deat_by_age = array();
-            for ($age = 0; $age <= $max_age; $age++) {
-                $deat_by_age[$age] = '';
-            }
-            $birt_by_decade = array();
-            $deat_by_decade = array();
-            for ($year = 1550; $year < 2030; $year += 10) {
-                $birt_by_decade[$year] = '';
-                $deat_by_decade[$year] = '';
-            }
+			// Bad data can cause "longest life" to be huge, blowing memory limits
+			$max_age = min($WT_TREE->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1;
+			// Inititialise chart data
+			$deat_by_age = array();
+			for ($age = 0; $age <= $max_age; $age++) {
+				$deat_by_age[$age] = '';
+			}
+			$birt_by_decade = array();
+			$deat_by_decade = array();
+			for ($year = 1550; $year < 2030; $year += 10) {
+				$birt_by_decade[$year] = '';
+				$deat_by_decade[$year] = '';
+			}
             
-            $unique_indis = array(); // Don't double-count indis with multiple names.
-            $nb_displayed = 0;
+			$unique_indis = array(); // Don't double-count indis with multiple names.
+			$nb_displayed = 0;
             
-            Individual::load($WT_TREE, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
-                $person = Individual::getInstance($pid, $WT_TREE);
-                if (!$person || !$person->canShowName()) {
-                    unset($listSosa[$sosa]);
-                    continue;
-                }
-                $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
-                    if (
-                        FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
-                        !isset($unique_indis[$person->getXref()])
-                        ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
-                    }
-                }
-                else {
-                    $birth_dates[0]=new Date('');
-                }
-                if ($death_dates = $person->getAllDeathDates()) {
-                    if (
-                        FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
-                        !isset($unique_indis[$person->getXref()])
-                        ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
-                    }
-                }
-                else {
-                    $death_dates[0] = new Date('');
-                }
-                $age = Date::getAge($birth_dates[0], $death_dates[0], 0);
-                if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) {
-                    $deat_by_age[$age] .= $person->getSex();
-                }
-                $listSosa[$sosa] = $person;
-                $unique_indis[$person->getXref()] = true;
-            }
-            $this->view_bag->set('sosa_list', $listSosa);   
+			Individual::load($WT_TREE, $listSosa);
+			foreach($listSosa as $sosa => $pid) {
+				$person = Individual::getInstance($pid, $WT_TREE);
+				if (!$person || !$person->canShowName()) {
+					unset($listSosa[$sosa]);
+					continue;
+				}
+				$nb_displayed++;
+				if ($birth_dates=$person->getAllBirthDates()) {
+					if (
+						FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
+						!isset($unique_indis[$person->getXref()])
+						) {
+						$birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+					}
+				}
+				else {
+					$birth_dates[0]=new Date('');
+				}
+				if ($death_dates = $person->getAllDeathDates()) {
+					if (
+						FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
+						!isset($unique_indis[$person->getXref()])
+						) {
+						$deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+					}
+				}
+				else {
+					$death_dates[0] = new Date('');
+				}
+				$age = Date::getAge($birth_dates[0], $death_dates[0], 0);
+				if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) {
+					$deat_by_age[$age] .= $person->getSex();
+				}
+				$listSosa[$sosa] = $person;
+				$unique_indis[$person->getXref()] = true;
+			}
+			$this->view_bag->set('sosa_list', $listSosa);   
             
-            $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
-            $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
+			$this->view_bag->set('sosa_count', count($listSosa));
+			$this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+			$this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
-            $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
+			$this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
             
-            $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
-            $this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death')));
-            $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year')));
-        }
+			$this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
+			$this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death')));
+			$this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year')));
+		}
         
-        ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render();        
-    }
+		ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render();        
+	}
     
-    /**
-     * Render the Ajax response for the sortable table of Sosa family
-     * @param AjaxController $controller
-     */
-    protected function renderFamSosaListIndi(AjaxController $controller) {
-        global $WT_TREE;
+	/**
+	 * Render the Ajax response for the sortable table of Sosa family
+	 * @param AjaxController $controller
+	 */
+	protected function renderFamSosaListIndi(AjaxController $controller) {
+		global $WT_TREE;
         
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
-        $this->view_bag->set('has_sosa', false);
+		$listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+		$this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
-            $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
-            $this->view_bag->set('table_id', $table_id);
+		if(count($listFamSosa) > 0) {
+			$this->view_bag->set('has_sosa', true);
+			$table_id = 'table-sosa-fam-' . Uuid::uuid4();
+			$this->view_bag->set('table_id', $table_id);
              
-            $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addInlineJavascript('
+			$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addInlineJavascript('
                 jQuery.fn.dataTableExt.oSort["unicode-asc"  ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 				jQuery.fn.dataTableExt.oSort["unicode-desc" ]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 				jQuery.fn.dataTableExt.oSort["num-html-asc" ]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a<b) ? -1 : (a>b ? 1 : 0);};
@@ -561,67 +561,67 @@ 
 				jQuery("#btn-toggle-statistics-'.$table_id.'").click();
            ');
         
-            $stats = new Stats($WT_TREE);        
-            $max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1;
+			$stats = new Stats($WT_TREE);        
+			$max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1;
             
-            //-- init chart data
-    		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
-    			$marr_by_age[$age] = '';
-    		}
-    		$birt_by_decade = array();
-    		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
-    			$birt_by_decade[$year] = '';
-    			$marr_by_decade[$year] = '';
-    		}
+			//-- init chart data
+			$marr_by_age = array();
+			for ($age=0; $age<=$max_age; $age++) {
+				$marr_by_age[$age] = '';
+			}
+			$birt_by_decade = array();
+			$marr_by_decade = array();
+			for ($year=1550; $year<2030; $year+=10) {
+				$birt_by_decade[$year] = '';
+				$marr_by_decade[$year] = '';
+			}
     		
-            foreach($listFamSosa as $sosa => $fid) {
-                $sfamily = Family::getInstance($fid, $WT_TREE);
-                if(!$sfamily || !$sfamily->canShow()) {
-                    unset($sfamily[$sosa]);
-                    continue;
-                }
-                $mdate=$sfamily->getMarriageDate();
+			foreach($listFamSosa as $sosa => $fid) {
+				$sfamily = Family::getInstance($fid, $WT_TREE);
+				if(!$sfamily || !$sfamily->canShow()) {
+					unset($sfamily[$sosa]);
+					continue;
+				}
+				$mdate=$sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
-                    ($hdate = $husb->getBirthDate()) && 
-                    $hdate->isOK() && $mdate->isOK()) {
-                    if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
-                    }
-                    $hage = Date::getAge($hdate, $mdate, 0);
-                    if ($hage >= 0 && $hage <= $max_age) {
-                        $marr_by_age[$hage] .= $husb->getSex();
-                    }
-                }
+				if( ($husb = $sfamily->getHusband()) && 
+					($hdate = $husb->getBirthDate()) && 
+					$hdate->isOK() && $mdate->isOK()) {
+					if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
+						$birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+					}
+					$hage = Date::getAge($hdate, $mdate, 0);
+					if ($hage >= 0 && $hage <= $max_age) {
+						$marr_by_age[$hage] .= $husb->getSex();
+					}
+				}
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
-                    $wdate->isOK() && $mdate->isOK()) {
-                    if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
-                    }
-                    $wage = Date::getAge($wdate, $mdate, 0);
-                    if ($wage >= 0 && $wage <= $max_age) {
-                        $marr_by_age[$wage] .= $wife->getSex();
-                    }
-                }                
+				if(($wife = $sfamily->getWife()) &&
+					($wdate=$wife->getBirthDate()) &&
+					$wdate->isOK() && $mdate->isOK()) {
+					if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
+						$birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+					}
+					$wage = Date::getAge($wdate, $mdate, 0);
+					if ($wage >= 0 && $wage <= $max_age) {
+						$marr_by_age[$wage] .= $wife->getSex();
+					}
+				}                
 
-                if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
-                }
+				if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
+					$marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+				}
                 
-                $listFamSosa[$sosa] = $sfamily;
-            }
-            $this->view_bag->set('sosa_list', $listFamSosa);
+				$listFamSosa[$sosa] = $sfamily;
+			}
+			$this->view_bag->set('sosa_list', $listFamSosa);
         
-            $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
-            $this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage')));
-            $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage')));
-        }
+			$this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
+			$this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage')));
+			$this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage')));
+		}
         
-        ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render();
-    }
+		ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render();
+	}
     
 }
\ No newline at end of file

Spacing +47 added lines, -47 removed lines

@@ -70,7 +70,7 @@ 
         $this->view_bag = new ViewBag();
         $this->view_bag->set('generation', $this->generation);
         $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0) > 0);
         
     }
     
@@ -91,14 +91,14 @@ 
 
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList');
             $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); 
             $this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
+            if ($this->view_bag->get('has_sosa', false)) {            
                 $controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
@@ -108,7 +108,7 @@ 
             			{
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $WT_TREE->getNameUrl(). '",
+                            "ged" : "' . $WT_TREE->getNameUrl().'",
                             "type" : "indi",
                             "gen" : "'.$this->generation.'"
                         },
@@ -133,7 +133,7 @@ 
                         {
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $WT_TREE->getNameUrl(). '",
+                            "ged" : "' . $WT_TREE->getNameUrl().'",
                             "type" : "fam",
                             "gen" : "'.$this->generation.'"
                         },
@@ -172,7 +172,7 @@ 
         
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList@missing');
             $this->view_bag->set('url_ged', $WT_TREE->getNameUrl());
@@ -181,11 +181,11 @@ 
             $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
             $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation - 1));
             $this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
+            if ($this->view_bag->get('has_missing', false)) {
+                $table_id = 'table-sosa-missing-'.Uuid::uuid4();
                 $this->view_bag->set('table_id', $table_id);
                 
                 $controller
@@ -198,7 +198,7 @@ 
     				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
                     
     				jQuery("#'.$table_id.'").dataTable( {
-                        dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+                        dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					'.I18N::datatablesI18N().',
     					jQueryUI: true,
     					autoWidth:false,
@@ -229,14 +229,14 @@ 
     					pagingType: "full_numbers"
     			   });
     			
-    				jQuery("#' . $table_id . '")
+    				jQuery("#' . $table_id.'")
     				/* Filter buttons in table header */
     				.on("click", "button[data-filter-column]", function() {
     					var btn = jQuery(this);
     					// De-activate the other buttons in this button group
     					btn.siblings().removeClass("ui-state-active");
     					// Apply (or clear) this filter
-    					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+    					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
     					if (btn.hasClass("ui-state-active")) {
     						btn.removeClass("ui-state-active");
     						col.search("").draw();
@@ -253,8 +253,8 @@ 
                 $unique_indis = array();
                 $sum_missing_different = 0;
                 $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
+                foreach ($missing_list as $num => $missing_tab) {
+                    if (isset($unique_indis[$missing_tab['indi']])) {
                         unset($missing_list[$num]);
                         continue;
                     }
@@ -272,7 +272,7 @@ 
                 $this->view_bag->set('missing_list', $missing_list);
                 $this->view_bag->set('missing_diff_count', $sum_missing_different);
                 $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation - 2));
                 $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
             }            
         }
@@ -290,7 +290,7 @@ 
         $controller = new AjaxController();
         $controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
+        switch ($type) {
             case 'indi':
                 $this->renderSosaListIndi($controller);
                 break;
@@ -313,9 +313,9 @@ 
         $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
+        if (count($listSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
+            $table_id = 'table-sosa-indi-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
                      
             $controller
@@ -327,8 +327,8 @@ 
 				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
             
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
-					' . I18N::datatablesI18N() . ',
+					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
+					' . I18N::datatablesI18N().',
 					jQueryUI: true,
 					autoWidth: false,
 					processing: true,
@@ -364,7 +364,7 @@ 
 					pagingType: "full_numbers"
 			   });
             
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -373,7 +373,7 @@ 
 				/* Hide/show statistics */
 				.on("click", ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#indi_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#indi_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -381,7 +381,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -416,30 +416,30 @@ 
             $nb_displayed = 0;
             
             Individual::load($WT_TREE, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
+            foreach ($listSosa as $sosa => $pid) {
                 $person = Individual::getInstance($pid, $WT_TREE);
                 if (!$person || !$person->canShowName()) {
                     unset($listSosa[$sosa]);
                     continue;
                 }
                 $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
+                if ($birth_dates = $person->getAllBirthDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
-                    $birth_dates[0]=new Date('');
+                    $birth_dates[0] = new Date('');
                 }
                 if ($death_dates = $person->getAllDeathDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+                        $deat_by_decade[(int)($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
@@ -455,7 +455,7 @@ 
             $this->view_bag->set('sosa_list', $listSosa);   
             
             $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+            $this->view_bag->set('sosa_theo', pow(2, $this->generation - 1));
             $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
             $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
@@ -475,12 +475,12 @@ 
     protected function renderFamSosaListIndi(AjaxController $controller) {
         global $WT_TREE;
         
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation); ;
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
+        if (count($listFamSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
+            $table_id = 'table-sosa-fam-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
              
             $controller
@@ -492,7 +492,7 @@ 
 				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
         
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+					dom: \'<"H"<"filtersH_' . $table_id.'"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
                     '.I18N::datatablesI18N(array(16, 32, 64, 128, -1)).',
 					jQueryUI: true,
 					autoWidth: false,
@@ -529,7 +529,7 @@ 
 					pagingType: "full_numbers"
 			   });
 					
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -538,7 +538,7 @@ 
 				/* Hide/show statistics */
 				.on("click",  ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#fam_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#fam_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -546,7 +546,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -566,29 +566,29 @@ 
             
             //-- init chart data
     		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
+    		for ($age = 0; $age <= $max_age; $age++) {
     			$marr_by_age[$age] = '';
     		}
     		$birt_by_decade = array();
     		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
+    		for ($year = 1550; $year < 2030; $year += 10) {
     			$birt_by_decade[$year] = '';
     			$marr_by_decade[$year] = '';
     		}
     		
-            foreach($listFamSosa as $sosa => $fid) {
+            foreach ($listFamSosa as $sosa => $fid) {
                 $sfamily = Family::getInstance($fid, $WT_TREE);
-                if(!$sfamily || !$sfamily->canShow()) {
+                if (!$sfamily || !$sfamily->canShow()) {
                     unset($sfamily[$sosa]);
                     continue;
                 }
-                $mdate=$sfamily->getMarriageDate();
+                $mdate = $sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
+                if (($husb = $sfamily->getHusband()) && 
                     ($hdate = $husb->getBirthDate()) && 
                     $hdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                        $birt_by_decade[(int)($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
                     }
                     $hage = Date::getAge($hdate, $mdate, 0);
                     if ($hage >= 0 && $hage <= $max_age) {
@@ -596,11 +596,11 @@ 
                     }
                 }
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
+                if (($wife = $sfamily->getWife()) &&
+                    ($wdate = $wife->getBirthDate()) &&
                     $wdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                        $birt_by_decade[(int)($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
                     }
                     $wage = Date::getAge($wdate, $mdate, 0);
                     if ($wage >= 0 && $wage <= $max_age) {
@@ -609,7 +609,7 @@ 
                 }                
 
                 if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+                    $marr_by_decade[(int)($mdate->gregorianYear() / 10) * 10] .= $husb->getSex().$wife->getSex();
                 }
                 
                 $listFamSosa[$sosa] = $sfamily;

src/Webtrees/Module/Sosa/Schema/Migration0.php

Indentation +12 added lines, -12 removed lines

@@ -22,18 +22,18 @@
 	public function upgrade() {
 
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' .
-	        ' majs_gedcom_id      INTEGER 	        NOT NULL,' .
-		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,' . 
-		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,' . // Allow to calculate sosa on 64 generations
-            ' majs_i_id           VARCHAR(20)	    NOT NULL,' .	
-            ' majs_gen            TINYINT			NULL,' .
-            ' majs_birth_year	  SMALLINT			NULL,' .
-            ' majs_death_year	  SMALLINT			NULL,' .
-            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' .
-		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' .
-		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' .			
-		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' .
+			' majs_gedcom_id      INTEGER 	        NOT NULL,' .
+			' majs_user_id        INTEGER           NOT NULL DEFAULT -1,' . 
+			' majs_sosa           BIGINT UNSIGNED 	NOT NULL,' . // Allow to calculate sosa on 64 generations
+			' majs_i_id           VARCHAR(20)	    NOT NULL,' .	
+			' majs_gen            TINYINT			NULL,' .
+			' majs_birth_year	  SMALLINT			NULL,' .
+			' majs_death_year	  SMALLINT			NULL,' .
+			' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' .
+			' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' .
+			' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' .			
+			') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}
 }

Spacing +11 added lines, -11 removed lines

@@ -22,17 +22,17 @@
 	public function upgrade() {
 
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' .
-	        ' majs_gedcom_id      INTEGER 	        NOT NULL,' .
-		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,' . 
-		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,' . // Allow to calculate sosa on 64 generations
-            ' majs_i_id           VARCHAR(20)	    NOT NULL,' .	
-            ' majs_gen            TINYINT			NULL,' .
-            ' majs_birth_year	  SMALLINT			NULL,' .
-            ' majs_death_year	  SMALLINT			NULL,' .
-            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' .
-		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' .
-		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' .			
+		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` ('.
+	        ' majs_gedcom_id      INTEGER 	        NOT NULL,'.
+		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,'. 
+		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,'.// Allow to calculate sosa on 64 generations
+            ' majs_i_id           VARCHAR(20)	    NOT NULL,'.	
+            ' majs_gen            TINYINT			NULL,'.
+            ' majs_birth_year	  SMALLINT			NULL,'.
+            ' majs_death_year	  SMALLINT			NULL,'.
+            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),'.
+		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,'.
+		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE'.			
 		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}

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

Indentation +17 added lines, -17 removed lines

@@ -23,17 +23,17 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {      
-        ?>                
+	protected function renderContent() {      
+		?>                
         <div id="maj-sosa-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php  if($this->data->get('is_setup')) { 
-			    $selectedgen = $this->data->get('generation');
-			    $this->renderSosaHeader();
-			    if($this->data->get('has_sosa') ) {
-			         if($selectedgen > 0) {
-			        ?>
+				$selectedgen = $this->data->get('generation');
+				$this->renderSosaHeader();
+				if($this->data->get('has_sosa') ) {
+					 if($selectedgen > 0) {
+					?>
 			<div id="sosalist-tabs">
 				<ul>
 					<li><a href="#sosalist-indi"><?php echo I18N::translate('Individuals'); ?></a></li>
@@ -53,7 +53,7 @@ 
 			<?php        } else { ?>
 			<p class="warning"><?php echo I18N::translate('No ancestor has been found for generation %d', $selectedgen); ?></p>
 			<?php    }
-			    }
+				}
 			} else { ?>
 			<p class="warning"><?php echo I18N::translate('The list could not be displayed. Reasons might be:'); ?><br/>
 				<ul>
@@ -64,15 +64,15 @@ 
 			<?php } ?>
 		</div> 
 		<?php 
-    }
+	}
     
-    /**
-     * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator
-     */
-    protected function renderSosaHeader() {
-        $selectedgen = $this->data->get('generation');
-        $max_gen = $this->data->get('max_gen');
-        ?>
+	/**
+	 * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator
+	 */
+	protected function renderSosaHeader() {
+		$selectedgen = $this->data->get('generation');
+		$max_gen = $this->data->get('max_gen');
+		?>
         
     	<form method="get" name="setgen" action="module.php">
 			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
@@ -117,7 +117,7 @@ 
 		
 		<?php 
 		}
-    }       
+	}       
     
 }
  
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -28,11 +28,11 @@ 
         <div id="maj-sosa-list-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')) { 
 			    $selectedgen = $this->data->get('generation');
 			    $this->renderSosaHeader();
-			    if($this->data->get('has_sosa') ) {
-			         if($selectedgen > 0) {
+			    if ($this->data->get('has_sosa')) {
+			         if ($selectedgen > 0) {
 			        ?>
 			<div id="sosalist-tabs">
 				<ul>
@@ -75,9 +75,9 @@ 
         ?>
         
     	<form method="get" name="setgen" action="module.php">
-			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
-			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action');?>">
-			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>">
+			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module'); ?>">
+			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action'); ?>">
+			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged'); ?>">
 			<div class="maj-table">
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Choose generation') ?></div>
@@ -85,9 +85,9 @@ 
 				<div class="maj-row">
 					<div class="value">
 						<select name="gen">							
-						<?php for($i=$this->data->get('min_gen'); $i <= $max_gen;$i++) {?>
+						<?php for ($i = $this->data->get('min_gen'); $i <= $max_gen; $i++) {?>
 							<option value="<?php echo $i; ?>"
-							<?php if($selectedgen && $selectedgen==$i) { ?> selected="true" <?php } ?>
+							<?php if ($selectedgen && $selectedgen == $i) { ?> selected="true" <?php } ?>
                 			><?php echo I18N::translate('Generation %d', $i); ?>
                 			</option>
                 		<?php } ?>
@@ -95,21 +95,21 @@ 
                 	</div>
                 </div>
       		</div>
-      		<input type="submit" value="<?php echo I18N::translate('Show');?>" />
+      		<input type="submit" value="<?php echo I18N::translate('Show'); ?>" />
       		<br />
       	</form>
-      	<?php if($selectedgen > 0) { ?>
+      	<?php if ($selectedgen > 0) { ?>
 		<h4>
-			<?php if($selectedgen > $this->data->get('min_gen')) { ?>
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen-1; ?>">
+			<?php if ($selectedgen > $this->data->get('min_gen')) { ?>
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen - 1; ?>">
 				<i class="icon-ldarrow" title="<?php echo I18N::translate('Previous generation'); ?>" ></i>
 			</a>
 			&nbsp;&nbsp;
 			<?php } ?>
 			<?php echo I18N::translate('Generation %d', $selectedgen); ?>
-			<?php if($selectedgen < $max_gen) { ?>
+			<?php if ($selectedgen < $max_gen) { ?>
 			&nbsp;&nbsp;
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen+1; ?>">
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen + 1; ?>">
 				<i class="icon-rdarrow" title="<?php echo I18N::translate('Next generation'); ?>" ></i>
 			</a>
 			<?php } ?>

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

Indentation +4 added lines, -4 removed lines

@@ -23,13 +23,13 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {      
-        ?>                
+	protected function renderContent() {      
+		?>                
         <div id="maj-sosa-stats-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php  if($this->data->get('is_setup')) {  
-			    $general_stats = $this->data->get('general_stats'); ?>
+				$general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
 				<div class="maj-row">
@@ -134,7 +134,7 @@ 
 			<?php   } else { ?>
 			<div class="warning"><?php echo I18N::translate('No Sosa root individual has been defined.'); ?></div>
 			<?php }     
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -30,11 +30,11 @@ 
 			<?php 
 			/** @var \Fisharebest\Webtrees\Individual $root_indi */
 			$root_indi = $this->data->get('root_indi');
-			if($root_indi !== null && $root_indi->canShowName()) { ?>
+			if ($root_indi !== null && $root_indi->canShowName()) { ?>
 			<h4 class="center"><?= I18N::translate('%s: %s', I18N::translate('Root individual'), $root_indi->getFullName()); ?><h4>
 			<?php } ?>
 			
-			<?php  if($this->data->get('is_setup')) {  
+			<?php  if ($this->data->get('is_setup')) {  
 			    $general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
@@ -56,7 +56,7 @@ 
 				</div>
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Mean generation time'); ?></div>
-					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'],  I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
+					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'], I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
 				</div>
 			</div>
 			
@@ -96,7 +96,7 @@ 
 					</tr>
 				</thead>
 				<tbody>
-					<?php foreach($this->data->get('generation_stats') as $gen => $row) { ?>
+					<?php foreach ($this->data->get('generation_stats') as $gen => $row) { ?>
 					<tr class="maj-row">
 						<td class="label"><?php echo I18N::translate('<strong>G%d</strong>', $gen); ?></td>
 						<td class="label"><?php echo I18N::translate('%1$s <> %2$s', $row['gen_min_birth'], $row['gen_max_birth']); ?></td>
@@ -110,7 +110,7 @@ 
 						<td class="value"><?php echo I18N::number($row['different']); ?></td>
 						<td class="value left percent_container">
 							<div class="percent_frame">
-								<div class="percent_cell" style="width:<?php echo 100*$row['perc_different'] ?>%;">
+								<div class="percent_cell" style="width:<?php echo 100 * $row['perc_different'] ?>%;">
 									&nbsp;<?php echo I18N::percentage($row['perc_different']); ?>&nbsp;
 								</div>
 							</div>
@@ -123,7 +123,7 @@ 
 				<tfoot>
 					<tr class="maj-row">
 						<td class="label" colspan="13">
-							<?php echo I18N::translate('Generation-equivalent: %s generations', I18N::number($this->data->get('equivalent_gen'),2)); ?>
+							<?php echo I18N::translate('Generation-equivalent: %s generations', I18N::number($this->data->get('equivalent_gen'), 2)); ?>
 						</td>
 					</tr>
 				</tfoot>
@@ -132,8 +132,8 @@ 
 			
 			<h3><?php echo I18N::translate('Known Sosa ancestors\' family dispersion'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_g2') ?: '' ; ?>
-				<?php echo $this->data->get('chart_img_g3') ?: '' ; ?>				
+				<?php echo $this->data->get('chart_img_g2') ?: ''; ?>
+				<?php echo $this->data->get('chart_img_g3') ?: ''; ?>				
 				<!--  <canvas id="chart_ancestors_g2" width="300" height="300"></canvas>  -->
 			</div>
 			

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

Indentation +87 added lines, -87 removed lines

@@ -32,11 +32,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-fam-list" class="sosa-list">
 			<table id="<?php echo $table_id; ?>">
@@ -187,59 +187,59 @@ 
 				<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
-			    /** @var \Fisharebest\Webtrees\Family $person */
+				/** @var \Fisharebest\Webtrees\Family $person */
 
-			    //PERSO Create decorator for Family
-			    $dfamily = new Family($family);
+				//PERSO Create decorator for Family
+				$dfamily = new Family($family);
 			    
-			    $husb = $family->getHusband();
-			    if (is_null($husb)) {
-			        $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
-			    }
-			    $dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-			    $wife = $family->getWife();
-			    if (is_null($wife)) {
-			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
-			    }
-			    $dwife = new \MyArtJaub\Webtrees\Individual($wife);
+				$husb = $family->getHusband();
+				if (is_null($husb)) {
+					$husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
+				}
+				$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
+				$wife = $family->getWife();
+				if (is_null($wife)) {
+					$wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
+				}
+				$dwife = new \MyArtJaub\Webtrees\Individual($wife);
 			    
-			    $mdate=$family->getMarriageDate();
+				$mdate=$family->getMarriageDate();
 			    
-			    if ($family->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($family->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    ?>			
+				if ($family->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($family->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				?>			
         		<tr <?php echo $class?>>
         			<td class="transparent"><?php echo I18N::translate('%1$d/%2$d', $sosa, ($sosa + 1) % 10); ?></td>
         			<td class="transparent"><?php echo $sosa; ?></td>
         			<!--  HUSBAND -->
         			<td colspan="2">
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
-        				}
-        				if ($num==$husb->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$husb->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
+						}
+						if ($num==$husb->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$husb->getSexImage();
+							list($surn, $givn)=explode(',', $name['sort']);
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dhusb->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $husb->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $husb->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<!-- Dummy column to match colspan in header -->
             		<td style="display:none;"></td>
@@ -255,27 +255,27 @@ 
             		<!--  WIFE -->
         			<td colspan="2">
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
-        				}
-        				if ($num==$wife->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$wife->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
+						}
+						if ($num==$wife->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$wife->getSexImage();
+							list($surn, $givn)=explode(',', $name['sort']);
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $wife->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dwife->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $wife->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $wife->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<!-- Dummy column to match colspan in header -->
             		<td style="display:none;"></td>
@@ -289,31 +289,31 @@ 
             		<td><?php  Date::getAge($wdate, $mdate, 2); ?></td>
             		<td><?php  Date::getAge($wdate, $mdate, 1); ?></td>
             		<td><?php 
-            		if ($marriage_dates = $family->getAllMarriageDates()) {
-        				foreach ($marriage_dates as $n => $marriage_date) {
-        					if ($n) { echo '<br>'; } ?>
+					if ($marriage_dates = $family->getAllMarriageDates()) {
+						foreach ($marriage_dates as $n => $marriage_date) {
+							if ($n) { echo '<br>'; } ?>
         					<div><?php echo $marriage_date->display(true); ?></div>
         				<?php }
-            		} elseif ($family->getFacts('_NMR')) {
-            		    echo I18N::translate('no');
-            		} elseif ($family->getFacts('MARR')) {
-            		    echo I18N::translate('yes');
-            		} else {
-            		    echo '&nbsp;';
-            		} ?>
+					} elseif ($family->getFacts('_NMR')) {
+						echo I18N::translate('no');
+					} elseif ($family->getFacts('MARR')) {
+						echo I18N::translate('yes');
+					} else {
+						echo '&nbsp;';
+					} ?>
             		</td>
             		<td><?php echo $marriage_dates ? $marriage_date->julianDay() : 0;  ?></td>
             		<td><?php 
-            		foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
-				        $tmp = new Place($marriage_place, $family->getTree());
-        				if ($n) { ?><br><?php } ?>
+					foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
+						$tmp = new Place($marriage_place, $family->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)) {
-				        $isMSourced = $dfamily->isMarriageSourced(); ?>
+						$isMSourced = $dfamily->isMarriageSourced(); ?>
 				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isMSourced, 'MARR', 1, 'medium'); ?></td>
 					<td><?php echo $isMSourced; ?></td>
 					<?php } else { ?>
@@ -326,30 +326,30 @@ 
 					<td><?php 
 					if (!$mdate->isOK()) { echo 'U'; }
 					else {
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
-					    else { echo 'YES'; }
+						if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
+						else { echo 'YES'; }
 					}
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
-					    echo 'M';
+						echo 'M';
 					} ?>
 					</td>
 					<td><?php 
-			         if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
-			         if ($husb->isDead() && !$wife->isDead()) {
-        				if ($wife->getSex() == 'F') { echo 'H'; }
-        				if ($wife->getSex() == 'M') { echo 'W'; } // male partners
-        			}
-        			if (!$husb->isDead() && $wife->isDead()) {
-        				if ($husb->getSex() == 'M') { echo 'W'; }
-        				if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
-        			}
-        			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
+					 if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
+					 if ($husb->isDead() && !$wife->isDead()) {
+						if ($wife->getSex() == 'F') { echo 'H'; }
+						if ($wife->getSex() == 'M') { echo 'W'; } // male partners
+					}
+					if (!$husb->isDead() && $wife->isDead()) {
+						if ($husb->getSex() == 'M') { echo 'W'; }
+						if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
+					}
+					if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
         			</td>
         			<td><?php 
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
-			         else { echo '&nbsp;'; } ?>
+					 if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
+					 elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
+					 else { echo '&nbsp;'; } ?>
 			         </td>
 				</tr>
         	<?php } ?>
@@ -387,7 +387,7 @@ 
         <p class="warning"><?php echo I18N::translate('No family has been found for generation %d', $this->data->get('generation')); ?></p>
         <?php 
 		}
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +31 added lines, -31 removed lines

@@ -34,7 +34,7 @@ 
 	 */
     protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
+        if ($this->data->get('has_sosa', false)) {
             $table_id = $this->data->get('table_id');            
         ?>   
         
@@ -52,7 +52,7 @@ 
 										class="ui-state-default"
 										title="<?php echo I18N::translate('Show individuals who are alive or couples where both partners are alive.'); ?>"
 									>
-									<?php echo I18N::translate('Both alive');?>
+									<?php echo I18N::translate('Both alive'); ?>
 									</button>
 									<button
 										type="button"
@@ -61,7 +61,7 @@ 
 										class="ui-state-default"
 										title="<?php echo I18N::translate('Show couples where only the female partner is deceased.'); ?>"
 									>
-									<?php echo I18N::translate('Widower');?>
+									<?php echo I18N::translate('Widower'); ?>
 									</button>
 									<button
 										type="button"
@@ -186,7 +186,7 @@ 
 				</thead>
 				<tbody>
 			
-			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
+			<?php foreach ($this->data->get('sosa_list') as $sosa => $family) {
 			    /** @var \Fisharebest\Webtrees\Family $person */
 
 			    //PERSO Create decorator for Family
@@ -203,7 +203,7 @@ 
 			    }
 			    $dwife = new \MyArtJaub\Webtrees\Individual($wife);
 			    
-			    $mdate=$family->getMarriageDate();
+			    $mdate = $family->getMarriageDate();
 			    
 			    if ($family->isPendingAddtion()) {
 			        $class = ' class="new"';
@@ -219,18 +219,18 @@ 
         			<!--  HUSBAND -->
         			<td colspan="2">
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
         				}
-        				if ($num==$husb->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$husb->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
+        				if ($num == $husb->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $husb->getSexImage();
+        					list($surn, $givn) = explode(',', $name['sort']);
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -244,29 +244,29 @@ 
             		<!-- Dummy column to match colspan in header -->
             		<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 $hdate=$husb->getBirthDate(); ?>
+            		<?php $hdate = $husb->getBirthDate(); ?>
             		<td><?php  Date::getAge($hdate, $mdate, 2); ?></td>
             		<td><?php  Date::getAge($hdate, $mdate, 1); ?></td>
             		<!--  WIFE -->
         			<td colspan="2">
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
         				}
-        				if ($num==$wife->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$wife->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
+        				if ($num == $wife->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $wife->getSexImage();
+        					list($surn, $givn) = explode(',', $name['sort']);
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $wife->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -280,12 +280,12 @@ 
             		<!-- Dummy column to match colspan in header -->
             		<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 $wdate=$wife->getBirthDate(); ?>
+            		<?php $wdate = $wife->getBirthDate(); ?>
             		<td><?php  Date::getAge($wdate, $mdate, 2); ?></td>
             		<td><?php  Date::getAge($wdate, $mdate, 1); ?></td>
             		<td><?php 
@@ -302,7 +302,7 @@ 
             		    echo '&nbsp;';
             		} ?>
             		</td>
-            		<td><?php echo $marriage_dates ? $marriage_date->julianDay() : 0;  ?></td>
+            		<td><?php echo $marriage_dates ? $marriage_date->julianDay() : 0; ?></td>
             		<td><?php 
             		foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
 				        $tmp = new Place($marriage_place, $family->getTree());
@@ -362,7 +362,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>

Braces +3 added lines, -7 removed lines

@@ -324,10 +324,8 @@ 
 					<td><?php echo I18N::number($nchi); ?></td>
 					<td><?php echo $nchi; ?></td>
 					<td><?php 
-					if (!$mdate->isOK()) { echo 'U'; }
-					else {
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
-					    else { echo 'YES'; }
+					if (!$mdate->isOK()) { echo 'U'; } else {
+					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; } else { echo 'YES'; }
 					}
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
@@ -347,9 +345,7 @@ 
         			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
         			</td>
         			<td><?php 
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
-			         else { echo '&nbsp;'; } ?>
+			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; } elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; } else { echo '&nbsp;'; } ?>
 			         </td>
 				</tr>
         	<?php } ?>