jon48 / webtrees-lib

src/Webtrees/Module/PatronymicLineage/Views/LineageView.php

Spacing +30 added lines, -30 removed lines

@@ -36,12 +36,12 @@ 
         /** @var \Fisharebest\Webtrees\Tree $tree */
         $tree = $this->data->get('tree');
         
-        echo '<h2 class="center">', $this->data->get('title') , '</h2>';
+        echo '<h2 class="center">', $this->data->get('title'), '</h2>';
         echo '<p class="center alpha_index">', implode(' | ', $this->getInitialLettersList()), '</p>';
          
-        if($this->data->get('issurnames', false)) {
+        if ($this->data->get('issurnames', false)) {
             $surns = $this->data->get('surnameslist', array());
-            $extra_params = array ('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
+            $extra_params = array('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
             // Show the surname list
             switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
                 case 'style1':
@@ -59,16 +59,16 @@ 
         else if ($this->data->get('islineages', false)) {
             //Link to indilist
             echo '<p class="center"><strong>'.
-                '<a href="indilist.php?ged=' . $tree->getNameUrl() . '&surname=' . rawurlencode($this->data->get('surname')) .'">'. 
+                '<a href="indilist.php?ged='.$tree->getNameUrl().'&surname='.rawurlencode($this->data->get('surname')).'">'. 
                 I18N::translate('Go to the list of individuals with surname %s', $this->data->get('legend')).
                 '</a></strong></p>';
             
             $lineages = $this->data->get('lineages', null);
             $nb_lineages = is_null($lineages) ? 0 : count($lineages);
-            if($nb_lineages == 0) {
+            if ($nb_lineages == 0) {
             	echo '<p class="center"><span class="warning">',
             		I18N::translate('No individuals with surname %s has been found. Please try another name.',
-            			'<span dir="auto">' . $this->data->get('legend') . '</span>'),
+            			'<span dir="auto">'.$this->data->get('legend').'</span>'),
             			'</span></p>';
             } else { 
             	
@@ -79,9 +79,9 @@ 
             	
             	echo '<div class="list_value_wrap">';            	
             	
-            	foreach($lineages as $i => $lineage) {
+            	foreach ($lineages as $i => $lineage) {
             		$this->printRootLineage($lineage);
-            		if($i < $nb_lineages - 1) echo '<hr />';
+            		if ($i < $nb_lineages - 1) echo '<hr />';
             	}
             	
             	echo '</div>';
@@ -104,7 +104,7 @@ 
         $list = array();
         /** @var \Fisharebest\Webtrees\Tree $tree */
         $tree = $this->data->get('tree');
-		$script_base_url = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+		$script_base_url = WT_SCRIPT_NAME.'?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME.'&mod_action=Lineage';
 		
         foreach (QueryName::surnameAlpha($tree, false, false) as $letter => $count) {
             switch ($letter) {
@@ -120,9 +120,9 @@ 
             }
             if ($count) {
                 if ($letter == $this->data->get('alpha')) {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
+                    $list[] = '<a href="'.$script_base_url.'&alpha='.rawurlencode($letter).'&amp;ged='.$tree->getNameUrl().'" class="warning" title="'.I18N::number($count).'">'.$html.'</a>';
                 } else {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                    $list[] = '<a href="'.$script_base_url.'&alpha='.rawurlencode($letter).'&amp;ged='.$tree->getNameUrl().'" title="'.I18N::number($count).'">'.$html.'</a>';
                 }
             } else {
                 $list[] = $html;
@@ -132,9 +132,9 @@ 
         // Search spiders don't get the "show all" option as the other links give them everything.
         if (!Auth::isSearchEngine()) {
             if ($this->data->get('show_all') === 'yes') {
-                $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+                $list[] = '<span class="warning">'.I18N::translate('All').'</span>';
             } else {
-                $list[] = '<a href="' . $script_base_url . '&show_all=yes' . '&amp;ged=' . $tree->getNameUrl() . '">' . I18N::translate('All') . '</a>';
+                $list[] = '<a href="'.$script_base_url.'&show_all=yes'.'&amp;ged='.$tree->getNameUrl().'">'.I18N::translate('All').'</a>';
             }
         }
     
@@ -147,11 +147,11 @@ 
      */
     private function printRootLineage(LineageRootNode $node) {    	
     	print '<div class="patrolin_tree">';
-    	if($node->getIndividual() === null) {
+    	if ($node->getIndividual() === null) {
     		$fam_nodes = $node->getFamiliesNodes();
-    		foreach($fam_nodes as $fam){
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
+    		foreach ($fam_nodes as $fam) {
+    			foreach ($fam_nodes[$fam] as $child_node) {
+    				if ($child_node) {
     					$this->printLineage($child_node);
     				}
     			}
@@ -163,7 +163,7 @@ 
     	echo '</div>';
     	
     	$places = $node->getPlaces();
-    	if($places && count($places)>0){
+    	if ($places && count($places) > 0) {
     		echo '<div class="patrolin_places">';
     		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlPlacesCloud($places, false, $this->data->get('tree'));
     		echo '</div>';
@@ -178,34 +178,34 @@ 
     	
     	echo '<ul>';
     	$fam_nodes = $node->getFamiliesNodes();
-    	if(count($fam_nodes) > 0) {
+    	if (count($fam_nodes) > 0) {
     		$is_first_family = true;
-    		foreach($fam_nodes as $fam) {
+    		foreach ($fam_nodes as $fam) {
     			$node_indi = $node->getIndividual();
     			echo '<li>';
-    			if($is_first_family){
+    			if ($is_first_family) {
     				echo FunctionsPrint::htmlIndividualForList($node_indi);
     			}
-				else{
+				else {
 					echo FunctionsPrint::htmlIndividualForList($node_indi, false);
 				}
 				//Get individual's spouse
 				$dfam = new Family($fam);
-				$spouse=$dfam->getSpouseById($node_indi);
+				$spouse = $dfam->getSpouseById($node_indi);
 				//Print the spouse if relevant
-				if($spouse){
+				if ($spouse) {
 					$marrdate = I18N::translate('yes');
 					$marryear = '';
 					echo '&nbsp;<a href="'.$fam->getHtmlUrl().'">';
-					if ($fam->getMarriageYear()){
+					if ($fam->getMarriageYear()) {
 						$marrdate = strip_tags($fam->getMarriageDate()->Display());
 						$marryear = $fam->getMarriageYear();
 					}
 					echo '<span class="details1" title="'.$marrdate.'"><i class="icon-rings"></i>'.$marryear.'</span></a>&nbsp;';
 					echo FunctionsPrint::htmlIndividualForList($spouse);
 				}
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
+    			foreach ($fam_nodes[$fam] as $child_node) {
+    				if ($child_node) {
     					$this->printLineage($child_node);
     				}
     				else {
@@ -218,10 +218,10 @@ 
     	else {
     		echo '<li>';
     		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlIndividualForList($node->getIndividual());
-    		if($node->hasFollowUpSurname()) {
-    			$url_base = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+    		if ($node->hasFollowUpSurname()) {
+    			$url_base = WT_SCRIPT_NAME.'?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME.'&mod_action=Lineage';
     			echo '&nbsp;'.
-    				'<a href="' . $url_base . '&surname=' . rawurlencode($node->getFollowUpSurname()) . '&amp;ged=' . $this->data->get('tree')->getNameUrl() . '">'.
+    				'<a href="'.$url_base.'&surname='.rawurlencode($node->getFollowUpSurname()).'&amp;ged='.$this->data->get('tree')->getNameUrl().'">'.
     				'('.I18N::translate('Go to %s lineages', $node->getFollowUpSurname()).')'.
     				'</a>';
     		}

src/Webtrees/ImageBuilder.php

Spacing +26 added lines, -26 removed lines

@@ -69,7 +69,7 @@ 
 	*
 	* @param Media|null $media Reference media object
 	*/
-	public function __construct(Media $media = null){
+	public function __construct(Media $media = null) {
 	    $this->media = $media;
 	    $this->use_ttf = function_exists('imagettftext');
 	    $this->expire_offset = 3600 * 24;
@@ -95,7 +95,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
+	    if ($expireOffset) $this->expire_offset = $expireOffset;
 	    return $this;
 	}
 	
@@ -115,7 +115,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+	    if (!is_null($show_watermark)) $this->show_watermark = $show_watermark;
 	    return $this;
 	}
 	
@@ -126,7 +126,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
+	    if ($font_max_size) $this->font_max_size = $font_max_size;
 	    return $this;
 	}
 	
@@ -137,7 +137,7 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
+	    if ($font_color) $this->font_color = $font_color;
 	    return $this;
 	}
 	
@@ -148,32 +148,32 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setAsAttachment($is_attachement) {
-	    if(is_bool($is_attachement)) $this->as_attachment = $is_attachement;
+	    if (is_bool($is_attachement)) $this->as_attachment = $is_attachement;
 	    return $this;
 	}
 	
 	/**
 	 * Render the image to the output.
 	 */
-	public function render(){
+	public function render() {
 	    
 	    if (!$this->media || !$this->media->canShow()) {
-	        Log::addMediaLog('Image Builder error: >' . I18N::translate('Missing or private media object.'));
+	        Log::addMediaLog('Image Builder error: >'.I18N::translate('Missing or private media object.'));
 	        $this->renderError();
 	    }
 	    
 	    $serverFilename = $this->media->getServerFilename();
 	    
 	    if (!file_exists($serverFilename)) {
-	        Log::addMediaLog('Image Builder error: >'. I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
+	        Log::addMediaLog('Image Builder error: >'.I18N::translate('The media object does not exist.').'< for path >'.$serverFilename.'<');
 	        $this->renderError();
 	    }
 	    
 	    $mimetype = $this->media->mimeType();
 	    $imgsize = $this->media->getImageAttributes();
 	    $filetime = $this->media->getFiletime();
-	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime) . ' GMT';	    
-	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()) . ' GMT';
+	    $filetimeHeader = gmdate('D, d M Y H:i:s', $filetime).' GMT';	    
+	    $expireHeader = gmdate('D, d M Y H:i:s', WT_TIMESTAMP + $this->getExpireOffset()).' GMT';
 	    
 	    $type = Functions::isImageTypeSupported($imgsize['ext']);
 	    $usewatermark = false;
@@ -205,10 +205,10 @@ 
 	    }
 	    
 	    // add caching headers.  allow browser to cache file, but not proxy
-	    header('Last-Modified: ' . $filetimeHeader);
-	    header('ETag: "' . $etag . '"');
-	    header('Expires: ' . $expireHeader);
-	    header('Cache-Control: max-age=' . $this->getExpireOffset() . ', s-maxage=0, proxy-revalidate');
+	    header('Last-Modified: '.$filetimeHeader);
+	    header('ETag: "'.$etag.'"');
+	    header('Expires: '.$expireHeader);
+	    header('Cache-Control: max-age='.$this->getExpireOffset().', s-maxage=0, proxy-revalidate');
 	    
 	    // if this file is already in the user’s cache, don’t resend it
 	    // first check if the if_modified_since param matches
@@ -223,13 +223,13 @@ 
 
 	    // send headers for the image
 	    $disposition = $this->as_attachment ? 'attachment' : 'inline';
-	    header('Content-Type: ' . $mimetype);
-	    header('Content-Disposition: ' . $disposition . '; filename="' . addslashes(basename($this->media->getFilename())) . '"');
+	    header('Content-Type: '.$mimetype);
+	    header('Content-Disposition: '.$disposition.'; filename="'.addslashes(basename($this->media->getFilename())).'"');
 	     
 	    if ($usewatermark) {
 	        // generate the watermarked image
-	        $imCreateFunc = 'imagecreatefrom' . $type;
-	        $imSendFunc   = 'image' . $type;
+	        $imCreateFunc = 'imagecreatefrom'.$type;
+	        $imSendFunc   = 'image'.$type;
 	    
 	        if (function_exists($imCreateFunc) && function_exists($imSendFunc)) {
 	            $im = $imCreateFunc($serverFilename);
@@ -242,7 +242,7 @@ 
 	            return;
 	        } else {
 	            // this image is defective.  log it
-	            Log::addMediaLog('Image Builder error: >' . I18N::translate('This media file is broken and cannot be watermarked.') . '< in file >' . $serverFilename . '< memory used: ' . memory_get_usage());
+	            Log::addMediaLog('Image Builder error: >'.I18N::translate('This media file is broken and cannot be watermarked.').'< in file >'.$serverFilename.'< memory used: '.memory_get_usage());
 	        }
 	    }
 	    
@@ -250,7 +250,7 @@ 
 	    $filesize = filesize($serverFilename);
 	    
 	    // set content-length header, send file
-	    header('Content-Length: ' . $filesize);
+	    header('Content-Length: '.$filesize);
 	    
 	    // Some servers disable fpassthru() and readfile()
 	    if (function_exists('readfile')) {
@@ -280,7 +280,7 @@ 
     	$bgc    = imagecolorallocate($im, 255, 255, 255); /* set background color */
     	imagefilledrectangle($im, 2, 2, $width - 4, $height - 4, $bgc); /* create a rectangle, leaving 2 px border */
     
-    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT . Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
+    	$this->embedText($im, $error, 100, '255, 0, 0', WT_ROOT.Config::FONT_DEJAVU_SANS_TTF, 'top', 'left');
     
     	http_response_code(404);
     	header('Content-Type: image/png');
@@ -298,7 +298,7 @@ 
 	protected function applyWatermark($im) {
 	    
 	    // text to watermark with	    
-	    if(method_exists($this->media, 'getWatermarkText')) {
+	    if (method_exists($this->media, 'getWatermarkText')) {
 	       $word1_text = $this->media->getWatermarkText();
 	    }
 	    else {
@@ -310,7 +310,7 @@ 
 	        $word1_text, 
 	        $this->font_max_size,
 	        $this->font_color,
-	        WT_ROOT . Config::FONT_DEJAVU_SANS_TTF,
+	        WT_ROOT.Config::FONT_DEJAVU_SANS_TTF,
 	        'top', 
 	        'left'
 	     );
@@ -429,7 +429,7 @@ 
 	 * @param string $hexstr
 	 * @return int[]
 	 */
-	protected function hexrgb ($hexstr)
+	protected function hexrgb($hexstr)
 	{
 	    $int = hexdec($hexstr);
 	
@@ -471,7 +471,7 @@ 
      */
     function imageTtfTextErrorHandler($errno, $errstr) {
         // log the error
-        Log::addErrorLog('Image Builder error: >' . $errno . '/' . $errstr . '< while processing file >' . $this->media->getServerFilename() . '<');
+        Log::addErrorLog('Image Builder error: >'.$errno.'/'.$errstr.'< while processing file >'.$this->media->getServerFilename().'<');
     
         // change value of useTTF to false so the fallback watermarking can be used.
         $this->use_ttf = false;

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

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
 	public function upgrade() {
 
 		Database::exec(
-		    'ALTER TABLE `##maj_sosa`' . 
-		    ' ADD COLUMN majs_birth_year_est SMALLINT NULL AFTER majs_birth_year,' .
+		    'ALTER TABLE `##maj_sosa`'. 
+		    ' ADD COLUMN majs_birth_year_est SMALLINT NULL AFTER majs_birth_year,'.
 		    ' ADD COLUMN majs_death_year_est SMALLINT NULL AFTER majs_death_year'
 		);
 		

src/Webtrees/Module/Sosa/SosaStatsController.php

Spacing +40 added lines, -41 removed lines

@@ -63,7 +63,7 @@ 
         $view_bag->set('title', $controller->getPageTitle());
         $view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
+        if ($this->sosa_provider->isSetup()) {
             $view_bag->set('is_setup', true);
             
             $view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
@@ -84,21 +84,21 @@ 
             $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
             $view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
+            $gen_theoretical = 1;
+            $total_theoretical = 0;
+            $prev_diff = 0;
+            $prev_known = 0.5;
             $generation_stats = array();
             
-            foreach($stats_gen as $gen => $tab){
-                $genY1= I18N::translate('-');
-                $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstEstimatedBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastEstimatedBirth'];
+            foreach ($stats_gen as $gen => $tab) {
+                $genY1 = I18N::translate('-');
+                $genY2 = I18N::translate('-');
+                if ($tab['firstBirth'] > 0) $genY1 = $tab['firstEstimatedBirth'];
+                if ($tab['lastBirth'] > 0) $genY2 = $tab['lastEstimatedBirth'];
                 $total_theoretical += $gen_theoretical;
                 $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
-                $missing=2*$prev_known - $tab['sosaCount'];
-                $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
+                $missing = 2 * $prev_known - $tab['sosaCount'];
+                $gen_diff = $tab['diffSosaTotalCount'] - $prev_diff;
                 
                 $generation_stats[$gen] = array(
                     'gen_min_birth' => $genY1,
@@ -107,7 +107,7 @@ 
                     'known' => $tab['sosaCount'],
                     'perc_known' => $perc_sosa_count_theor,
                     'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+                    'perc_missing' => 1 - Functions::safeDivision($tab['sosaCount'], 2 * $prev_known),
                     'total_known' => $tab['sosaTotalCount'],
                     'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
                     'different' => $gen_diff,
@@ -117,8 +117,8 @@ 
                 );
                 
                 $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
+                $prev_known = $tab['sosaCount'];
+                $prev_diff = $tab['diffSosaTotalCount'];
             }
             
             $view_bag->set('generation_stats', $generation_stats);
@@ -149,13 +149,12 @@ 
     {
         $top10multiancestors = $this->sosa_provider->getTopMultiSosaAncestorsNoTies(10);
         $top10ancestors = array();
-        if($top10multiancestors !== null && count($top10multiancestors)) {
-            foreach($top10multiancestors as $pid => $count) {
+        if ($top10multiancestors !== null && count($top10multiancestors)) {
+            foreach ($top10multiancestors as $pid => $count) {
                 $indi = Individual::getInstance($pid, $this->sosa_provider->getTree());
-                if($indi !== null && $indi->canShowName()) {
+                if ($indi !== null && $indi->canShowName()) {
                     array_key_exists($count, $top10ancestors) ?
-                        $top10ancestors[$count][] = $indi:
-                        $top10ancestors[$count] = array($count => $indi);
+                        $top10ancestors[$count][] = $indi : $top10ancestors[$count] = array($count => $indi);
                 }
             }
         }
@@ -169,27 +168,27 @@ 
      private function htmlAncestorDispersionG2()
     {
         $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+        if (count($ancestorsDispGen2) == 0) return;
         
         $size = '600x300';
         
         $total = array_sum($ancestorsDispGen2);
         $father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
+        $father = array(
             'color' => '84beff', 
             'count' => $father_count, 
             'perc' => Functions::safeDivision($father_count, $total), 
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
         );
         $mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
+        $mother = array(
             'color' => 'ffd1dc', 
             'count' => $mother_count, 
             'perc' => Functions::safeDivision($mother_count, $total),
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
         );
         $shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
+        $shared = array(
             'color' => '777777', 
             'count' => $shared_count, 
             'perc' => Functions::safeDivision($shared_count, $total),
@@ -199,10 +198,10 @@ 
         $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
         $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
         $chl = 
-             $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
-             $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
-             $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
-        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+             $father['name'].' - '.I18N::percentage($father['perc'], 1).'|'.
+             $shared['name'].' - '.I18N::percentage($shared['perc'], 1).'|'.
+             $mother['name'].' - '.I18N::percentage($mother['perc'], 1);
+        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"".$chart_title."\" title=\"".$chart_title."\" />";
     }
     
     /**
@@ -226,7 +225,7 @@ 
         $total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
         $total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
         $total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+        $total = $total_fatfat + $total_fatmot + $total_motfat + $total_motmot + $total_sha;
     
         $chd = $this->arrayToExtendedEncoding(array(
 	    4095 * Functions::safeDivision($total_fatfat, $total), 
@@ -237,12 +236,12 @@ 
         ));
         $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
         $chl =
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
-            I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
-         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat').' - '.I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot').' - '.I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1).'|'.
+            I18N::translate('Shared').' - '.I18N::percentage(Functions::safeDivision($total_sha, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat').' - '.I18N::percentage(Functions::safeDivision($total_motfat, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot').' - '.I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
+         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"".$chart_title."\" title=\"".$chart_title."\" />";
     }    
     
     /**
@@ -251,15 +250,15 @@ 
      */
     private function htmlAncestorGenDepthG3() {
         $ancestorsGenDepth3 = $this->sosa_provider->getGenerationDepthStatsAtGen(3);
-        if(count($ancestorsGenDepth3) == 0) return;
+        if (count($ancestorsGenDepth3) == 0) return;
         
         $ancestors = array();
         $chd_mean = array();
         $chd_error_low = array();
         $chd_error_high = array();
-        foreach($ancestorsGenDepth3 as $sosa => $genDepthStat) {
+        foreach ($ancestorsGenDepth3 as $sosa => $genDepthStat) {
             $ancestor = Individual::getInstance($genDepthStat['root_ancestor_id'], $this->sosa_provider->getTree());
-            if($ancestor !== null && $ancestor->canShowName()) {
+            if ($ancestor !== null && $ancestor->canShowName()) {
                 $tmp = $ancestor->getAllNames();
                 $ancestors[] = Filter::escapeUrl($tmp[$ancestor->getPrimaryName()]['fullNN']);
             }
@@ -272,7 +271,7 @@ 
         }
         
         $maxChd = ceil(max($chd_error_high));
-        $chd = implode(',', $chd_mean) . '|' . implode(',', $chd_error_low) . '|' . implode(',', $chd_error_high);
+        $chd = implode(',', $chd_mean).'|'.implode(',', $chd_error_low).'|'.implode(',', $chd_error_high);
         $chxl = implode('|', array_reverse($ancestors));
         $chbh = 30;
         $chs = count($ancestors) * $chbh + 50;
@@ -294,9 +293,9 @@ 
             if ($value < 0) {
                 $value = 0;
             }
-            $first  = (int) ($value / 64);
+            $first  = (int)($value / 64);
             $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+            $encoding .= $xencoding[(int)$first].$xencoding[(int)$second];
         }
     
         return $encoding;

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

Spacing +14 added lines, -14 removed lines

@@ -31,11 +31,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">
@@ -57,7 +57,7 @@ 
 				</div>
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Generation mean duration'); ?></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>
 			
@@ -97,7 +97,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>
@@ -111,7 +111,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>
@@ -131,17 +131,17 @@ 
 							             I18N::translate('%s generation'),
 							             I18N::translate('%s generations'),
 							             $this->data->get('mean_gen_depth'),
-							             I18N::number($this->data->get('mean_gen_depth'),2)
+							             I18N::number($this->data->get('mean_gen_depth'), 2)
 							         )
 							    ).
-								' &mdash; ' . 
+								' &mdash; '. 
 								I18N::translate(
 								    'Standard deviation: %s',
 								    I18N::plural(
 								        I18N::translate('%s generation'), 
 								        I18N::translate('%s generations'), 
 								        $this->data->get('stddev_gen_depth'), 
-								        I18N::number($this->data->get('stddev_gen_depth'),2)
+								        I18N::number($this->data->get('stddev_gen_depth'), 2)
 								    )
 								);
 							?>
@@ -153,17 +153,17 @@ 
 			
 			<?php  
 			$top10_multi_ancestors = $this->data->get('top10multiancestors');
-			if(count($top10_multi_ancestors) > 0) { ?>
+			if (count($top10_multi_ancestors) > 0) { ?>
 			<h3><?= I18N::translate('Most duplicated root Sosa ancestors'); ?></h3>
 			<div class="maj-table">
-			<?php foreach($top10_multi_ancestors as $count => $indis) { ?>
+			<?php foreach ($top10_multi_ancestors as $count => $indis) { ?>
 			    <div class="maj-row">
 			    	<div class="label"><?= I18N::translate('%s times', I18N::number($count)); ?></div>
 			    	<div class="value"><?php 
 			    	echo implode(
 			    	    I18N::$list_separator, 
 			    	    array_map(function(Individual $indi) {
-			    	        return '<a href="'. $indi->getHtmlUrl(). '">'. $indi->getFullName() . '&nbsp;' . $indi->getSexImage() . '</a>';
+			    	        return '<a href="'.$indi->getHtmlUrl().'">'.$indi->getFullName().'&nbsp;'.$indi->getSexImage().'</a>';
 			    	    }, $indis)
 			    	);
 			    	?></div>
@@ -174,14 +174,14 @@ 
 			
 			<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>
 			
 			<h3><?php echo I18N::translate('Mean generation depth by grandparents'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_gendepth3') ?: '' ; ?>
+				<?php echo $this->data->get('chart_img_gendepth3') ?: ''; ?>
 			</div>
 			
 			<?php   } else { ?>

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

Spacing +81 added lines, -81 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 {
@@ -145,7 +145,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;
@@ -159,7 +159,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 ')
@@ -175,12 +175,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(), 
@@ -195,7 +195,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();
@@ -203,9 +203,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.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                 $values_table = array_merge(
@@ -226,9 +226,9 @@ 
             $i++;
         }
         
-        $sql = 'REPLACE INTO `##maj_sosa`' .
-            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-            ' 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_birth_year_est, majs_death_year, majs_death_year_est)'.
+            ' VALUES '.implode(',', $questionmarks_table);
         Database::prepare($sql)->execute($values_table);
     }
     
@@ -244,7 +244,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'
@@ -261,7 +261,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'
@@ -280,13 +280,13 @@ 
      *
      * @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(),
@@ -300,13 +300,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`'.
@@ -331,13 +331,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`'.
@@ -367,9 +367,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'.
@@ -408,10 +408,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(
@@ -436,9 +436,9 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
+	    if (!$this->is_setup) return 0;
 	    return Database::prepare(
-	        'SELECT COUNT(*) FROM `##individuals`' .
+	        'SELECT COUNT(*) FROM `##individuals`'.
 	        ' WHERE i_file = :tree_id')
 	        ->execute(array('tree_id' => $this->tree->getTreeId()))
 	        ->fetchOne() ?: 0;
@@ -449,10 +449,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 COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT 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(), 
@@ -466,10 +466,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 COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen= :gen')
         ->execute(array(
@@ -485,10 +485,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 COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -503,10 +503,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 COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT 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(), 
@@ -520,10 +520,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 COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT 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(
@@ -545,8 +545,8 @@ 
      * @param number $gen Generation
      * @return array Birth statistics array
      */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
+    public function getStatsBirthYearInGeneration($gen) {
+        if (!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
         return Database::prepare(
             'SELECT'.
             ' MIN(majs_birth_year) AS first, MIN(majs_birth_year_est) AS first_est,'.
@@ -567,25 +567,25 @@ 
      *
      * @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 = $sum_x = $sum_y= $sum_x2 = $n = 0;
-        foreach($this->statistics_tab as $gen=>$stats){
-            if(!is_null($stats['avgBirth'])) {
+        $sum_xy = $sum_x = $sum_y = $sum_x2 = $n = 0;
+        foreach ($this->statistics_tab as $gen=>$stats) {
+            if (!is_null($stats['avgBirth'])) {
                 $n++;
-                $sum_xy+=$gen*$stats['avgBirth'];
-                $sum_x+=$gen;
-                $sum_y+=$stats['avgBirth'];
-                $sum_x2+=$gen*$gen;
+                $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;
     }
@@ -609,7 +609,7 @@ 
      * @return array
      */
     public function getGenerationDepthStatsAtGen($gen) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         $gen_depth_stats_raw = Database::prepare(
             'SELECT stats_by_gen.root_ancestor AS root_ancestor_sosa,'.
             '   sosa_list.majs_i_id as root_ancestor_id,'.
@@ -684,14 +684,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,'.
@@ -724,7 +724,7 @@ 
      * @return array 
      */
     public function getTopMultiSosaAncestorsNoTies($limit) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         return Database::prepare(
             'SELECT sosa_i_id, sosa_count FROM ('.
             '   SELECT'.
@@ -737,20 +737,20 @@ 
             '           COUNT(sosa.majs_sosa) sosa_count,'.
             '           MIN(sosa.majs_sosa) sosa_min'.
             '       FROM ##maj_sosa AS sosa'.
-            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.   // Link to sosa's father
+            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.// Link to sosa's father
             '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
             '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
-            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.  // Link to sosa's mother
+            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.// Link to sosa's mother
             '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
             '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
             '       WHERE sosa.majs_gedcom_id = :tree_id'.
             '       AND sosa.majs_user_id = :user_id'.
-            '       AND sosa_fat.majs_sosa IS NULL'.    // We keep only root individuals, i.e. those with no father or mother
+            '       AND sosa_fat.majs_sosa IS NULL'.// We keep only root individuals, i.e. those with no father or mother
             '       AND sosa_mot.majs_sosa IS NULL'. 
             '       GROUP BY sosa.majs_i_id'.
-            '       HAVING COUNT(sosa.majs_sosa) > 1'.   // Limit to the duplicate sosas.
+            '       HAVING COUNT(sosa.majs_sosa) > 1'.// Limit to the duplicate sosas.
             '       ORDER BY COUNT(sosa.majs_sosa) DESC'.
-            '       LIMIT ' . ($limit + 1) . // We want to select one more than required
+            '       LIMIT '.($limit + 1).// We want to select one more than required
             '   ) AS top_sosa,'.
             '   (SELECT @prev_count := 0, @keep := 0) x'.
             '   ORDER BY top_sosa.sosa_count ASC'.