jon48 / webtrees-lib

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

Indentation +6 added lines, -6 removed lines

@@ -24,16 +24,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        ?>                
+	protected function renderContent() {        
+		?>                
         <div id="maj-geodisp-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
 			if($this->data->get('has_analysis', false)) { 
-			    /** @var GeoAnalysis $ga  */
-    		    $ga = $this->data->get('geoanalysis');
-    		?>
+				/** @var GeoAnalysis $ga  */
+				$ga = $this->data->get('geoanalysis');
+			?>
     		
     		<div id="geodispersion-panel">
     			<h3><?php echo $ga->getTitle() ?></h3>
@@ -66,7 +66,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
-			if($this->data->get('has_analysis', false)) { 
+			if ($this->data->get('has_analysis', false)) { 
 			    /** @var GeoAnalysis $ga  */
     		    $ga = $this->data->get('geoanalysis');
     		?>

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));         	

Braces +9 added lines, -9 removed lines

@@ -65,8 +65,7 @@ 
         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);
         }
@@ -97,16 +96,16 @@ 
             $content = '';
             if(isset($dataplace['flag'])){
                 $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
-            }
-            else{
+            } 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>';
+            if($perc2>=0.1) {
+                            $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+            }
             $content .= '</td>';
                
             $html .= '
@@ -126,7 +125,9 @@ 
         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>';
+            if($perc>=0.1) {
+            	$html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+            }
             $html .='</td>';
         }
         
@@ -152,8 +153,7 @@ 
             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));         	

Indentation +93 added lines, -93 removed lines

@@ -24,89 +24,89 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {       
+	protected function renderContent() {       
 
-        $max_details_gen = $this->data->get('max_details_gen');
-        $analysis_level = $this->data->get('analysis_level');
-        $results_by_gen = $this->data->get('results_by_generations');
-        $display_all_places = $this->data->get('display_all_places', true);
+		$max_details_gen = $this->data->get('max_details_gen');
+		$analysis_level = $this->data->get('analysis_level');
+		$results_by_gen = $this->data->get('results_by_generations');
+		$display_all_places = $this->data->get('display_all_places', true);
         
-        $html = 
-        '<div id="geodispersion_gen">
+		$html = 
+		'<div id="geodispersion_gen">
         	<table id="geodispersion_gentable" class="center">';
             
-        foreach($results_by_gen as $gen => $genData){
-            $html .= 
-            '<tr>
+		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)) . 
-                '</td>
+					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)) . 
+				'</td>
                  <td class="optionbox left">'.
-                    ($display_all_places ? 
-                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
-                        $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
-                     ) .
-                '</ditdv>
+					($display_all_places ? 
+						$this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
+						$this->htmlGenerationTopPlacesRow($genData, $analysis_level)
+					 ) .
+				'</ditdv>
             </tr>';
-        }       
+		}       
         
-        $html.= 
-            '</table>
+		$html.= 
+			'</table>
             <div class="left">
                 <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.') . 
-                '<br />';
-        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{
-            $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.= 
-            '</div>
+				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){
+			$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{
+			$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.= 
+			'</div>
         </div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
     
-    /**
-     * Return the HTML code to display a row with all places found in a generation.
-     *
-     * @param array $data Data array
-     * @param int $analysis_level Level of subdivision of analysis
-     * @return string HTML code for all places row
-     */
-    protected function htmlGenerationAllPlacesRow($data, $analysis_level) {
-        $html =
-        '<table class="geodispersion_bigrow">
+	/**
+	 * Return the HTML code to display a row with all places found in a generation.
+	 *
+	 * @param array $data Data array
+	 * @param int $analysis_level Level of subdivision of analysis
+	 * @return string HTML code for all places row
+	 */
+	protected function htmlGenerationAllPlacesRow($data, $analysis_level) {
+		$html =
+		'<table class="geodispersion_bigrow">
             <tr>';
         
-        $sum_gen = $data['sum'];
-        $unknownother = $data['unknown'] + $data['other'];
-        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>';
-            }
-            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>';
-            $content .= '</td>';
+		$sum_gen = $data['sum'];
+		$unknownother = $data['unknown'] + $data['other'];
+		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>';
+			}
+			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>';
+			$content .= '</td>';
                
-            $html .= '
+			$html .= '
                 <td class="geodispersion_rowitem" width="'.max(round(100*$perc, 0),1).'%">
                     <table>
                         <tr>
@@ -118,46 +118,46 @@ 
                         </tr>
                     </table>
                 </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 .= 
-            '</tr>
+		$html .= 
+			'</tr>
         </table>';
-        return $html;
-    }
+		return $html;
+	}
     
 	/**
 	 * Returns the HTML code fo display a row of the Top Places found for a generation.
 	 *
 	 * @param array $data Data array
-     * @param int $analysis_level Level of subdivision of analysis
+	 * @param int $analysis_level Level of subdivision of analysis
 	 * @return string HTML code for Top Places row
 	 */
-    protected function htmlGenerationTopPlacesRow($data, $analysis_level) {
-        $tmp_places = array();
-        $sum_gen = $data['sum'];
-        $other = $data['other'];
+	protected function htmlGenerationTopPlacesRow($data, $analysis_level) {
+		$tmp_places = array();
+		$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>';
-            }
-            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));         	
-        }
+		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{
+				$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));         	
+		}
         
-        return implode(I18N::$list_separator, $tmp_places);
-    }
+		return implode(I18N::$list_separator, $tmp_places);
+	}
     
 }
  
\ No newline at end of file

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

Indentation +27 added lines, -27 removed lines

@@ -25,17 +25,17 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisTabGeneralView::htmlAnalysisData()
 	 */
-    protected function htmlAnalysisData() {
+	protected function htmlAnalysisData() {
         
-        /** @var OutlineMap $map */
-        $map = $this->data->get('map');
-        $canvas = $map->getCanvas();
-        $subdvisions_results = $this->data->get('results_by_subdivisions');
+		/** @var OutlineMap $map */
+		$map = $this->data->get('map');
+		$canvas = $map->getCanvas();
+		$subdvisions_results = $this->data->get('results_by_subdivisions');
         
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
+		$nb_found = $this->data->get('stats_gen_nb_found');
+		$nb_other = $this->data->get('stats_gen_nb_other');
         
-        $html = '<script>
+		$html = '<script>
 			var tip = null;
 			var tipText = "";
 			var over = false;
@@ -82,29 +82,29 @@ 
 				var map = {};
 		';
         
-        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/>';
-                $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");'.
-                    '});'.
-                    'map.area'.$location['id'].'.mouseout(function () {'.
-                    'map.area'.$location['id'].'.stop().animate({"fill" : "'.$canvas->max_color.'", "fill-opacity" : '.$location['transparency'].'}, 100, "linear");'.
-                    '});';
-            }
-        }
-        $html .= '});
+		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/>';
+				$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");'.
+					'});'.
+					'map.area'.$location['id'].'.mouseout(function () {'.
+					'map.area'.$location['id'].'.stop().animate({"fill" : "'.$canvas->max_color.'", "fill-opacity" : '.$location['transparency'].'}, 100, "linear");'.
+					'});';
+			}
+		}
+		$html .= '});
             </script>
             
             <div id="geodispersion_map"></div>
     	   <div id="geodispersion_tip"></div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 } 
\ No newline at end of file

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");'.

Braces +3 added lines, -1 removed lines

@@ -86,7 +86,9 @@
             $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'].' });';

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

Indentation +25 added lines, -25 removed lines

@@ -23,14 +23,14 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var Tree $tree  */
-        $tree = $this->data->get('tree');
-        $root_url = $this->data->get('root_url');
-        $other_trees = $this->data->get('other_trees');
-        $table_id = $this->data->get('table_id');
-        ?>        
+		/** @var Tree $tree  */
+		$tree = $this->data->get('tree');
+		$root_url = $this->data->get('root_url');
+		$other_trees = $this->data->get('other_trees');
+		$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>
@@ -63,23 +63,23 @@ 
 		<p>
 		<?php $places_hierarchy = $this->data->get('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: ');
-		            break;
-		        case 'data':
-		            echo I18N::translate('Your GEDCOM header does not contain any indication of place structure.').
-		            '<br/>'.
-		            I18N::translate('Here is an example of your place data: ');
-		            break;
-		        default:
-		            break;
-		    }
-		    $str_hierarchy = array();
-		    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>';
+			switch ($places_hierarchy['type']) {
+				case 'header':
+					echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
+					break;
+				case 'data':
+					echo I18N::translate('Your GEDCOM header does not contain any indication of place structure.').
+					'<br/>'.
+					I18N::translate('Here is an example of your place data: ');
+					break;
+				default:
+					break;
+			}
+			$str_hierarchy = array();
+			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>';
 		}
 		?>
 		</p>
@@ -109,7 +109,7 @@ 
         </a>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

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

Indentation +5 added lines, -5 removed lines

@@ -23,15 +23,15 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        ?>                
+	protected function renderContent() {        
+		?>                
         <div id="maj-geodisp-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
 			if($this->data->get('has_list', false)) { 
-    		    $galist = $this->data->get('geoanalysislist');
-    		?>
+				$galist = $this->data->get('geoanalysislist');
+			?>
     		
     		<p class="center"><?php echo I18N::translate('Choose a geographical dispersion analysis:'); ?><p>
 			
@@ -58,7 +58,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

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

Indentation +15 added lines, -15 removed lines

@@ -25,27 +25,27 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
-        $nb_unknown = $this->data->get('stats_gen_nb_unknown');
-        $perc_known = Functions::safeDivision($nb_found - $nb_other, $nb_found + $nb_unknown);
+	protected function renderContent() {
+		$nb_found = $this->data->get('stats_gen_nb_found');
+		$nb_other = $this->data->get('stats_gen_nb_other');
+		$nb_unknown = $this->data->get('stats_gen_nb_unknown');
+		$perc_known = Functions::safeDivision($nb_found - $nb_other, $nb_found + $nb_unknown);
 
-        $html = '<div id="geodispersion_summary">
+		$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>';
-        if($nb_other > 0){
-            $perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
-            $html .=
-        		'<div class="maj-row">
+		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>';
-        }
-        $html .= '<div class="maj-row">
+		}
+		$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>
@@ -56,8 +56,8 @@ 
 		' . $this->htmlAnalysisData(). '
 		</div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 	/**
 	 * Returns HTML code to display the analysis data, under the appropriate format.
@@ -65,7 +65,7 @@ 
 	 * @return string HTML Code for analysis display
 	 * @abstract
 	 */
-    protected abstract function htmlAnalysisData();        
+	protected abstract function htmlAnalysisData();        
     
 }
  
\ No newline at end of file

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

Indentation +27 added lines, -27 removed lines

@@ -22,44 +22,44 @@
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisTabGeneralView::htmlAnalysisData()
 	 */
-    protected function htmlAnalysisData() {
-        $results = $this->data->get('results');
-        $analysis_level = $this->data->get('analysis_level');
+	protected function htmlAnalysisData() {
+		$results = $this->data->get('results');
+		$analysis_level = $this->data->get('analysis_level');
         
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
+		$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){
-            $perc = Functions::safeDivision($nb, $nb_found - $nb_other);
-            if($nb!=$previous_nb){
-                $j= I18N::number($i);
-            }
-            else{
-                $j='&nbsp;';
-            }
+		$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);
+			}
+			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.=
-            '<div class="maj-row">
+			$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>';
-            $i++;
-            $previous_nb=$nb;
-        }
+			$i++;
+			$previous_nb=$nb;
+		}
         
-        $html.='</div>';
+		$html.='</div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 }
  
\ No newline at end of file

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;
     }

Braces +4 added lines, -3 removed lines

@@ -37,14 +37,15 @@
             $perc = Functions::safeDivision($nb, $nb_found - $nb_other);
             if($nb!=$previous_nb){
                 $j= I18N::number($i);
-            }
-            else{
+            } else{
                 $j=' ';
             }
             	
             $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]);
+            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>

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

Indentation +32 added lines, -32 removed lines

@@ -17,41 +17,41 @@
  */
 interface CertificateProviderInterface  {
     
-    /**
-     * Returns the certificates directory path as it is really (within the firewall directory).
-     *
-     * @return string Real certificates directory path
-     */
-    function getRealCertificatesDirectory();
+	/**
+	 * Returns the certificates directory path as it is really (within the firewall directory).
+	 *
+	 * @return string Real certificates directory path
+	 */
+	function getRealCertificatesDirectory();
     
-    /**
-     * Returns an array of the folders (cities) in the certificate directory.
-     * Cities name are UTF8 encoded.
-     *
-     * @return array Array of cities name
-     */
-    function getCitiesList();
+	/**
+	 * Returns an array of the folders (cities) in the certificate directory.
+	 * Cities name are UTF8 encoded.
+	 *
+	 * @return array Array of cities name
+	 */
+	function getCitiesList();
     
-    /**
-     * Returns the list of available certificates for a specified city.
-     * Format of the list :
-     * < file name , date of the certificate , type of certificate , name of the certificate >
-     * Data are UTF8 encoded.
-     *
-     * @param string $selCity City to look in
-     * @return array List of certificates
-     */
-    function getCertificatesList($selCity);
+	/**
+	 * Returns the list of available certificates for a specified city.
+	 * Format of the list :
+	 * < file name , date of the certificate , type of certificate , name of the certificate >
+	 * Data are UTF8 encoded.
+	 *
+	 * @param string $selCity City to look in
+	 * @return array List of certificates
+	 */
+	function getCertificatesList($selCity);
     
-    /**
-     * Return the list of certificates from a city $city and containing the characters $contains
-     *
-     * @param string $city City to search in
-     * @param string $contains Characters to match
-     * @param string $limit Maximum number of results
-     * @return array Array of matching certificates
-     */
-    function getCertificatesListBeginWith($city, $contains, $limit);
+	/**
+	 * Return the list of certificates from a city $city and containing the characters $contains
+	 *
+	 * @param string $city City to search in
+	 * @param string $contains Characters to match
+	 * @param string $limit Maximum number of results
+	 * @return array Array of matching certificates
+	 */
+	function getCertificatesListBeginWith($city, $contains, $limit);
     
 }
 

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).

src/Webtrees/Module/Certificates/Views/CertificateView.php

Indentation +8 added lines, -8 removed lines

@@ -25,17 +25,17 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        ?>                
+	protected function renderContent() {
+		?>                
         <div id="maj-cert-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
     		<?php if($this->data->get('has_certif', false)) { 
-    		    /** @var Certificate $certificate   */
-    		  $certificate = $this->data->get('certificate');
-    		  $has_linked_indis = $this->data->get('has_linked_indis', false);
-    		  $has_linked_fams = $this->data->get('has_linked_fams', false);
-    		?>
+				/** @var Certificate $certificate   */
+			  $certificate = $this->data->get('certificate');
+			  $has_linked_indis = $this->data->get('has_linked_indis', false);
+			  $has_linked_fams = $this->data->get('has_linked_fams', false);
+			?>
     		<div id="certificate-details">
         		<h3>
         			<?php echo $certificate->getCity(); ?>
@@ -86,7 +86,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
         <div id="maj-cert-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
-    		<?php if($this->data->get('has_certif', false)) { 
+    		<?php if ($this->data->get('has_certif', false)) { 
     		    /** @var Certificate $certificate   */
     		  $certificate = $this->data->get('certificate');
     		  $has_linked_indis = $this->data->get('has_linked_indis', false);
@@ -49,16 +49,16 @@ 
     				<div id="certificate-edit">
     					<?php echo $certificate->displayImage(); ?>
     				</div>
-    				<?php if($has_linked_indis || $has_linked_fams) { ?>
+    				<?php if ($has_linked_indis || $has_linked_fams) { ?>
     				<ul>
-    					<?php if($has_linked_indis) { ?>
+    					<?php if ($has_linked_indis) { ?>
     					<li>
     						<a href="#indi-certificate">
     							<span id="indisource"><?php echo I18N::translate('Individuals'); ?></span>
     						</a>
     					</li>
     					<?php } ?>
-    					<?php if($has_linked_fams) { ?>
+    					<?php if ($has_linked_fams) { ?>
     					<li>
     						<a href="#fam-certificate">
     							<span id="famsource"><?php echo I18N::translate('Families'); ?></span>
@@ -67,13 +67,13 @@ 
     					<?php } ?>
     				</ul>
     				
-    				<?php if($has_linked_indis) { ?>
+    				<?php if ($has_linked_indis) { ?>
     				<div id="indi-certificate">
     					<?php echo FunctionsPrintLists::individualTable($this->data->get('linked_indis')); ?>
     				</div>
 					<?php } ?>
 					
-					<?php if($has_linked_fams) { ?>
+					<?php if ($has_linked_fams) { ?>
     				<div id="fam-certificate">
     					<?php echo FunctionsPrintLists::familyTable($this->data->get('linked_fams')); ?>
     				</div>