jon48 / webtrees-lib

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

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

Indentation +32 added lines, -32 removed lines

@@ -25,24 +25,24 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisTabGeneralView::htmlAnalysisData()
 	 */
-    protected function htmlAnalysisData() {
+	protected function htmlAnalysisData() {
         
-        /** @var OutlineMap $map */
-        $map = $this->data->get('map');
+		/** @var OutlineMap $map */
+		$map = $this->data->get('map');
         
-        if($map === null) {
-            return '<p class="warning">' .
-                I18N::translate('The map could not be loaded.') . 
-            '</p>';
-        }
+		if($map === null) {
+			return '<p class="warning">' .
+				I18N::translate('The map could not be loaded.') . 
+			'</p>';
+		}
         
-        $canvas = $map->getCanvas();
-        $subdvisions_results = $this->data->get('results_by_subdivisions');
+		$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;
@@ -89,29 +89,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 +15 added lines, -15 removed lines

@@ -30,9 +30,9 @@ 
         /** @var OutlineMap $map */
         $map = $this->data->get('map');
         
-        if($map === null) {
-            return '<p class="warning">' .
-                I18N::translate('The map could not be loaded.') . 
+        if ($map === null) {
+            return '<p class="warning">'.
+                I18N::translate('The map could not be loaded.'). 
             '</p>';
         }
         
@@ -82,23 +82,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

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/Model/Certificate.php

Indentation +41 added lines, -41 removed lines

@@ -35,12 +35,12 @@ 
  */
 class Certificate extends Media {
     
-    const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
+	const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
 		
-    /** @var string The "TITL" value from the GEDCOM 
-     * This is a tweak to overcome the private level from the parent object...
-     */
-    protected $title = '';
+	/** @var string The "TITL" value from the GEDCOM 
+	 * This is a tweak to overcome the private level from the parent object...
+	 */
+	protected $title = '';
     
 	/**
 	 * Certificate provider
@@ -80,7 +80,7 @@ 
 	 * @param CertificateProviderInterface $provider
 	 */
 	public function __construct($data, Tree $tree, CertificateProviderInterface $provider) {
-	    $this->provider = $provider;
+		$this->provider = $provider;
 		// Data is only the file name
 		$data = str_replace("\\", '/', $data);
 		$xref = Functions::encryptToSafeBase64($data);
@@ -165,7 +165,7 @@ 
 	 * @see \Fisharebest\Webtrees\Media::getTitle()
 	 */
 	public function getTitle() {
-	    return $this->title;
+		return $this->title;
 	}
 	
 	/**
@@ -241,26 +241,26 @@ 
 	 	$module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME);
 	 	
 	 	if($module) {
-    		$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
-    		$sid= Filter::get('sid', WT_REGEX_XREF);	
+			$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
+			$sid= Filter::get('sid', WT_REGEX_XREF);	
     	
-    		if($sid){
-    			$this->source = Source::getInstance($sid, $this->tree);
-    		}
-    		else{
-    			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
-    		}
+			if($sid){
+				$this->source = Source::getInstance($sid, $this->tree);
+			}
+			else{
+				$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
+			}
     		
-    		if($this->source) {
-    			$wmtext = '©';
-    			$repofact = $this->source->getFirstFact('REPO');
-    			if($repofact) {
-    				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
-    			}
-    			$wmtext .= $this->source->getFullName();			
-    		}	
-    		return $wmtext;
+			if($this->source) {
+				$wmtext = '©';
+				$repofact = $this->source->getFirstFact('REPO');
+				if($repofact) {
+					$repo = $repofact->getTarget();
+					if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+				}
+				$wmtext .= $this->source->getFullName();			
+			}	
+			return $wmtext;
 	 	}
 	 	return '';
 	}
@@ -323,8 +323,8 @@ 
 				' FROM `##individuals`'.
 				' WHERE i_file= :gedcom_id AND i_gedcom LIKE :gedcom')
 		->execute(array(
-		    'gedcom_id' => $this->tree->getTreeId(),
-		    'gedcom' => '%_ACT '.$this->getFilename().'%'		    
+			'gedcom_id' => $this->tree->getTreeId(),
+			'gedcom' => '%_ACT '.$this->getFilename().'%'		    
 		))->fetchAll();
 		
 		$list = array();
@@ -347,8 +347,8 @@ 
 				' FROM `##families`'.
 				' WHERE f_file= :gedcom_id AND f_gedcom LIKE :gedcom')
 		->execute(array(
-		    'gedcom_id' => $this->tree->getTreeId(),
-		    'gedcom' => '%_ACT '.$this->getFilename().'%'		    
+			'gedcom_id' => $this->tree->getTreeId(),
+			'gedcom' => '%_ACT '.$this->getFilename().'%'		    
 		))->fetchAll();
 		
 		$list = array();
@@ -375,25 +375,25 @@ 
 				'SELECT i_gedcom AS gedrec FROM `##individuals`'.
 				' WHERE i_file=:gedcom_id AND i_gedcom LIKE :gedcom')
 		  ->execute(array(
-		      'gedcom_id' => $this->tree->getTreeId(), 
-		      'gedcom' => '%_ACT '.$this->getFilename().'%'		      
+			  'gedcom_id' => $this->tree->getTreeId(), 
+			  'gedcom' => '%_ACT '.$this->getFilename().'%'		      
 		  ))->fetchOne();
 		if(!$ged){
 			$ged = Database::prepare(
 					'SELECT f_gedcom AS gedrec FROM `##families`'.
 					' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom')
-			     ->execute(array(
-			         'gedcom_id' => $this->tree->getTreeId(), 
-			         'gedcom' => '%_ACT '.$this->getFilename().'%'			         
-			     ))->fetchOne();
+				 ->execute(array(
+					 'gedcom_id' => $this->tree->getTreeId(), 
+					 'gedcom' => '%_ACT '.$this->getFilename().'%'			         
+				 ))->fetchOne();
 			if(!$ged){
 				$ged = Database::prepare(
-				    'SELECT o_gedcom AS gedrec FROM `##other`'.
-				    ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
-				    ->execute(array(
-				        'gedcom_id' => $this->tree->getTreeId(),
-				        'gedcom' => '%_ACT '.$this->getFilename().'%'				        
-				    ))->fetchOne();
+					'SELECT o_gedcom AS gedrec FROM `##other`'.
+					' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
+					->execute(array(
+						'gedcom_id' => $this->tree->getTreeId(),
+						'gedcom' => '%_ACT '.$this->getFilename().'%'				        
+					))->fetchOne();
 			}
 		}
 		//If a record has been found, parse it to find the source reference.

Braces +11 added lines, -7 removed lines

@@ -118,8 +118,7 @@ 
 			if(Functions::isValidPath($certfile, true)) {
 				return new Certificate($certfile, $tree, $provider);
 			}
-		}
-		catch (\Exception $ex) { 
+		} catch (\Exception $ex) { 
 			Log::addErrorLog('Certificate module error : > '.$ex->getMessage().' < with data > '.$xref.' <');
 		}	
 
@@ -202,7 +201,9 @@ 
 	 */
 	public function getCity(){
 		$chunks = explode('/', $this->getFilename(), 2);
-		if(count($chunks) > 1) return $chunks[0];
+		if(count($chunks) > 1) {
+			return $chunks[0];
+		}
 		return null;
 	}
 	
@@ -246,8 +247,7 @@ 
     	
     		if($sid){
     			$this->source = Source::getInstance($sid, $this->tree);
-    		}
-    		else{
+    		} else{
     			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
     		}
     		
@@ -256,7 +256,9 @@ 
     			$repofact = $this->source->getFirstFact('REPO');
     			if($repofact) {
     				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+    				if($repo && $repo instanceof Repository) {
+    					$wmtext .= ' '.$repo->getFullName().' - ';
+    				}
     			}
     			$wmtext .= $this->source->getFullName();			
     		}	
@@ -426,7 +428,9 @@ 
 			}
 		}
 		
-		if($sid) $this->source = Source::getInstance($sid, $this->tree);
+		if($sid) {
+			$this->source = Source::getInstance($sid, $this->tree);
+		}
 		
 		return $this->source;	
 	}

Spacing +58 added lines, -58 removed lines

@@ -35,7 +35,7 @@ 
  */
 class Certificate extends Media {
     
-    const URL_PREFIX  = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
+    const URL_PREFIX = 'module.php?mod=myartjaub_certificates&mod_action=Certificate&cid=';
 		
     /** @var string The "TITL" value from the GEDCOM 
      * This is a tweak to overcome the private level from the parent object...
@@ -95,8 +95,8 @@ 
 		
 		$match = null;
 		$ct = preg_match("/(?<year>\d{1,4})(\.(?<month>\d{1,2}))?(\.(?<day>\d{1,2}))?( (?<type>[A-Z]{1,2}) )?(?<details>.*)/", $this->title, $match);
-		if($ct > 0){
-			$monthId = (int) $match['month'];
+		if ($ct > 0) {
+			$monthId = (int)$match['month'];
 			$calendarShortMonths = Functions::getCalendarShortMonths();
 			$monthShortName = array_key_exists($monthId, $calendarShortMonths) ? $calendarShortMonths[$monthId] : $monthId;
 			$this->certDate = new Date($match['day'].' '.strtoupper($monthShortName).' '.$match['year']);
@@ -112,11 +112,11 @@ 
 	 * @see \Fisharebest\Webtrees\GedcomRecord::getInstance()
 	 */	
 	static public function getInstance($xref, Tree $tree, $gedcom = null, CertificateProviderInterface $provider = null) {
-		try{
+		try {
 			$certfile = Functions::decryptFromSafeBase64($xref);
 			
 			//NEED TO CHECK THAT !!!
-			if(Functions::isValidPath($certfile, true)) {
+			if (Functions::isValidPath($certfile, true)) {
 				return new Certificate($certfile, $tree, $provider);
 			}
 		}
@@ -153,8 +153,8 @@ 
 	 *
 	 * @param string|Source $xref
 	 */
-	public function setSource($xref){
-		if($xref instanceof Source){
+	public function setSource($xref) {
+		if ($xref instanceof Source) {
 			$this->source = $xref;
 		} else {
 			$this->source = Source::getInstance($xref, $this->tree);
@@ -174,7 +174,7 @@ 
 	 *
 	 * @return Date Certificate date
 	 */
-	public function getCertificateDate(){
+	public function getCertificateDate() {
 		return $this->certDate;
 	}
 	
@@ -183,7 +183,7 @@ 
 	 *
 	 * @return string Certificate date
 	 */
-	public function getCertificateType(){
+	public function getCertificateType() {
 		return $this->certType;
 	}
 	
@@ -192,7 +192,7 @@ 
 	 *
 	 * @return string Certificate details
 	 */
-	public function getCertificateDetails(){
+	public function getCertificateDetails() {
 		return $this->certDetails;
 	}
 	
@@ -201,9 +201,9 @@ 
 	 *
 	 * @return string|NULL Certificate city
 	 */
-	public function getCity(){
+	public function getCity() {
 		$chunks = explode('/', $this->getFilename(), 2);
-		if(count($chunks) > 1) return $chunks[0];
+		if (count($chunks) > 1) return $chunks[0];
 		return null;
 	}
 	
@@ -211,8 +211,8 @@ 
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\Media::getServerFilename()
 	 */
-	public function getServerFilename($which='main') {
-		$filename =  $this->provider->getRealCertificatesDirectory() . $this->getFilename();
+	public function getServerFilename($which = 'main') {
+		$filename = $this->provider->getRealCertificatesDirectory().$this->getFilename();
 		return Functions::encodeUtf8ToFileSystem($filename);
 	}
 	
@@ -223,11 +223,11 @@ 
 	public function getHtmlUrlDirect($which = 'main', $download = false) {
 		$sidstr = ($this->source) ? '&sid='.$this->source->getXref() : '';
 		return
-			'module.php?mod='. \MyArtJaub\Webtrees\Constants::MODULE_MAJ_CERTIF_NAME . 
-			'&mod_action=Certificate@image' . 
-			'&ged='. $this->tree->getNameUrl() .
-			'&cid=' . $this->getXref() . $sidstr .
-			'&cb=' . $this->getEtag($which);
+			'module.php?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_CERTIF_NAME. 
+			'&mod_action=Certificate@image'. 
+			'&ged='.$this->tree->getNameUrl().
+			'&cid='.$this->getXref().$sidstr.
+			'&cb='.$this->getEtag($which);
 	}
 	
 	/**
@@ -238,26 +238,26 @@ 
 	 *
 	 * @return string Watermark text
 	 */
-	 public function getWatermarkText(){	
+	 public function getWatermarkText() {	
 	 	$module = Module::getModuleByName(Constants::MODULE_MAJ_CERTIF_NAME);
 	 	
-	 	if($module) {
+	 	if ($module) {
     		$wmtext = $module->getSetting('MAJ_WM_DEFAULT', I18N::translate('This image is protected under copyright law.'));
-    		$sid= Filter::get('sid', WT_REGEX_XREF);	
+    		$sid = Filter::get('sid', WT_REGEX_XREF);	
     	
-    		if($sid){
+    		if ($sid) {
     			$this->source = Source::getInstance($sid, $this->tree);
     		}
-    		else{
-    			$this->fetchALinkedSource();  // the method already attach the source to the Certificate object;
+    		else {
+    			$this->fetchALinkedSource(); // the method already attach the source to the Certificate object;
     		}
     		
-    		if($this->source) {
+    		if ($this->source) {
     			$wmtext = '&copy;';
     			$repofact = $this->source->getFirstFact('REPO');
-    			if($repofact) {
+    			if ($repofact) {
     				$repo = $repofact->getTarget();
-    				if($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
+    				if ($repo && $repo instanceof Repository)  $wmtext .= ' '.$repo->getFullName().' - ';
     			}
     			$wmtext .= $this->source->getFullName();			
     		}	
@@ -279,45 +279,45 @@ 
 		
 		$script = '';
 		$controller = Globals::getController();
-		if($controller && !($controller instanceof IndividualController)){
+		if ($controller && !($controller instanceof IndividualController)) {
 			$controller->addInlineJavascript('$(document).ready(function() { '.$js.' });');
 		} else {
-			$script = '<script>' . $js . '</script>';
+			$script = '<script>'.$js.'</script>';
 		}
 		
 		if ($which == 'icon' || !file_exists($this->getServerFilename())) {
 			// Use an icon
 			$image =
-			'<i dir="auto" class="icon-maj-certificate margin-h-2"' .
-			' title="' . strip_tags($this->getFullName()) . '"' .
+			'<i dir="auto" class="icon-maj-certificate margin-h-2"'.
+			' title="'.strip_tags($this->getFullName()).'"'.
 			'></i>';
 		} else {
 			$imgsize = getimagesize($this->getServerFilename());
 			$image =
-			'<img' .
-			' class ="'. 'certif_image'					 	. '"' .
-			' dir="'   . 'auto'                           	. '"' . // For the tool-tip
-			' src="'   . $this->getHtmlUrlDirect() 			. '"' .
-			' alt="'   . strip_tags($this->getFullName()) 	. '"' .
-			' title="' . strip_tags($this->getFullName()) 	. '"' .
-			$imgsize[3] . // height="yyy" width="xxx"
+			'<img'.
+			' class ="'.'certif_image'.'"'.
+			' dir="'.'auto'.'"'.// For the tool-tip
+			' src="'.$this->getHtmlUrlDirect().'"'.
+			' alt="'.strip_tags($this->getFullName()).'"'.
+			' title="'.strip_tags($this->getFullName()).'"'.
+			$imgsize[3].// height="yyy" width="xxx"
 			'>';
 		}	
 		return
-		'<a' .
-		' class="'          . 'certgallery'                          . '"' .
-		' href="'           . $this->getHtmlUrlDirect()    		 . '"' .
-		' type="'           . $this->mimeType()                  . '"' .
-		' data-obje-url="'  . $this->getHtmlUrl()                . '"' .
-		' data-title="'     . strip_tags($this->getFullName())   . '"' .
-		'>' . $image . '</a>'.$script;
+		'<a'.
+		' class="'.'certgallery'.'"'.
+		' href="'.$this->getHtmlUrlDirect().'"'.
+		' type="'.$this->mimeType().'"'.
+		' data-obje-url="'.$this->getHtmlUrl().'"'.
+		' data-title="'.strip_tags($this->getFullName()).'"'.
+		'>'.$image.'</a>'.$script;
 	}
 	
 	/**
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::linkedIndividuals()
 	 */
-	public function linkedIndividuals($link = '_ACT'){
+	public function linkedIndividuals($link = '_ACT') {
 		$rows = Database::prepare(
 				'SELECT i_id AS xref, i_gedcom AS gedcom'.
 				' FROM `##individuals`'.
@@ -341,7 +341,7 @@ 
 	 * {@inhericDoc}
 	 * @see \Fisharebest\Webtrees\GedcomRecord::linkedFamilies()
 	 */
-	public function linkedFamilies($link = '_ACT'){
+	public function linkedFamilies($link = '_ACT') {
 		$rows = Database::prepare(
 				'SELECT f_id AS xref, f_gedcom AS gedcom'.
 				' FROM `##families`'.
@@ -366,7 +366,7 @@ 
 	 *
 	 * @return Source|NULL Linked source
 	 */
-	public function fetchALinkedSource(){		
+	public function fetchALinkedSource() {		
 		$sid = null;
 		
 		// Try to find in individual, then families, then other types of records. We are interested in the first available value.
@@ -378,7 +378,7 @@ 
 		      'gedcom_id' => $this->tree->getTreeId(), 
 		      'gedcom' => '%_ACT '.$this->getFilename().'%'		      
 		  ))->fetchOne();
-		if(!$ged){
+		if (!$ged) {
 			$ged = Database::prepare(
 					'SELECT f_gedcom AS gedrec FROM `##families`'.
 					' WHERE f_file=:gedcom_id AND f_gedcom LIKE :gedcom')
@@ -386,7 +386,7 @@ 
 			         'gedcom_id' => $this->tree->getTreeId(), 
 			         'gedcom' => '%_ACT '.$this->getFilename().'%'			         
 			     ))->fetchOne();
-			if(!$ged){
+			if (!$ged) {
 				$ged = Database::prepare(
 				    'SELECT o_gedcom AS gedrec FROM `##other`'.
 				    ' WHERE o_file=:gedcom_id AND o_gedcom LIKE :gedcom')
@@ -397,19 +397,19 @@ 
 			}
 		}
 		//If a record has been found, parse it to find the source reference.
-		if($ged){
+		if ($ged) {
 			$gedlines = explode("\n", $ged);
 			$level = 0;
 			$levelsource = -1;
-			$sid_tmp=null;
+			$sid_tmp = null;
 			$sourcefound = false;
-			foreach($gedlines as $gedline){
+			foreach ($gedlines as $gedline) {
 				// Get the level
 				$match = null;
 				if (!$sourcefound && preg_match('~^('.WT_REGEX_INTEGER.') ~', $gedline, $match)) {
 					$level = $match[1];
 					//If we are not any more within the context of a source, reset
-					if($level <= $levelsource){
+					if ($level <= $levelsource) {
 						$levelsource = -1;
 						$sid_tmp = null;
 					}
@@ -417,11 +417,11 @@ 
 					$match2 = null;
 					if (preg_match('~^'.$level.' SOUR @('.WT_REGEX_XREF.')@$~', $gedline, $match2)) {
 						$levelsource = $level;
-						$sid_tmp=$match2[1];
+						$sid_tmp = $match2[1];
 					}
 					// If the image has be found, get the source reference and exit.
 					$match3 = null;
-					if($levelsource>=0 && $sid_tmp && preg_match('~^'.$level.' _ACT '.preg_quote($this->getFilename()).'~', $gedline, $match3)){
+					if ($levelsource >= 0 && $sid_tmp && preg_match('~^'.$level.' _ACT '.preg_quote($this->getFilename()).'~', $gedline, $match3)) {
 						$sid = $sid_tmp;
 						$sourcefound = true;
 					}
@@ -429,7 +429,7 @@ 
 			}
 		}
 		
-		if($sid) $this->source = Source::getInstance($sid, $this->tree);
+		if ($sid) $this->source = Source::getInstance($sid, $this->tree);
 		
 		return $this->source;	
 	}

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>

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

Indentation +5 added lines, -5 removed lines

@@ -26,11 +26,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var AbstractModule $module  */
-        $module = $this->data->get('module');        
-        ?>        
+		/** @var AbstractModule $module  */
+		$module = $this->data->get('module');        
+		?>        
         <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>
@@ -186,7 +186,7 @@ 
         </form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file