jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/GeoAnalysisController.php

Braces +28 added lines, -21 removed lines

@@ -144,14 +144,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);
+        }
         
         $controller->encode($res);
     }
@@ -175,14 +176,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);
+        }
 
         $controller->encode($res);
     }
@@ -234,7 +236,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);
@@ -255,11 +259,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;
@@ -277,8 +282,7 @@ 
                 }
                 
                 $html = ViewFactory::make('GeoAnalysisTabGeneralMap', $this, new BaseController(), $data)->getHtmlPartial();
-            }
-            else {
+            } else {
                 $results = $placesGeneralResults['places'];
                 arsort($results);
                 $data->set('results', $results);
@@ -286,8 +290,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;
@@ -319,9 +322,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;
@@ -339,8 +348,7 @@ 
                                 $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
                             }
                         }
-                    }
-                    else {
+                    } else {
                         $tmp = $genData['places'];
                         if($other > 0) {
                             $tmp = array_slice($tmp, 0, 5, true);
@@ -356,8 +364,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;

src/Webtrees/Module/GeoDispersion/Model/OutlineMap.php

Braces +25 added lines, -10 removed lines

@@ -70,7 +70,9 @@ 
         $this->is_loaded = false;
         $this->subdivisions = array();
         $this->mappings = array();
-        if($load) $this->load();
+        if($load) {
+        	$this->load();
+        }
     }
     
     /**
@@ -117,7 +119,9 @@ 
                 foreach($xml->subdivisions->children() as $subdivision){
                     $attributes = $subdivision->attributes();
                     $key = trim($attributes['name']);
-                    if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
+                    if(isset($attributes['parent'])) {
+                    	$key .= '@'.trim($attributes['parent']);
+                    }
                     $this->subdivisions[$key] = array(
                         'id' => trim($attributes['id']),
                         'displayname' => trim($attributes['name']),
@@ -144,9 +148,10 @@ 
      */
     public function isLoaded() {
         try{
-            if(!$this->is_loaded) $this->load();
-        }
-        catch (\Exception $ex) { }
+            if(!$this->is_loaded) {
+            	$this->load();
+            }
+        } catch (\Exception $ex) { }
         return $this->is_loaded;
     }
     
@@ -163,7 +168,9 @@ 
 	 * @return string
 	 */
     public function getDescription() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->description;
     }
     
@@ -172,7 +179,9 @@ 
 	 * @return string
 	 */
     public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->top_level_name;
     }    
     
@@ -181,7 +190,9 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
      */
     public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->canvas;
     }
     
@@ -190,7 +201,9 @@ 
      * @return array
      */
     public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->subdivisions;
     }
     
@@ -199,7 +212,9 @@ 
      * @return array
      */
     public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->mappings;
     }
     

src/Webtrees/Module/GeoDispersion/AdminConfigController.php

Braces +14 added lines, -13 removed lines

@@ -78,7 +78,9 @@ 
         
         $other_trees = array();
         foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $wt_tree->getTreeId()) $other_trees[] = $tree;
+            if($tree->getTreeId() != $wt_tree->getTreeId()) {
+            	$other_trees[] = $tree;
+            }
         }      
         $data->set('other_trees', $other_trees);
         
@@ -177,7 +179,9 @@ 
         
         // Generate an AJAX/JSON response for datatables to load a block of rows
         $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
+        if($search) {
+        	$search = $search['value'];
+        }
         $start  = Filter::postInteger('start');
         $length = Filter::postInteger('length');
         $order  = Filter::postArray('order');
@@ -259,8 +263,7 @@ 
     		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
     		        }
     		        $datum[7] .= '</span>';
-		        }
-		        else {
+		        } else {
 		            $datum[6] = I18N::translate('Error when loading map.');
 		        }
 		    }
@@ -335,8 +338,7 @@ 
                     if($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
+                    } else {
                         $options->setMap(null);
                     }
                 }
@@ -347,8 +349,7 @@ 
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
 					$ga = $res;
 					$success = true;
-				}
-				else {
+				} else {
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
@@ -366,8 +367,7 @@ 
 				FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully added.', $ga->getTitle()), 'success');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” has been added.');
 				$success = true;
-			}
-			else {
+			} else {
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
@@ -377,8 +377,7 @@ 
         if(!$success) {			
             if($ga) {
                 $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
-            }
-            else {
+            } else {
                 $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
             }
         }        
@@ -435,7 +434,9 @@ 
         $data->set('map_list', $map_list);
     
         $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+        for($i = 1; $i <= 10 ; $i++) {
+        	$gen_details[$i] = $i;
+        }
         $data->set('generation_details', $gen_details);
     
         ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();

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

Braces +77 added lines, -30 removed lines

@@ -84,21 +84,25 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
-            self::$default_user = User::find(-1);
+        if(self::$default_user === null) {
+                    self::$default_user = User::find(-1);
+        }
         
         $this->tree = $tree;
         $this->user = $user;
         $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+        if($this->user === null) {
+        	$this->user = Auth::user();
+        }
+        if(strlen($this->user->getUserId()) == 0) {
+        	$this->user = self::$default_user;
+        }
         
         // Check if the user, or the default user, has a root already setup;
         if(empty($this->getRootIndiId())) {
             if($this->user == self::$default_user) {  // If the default user is not setup
                 $this->is_setup = false;
-            }
-            else {
+            } else {
                 $this->user = self::$default_user;
                 $this->is_setup = $this->getRootIndiId() === null;
             }            
@@ -141,7 +145,9 @@ 
      * Remove all Sosa entries related to the gedcom file and user
      */
     public function deleteAll() {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
@@ -157,7 +163,9 @@ 
      * @param int $sosa
      */
     public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         $gen = Functions::getGeneration($sosa);
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
@@ -177,7 +185,9 @@ 
      * @param array $sosa_records
      */
     public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         
         $treeid = $this->tree->getTreeId();
         $userid = $this->user->getUserId();
@@ -224,7 +234,9 @@ 
      * @return array Array of sosa numbers
      */
     public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
+        if(!$this->is_setup) {
+        	return array();
+        }
         return Database::prepare(
                 'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
                 ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -241,7 +253,9 @@ 
      * @return number Last generation if found, 1 otherwise
      */
     public function getLastGeneration() {
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         return Database::prepare(
                 'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
                 ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -261,7 +275,9 @@ 
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
     public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+        if(!$this->is_setup) {
+        	return array();
+        }
         return Database::prepare(
             'SELECT majs_i_id AS indi,' .
             ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
@@ -281,9 +297,12 @@ 
      * @return array Array of Sosa individuals
      */
     public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
-            $this->sosa_list_by_gen = array();
+        if(!$this->is_setup) {
+        	return array();
+        }
+        if(!$this->sosa_list_by_gen) {
+                    $this->sosa_list_by_gen = array();
+        }
         
         if($gen){
             if(!isset($this->sosa_list_by_gen[$gen])){
@@ -312,9 +331,12 @@ 
      * @return array Array of Sosa families
      */
     public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
-            $this->sosa_fam_list_by_gen = array();
+        if(!$this->is_setup) {
+        	return array();
+        }
+        if(!$this->sosa_fam_list_by_gen) {
+                    $this->sosa_fam_list_by_gen = array();
+        }
         
         if($gen){
             if(!isset($this->sosa_fam_list_by_gen[$gen])){
@@ -348,7 +370,9 @@ 
      * @return array Array of Sosa individuals
      */
     public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
+        if(!$this->is_setup) {
+        	return array();
+        }
         if($gen){
             return $this->sosa_list_by_gen[$gen] = Database::prepare(
                 'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
@@ -386,7 +410,9 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
+        if(!$this->is_setup) {
+        	return array();
+        }
         if(!$this->statistics_tab) {
             $this->statistics_tab = array();
             if($maxGeneration = $this->getLastGeneration()) {
@@ -412,7 +438,9 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
+	    if(!$this->is_setup) {
+	    	return 0;
+	    }
 	    return Database::prepare(
 	        'SELECT COUNT(*) FROM `##individuals`' .
 	        ' WHERE i_file = :tree_id')
@@ -426,7 +454,9 @@ 
      * @return number Number of Sosas
      */
     public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+        if(!$this->is_setup) {
+        	return 0;
+        }
         return Database::prepare(
             'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
@@ -443,7 +473,9 @@ 
      * @return number Number of Sosas in generation
      */
     public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+        if(!$this->is_setup) {
+        	return 0;
+        }
         return Database::prepare(
             'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
@@ -462,7 +494,9 @@ 
      * @return number Total number of Sosas up to generation
      */
     public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+        if(!$this->is_setup) {
+        	return 0;
+        }
         return Database::prepare(
             'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
@@ -480,7 +514,9 @@ 
      * @return number Total number of distinct individual
      */
     public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+        if(!$this->is_setup) {
+        	return 0;
+        }
         return Database::prepare(
             'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
@@ -497,7 +533,9 @@ 
      * @return number Number of distinct Sosa individuals up to generation
      */
     public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+        if(!$this->is_setup) {
+        	return 0;
+        }
         return Database::prepare(
             'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
@@ -520,7 +558,9 @@ 
      * @return array Birth statistics array
      */
     public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
+        if(!$this->is_setup) {
+        	return array('first' => 0, 'avg' => 0, 'last' => 0);
+        }
         return Database::prepare(
             'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
             ' FROM `##maj_sosa`' .
@@ -540,7 +580,9 @@ 
      * @return number|NULL Mean generation time
      */
     public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
+        if(!$this->is_setup) {
+        	return;
+        }
         if(!$this->statistics_tab){
             $this->getStatisticsByGeneration();
         }
@@ -586,7 +628,10 @@ 
      * @return array
      */
     public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+        if(!$this->is_setup || $gen > 11) {
+        	return array();
+        }
+        // Going further than 11 gen will be out of range in the query
         return Database::prepare(
             'SELECT branches, count(i_id)'.
             ' FROM ('.
@@ -626,7 +671,9 @@ 
      * @return array 
      */
     public function getTopMultiSosaAncestorsNoTies($limit) {
-        if(!$this->is_setup) return array();
+        if(!$this->is_setup) {
+        	return array();
+        }
         return Database::prepare(
             'SELECT sosa_i_id, sosa_count FROM ('.
             '   SELECT'.