jon48 / webtrees-lib

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

Braces +3 added lines, -6 removed lines

@@ -167,8 +167,7 @@ 
 			$ga = $this->getGeoAnalysis($id, false);
 			
 			$id = Database::commit();
-		}
-		catch(\Exception $ex) {
+		} catch(\Exception $ex) {
 			Database::rollback();
 			$ga = null;
 			Log::addErrorLog('A new Geo Analysis failed to be created. Transaction rollbacked. Parameters ['.$description.', '.$analysis_level.','.$map_file.','.$map_top_level.','.$use_flags.', '.$gen_details.']. Exception: '.$ex->getMessage());
@@ -210,8 +209,7 @@ 
 			$ga = $this->getGeoAnalysis($ga->getId(), false);
 			
 			$id = Database::commit();
-		}
-		catch(\Exception $ex) {		    
+		} catch(\Exception $ex) {		    
 			Database::rollback();
 			Log::addErrorLog('The Geo Analysis ID “' . $ga->getId() . '” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
 			$ga = null;
@@ -350,8 +348,7 @@ 
         if(!$this->place_hierarchy) {
             if($place_structure = $this->getPlacesHierarchyFromHeader()) {
                 $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
-            }
-            else {
+            } else {
                 $this->place_hierarchy = array('type' => 'data', 'hierarchy' => $this->getPlacesHierarchyFromData());
             }            
         }

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

Braces +10 added lines, -16 removed lines

@@ -217,39 +217,34 @@ 
                             $placest = implode(I18N::$list_separator, array_slice($levels, 0, $this->analysis_level));
                             if(isset($placesDispGeneral['places'][$placest])) {
                                 $placesDispGeneral['places'][$placest] += 1;
-                            }
-                            else { 
+                            } else { 
                                 $placesDispGeneral['places'][$placest] = 1;
                             }
-                            if($placesDispGeneral['places'][$placest]>$placesDispGeneral['max'])
-                                $placesDispGeneral['max'] = $placesDispGeneral['places'][$placest];
+                            if($placesDispGeneral['places'][$placest]>$placesDispGeneral['max']) {
+                                                            $placesDispGeneral['max'] = $placesDispGeneral['places'][$placest];
+                            }
                             foreach($genstab as $gen) {
                                 if(isset($placesDispGenerations[$gen]['places'][$placest])) {
                                     $placesDispGenerations[$gen]['places'][$placest] += 1;
-                                }
-                                else { 
+                                } else { 
                                     $placesDispGenerations[$gen]['places'][$placest] = 1;
                                 }
                                 if(isset($placesDispGenerations[$gen]['sum'])) {
                                     $placesDispGenerations[$gen]['sum'] += 1;
-                                }
-                                else { 
+                                } else { 
                                     $placesDispGenerations[$gen]['sum'] = 1;
                                 }
                             }
-                        }
-                        else{
+                        } else{
                             if(isset($placesDispGeneral['other'])) {
                                 $placesDispGeneral['other'] += 1;
-                            }
-                            else { 
+                            } else { 
                                 $placesDispGeneral['other'] = 1;
                             }
                             foreach($genstab as $gen) {
                                 if(isset($placesDispGenerations[$gen]['other'])) {
                                     $placesDispGenerations[$gen]['other'] += 1;
-                                }
-                                else { 
+                                } else { 
                                     $placesDispGenerations[$gen]['other'] = 1;
                                 }
                             }
@@ -263,8 +258,7 @@ 
                     foreach($genstab as $gen) {
                         if(isset($placesDispGenerations[$gen]['unknown'])) { 
                             $placesDispGenerations[$gen]['unknown'] += 1;
-                        }
-                        else { 
+                        } else { 
                             $placesDispGenerations[$gen]['unknown'] = 1; 
                         }
                     }

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

Braces +24 added lines, -8 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']),
@@ -142,7 +146,9 @@ 
 	 * @return string
 	 */
     public function getFileName() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->filename;
     }
     
@@ -151,7 +157,9 @@ 
 	 * @return string
 	 */
     public function getDescription() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->description;
     }
     
@@ -160,7 +168,9 @@ 
 	 * @return string
 	 */
     public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->top_level_name;
     }    
     
@@ -169,7 +179,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;
     }
     
@@ -178,7 +190,9 @@ 
      * @return array
      */
     public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->subdivisions;
     }
     
@@ -187,7 +201,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 +13 added lines, -11 removed lines

@@ -79,7 +79,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);
         
@@ -182,7 +184,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');
@@ -336,8 +340,7 @@ 
                     if($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
+                    } else {
                         $options->setMap(null);
                     }
                 }
@@ -348,8 +351,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.');
 				}
@@ -367,8 +369,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.');
 			}
@@ -378,8 +379,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();
             }
         }        
@@ -437,7 +437,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/GeoDispersion/Views/GeoAnalysisEditView.php

Braces +4 added lines, -1 removed lines

@@ -54,7 +54,10 @@
     				<?php echo I18N::translate('Description'); ?>
     			</label>
     			<div class="col-sm-9">
-    				<input class="form-control" type="text" id="description" name="description" required maxlength="70" <?php if(!$is_new) echo 'value="' . Filter::escapeHtml($ga->getTitle()) .'"'; ?> dir="auto">
+    				<input class="form-control" type="text" id="description" name="description" required maxlength="70" <?php if(!$is_new) {
+	echo 'value="' . Filter::escapeHtml($ga->getTitle()) .'"';
+}
+?> dir="auto">
     				<p class="small text-muted">
     					<?php echo I18N::translate('Description to be given to the geographical dispersion analysis. It will be used as the page title for it.'); ?>
     				</p>

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

Braces +9 added lines, -9 removed lines

@@ -65,8 +65,7 @@ 
         if(!is_null($max_details_gen) && $max_details_gen == 0){
             $html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
             $html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
-        }
-        else{
+        } else{
             $html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
             $html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
         }
@@ -97,16 +96,16 @@ 
             $content = '';
             if(isset($dataplace['flag'])){
                 $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
-            }
-            else{
+            } else{
                 $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
             }
             $count = $dataplace['count'];
             $content .= I18N::number($count);
             $perc = Functions::safeDivision($count, $sum_gen + $unknownother);
             $perc2= Functions::safeDivision($count, $sum_gen);
-            if($perc2>=0.1) 
-                $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+            if($perc2>=0.1) {
+                            $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+            }
             $content .= '</td>';
                
             $html .= '
@@ -126,7 +125,9 @@ 
         if($unknownother>0){
             $perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
             $html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
-            if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+            if($perc>=0.1) {
+            	$html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+            }
             $html .='</td>';
         }
         
@@ -152,8 +153,7 @@ 
             if($placename != 'other'){
                 $levels = array_map('trim',explode(',', $placename));
                 $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
-            }
-            else{
+            } else{
                 $placename = I18N::translate('Other places');
             }
             $tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	

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

Braces +3 added lines, -1 removed lines

@@ -86,7 +86,9 @@
             $html.= 'map.area'.$location['id'].' = paper.path("'.$location['coord'].'").attr(attr);';
             if(isset($location['transparency'])) {
                 $textToolTip = '<strong>'.$location['displayname'].'</strong><br/>';
-                if($this->data->get('use_flags') && $location['flag'] != '') $textToolTip .= '<span class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($location['place'], $location['flag']).'</span><br/>';
+                if($this->data->get('use_flags') && $location['flag'] != '') {
+                	$textToolTip .= '<span class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($location['place'], $location['flag']).'</span><br/>';
+                }
                 $textToolTip .= I18N::translate('%d individuals', $location['count']).'<br/>'.I18N::percentage(Functions::safeDivision($location['count'], $nb_found - $nb_other), 1);
                 $html.= 'addTip(map.area'.$location['id'].'.node, "'.Filter::escapeJs($textToolTip).'");';
                 $html.= 'map.area'.$location['id'].'.attr({"fill" : "'. $canvas->max_color .'", "fill-opacity" : '.$location['transparency'].' });';

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

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;