jon48 / webtrees-lib

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/GeoDispersion/GeoAnalysisController.php

Braces +28 added lines, -21 removed lines

@@ -146,14 +146,15 @@ 
             $this->provider->setGeoAnalysisStatus($ga, $status);
             $res['status'] = $status;
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
         }
         
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if($res['error']) {
+        	http_response_code(500);
+        }
         
         echo \Zend_Json::encode($res);
     }
@@ -179,14 +180,15 @@ 
         try{
             $this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
-        }
-        catch (\Exception $ex) {
+        } catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '. $ex->getMessage());
         }
     
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if($res['error']) {
+        	http_response_code(500);
+        }
     
         echo \Zend_Json::encode($res);
     }
@@ -242,7 +244,9 @@ 
             
             $nb_found = $placesGeneralResults['knownsum'];
             $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+            if(isset($placesGeneralResults['other'])) {
+            	$nb_other =$placesGeneralResults['other'];
+            }
             $nb_unknown = $placesGeneralResults['unknown'];
             
             $data->set('stats_gen_nb_found', $nb_found);
@@ -264,11 +268,12 @@ 
                     if($level_map >= 0 && $level_map < count($levelvalues)) {
                         $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
                         if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
-                    }
-                    else {
+                    } else {
                         $levelref = $levelvalues[0];
                     }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+                    if(isset($places_mappings[$levelref])) {
+                    	$levelref = $places_mappings[$levelref];
+                    }
                     if(isset($results_by_subdivs[$levelref])) {
                         $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
                         $count_subd  += $count;
@@ -285,8 +290,7 @@ 
                 $data->set('results_by_subdivisions', $results_by_subdivs);
                 
                 $html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-            else {
+            } else {
                 $results = $placesGeneralResults['places'];
                 arsort($results);
                 $data->set('results', $results);
@@ -294,8 +298,7 @@ 
                 
                 $html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
             }
-        }
-        else {
+        } else {
             $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
         }
         return $html;
@@ -330,9 +333,15 @@ 
                 $sum = 0;
                 $other = 0;
                 $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+                if(isset($genData['sum'])) {
+                	$sum = $genData['sum'];
+                }
+                if(isset($genData['other'])) {
+                	$other = $genData['other'];
+                }
+                if(isset($genData['unknown'])) {
+                	$unknown = $genData['unknown'];
+                }
                 
                 if($sum > 0) {                
                     $results_by_gen[$gen]['sum'] = $sum;
@@ -351,8 +360,7 @@ 
                                 $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
                             }
                         }
-                    }
-                    else {
+                    } else {
                         $tmp = $genData['places'];
                         if($other > 0) {
                             $tmp = array_slice($tmp, 0, 5, true);
@@ -368,8 +376,7 @@ 
             
             $html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
             
-        }
-        else {
+        } else {
             $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
         }
         return $html;

Indentation +231 added lines, -231 removed lines

@@ -35,47 +35,47 @@ 
  */
 class GeoAnalysisController extends MvcController
 {
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $provider
+	 */
+	protected $provider;
     
-    /**
-     * Constructor for GeoAnalysis controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for GeoAnalysis controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * GeoAnalysis@index
-     */
-    public function index() {
+	/**
+	 * GeoAnalysis@index
+	 */
+	public function index() {
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('has_analysis', false);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('has_analysis', false);
         
-        $ga_id = Filter::getInteger('ga_id');        
+		$ga_id = Filter::getInteger('ga_id');        
         
-        if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
-            $data->set('has_analysis', true);
-            $data->set('geoanalysis', $ga);
+		if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
+			$data->set('has_analysis', true);
+			$data->set('geoanalysis', $ga);
             
-            $controller
-                ->addExternalJavascript(Constants::WT_RAPHAEL_JS_URL())
-                ->addInlineJavascript('
+			$controller
+				->addExternalJavascript(Constants::WT_RAPHAEL_JS_URL())
+				->addInlineJavascript('
                 jQuery("#geodispersion-tabs").tabs();
                 jQuery("#geodispersion-tabs").css("visibility", "visible");
                 
@@ -96,133 +96,133 @@ 
 					"json"
 				);
             ');
-        }
+		}
         
-        ViewFactory::make('GeoAnalysis', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysis', $this, $controller, $data)->render();
+	}
     
-    /**
-     * GeoAnalysis@listAll
-     */
-    public function listAll() {
+	/**
+	 * GeoAnalysis@listAll
+	 */
+	public function listAll() {
         
-        $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
+		$controller = new PageController();
+		$controller->setPageTitle(I18N::translate('Sosa Geographical dispersion'));
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('has_list', false);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('has_list', false);
         
-        $ga_list = $this->provider->getGeoAnalysisList();
-        if(count($ga_list) > 0 ) {
-             $data->set('has_list', true);
-             $data->set('geoanalysislist', $ga_list);
-        }
+		$ga_list = $this->provider->getGeoAnalysisList();
+		if(count($ga_list) > 0 ) {
+			 $data->set('has_list', true);
+			 $data->set('geoanalysislist', $ga_list);
+		}
         
-        ViewFactory::make('GeoAnalysisList', $this, $controller, $data)->render();        
-    }
+		ViewFactory::make('GeoAnalysisList', $this, $controller, $data)->render();        
+	}
     	
 	/**
 	 * GeoAnalysis@setStatus
 	 */
-    public function setStatus() {  
-        global $WT_TREE;
+	public function setStatus() {  
+		global $WT_TREE;
         
-        $controller = new JsonController();
+		$controller = new JsonController();
         
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isManager($WT_TREE) 
-            && $ga !== null
-        );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isManager($WT_TREE) 
+			&& $ga !== null
+		);
         
-        $status = Filter::getBool('status');
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
-            $this->provider->setGeoAnalysisStatus($ga, $status);
-            $res['status'] = $status;
+		$status = Filter::getBool('status');
+		$res = array('geoanalysis' => $ga->getId() , 'error' => null);
+		try{
+			$this->provider->setGeoAnalysisStatus($ga, $status);
+			$res['status'] = $status;
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
-        }
-        catch (\Exception $ex) {
-            $res['error'] = $ex->getMessage();
+		}
+		catch (\Exception $ex) {
+			$res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
-        }
+		}
         
-        $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+		$controller->pageHeader();
+		if($res['error']) http_response_code(500);
         
-        echo \Zend_Json::encode($res);
-    }
+		echo \Zend_Json::encode($res);
+	}
     
 	/**
-     * GeoAnalysis@delete
-     */
-    public function delete() {
-        global $WT_TREE;
+	 * GeoAnalysis@delete
+	 */
+	public function delete() {
+		global $WT_TREE;
     
-        $controller = new JsonController();
+		$controller = new JsonController();
     
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
     
-        $controller->restrictAccess(
-            true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
-            &&  Auth::isManager($WT_TREE)
-            && $ga
-            );
+		$controller->restrictAccess(
+			true // Filter::checkCsrf()   -- Cannot use CSRF on a GET request (modules can only work with GET requests)
+			&&  Auth::isManager($WT_TREE)
+			&& $ga
+			);
             
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
-            $this->provider->deleteGeoAnalysis($ga);
+		$res = array('geoanalysis' => $ga->getId() , 'error' => null);
+		try{
+			$this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
-        }
-        catch (\Exception $ex) {
-            $res['error'] = $ex->getMessage();
+		}
+		catch (\Exception $ex) {
+			$res['error'] = $ex->getMessage();
 			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '. $ex->getMessage());
-        }
+		}
     
-        $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+		$controller->pageHeader();
+		if($res['error']) http_response_code(500);
     
-        echo \Zend_Json::encode($res);
-    }
+		echo \Zend_Json::encode($res);
+	}
         	
-    /**
-     * GeoAnalysis@dataTabs
-     */
-    public function dataTabs() {
-        global $WT_TREE;
+	/**
+	 * GeoAnalysis@dataTabs
+	 */
+	public function dataTabs() {
+		global $WT_TREE;
         
-        $controller = new JsonController();
+		$controller = new JsonController();
         
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id);
-        $sosa_provider = new SosaProvider($WT_TREE, Auth::user());
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id);
+		$sosa_provider = new SosaProvider($WT_TREE, Auth::user());
         
-        $controller
-            ->restrictAccess($ga && $sosa_provider->isSetup())
-            ->pageHeader();
+		$controller
+			->restrictAccess($ga && $sosa_provider->isSetup())
+			->pageHeader();
         
-        $jsonArray = array();
+		$jsonArray = array();
         
-        list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
+		list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
         
-        $flags = array();
-        if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
-            $mapProvider = new GoogleMapsProvider();            
-            foreach($placesDispGeneral['places'] as $place => $count) {
-                $flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $WT_TREE));
-            }
-        }
+		$flags = array();
+		if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
+			$mapProvider = new GoogleMapsProvider();            
+			foreach($placesDispGeneral['places'] as $place => $count) {
+				$flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $WT_TREE));
+			}
+		}
         
-        $jsonArray['generaltab'] = $this->htmlPlacesAnalysisGeneralTab($ga, $placesDispGeneral, $flags);
-        $jsonArray['generationstab'] = $this->htmlPlacesAnalysisGenerationsTab($ga, $placesDispGenerations, $flags);
+		$jsonArray['generaltab'] = $this->htmlPlacesAnalysisGeneralTab($ga, $placesDispGeneral, $flags);
+		$jsonArray['generationstab'] = $this->htmlPlacesAnalysisGenerationsTab($ga, $placesDispGenerations, $flags);
         
-        echo \Zend_Json::encode($jsonArray);
-    }
+		echo \Zend_Json::encode($jsonArray);
+	}
     
 	/**
 	 * Returns HTML code for the GeoAnalysis general tab (can be either a map or a table).
@@ -232,70 +232,70 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the general tab
 	 */
-    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {
-        global $WT_TREE;
+	protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {
+		global $WT_TREE;
         
-        if(!empty($placesGeneralResults)){
-            $data = new ViewBag();
+		if(!empty($placesGeneralResults)){
+			$data = new ViewBag();
             
-            $nb_found = $placesGeneralResults['knownsum'];
-            $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
-            $nb_unknown = $placesGeneralResults['unknown'];
+			$nb_found = $placesGeneralResults['knownsum'];
+			$nb_other = 0;
+			if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+			$nb_unknown = $placesGeneralResults['unknown'];
             
-            $data->set('stats_gen_nb_found', $nb_found);
-            $data->set('stats_gen_nb_other', $nb_other);
-            $data->set('stats_gen_nb_unknown', $nb_unknown);
+			$data->set('stats_gen_nb_found', $nb_found);
+			$data->set('stats_gen_nb_other', $nb_other);
+			$data->set('stats_gen_nb_unknown', $nb_unknown);
             
-            $data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
+			$data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
             
-            if($ga->hasMap()) {
-                $max = $placesGeneralResults['max'];
-                $map = $ga->getOptions()->getMap();
-                $results_by_subdivs = $map->getSubdivisions();
-                $places_mappings = $map->getPlacesMappings();
-                foreach ($placesGeneralResults['places'] as $location => $count) {
-                    $levelvalues = array_reverse(array_map('trim',explode(',', $location)));
-                    $level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
-                    if($level_map >= 0 && $level_map < count($levelvalues)) {
-                        $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
-                        if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
-                    }
-                    else {
-                        $levelref = $levelvalues[0];
-                    }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
-                    if(isset($results_by_subdivs[$levelref])) {
-                        $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
-                        $count_subd  += $count;
-                        $results_by_subdivs[$levelref]['count'] = $count_subd;   
-                        $results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
-                        if($ga->getOptions()->isUsingFlags() && $flags) {
-                            $results_by_subdivs[$levelref]['place'] = new Place($location, $WT_TREE);
-                            $results_by_subdivs[$levelref]['flag'] = $flags[$location];
-                        }
-                    }
-                }             
+			if($ga->hasMap()) {
+				$max = $placesGeneralResults['max'];
+				$map = $ga->getOptions()->getMap();
+				$results_by_subdivs = $map->getSubdivisions();
+				$places_mappings = $map->getPlacesMappings();
+				foreach ($placesGeneralResults['places'] as $location => $count) {
+					$levelvalues = array_reverse(array_map('trim',explode(',', $location)));
+					$level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
+					if($level_map >= 0 && $level_map < count($levelvalues)) {
+						$levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
+						if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
+					}
+					else {
+						$levelref = $levelvalues[0];
+					}
+					if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+					if(isset($results_by_subdivs[$levelref])) {
+						$count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
+						$count_subd  += $count;
+						$results_by_subdivs[$levelref]['count'] = $count_subd;   
+						$results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
+						if($ga->getOptions()->isUsingFlags() && $flags) {
+							$results_by_subdivs[$levelref]['place'] = new Place($location, $WT_TREE);
+							$results_by_subdivs[$levelref]['flag'] = $flags[$location];
+						}
+					}
+				}             
                 
-                $data->set('map', $ga->getOptions()->getMap());
-                $data->set('results_by_subdivisions', $results_by_subdivs);
+				$data->set('map', $ga->getOptions()->getMap());
+				$data->set('results_by_subdivisions', $results_by_subdivs);
                 
-                $html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-            else {
-                $results = $placesGeneralResults['places'];
-                arsort($results);
-                $data->set('results', $results);
-                $data->set('analysis_level', $ga->getAnalysisLevel());
+				$html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
+			}
+			else {
+				$results = $placesGeneralResults['places'];
+				arsort($results);
+				$data->set('results', $results);
+				$data->set('analysis_level', $ga->getAnalysisLevel());
                 
-                $html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-        }
-        else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
-        }
-        return $html;
-    }
+				$html = ViewFactory::make('GeoAnalysisTabGeneralTable', $this, new BaseController(), $data)->getHtmlPartial();
+			}
+		}
+		else {
+			$html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
+		}
+		return $html;
+	}
     
 	/**
 	 * Returns HTML code for the GeoAnalysis generations tab.
@@ -305,68 +305,68 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the generations tab
 	 */
-    protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {
-        global $WT_TREE;
+	protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {
+		global $WT_TREE;
         
-        if(!empty($placesGenerationsResults) && $ga->getOptions()){
-            $data = new ViewBag();
+		if(!empty($placesGenerationsResults) && $ga->getOptions()){
+			$data = new ViewBag();
             
-            ksort($placesGenerationsResults);
+			ksort($placesGenerationsResults);
             
-            $detailslevel = $ga->getOptions()->getMaxDetailsInGen();
-            $data->set('max_details_gen', $detailslevel);    
-            $data->set('use_flags', $ga->getOptions()->isUsingFlags());
-            $data->set('analysis_level', $ga->getAnalysisLevel());
-            $display_all_places = !is_null($detailslevel) && $detailslevel == 0;
-            $data->set('display_all_places', $display_all_places);
+			$detailslevel = $ga->getOptions()->getMaxDetailsInGen();
+			$data->set('max_details_gen', $detailslevel);    
+			$data->set('use_flags', $ga->getOptions()->isUsingFlags());
+			$data->set('analysis_level', $ga->getAnalysisLevel());
+			$display_all_places = !is_null($detailslevel) && $detailslevel == 0;
+			$data->set('display_all_places', $display_all_places);
             
-            $results_by_gen = array();
-            foreach($placesGenerationsResults as $gen => $genData){
-                $sum = 0;
-                $other = 0;
-                $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+			$results_by_gen = array();
+			foreach($placesGenerationsResults as $gen => $genData){
+				$sum = 0;
+				$other = 0;
+				$unknown = 0;
+				if(isset($genData['sum'])) $sum = $genData['sum'];
+				if(isset($genData['other'])) $other = $genData['other'];
+				if(isset($genData['unknown'])) $unknown = $genData['unknown'];
                 
-                if($sum > 0) {                
-                    $results_by_gen[$gen]['sum'] = $sum;
-                    $results_by_gen[$gen]['other'] = $other;
-                    $results_by_gen[$gen]['unknown'] = $unknown;
-                    $results_by_gen[$gen]['places'] = array();                    
-                    arsort($genData['places']);
+				if($sum > 0) {                
+					$results_by_gen[$gen]['sum'] = $sum;
+					$results_by_gen[$gen]['other'] = $other;
+					$results_by_gen[$gen]['unknown'] = $unknown;
+					$results_by_gen[$gen]['places'] = array();                    
+					arsort($genData['places']);
                     
-                    if($display_all_places){
-                        foreach($genData['places'] as $placename=> $count){
-                            $results_by_gen[$gen]['places'][$placename]['count'] = $count;
+					if($display_all_places){
+						foreach($genData['places'] as $placename=> $count){
+							$results_by_gen[$gen]['places'][$placename]['count'] = $count;
                             
-                            if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
-                                $results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, $WT_TREE);
-                                $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
-                            }
-                        }
-                    }
-                    else {
-                        $tmp = $genData['places'];
-                        if($other > 0) {
-                            $tmp = array_slice($tmp, 0, 5, true);
-                            $tmp['other'] = $other;
-                            arsort($tmp);  
-                        }                      
-                        $results_by_gen[$gen]['places'] = array_slice($tmp, 0, 5, true);                        
-                    }
-                }
-            }
+							if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
+								$results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, $WT_TREE);
+								$results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
+							}
+						}
+					}
+					else {
+						$tmp = $genData['places'];
+						if($other > 0) {
+							$tmp = array_slice($tmp, 0, 5, true);
+							$tmp['other'] = $other;
+							arsort($tmp);  
+						}                      
+						$results_by_gen[$gen]['places'] = array_slice($tmp, 0, 5, true);                        
+					}
+				}
+			}
             
-            $data->set('results_by_generations', $results_by_gen);
+			$data->set('results_by_generations', $results_by_gen);
             
-            $html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
+			$html = ViewFactory::make('GeoAnalysisTabGenerations', $this, new BaseController(), $data)->getHtmlPartial();
             
-        }
-        else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
-        }
-        return $html;
-    }
+		}
+		else {
+			$html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
+		}
+		return $html;
+	}
         
 }
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

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

src/Webtrees/Module/Certificates/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/AdminConfigController.php

Spacing +10 added lines, -10 removed lines

@@ -35,39 +35,39 @@ 
     protected function update() {
         global $WT_TREE;
         
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
             
             $this->module->setSetting('MAJ_SHOW_CERT', Filter::post('MAJ_SHOW_CERT'));
             $this->module->setSetting('MAJ_SHOW_NO_WATERMARK', Filter::post('MAJ_SHOW_NO_WATERMARK'));
             
-            if($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
+            if ($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
                 $this->module->setSetting('MAJ_WM_DEFAULT', $MAJ_WM_DEFAULT);
             }
             
-            if($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
+            if ($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
                 $this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $MAJ_WM_FONT_MAXSIZE);
             }
             
             // Only accept valid color for MAJ_WM_FONT_COLOR
             $MAJ_WM_FONT_COLOR = Filter::post('MAJ_WM_FONT_COLOR', '#([a-fA-F0-9]{3}){1,2}');            
-            if($MAJ_WM_FONT_COLOR) {
+            if ($MAJ_WM_FONT_COLOR) {
                 $this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
             }
             
             // Only accept valid folders for MAJ_CERT_ROOTDIR
-            $MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR') . '/');
+            $MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR').'/');
             if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
                 $MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
             }
             
             if ($MAJ_CERT_ROOTDIR) {
-                if (is_dir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+                if (is_dir(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)) {
                     $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                } elseif (File::mkdir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+                } elseif (File::mkdir(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)) {
                     $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'info');
+                    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)), 'info');
                 } else {
-                    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'danger');
+                    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR.$MAJ_CERT_ROOTDIR)), 'danger');
                 }
             }
             
@@ -88,7 +88,7 @@ 
         global $WT_TREE;
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init($WT_TREE);        
         $ctrl = new PageController();

Braces +3 added lines, -1 removed lines

@@ -88,7 +88,9 @@
         global $WT_TREE;
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init($WT_TREE);        
         $ctrl = new PageController();

Indentation +57 added lines, -57 removed lines

@@ -28,77 +28,77 @@
  */
 class AdminConfigController extends MvcController
 {
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {
         
-        if(Auth::isAdmin()){
+		if(Auth::isAdmin()){
             
-            $this->module->setSetting('MAJ_SHOW_CERT', Filter::post('MAJ_SHOW_CERT'));
-            $this->module->setSetting('MAJ_SHOW_NO_WATERMARK', Filter::post('MAJ_SHOW_NO_WATERMARK'));
+			$this->module->setSetting('MAJ_SHOW_CERT', Filter::post('MAJ_SHOW_CERT'));
+			$this->module->setSetting('MAJ_SHOW_NO_WATERMARK', Filter::post('MAJ_SHOW_NO_WATERMARK'));
             
-            if($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
-                $this->module->setSetting('MAJ_WM_DEFAULT', $MAJ_WM_DEFAULT);
-            }
+			if($MAJ_WM_DEFAULT = Filter::post('MAJ_WM_DEFAULT')) {
+				$this->module->setSetting('MAJ_WM_DEFAULT', $MAJ_WM_DEFAULT);
+			}
             
-            if($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
-                $this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $MAJ_WM_FONT_MAXSIZE);
-            }
+			if($MAJ_WM_FONT_MAXSIZE = Filter::postInteger('MAJ_WM_FONT_MAXSIZE')) {
+				$this->module->setSetting('MAJ_WM_FONT_MAXSIZE', $MAJ_WM_FONT_MAXSIZE);
+			}
             
-            // Only accept valid color for MAJ_WM_FONT_COLOR
-            $MAJ_WM_FONT_COLOR = Filter::post('MAJ_WM_FONT_COLOR', '#([a-fA-F0-9]{3}){1,2}');            
-            if($MAJ_WM_FONT_COLOR) {
-                $this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
-            }
+			// Only accept valid color for MAJ_WM_FONT_COLOR
+			$MAJ_WM_FONT_COLOR = Filter::post('MAJ_WM_FONT_COLOR', '#([a-fA-F0-9]{3}){1,2}');            
+			if($MAJ_WM_FONT_COLOR) {
+				$this->module->setSetting('MAJ_WM_FONT_COLOR', $MAJ_WM_FONT_COLOR);
+			}
             
-            // Only accept valid folders for MAJ_CERT_ROOTDIR
-            $MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR') . '/');
-            if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
-                $MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
-            }
+			// Only accept valid folders for MAJ_CERT_ROOTDIR
+			$MAJ_CERT_ROOTDIR = preg_replace('/[\/\\\\]+/', '/', Filter::post('MAJ_CERT_ROOTDIR') . '/');
+			if (substr($MAJ_CERT_ROOTDIR, 0, 1) === '/') {
+				$MAJ_CERT_ROOTDIR = substr($MAJ_CERT_ROOTDIR, 1);
+			}
             
-            if ($MAJ_CERT_ROOTDIR) {
-                if (is_dir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
-                    $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                } elseif (File::mkdir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
-                    $this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
-                    FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'info');
-                } else {
-                    FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'danger');
-                }
-            }
+			if ($MAJ_CERT_ROOTDIR) {
+				if (is_dir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+					$this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
+				} elseif (File::mkdir(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)) {
+					$this->module->setSetting('MAJ_CERT_ROOTDIR', $MAJ_CERT_ROOTDIR);
+					FlashMessages::addMessage(I18N::translate('The folder %s has been created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'info');
+				} else {
+					FlashMessages::addMessage(I18N::translate('The folder %s does not exist, and it could not be created.', Html::filename(WT_DATA_DIR . $MAJ_CERT_ROOTDIR)), 'danger');
+				}
+			}
             
-            FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
             
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {      
-        global $WT_TREE;
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {      
+		global $WT_TREE;
         
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
         
 }
\ No newline at end of file

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

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

Indentation +13 added lines, -13 removed lines

@@ -25,12 +25,12 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $cities = $this->data->get('cities');
-        $selected_city = $this->data->get('selected_city');
+		$cities = $this->data->get('cities');
+		$selected_city = $this->data->get('selected_city');
         
-        ?>                
+		?>                
         <div id="maj-cert-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
@@ -61,8 +61,8 @@ 
     				</thead>
     				<tbody>
     				<?php foreach ($this->data->get('certificate_list') as $certificate) { 
-    				    /** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
-    				    ?>
+						/** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
+						?>
     					<tr>
     						<!-- Certificate date -->
     						<?php if($date = $certificate->getCertificateDate()) { ?>
@@ -76,12 +76,12 @@ 
     						<td><?php echo Filter::escapeHtml($certificate->getCertificateType() ?: '');  ?></td>
     						<!--  Certificate Name -->
     						<?php 
-    						$name = $certificate->getCertificateDetails() ?: '';
-    						$sortname = "";
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
-    						$sortname .= $name;
-    						?>
+							$name = $certificate->getCertificateDetails() ?: '';
+							$sortname = "";
+							$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
+							if($ct_names > 0) $sortname = $match[1].'_';
+							$sortname .= $name;
+							?>
     						<td><?php echo Filter::escapeHtml($sortname); ?></td>
     						<td>
     							<a href="<?php echo $certificate->getHtmlUrl(); ?>"><?php echo Filter::escapeHtml($name); ?></a>
@@ -95,7 +95,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -35,21 +35,21 @@ 
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<form method="get" name="selcity" action="module.php">
-    			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
-    			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action');?>">
-    			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>">
+    			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module'); ?>">
+    			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action'); ?>">
+    			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged'); ?>">
     			<select name="city">
     			<?php foreach ($cities as $city) { ?>
-    				<option value="<?php echo Functions::encryptToSafeBase64($city); ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?php echo $city;?></option>
+    				<option value="<?php echo Functions::encryptToSafeBase64($city); ?>" <?php if (trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?php echo $city; ?></option>
     			<?php } ?>
     			</select>
-    			<input type="submit" value="<?php echo I18N::translate('Show');?>" />
+    			<input type="submit" value="<?php echo I18N::translate('Show'); ?>" />
     		</form>
     		
-    		<?php if($this->data->get('has_list', false)) { ?>
+    		<?php if ($this->data->get('has_list', false)) { ?>
     		<div class="loading-image">&nbsp;</div>
     		<div class="certificate-list">
-    			<table id="<?php echo $this->data->get('table_id');?>">
+    			<table id="<?php echo $this->data->get('table_id'); ?>">
     				<thead>
     					<tr>
     						<th><?php echo I18N::translate('Date'); ?></th>
@@ -65,7 +65,7 @@ 
     				    ?>
     					<tr>
     						<!-- Certificate date -->
-    						<?php if($date = $certificate->getCertificateDate()) { ?>
+    						<?php if ($date = $certificate->getCertificateDate()) { ?>
     						<td><?php echo $date->display(); ?></td>
     						<td><?php echo $date->julianDay(); ?></td>
     						<?php } else { ?>
@@ -73,13 +73,13 @@ 
     						<td>0</td>
     						<?php  } ?>
     						<!--  Certificate Type -->
-    						<td><?php echo Filter::escapeHtml($certificate->getCertificateType() ?: '');  ?></td>
+    						<td><?php echo Filter::escapeHtml($certificate->getCertificateType() ?: ''); ?></td>
     						<!--  Certificate Name -->
     						<?php 
     						$name = $certificate->getCertificateDetails() ?: '';
     						$sortname = "";
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
+    						$ct_names = preg_match("/([A-Z]{2,})/", $name, $match);
+    						if ($ct_names > 0) $sortname = $match[1].'_';
     						$sortname .= $name;
     						?>
     						<td><?php echo Filter::escapeHtml($sortname); ?></td>

Braces +7 added lines, -2 removed lines

@@ -40,7 +40,10 @@ 
     			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>">
     			<select name="city">
     			<?php foreach ($cities as $city) { ?>
-    				<option value="<?php echo Functions::encryptToSafeBase64($city); ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?php echo $city;?></option>
+    				<option value="<?php echo Functions::encryptToSafeBase64($city); ?>" <?php if(trim($city) == trim($selected_city)) {
+	echo 'selected="selected"'?> ><?php echo $city;
+}
+?></option>
     			<?php } ?>
     			</select>
     			<input type="submit" value="<?php echo I18N::translate('Show');?>" />
@@ -79,7 +82,9 @@ 
     						$name = $certificate->getCertificateDetails() ?: '';
     						$sortname = "";
     						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
+    						if($ct_names > 0) {
+    							$sortname = $match[1].'_';
+    						}
     						$sortname .= $name;
     						?>
     						<td><?php echo Filter::escapeHtml($sortname); ?></td>

src/Webtrees/Module/PatronymicLineageModule.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
      public function getMenu(fw\Tree $tree, $reference) {

          $tree_url = $tree ? $tree->getNameUrl() : '';

          $surname = $reference && is_string($reference) ? $reference : '';

-         return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));

+         return new fw\Menu($this->getTitle(), 'module.php?mod='.$this->getName().'&mod_action=Lineage&ged='.$tree_url.'&surname='.$surname, 'menu-maj-list-lineage', array('rel' => 'nofollow'));

      }

 
 }

Indentation +30 added lines, -30 removed lines

@@ -18,40 +18,40 @@
  * Patronymic Lineage Module.

  */

 class PatronymicLineageModule extends fw\Module\AbstractModule 

-    implements ModuleMenuItemInterface

+	implements ModuleMenuItemInterface

 {

-    /** @var string For custom modules - link for support, upgrades, etc. */

-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';

+	/** @var string For custom modules - link for support, upgrades, etc. */

+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';

         

-    /**

-     * {@inhericDoc}

-     */

-    public function getTitle() {

-        return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');

-    }

+	/**

+	 * {@inhericDoc}

+	 */

+	public function getTitle() {

+		return /* I18N: Name of the “Patronymic lineage” module */ I18N::translate('Patronymic Lineages');

+	}

     

-    /**

-     * {@inhericDoc}

-     */

-    public function getDescription() {

-        return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');

-    }

+	/**

+	 * {@inhericDoc}

+	 */

+	public function getDescription() {

+		return /* I18N: Description of the “Patronymic lineage” module */ I18N::translate('Display lineages of people holding the same surname.');

+	}

     

-    /**

-     * {@inhericDoc}

-     */

-    public function modAction($mod_action) {

-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);

-    }


-     /** 

-      * {@inhericDoc}

-      * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()

-      */

-     public function getMenu(fw\Tree $tree, $reference) {

-         $tree_url = $tree ? $tree->getNameUrl() : '';

-         $surname = $reference && is_string($reference) ? $reference : '';

-         return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));

-     }

+	/**

+	 * {@inhericDoc}

+	 */

+	public function modAction($mod_action) {

+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);

+	}


+	 /** 

+	  * {@inhericDoc}

+	  * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()

+	  */

+	 public function getMenu(fw\Tree $tree, $reference) {

+		 $tree_url = $tree ? $tree->getNameUrl() : '';

+		 $surname = $reference && is_string($reference) ? $reference : '';

+		 return new fw\Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Lineage&ged=' . $tree_url . '&surname=' . $surname , 'menu-maj-list-lineage', array('rel' => 'nofollow'));

+	 }

 
 }

  
\ No newline at end of file

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Indentation +58 added lines, -58 removed lines

@@ -23,74 +23,74 @@
  */
 class PiwikController extends MvcController
 {   
-    /**
-     * Retrieve the number of visitors from Piwik, for a given period.
-     * 
-     * @param string $block_id
-     * @param string $period
-     * @param (null|int) Number of visits
-     */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+	/**
+	 * Retrieve the number of visitors from Piwik, for a given period.
+	 * 
+	 * @param string $block_id
+	 * @param string $period
+	 * @param (null|int) Number of visits
+	 */
+	private function getNumberOfVisitsPiwik($block_id, $period='year'){
     
-        $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
-        $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
-        $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
+		$piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
+		$piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
+		$piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
-            $piwik_token && strlen($piwik_token)            
-            ) 
-        {        
-            // calling Piwik REST API
-            $url = $piwik_url;
-            $url .= '?module=API&method=VisitsSummary.getVisits';
-            $url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
-            $url .= '&format=PHP';
-            $url .= '&token_auth='.$piwik_token;
+		if($piwik_url && strlen($piwik_url) > 0 &&
+			$piwik_siteid  && strlen($piwik_siteid) > 0 &&
+			$piwik_token && strlen($piwik_token)            
+			) 
+		{        
+			// calling Piwik REST API
+			$url = $piwik_url;
+			$url .= '?module=API&method=VisitsSummary.getVisits';
+			$url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
+			$url .= '&format=PHP';
+			$url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
-                $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
-            }
-        }
+			if($fetched = File::fetchUrl($url)) {
+				$content = @unserialize($fetched);
+				if(is_numeric($content)) return $content;
+			}
+		}
     
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * Piwik@index
-     */
-    public function index() {  
+	/**
+	 * Piwik@index
+	 */
+	public function index() {  
         
-        $ctrl = new AjaxController();
+		$ctrl = new AjaxController();
         
-        $data = new ViewBag();
-        $data->set('has_stats', false);
+		$data = new ViewBag();
+		$data->set('has_stats', false);
         
-        $block_id = Filter::get('block_id');        
-        if($block_id){
-            if(Cache::isCached('piwikCountYear', $this->module)) {
-                $visitCountYear = Cache::get('piwikCountYear', $this->module);
-            }
-            else{
-                $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                Cache::save('piwikCountYear', $visitCountYear, $this->module);
-            }
-            if($visitCountYear){
-                $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+		$block_id = Filter::get('block_id');        
+		if($block_id){
+			if(Cache::isCached('piwikCountYear', $this->module)) {
+				$visitCountYear = Cache::get('piwikCountYear', $this->module);
+			}
+			else{
+				$visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
+				Cache::save('piwikCountYear', $visitCountYear, $this->module);
+			}
+			if($visitCountYear){
+				$visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
+				$visitCountYear = max( 0, $visitCountYear);
                 
-                $data->set('has_stats', true);
-                $data->set('visits_today', $visitCountToday);
-                $data->set('visits_year', $visitCountYear + $visitCountToday);                
-            }
-        }
+				$data->set('has_stats', true);
+				$data->set('visits_today', $visitCountToday);
+				$data->set('visits_year', $visitCountYear + $visitCountToday);                
+			}
+		}
         
-        ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
-    }
+		ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
+	}
     
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -30,14 +30,14 @@ 
      * @param string $period
      * @param (null|int) Number of visits
      */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+    private function getNumberOfVisitsPiwik($block_id, $period = 'year') {
     
         $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
         $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
         $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
+        if ($piwik_url && strlen($piwik_url) > 0 &&
+            $piwik_siteid && strlen($piwik_siteid) > 0 &&
             $piwik_token && strlen($piwik_token)            
             ) 
         {        
@@ -48,9 +48,9 @@ 
             $url .= '&format=PHP';
             $url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
+            if ($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if (is_numeric($content)) return $content;
             }
         }
     
@@ -72,17 +72,17 @@ 
         $data->set('has_stats', false);
         
         $block_id = Filter::get('block_id');        
-        if($block_id){
-            if(Cache::isCached('piwikCountYear', $this->module)) {
+        if ($block_id) {
+            if (Cache::isCached('piwikCountYear', $this->module)) {
                 $visitCountYear = Cache::get('piwikCountYear', $this->module);
             }
-            else{
+            else {
                 $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
                 Cache::save('piwikCountYear', $visitCountYear, $this->module);
             }
-            if($visitCountYear){
+            if ($visitCountYear) {
                 $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+                $visitCountYear = max(0, $visitCountYear);
                 
                 $data->set('has_stats', true);
                 $data->set('visits_today', $visitCountToday);

Braces +4 added lines, -3 removed lines

@@ -50,7 +50,9 @@ 
         
             if($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if(is_numeric($content)) {
+                	return $content;
+                }
             }
         }
     
@@ -75,8 +77,7 @@ 
         if($block_id){
             if(Cache::isCached('piwikCountYear', $this->module)) {
                 $visitCountYear = Cache::get('piwikCountYear', $this->module);
-            }
-            else{
+            } else{
                 $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
                 Cache::save('piwikCountYear', $visitCountYear, $this->module);
             }