jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGenerationsView.php

Spacing +30 added lines, -31 removed lines

@@ -38,39 +38,38 @@ 
         '<div id="geodispersion_gen">
         	<table id="geodispersion_gentable" class="center">';
             
-        foreach($results_by_gen as $gen => $genData){
+        foreach ($results_by_gen as $gen => $genData) {
             $html .= 
             '<tr>
                 <td class="descriptionbox">' .
                     I18N::translate("Generation %s", I18N::number($gen)).
                     ($display_all_places ? '<br />' : ' ').
-                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
+                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']), 1)). 
                 '</td>
                  <td class="optionbox left">'.
                     ($display_all_places ? 
-                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
-                        $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
-                     ) .
+                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) : $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
+                     ).
                 '</ditdv>
             </tr>';
         }       
         
-        $html.= 
+        $html .= 
             '</table>
             <div class="left">
-                <strong>' . I18N::translate('Interpretation help:') . '</strong>
+                <strong>' . I18N::translate('Interpretation help:').'</strong>
                 <br />'.
-                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
+                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.'). 
                 '<br />';
-        if(!is_null($max_details_gen) && $max_details_gen == 0){
+        if (!is_null($max_details_gen) && $max_details_gen == 0) {
             $html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
             $html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
         }
-        else{
+        else {
             $html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
             $html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
         }
-        $html.= 
+        $html .= 
             '</div>
         </div>';
         
@@ -92,25 +91,25 @@ 
         
         $sum_gen = $data['sum'];
         $unknownother = $data['unknown'] + $data['other'];
-        foreach($data['places'] as $placename=> $dataplace){
-            $levels = array_map('trim',explode(',', $placename));
+        foreach ($data['places'] as $placename=> $dataplace) {
+            $levels = array_map('trim', explode(',', $placename));
             $content = '';
-            if(isset($dataplace['flag'])){
-                $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
+            if (isset($dataplace['flag'])) {
+                $content .= '<td class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']).'</td><td>';
             }
-            else{
-                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
+            else {
+                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level - 1].'</span><br/>';
             }
             $count = $dataplace['count'];
             $content .= I18N::number($count);
             $perc = Functions::safeDivision($count, $sum_gen + $unknownother);
-            $perc2= Functions::safeDivision($count, $sum_gen);
-            if($perc2>=0.1) 
-                $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+            $perc2 = Functions::safeDivision($count, $sum_gen);
+            if ($perc2 >= 0.1) 
+                $content .= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
             $content .= '</td>';
                
             $html .= '
-                <td class="geodispersion_rowitem" width="'.max(round(100*$perc, 0),1).'%">
+                <td class="geodispersion_rowitem" width="'.max(round(100 * $perc, 0), 1).'%">
                     <table>
                         <tr>
                             <td>
@@ -123,11 +122,11 @@ 
                 </td>';
         }
         
-        if($unknownother>0){
-            $perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
-            $html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
-            if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
-            $html .='</td>';
+        if ($unknownother > 0) {
+            $perc = Functions::safeDivision($unknownother, $sum_gen + $unknownother);
+            $html .= '<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
+            if ($perc >= 0.1) $html .= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+            $html .= '</td>';
         }
         
         $html .= 
@@ -148,12 +147,12 @@ 
         $sum_gen = $data['sum'];
         $other = $data['other'];
         
-        foreach($data['places'] as $placename => $count) {
-            if($placename != 'other'){
-                $levels = array_map('trim',explode(',', $placename));
-                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
+        foreach ($data['places'] as $placename => $count) {
+            if ($placename != 'other') {
+                $levels = array_map('trim', explode(',', $placename));
+                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level - 1].'</span>';
             }
-            else{
+            else {
                 $placename = I18N::translate('Other places');
             }
             $tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGeneralMapView.php

Spacing +12 added lines, -12 removed lines

@@ -75,23 +75,23 @@
 				    }
 				});
 
-				var paper = new Raphael(document.getElementById("geodispersion_map"), '. $canvas->width .', '. $canvas->height .');
-				var background = paper.rect(0, 0, ' . $canvas->width . ', '. $canvas->height . ');
-				background.attr({"fill" : "'. $canvas->background_color .'", "stroke" : "'. $canvas->background_stroke .'", "stroke-width": 1, "stroke-linejoin": "round" });
-				var attr = { fill: "'. $canvas->default_color .'", stroke: "'. $canvas->default_stroke .'", "stroke-width": 1, "stroke-linejoin": "round" };
+				var paper = new Raphael(document.getElementById("geodispersion_map"), '. $canvas->width.', '.$canvas->height.');
+				var background = paper.rect(0, 0, ' . $canvas->width.', '.$canvas->height.');
+				background.attr({"fill" : "'. $canvas->background_color.'", "stroke" : "'.$canvas->background_stroke.'", "stroke-width": 1, "stroke-linejoin": "round" });
+				var attr = { fill: "'. $canvas->default_color.'", stroke: "'.$canvas->default_stroke.'", "stroke-width": 1, "stroke-linejoin": "round" };
 				var map = {};
 		';
         
-        foreach($subdvisions_results as $name => $location){
-            $html.= 'map.area'.$location['id'].' = paper.path("'.$location['coord'].'").attr(attr);';
-            if(isset($location['transparency'])) {
+        foreach ($subdvisions_results as $name => $location) {
+            $html .= 'map.area'.$location['id'].' = paper.path("'.$location['coord'].'").attr(attr);';
+            if (isset($location['transparency'])) {
                 $textToolTip = '<strong>'.$location['displayname'].'</strong><br/>';
-                if($this->data->get('use_flags') && $location['flag'] != '') $textToolTip .= '<span class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($location['place'], $location['flag']).'</span><br/>';
+                if ($this->data->get('use_flags') && $location['flag'] != '') $textToolTip .= '<span class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($location['place'], $location['flag']).'</span><br/>';
                 $textToolTip .= I18N::translate('%d individuals', $location['count']).'<br/>'.I18N::percentage(Functions::safeDivision($location['count'], $nb_found - $nb_other), 1);
-                $html.= 'addTip(map.area'.$location['id'].'.node, "'.Filter::escapeJs($textToolTip).'");';
-                $html.= 'map.area'.$location['id'].'.attr({"fill" : "'. $canvas->max_color .'", "fill-opacity" : '.$location['transparency'].' });';
-                $html.= 'map.area'.$location['id'].'.mouseover(function () {'.
-                    'map.area'.$location['id'].'.stop().animate({"fill" : "'. $canvas->hover_color .'", "fill-opacity" : 1}, 100, "linear");'.
+                $html .= 'addTip(map.area'.$location['id'].'.node, "'.Filter::escapeJs($textToolTip).'");';
+                $html .= 'map.area'.$location['id'].'.attr({"fill" : "'.$canvas->max_color.'", "fill-opacity" : '.$location['transparency'].' });';
+                $html .= 'map.area'.$location['id'].'.mouseover(function () {'.
+                    'map.area'.$location['id'].'.stop().animate({"fill" : "'.$canvas->hover_color.'", "fill-opacity" : 1}, 100, "linear");'.
                     '});'.
                     'map.area'.$location['id'].'.mouseout(function () {'.
                     'map.area'.$location['id'].'.stop().animate({"fill" : "'.$canvas->max_color.'", "fill-opacity" : '.$location['transparency'].'}, 100, "linear");'.

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

Spacing +7 added lines, -7 removed lines

@@ -41,16 +41,16 @@ 
 		
 		<h2>
 			<?php echo $tree->getTitleHtml(); ?>
-			<?php if(count($other_trees) > 0) {?>
+			<?php if (count($other_trees) > 0) {?>
 			<div class="btn-group">
 				<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 					<?php echo I18N::translate('Change tree'); ?>
 					<span class="caret"></span>
 				</button>
-				<?php foreach($other_trees as $other_tree) { ?>
+				<?php foreach ($other_trees as $other_tree) { ?>
 				<ul class="dropdown-menu" role="menu">
 					<li>
-						<a href="<?php echo $root_url . '&ged=' . $other_tree->getNameUrl(); ?>">
+						<a href="<?php echo $root_url.'&ged='.$other_tree->getNameUrl(); ?>">
 							<i class="fa fa-fw fa-tree"></i>&nbsp;<?php echo $other_tree->getTitleHtml(); ?>
 						</a>
 					</li>
@@ -62,7 +62,7 @@ 
 		
 		<p>
 		<?php $places_hierarchy = $this->data->get('places_hierarchy'); 
-		if($places_hierarchy) {
+		if ($places_hierarchy) {
 		    switch ($places_hierarchy['type']) {
 		        case 'header':
 		            echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
@@ -76,10 +76,10 @@ 
 		            break;
 		    }
 		    $str_hierarchy = array();
-		    foreach($places_hierarchy['hierarchy'] as $key => $level) {
+		    foreach ($places_hierarchy['hierarchy'] as $key => $level) {
 		        $str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
 		    }
-		    echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
+		    echo '<strong>'.implode(I18N::$list_separator, $str_hierarchy).'</strong>';
 		}
 		?>
 		</p>
@@ -103,7 +103,7 @@ 
     		</tbody>
     	</table>
     	
-        <a type="button" class="btn btn-primary" href="<?php echo $root_url . '@add&ged=' . $tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
+        <a type="button" class="btn btn-primary" href="<?php echo $root_url.'@add&ged='.$tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
         	<i class="fa fa-plus"></i>
         	<?php echo I18N::translate('Add'); ?>
         </a>

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisListView.php

Spacing +3 added lines, -3 removed lines

@@ -29,17 +29,17 @@
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
-			if($this->data->get('has_list', false)) { 
+			if ($this->data->get('has_list', false)) { 
     		    $galist = $this->data->get('geoanalysislist');
     		?>
     		
     		<p class="center"><?php echo I18N::translate('Choose a geographical dispersion analysis:'); ?><p>
 			
 			<div class="maj-table">
-				<?php foreach($galist as $ga) {?>
+				<?php foreach ($galist as $ga) {?>
 				<div class="maj-row">
 					<div class="label">	
-						<?php if($ga->hasMap()) { ?>
+						<?php if ($ga->hasMap()) { ?>
 						<i class="icon-maj-map" title="<?php echo I18N::translate('Map'); ?>"></i>
 						<?php } else { ?>
 						<i class="icon-maj-table" title="<?php echo I18N::translate('Table'); ?>"></i>

src/Webtrees/Module/GeoDispersion/Views/AbstractGeoAnalysisTabGeneralView.php

Spacing +8 added lines, -8 removed lines

@@ -34,26 +34,26 @@
         $html = '<div id="geodispersion_summary">
         	<div class="maj-table center">
         		<div class="maj-row">
-        			<div class="label">' . I18N::translate('Places found'). '</div>
-        			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_found - $nb_other, I18N::percentage($perc_known)). '</div>
+        			<div class="label">' . I18N::translate('Places found').'</div>
+        			<div class="value">' . I18N::translate('%1$d (%2$s)', $nb_found - $nb_other, I18N::percentage($perc_known)).'</div>
         		</div>';
-        if($nb_other > 0){
+        if ($nb_other > 0) {
             $perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
             $html .=
         		'<div class="maj-row">
-        			<div class="label">' . I18N::translate('Other places'). '</div>
-        			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_other, I18N::percentage($perc_other)). '</div>
+        			<div class="label">' . I18N::translate('Other places').'</div>
+        			<div class="value">' . I18N::translate('%1$d (%2$s)', $nb_other, I18N::percentage($perc_other)).'</div>
         		</div>';
         }
         $html .= '<div class="maj-row">
-        			<div class="label">' . I18N::translate('Places not found'). '</div>
-        			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_unknown, I18N::percentage(1 - $perc_known)). '</div>
+        			<div class="label">' . I18N::translate('Places not found').'</div>
+        			<div class="value">' . I18N::translate('%1$d (%2$s)', $nb_unknown, I18N::percentage(1 - $perc_known)).'</div>
         		</div>
         	</div>
         </div>
         <br/>
 		<div id="geodispersion_data">
-		' . $this->htmlAnalysisData(). '
+		' . $this->htmlAnalysisData().'
 		</div>';
         
         return $html;

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGeneralTableView.php

Spacing +16 added lines, -16 removed lines

@@ -29,34 +29,34 @@
         $nb_found = $this->data->get('stats_gen_nb_found');
         $nb_other = $this->data->get('stats_gen_nb_other');
         
-        $i=1;
-        $previous_nb=0;        
+        $i = 1;
+        $previous_nb = 0;        
         
-        $html='<div class="maj-table center">';        
-        foreach($results as $place => $nb){
+        $html = '<div class="maj-table center">';        
+        foreach ($results as $place => $nb) {
             $perc = Functions::safeDivision($nb, $nb_found - $nb_other);
-            if($nb!=$previous_nb){
-                $j= I18N::number($i);
+            if ($nb != $previous_nb) {
+                $j = I18N::number($i);
             }
-            else{
-                $j='&nbsp;';
+            else {
+                $j = '&nbsp;';
             }
             	
-            $levels = array_map('trim',explode(',', $place));
-            $placename = $levels[$analysis_level-1];
-            if($placename == '' && $analysis_level > 1) $placename = I18N::translate('Unknown (%s)', $levels[$analysis_level-2]);
-            $html.=
+            $levels = array_map('trim', explode(',', $place));
+            $placename = $levels[$analysis_level - 1];
+            if ($placename == '' && $analysis_level > 1) $placename = I18N::translate('Unknown (%s)', $levels[$analysis_level - 2]);
+            $html .=
             '<div class="maj-row">
                 <div class="label"><strong>'.$j.'</strong></div>
                 <div class="label">'.$placename.'</div>
-                <div class="value">'.I18N::translate('%d',$nb).'</div>
-                <div class="value">'.I18N::percentage($perc,1).'</div>
+                <div class="value">'.I18N::translate('%d', $nb).'</div>
+                <div class="value">'.I18N::percentage($perc, 1).'</div>
              </div>';
             $i++;
-            $previous_nb=$nb;
+            $previous_nb = $nb;
         }
         
-        $html.='</div>';
+        $html .= '</div>';
         
         return $html;
     }

src/Webtrees/Module/GeoDispersion/GeoAnalysisController.php

Spacing +39 added lines, -39 removed lines

@@ -70,7 +70,7 @@ 
         
         $ga_id = Filter::getInteger('ga_id');        
         
-        if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
+        if ($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
             $data->set('has_analysis', true);
             $data->set('geoanalysis', $ga);
             
@@ -83,7 +83,7 @@ 
                 jQuery.get(
 					"module.php",
 					{
-                        "mod" : "'. $this->module->getName() .'",  
+                        "mod" : "'. $this->module->getName().'",  
                         "mod_action": "GeoAnalysis@dataTabs",
                         "ga_id" : "'.$ga_id.'"
                     },
@@ -115,7 +115,7 @@ 
         $data->set('has_list', false);
         
         $ga_list = $this->provider->getGeoAnalysisList();
-        if(count($ga_list) > 0 ) {
+        if (count($ga_list) > 0) {
              $data->set('has_list', true);
              $data->set('geoanalysislist', $ga_list);
         }
@@ -141,19 +141,19 @@ 
         );
         
         $status = Filter::getBool('status');
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
+        $res = array('geoanalysis' => $ga->getId(), 'error' => null);
+        try {
             $this->provider->setGeoAnalysisStatus($ga, $status);
             $res['status'] = $status;
-			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
+			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '.($status ? 'enabled' : 'disabled').'.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be '.($status ? 'enabled' : 'disabled').'. Error: '.$ex->getMessage());
         }
         
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
         
         echo \Zend_Json::encode($res);
     }
@@ -175,18 +175,18 @@ 
             && $ga
             );
             
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
+        $res = array('geoanalysis' => $ga->getId(), 'error' => null);
+        try {
             $this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '.$ex->getMessage());
         }
     
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
     
         echo \Zend_Json::encode($res);
     }
@@ -212,9 +212,9 @@ 
         list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
         
         $flags = array();
-        if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
+        if ($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
             $mapProvider = new GoogleMapsProvider();            
-            foreach($placesDispGeneral['places'] as $place => $count) {
+            foreach ($placesDispGeneral['places'] as $place => $count) {
                 $flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $WT_TREE));
             }
         }
@@ -233,16 +233,16 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the general tab
 	 */
-    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {
+    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags = null) {
         global $WT_TREE;
         
         $html = '';
-        if($placesGeneralResults){
+        if ($placesGeneralResults) {
             $data = new ViewBag();
             
             $nb_found = $placesGeneralResults['knownsum'];
             $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+            if (isset($placesGeneralResults['other'])) $nb_other = $placesGeneralResults['other'];
             $nb_unknown = $placesGeneralResults['unknown'];
             
             $data->set('stats_gen_nb_found', $nb_found);
@@ -251,7 +251,7 @@ 
             
             $data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
             
-            if($ga->hasMap()) {
+            if ($ga->hasMap()) {
                 $max = $placesGeneralResults['max'];
                 $map = $ga->getOptions()->getMap();
                 $maxcolor = $map->getCanvas()->max_color;
@@ -259,22 +259,22 @@ 
                 $results_by_subdivs = $map->getSubdivisions();
                 $places_mappings = $map->getPlacesMappings();
                 foreach ($placesGeneralResults['places'] as $location => $count) {
-                    $levelvalues = array_reverse(array_map('trim',explode(',', $location)));
+                    $levelvalues = array_reverse(array_map('trim', explode(',', $location)));
                     $level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
-                    if($level_map >= 0 && $level_map < count($levelvalues)) {
-                        $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
-                        if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
+                    if ($level_map >= 0 && $level_map < count($levelvalues)) {
+                        $levelref = $levelvalues[0].'@'.$levelvalues[$level_map];
+                        if (!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
                     }
                     else {
                         $levelref = $levelvalues[0];
                     }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
-                    if(isset($results_by_subdivs[$levelref])) {
+                    if (isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+                    if (isset($results_by_subdivs[$levelref])) {
                         $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
-                        $count_subd  += $count;
+                        $count_subd += $count;
                         $results_by_subdivs[$levelref]['count'] = $count_subd;   
                         $results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
-                        if($ga->getOptions()->isUsingFlags() && $flags) {
+                        if ($ga->getOptions()->isUsingFlags() && $flags) {
                             $results_by_subdivs[$levelref]['place'] = new Place($location, $WT_TREE);
                             $results_by_subdivs[$levelref]['flag'] = $flags[$location];
                         }
@@ -296,7 +296,7 @@ 
             }
         }
         else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
+            $html = '<p class="warning">'.I18N::translate('No data is available for the general analysis.').'</p>';
         }
         return $html;
     }
@@ -313,7 +313,7 @@ 
         global $WT_TREE;
         
         $html = '<p class="warning">'.I18N::translate('No data is available for the generations analysis.').'<p>';
-        if($placesGenerationsResults && $ga->getOptions()){
+        if ($placesGenerationsResults && $ga->getOptions()) {
             $data = new ViewBag();
             
             ksort($placesGenerationsResults);
@@ -326,27 +326,27 @@ 
             $data->set('display_all_places', $display_all_places);
             
             $results_by_gen = array();
-            foreach($placesGenerationsResults as $gen => $genData){
+            foreach ($placesGenerationsResults as $gen => $genData) {
                 $sum = 0;
                 $other = 0;
                 $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+                if (isset($genData['sum'])) $sum = $genData['sum'];
+                if (isset($genData['other'])) $other = $genData['other'];
+                if (isset($genData['unknown'])) $unknown = $genData['unknown'];
                 
-                if($sum > 0) {                
+                if ($sum > 0) {                
                     $results_by_gen[$gen]['sum'] = $sum;
                     $results_by_gen[$gen]['other'] = $other;
                     $results_by_gen[$gen]['unknown'] = $unknown;
                     $results_by_gen[$gen]['places'] = array();                    
                     arsort($genData['places']);
                     
-                    if($display_all_places){
-                        foreach($genData['places'] as $placename=> $count){
+                    if ($display_all_places) {
+                        foreach ($genData['places'] as $placename=> $count) {
                             $results_by_gen[$gen]['places'][$placename]['count'] = $count;
-                            $levels = array_map('trim',explode(',', $placename));
+                            $levels = array_map('trim', explode(',', $placename));
                             
-                            if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
+                            if ($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != '') {
                                 $results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, $WT_TREE);
                                 $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
                             }
@@ -354,7 +354,7 @@ 
                     }
                     else {
                         $tmp = $genData['places'];
-                        if($other > 0) {
+                        if ($other > 0) {
                             $tmp = array_slice($tmp, 0, 5, true);
                             $tmp['other'] = $other;
                             arsort($tmp);  
@@ -370,7 +370,7 @@ 
             
         }
         else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
+            $html = '<p class="warning">'.I18N::translate('No data is available for the generations analysis.').'</p>';
         }
         return $html;
     }

src/Webtrees/Module/Certificates/CertificateController.php

Spacing +16 added lines, -16 removed lines

@@ -71,16 +71,16 @@ 
         
         $certificate = null;
         $city = '';
-        if($cid && strlen($cid) > 22){
+        if ($cid && strlen($cid) > 22) {
             $certificate = Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
-            if($certificate) $city = $certificate->getCity();
+            if ($certificate) $city = $certificate->getCity();
         }
         
         $data = new ViewBag();
         $data->set('title', $controller->getPageTitle());
         
         $data->set('has_certif', false);
-        if($certificate) {
+        if ($certificate) {
             $controller->restrictAccess($certificate->canShow());
             $data->set('title', $certificate->getTitle());
             $data->set('has_certif', true);
@@ -88,10 +88,10 @@ 
             
             $data->set(
                 'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $WT_TREE->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+                'module.php?mod='.Constants::MODULE_MAJ_CERTIF_NAME. 
+                    '&mod_action=Certificate@listAll'.
+                    '&ged='.$WT_TREE->getNameUrl().
+                    '&city='.Functions::encryptToSafeBase64($certificate->getCity())
             );
             
             $controller->addInlineJavascript('
@@ -105,12 +105,12 @@ 
             $linked_indis = $certificate->linkedIndividuals();
             $linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
+            if ($linked_indis && count($linked_indis) > 0) {
                 $data->set('has_linked_indis', true);
                 $data->set('linked_indis', $linked_indis);
             }
             
-            if($linked_fams && count($linked_fams) > 0) {
+            if ($linked_fams && count($linked_fams) > 0) {
                 $data->set('has_linked_fams', true);
                 $data->set('linked_fams', $linked_fams);
             }
@@ -125,9 +125,9 @@ 
     public function image() {      
         global $WT_TREE;
         
-        $cid   = Filter::get('cid');
+        $cid = Filter::get('cid');
         $certificate = null;
-        if($cid) $certificate =  Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
+        if ($cid) $certificate = Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
         
         $imageBuilder = new ImageBuilder($certificate);
         
@@ -160,7 +160,7 @@ 
         
         $city = Filter::get('city');
         
-        if($city && strlen($city) > 22){
+        if ($city && strlen($city) > 22) {
             $city = Functions::decryptFromSafeBase64($city);
             $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
         }
@@ -175,11 +175,11 @@ 
         $data->set('selected_city', $city);
         
         $data->set('has_list', false);        
-        if($city) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+        if ($city) {            
+            $table_id = 'table-certiflist-'.Uuid::uuid4();
             
             $certif_list = $this->provider->getCertificatesList($city);            
-            if($certif_list) {                
+            if ($certif_list) {                
                 $data->set('has_list', true);
                 $data->set('table_id', $table_id);
                 $data->set('certificate_list', $certif_list);
@@ -194,7 +194,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,

src/Webtrees/Module/Certificates/Model/CertificateProviderInterface.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 /**
  * Interface for providers of certificates
  */
-interface CertificateProviderInterface  {
+interface CertificateProviderInterface {
     
     /**
      * Returns the certificates directory path as it is really (within the firewall directory).