jon48 / webtrees-lib

src/Webtrees/Module/Sosa/Views/SosaStatsView.php

Spacing +14 added lines, -14 removed lines

@@ -31,11 +31,11 @@ 
 			<?php 
 			/** @var \Fisharebest\Webtrees\Individual $root_indi */
 			$root_indi = $this->data->get('root_indi');
-			if($root_indi !== null && $root_indi->canShowName()) { ?>
+			if ($root_indi !== null && $root_indi->canShowName()) { ?>
 			<h4 class="center"><?= I18N::translate('%s: %s', I18N::translate('Root individual'), $root_indi->getFullName()); ?><h4>
 			<?php } ?>
 			
-			<?php  if($this->data->get('is_setup')) {  
+			<?php  if ($this->data->get('is_setup')) {  
 			    $general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
@@ -57,7 +57,7 @@ 
 				</div>
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Generation mean duration'); ?></div>
-					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'],  I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
+					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'], I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
 				</div>
 			</div>
 			
@@ -97,7 +97,7 @@ 
 					</tr>
 				</thead>
 				<tbody>
-					<?php foreach($this->data->get('generation_stats') as $gen => $row) { ?>
+					<?php foreach ($this->data->get('generation_stats') as $gen => $row) { ?>
 					<tr class="maj-row">
 						<td class="label"><?php echo I18N::translate('<strong>G%d</strong>', $gen); ?></td>
 						<td class="label"><?php echo I18N::translate('%1$s <> %2$s', $row['gen_min_birth'], $row['gen_max_birth']); ?></td>
@@ -111,7 +111,7 @@ 
 						<td class="value"><?php echo I18N::number($row['different']); ?></td>
 						<td class="value left percent_container">
 							<div class="percent_frame">
-								<div class="percent_cell" style="width:<?php echo 100*$row['perc_different'] ?>%;">
+								<div class="percent_cell" style="width:<?php echo 100 * $row['perc_different'] ?>%;">
 									&nbsp;<?php echo I18N::percentage($row['perc_different']); ?>&nbsp;
 								</div>
 							</div>
@@ -131,17 +131,17 @@ 
 							             I18N::translate('%s generation'),
 							             I18N::translate('%s generations'),
 							             $this->data->get('mean_gen_depth'),
-							             I18N::number($this->data->get('mean_gen_depth'),2)
+							             I18N::number($this->data->get('mean_gen_depth'), 2)
 							         )
 							    ).
-								' &mdash; ' . 
+								' &mdash; '. 
 								I18N::translate(
 								    'Standard deviation: %s',
 								    I18N::plural(
 								        I18N::translate('%s generation'), 
 								        I18N::translate('%s generations'), 
 								        $this->data->get('stddev_gen_depth'), 
-								        I18N::number($this->data->get('stddev_gen_depth'),2)
+								        I18N::number($this->data->get('stddev_gen_depth'), 2)
 								    )
 								);
 							?>
@@ -153,17 +153,17 @@ 
 			
 			<?php  
 			$top10_multi_ancestors = $this->data->get('top10multiancestors');
-			if(count($top10_multi_ancestors) > 0) { ?>
+			if (count($top10_multi_ancestors) > 0) { ?>
 			<h3><?= I18N::translate('Most duplicated root Sosa ancestors'); ?></h3>
 			<div class="maj-table">
-			<?php foreach($top10_multi_ancestors as $count => $indis) { ?>
+			<?php foreach ($top10_multi_ancestors as $count => $indis) { ?>
 			    <div class="maj-row">
 			    	<div class="label"><?= I18N::translate('%s times', I18N::number($count)); ?></div>
 			    	<div class="value"><?php 
 			    	echo implode(
 			    	    I18N::$list_separator, 
 			    	    array_map(function(Individual $indi) {
-			    	        return '<a href="'. $indi->getHtmlUrl(). '">'. $indi->getFullName() . '&nbsp;' . $indi->getSexImage() . '</a>';
+			    	        return '<a href="'.$indi->getHtmlUrl().'">'.$indi->getFullName().'&nbsp;'.$indi->getSexImage().'</a>';
 			    	    }, $indis)
 			    	);
 			    	?></div>
@@ -174,14 +174,14 @@ 
 			
 			<h3><?php echo I18N::translate('Known Sosa ancestors\' family dispersion'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_g2') ?: '' ; ?>
-				<?php echo $this->data->get('chart_img_g3') ?: '' ; ?>
+				<?php echo $this->data->get('chart_img_g2') ?: ''; ?>
+				<?php echo $this->data->get('chart_img_g3') ?: ''; ?>
 				<!--  <canvas id="chart_ancestors_g2" width="300" height="300"></canvas>  -->
 			</div>
 			
 			<h3><?php echo I18N::translate('Mean generation depth by grandparents'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_gendepth3') ?: '' ; ?>
+				<?php echo $this->data->get('chart_img_gendepth3') ?: ''; ?>
 			</div>
 			
 			<?php   } else { ?>

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

Spacing +81 added lines, -81 removed lines

@@ -84,18 +84,18 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
+        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
+        if (empty($this->getRootIndiId())) {
+            if ($this->user == self::$default_user) {  // If the default user is not setup
                 $this->is_setup = false;
             }
             else {
@@ -145,7 +145,7 @@ 
      */
     public function getRootIndi() {
         $root_indi_id = $this->getRootIndiId();
-        if(!empty($root_indi_id)) {
+        if (!empty($root_indi_id)) {
             return Individual::getInstance($root_indi_id, $this->tree);
         }
         return null;
@@ -159,7 +159,7 @@ 
      * 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 ')
@@ -175,12 +175,12 @@ 
      * @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`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
+            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id'.
+            ' AND majs_gen >= :gen'.
             ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(), 
@@ -195,7 +195,7 @@ 
      * @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();
@@ -203,9 +203,9 @@ 
         $values_table = array();
         
         $i = 0;
-        foreach  ($sosa_records as $row) {
+        foreach ($sosa_records as $row) {
             $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
+            if ($gen <= self::MAX_DB_GENERATIONS) {
                 $questionmarks_table[] = 
                     '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :byearest'.$i.', :dyear'.$i.', :dyearest'.$i.')';
                 $values_table = array_merge(
@@ -226,9 +226,9 @@ 
             $i++;
         }
         
-        $sql = 'REPLACE INTO `##maj_sosa`' .
-            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)' .
-            ' VALUES '. implode(',', $questionmarks_table);
+        $sql = 'REPLACE INTO `##maj_sosa`'.
+            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_birth_year_est, majs_death_year, majs_death_year_est)'.
+            ' VALUES '.implode(',', $questionmarks_table);
         Database::prepare($sql)->execute($values_table);
     }
     
@@ -244,7 +244,7 @@ 
      * @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'
@@ -261,7 +261,7 @@ 
      * @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'
@@ -280,13 +280,13 @@ 
      *
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+    public function getAllSosaWithGenerations() {
+        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' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+            'SELECT majs_i_id AS indi,'.
+            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations'.
+            ' FROM `##maj_sosa`'.
+            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' GROUP BY majs_i_id'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(),
@@ -300,13 +300,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
+    public function getSosaListAtGeneration($gen) {
+        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])){
+        if ($gen) {
+            if (!isset($this->sosa_list_by_gen[$gen])) {
                 $this->sosa_list_by_gen[$gen] = Database::prepare(
                     'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
                     ' FROM `##maj_sosa`'.
@@ -331,13 +331,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa families
      */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
+    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($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_fam_list_by_gen[$gen])) {
                 $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
                     'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
                     ' FROM `##families`'.
@@ -367,9 +367,9 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
+    public function getMissingSosaListAtGeneration($gen) {
+        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'.
                 ' FROM `##maj_sosa` schild'.
@@ -408,10 +408,10 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
+        if (!$this->is_setup) return array();
+        if (!$this->statistics_tab) {
             $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
+            if ($maxGeneration = $this->getLastGeneration()) {
                 for ($gen = 1; $gen <= $maxGeneration; $gen++) {
                     $birthStats = $this->getStatsBirthYearInGeneration($gen);
                     $this->statistics_tab[$gen] = array(
@@ -436,9 +436,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`' .
+	        'SELECT COUNT(*) FROM `##individuals`'.
 	        ' WHERE i_file = :tree_id')
 	        ->execute(array('tree_id' => $this->tree->getTreeId()))
 	        ->fetchOne() ?: 0;
@@ -449,10 +449,10 @@ 
      *
      * @return number Number of Sosas
      */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
             ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -466,10 +466,10 @@ 
      * @param number $gen Generation
      * @return number Number of Sosas in generation
      */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountAtGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen= :gen')
         ->execute(array(
@@ -485,10 +485,10 @@ 
      * @param number $gen Generation
      * @return number Total number of Sosas up to generation
      */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -503,10 +503,10 @@ 
      *
      * @return number Total number of distinct individual
      */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
         ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -520,10 +520,10 @@ 
      * @param number $gen Generation
      * @return number Number of distinct Sosa individuals up to generation
      */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -545,8 +545,8 @@ 
      * @param number $gen Generation
      * @return array Birth statistics array
      */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
+    public function getStatsBirthYearInGeneration($gen) {
+        if (!$this->is_setup) return array('first' => 0, 'first_est' => 0, 'avg' => 0, 'last' => 0, 'last_est' => 0);
         return Database::prepare(
             'SELECT'.
             ' MIN(majs_birth_year) AS first, MIN(majs_birth_year_est) AS first_est,'.
@@ -567,25 +567,25 @@ 
      *
      * @return number|NULL Mean generation time
      */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
+    public function getMeanGenerationTime() {
+        if (!$this->is_setup) return;
+        if (!$this->statistics_tab) {
             $this->getStatisticsByGeneration();
         }
         //Linear regression on x=generation and y=birthdate
-        $sum_xy = $sum_x = $sum_y= $sum_x2 = $n = 0;
-        foreach($this->statistics_tab as $gen=>$stats){
-            if(!is_null($stats['avgBirth'])) {
+        $sum_xy = $sum_x = $sum_y = $sum_x2 = $n = 0;
+        foreach ($this->statistics_tab as $gen=>$stats) {
+            if (!is_null($stats['avgBirth'])) {
                 $n++;
-                $sum_xy+=$gen*$stats['avgBirth'];
-                $sum_x+=$gen;
-                $sum_y+=$stats['avgBirth'];
-                $sum_x2+=$gen*$gen;
+                $sum_xy += $gen * $stats['avgBirth'];
+                $sum_x += $gen;
+                $sum_y += $stats['avgBirth'];
+                $sum_x2 += $gen * $gen;
             }
         }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+        $denom = ($n * $sum_x2) - ($sum_x * $sum_x);
+        if ($denom != 0) {
+            return -(($n * $sum_xy) - ($sum_x * $sum_y)) / ($denom);
         }
         return null;
     }
@@ -609,7 +609,7 @@ 
      * @return array
      */
     public function getGenerationDepthStatsAtGen($gen) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         $gen_depth_stats_raw = Database::prepare(
             'SELECT stats_by_gen.root_ancestor AS root_ancestor_sosa,'.
             '   sosa_list.majs_i_id as root_ancestor_id,'.
@@ -684,14 +684,14 @@ 
      * @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 ('.
             '   SELECT i_id,'.
             '       CASE'.
             '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+            '           ELSE -1'.// We put all ancestors shared between some branches in the same bucket
             '       END branches'.
             '   FROM ('.
             '       SELECT DISTINCT majs_i_id i_id,'.
@@ -724,7 +724,7 @@ 
      * @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'.
@@ -737,20 +737,20 @@ 
             '           COUNT(sosa.majs_sosa) sosa_count,'.
             '           MIN(sosa.majs_sosa) sosa_min'.
             '       FROM ##maj_sosa AS sosa'.
-            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.   // Link to sosa's father
+            '       LEFT JOIN ##maj_sosa AS sosa_fat ON sosa_fat.majs_sosa = 2 * sosa.majs_sosa'.// Link to sosa's father
             '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
             '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
-            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.  // Link to sosa's mother
+            '       LEFT JOIN ##maj_sosa AS sosa_mot on sosa_mot.majs_sosa = (2 * sosa.majs_sosa + 1)'.// Link to sosa's mother
             '           AND sosa.majs_gedcom_id = sosa_fat.majs_gedcom_id'.
             '           AND sosa.majs_user_id = sosa_fat.majs_user_id'.
             '       WHERE sosa.majs_gedcom_id = :tree_id'.
             '       AND sosa.majs_user_id = :user_id'.
-            '       AND sosa_fat.majs_sosa IS NULL'.    // We keep only root individuals, i.e. those with no father or mother
+            '       AND sosa_fat.majs_sosa IS NULL'.// We keep only root individuals, i.e. those with no father or mother
             '       AND sosa_mot.majs_sosa IS NULL'. 
             '       GROUP BY sosa.majs_i_id'.
-            '       HAVING COUNT(sosa.majs_sosa) > 1'.   // Limit to the duplicate sosas.
+            '       HAVING COUNT(sosa.majs_sosa) > 1'.// Limit to the duplicate sosas.
             '       ORDER BY COUNT(sosa.majs_sosa) DESC'.
-            '       LIMIT ' . ($limit + 1) . // We want to select one more than required
+            '       LIMIT '.($limit + 1).// We want to select one more than required
             '   ) AS top_sosa,'.
             '   (SELECT @prev_count := 0, @keep := 0) x'.
             '   ORDER BY top_sosa.sosa_count ASC'.

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

Spacing +36 added lines, -36 removed lines

@@ -65,14 +65,14 @@ 
         ->setUsingFlags($row['majgd_useflagsgen'] == 'yes')
         ->setMaxDetailsInGen($row['majgd_detailsgen']);
         
-        if($row['majgd_map']) {
+        if ($row['majgd_map']) {
             $options
             ->setMap(new OutlineMap($row['majgd_map']))
             ->setMapLevel($row['majgd_toplevel']);
         }
         
         $enabled = true;
-        if(isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
+        if (isset($row['majgd_status']) && $row['majgd_status'] == 'disabled') {
             $enabled = false;
         }
         
@@ -93,8 +93,8 @@ 
      */
     public function getGeoAnalysisCount() {
         return Database::prepare(
-            'SELECT COUNT(majgd_id)' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT COUNT(majgd_id)'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id'
             )->execute(array(
                 'gedcom_id' => $this->tree->getTreeId()
@@ -110,15 +110,15 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis|NULL
      */
     public function getGeoAnalysis($id, $only_enabled = true) {
-        $args = array (
+        $args = array(
             'gedcom_id' => $this->tree->getTreeId(),
             'ga_id' => $id
         );
         
-        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
+        $sql = 'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id AND majgd_id=:ga_id';
-        if($only_enabled) {
+        if ($only_enabled) {
             $sql .= ' AND majgd_status = :status';
             $args['status'] = 'enabled';
         }
@@ -126,7 +126,7 @@ 
         
         $ga_array = Database::prepare($sql)->execute($args)->fetchOneRow(\PDO::FETCH_ASSOC);
         
-        if($ga_array) {
+        if ($ga_array) {
             return $this->loadGeoAnalysisFromRow($ga_array);
         }
         
@@ -146,7 +146,7 @@ 
      * @return GeoAnalysis
      */
 	public function createGeoAnalysis($description, $analysis_level, $map_file, $map_top_level, $use_flags, $gen_details) {
-		try{
+		try {
 			Database::beginTransaction();
 		
 			Database::prepare(
@@ -168,7 +168,7 @@ 
 			
 			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());
@@ -211,9 +211,9 @@ 
 			
 			 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());
+			Log::addErrorLog('The Geo Analysis ID “'.$ga->getId().'” failed to be updated. Transaction rollbacked. Exception: '.$ex->getMessage());
 			$ga = null;
 		}
 		return $ga;
@@ -258,12 +258,12 @@ 
      *
      * @return array List of enabled maps
      */
-    public function getGeoAnalysisList(){
+    public function getGeoAnalysisList() {
         $res = array();
         
         $list = Database::prepare(
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id AND majgd_status = :status'.
             ' ORDER BY majgd_descr'
         )->execute(array(
@@ -271,7 +271,7 @@ 
             'status' => 'enabled'
         ))->fetchAll(\PDO::FETCH_ASSOC);
         
-        foreach($list as $ga) {
+        foreach ($list as $ga) {
            $res[] = $this->loadGeoAnalysisFromRow($ga);
         }
         
@@ -287,17 +287,17 @@ 
      * @param int|null $limit Max number of items to return (for pagination)
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysis[]
      */
-    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null){
+    public function getFilteredGeoAnalysisList($search = null, $order_by = null, $start = 0, $limit = null) {
         $res = array();
             
         $sql = 
-            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status' .
-            ' FROM `##maj_geodispersion`' .
+            'SELECT majgd_id, majgd_descr, majgd_sublevel, majgd_map, majgd_toplevel, majgd_useflagsgen, majgd_detailsgen, majgd_status'.
+            ' FROM `##maj_geodispersion`'.
             ' WHERE majgd_file = :gedcom_id';
         
         $args = array('gedcom_id'=> $this->tree->getTreeId());
         
-        if($search) {
+        if ($search) {
             $sql .= ' AND majgd_descr LIKE CONCAT(\'%\', :search, \'%\')';
             $args['search'] = $search;
         }
@@ -311,10 +311,10 @@ 
                 
                 switch ($value['dir']) {
                     case 'asc':
-                        $sql .= $value['column'] . ' ASC ';
+                        $sql .= $value['column'].' ASC ';
                         break;
                     case 'desc':
-                        $sql .= $value['column'] . ' DESC ';
+                        $sql .= $value['column'].' DESC ';
                         break;
                 }
             }
@@ -330,7 +330,7 @@ 
             
         $data = Database::prepare($sql)->execute($args)->fetchAll(\PDO::FETCH_ASSOC);
 
-        foreach($data as $ga) {
+        foreach ($data as $ga) {
             $res[] = $this->loadGeoAnalysisFromRow($ga);
         }
         
@@ -347,11 +347,11 @@ 
      * @return array
      */
     public function getPlacesHierarchy() {
-        if(!$this->place_hierarchy) {
-            if($place_structure = $this->getPlacesHierarchyFromHeader()) {
+        if (!$this->place_hierarchy) {
+            if ($place_structure = $this->getPlacesHierarchyFromHeader()) {
                 $this->place_hierarchy = array('type' => 'header', 'hierarchy' => $place_structure);
             }
-            elseif ($place_structure = $this->getPlacesHierarchyFromData()){
+            elseif ($place_structure = $this->getPlacesHierarchyFromData()) {
                 $this->place_hierarchy = array('type' => 'data', 'hierarchy' => $place_structure);
             }
             else {
@@ -370,8 +370,8 @@ 
     protected function getPlacesHierarchyFromHeader() {
         $head = GedcomRecord::getInstance('HEAD', $this->tree);
         $head_place = $head->getFirstFact('PLAC');
-        if($head_place && $head_place_value = $head_place->getAttribute('FORM')){
-            return array_reverse(array_map('trim',explode(',', $head_place_value)));
+        if ($head_place && $head_place_value = $head_place->getAttribute('FORM')) {
+            return array_reverse(array_map('trim', explode(',', $head_place_value)));
         }
         return null;
     }
@@ -387,7 +387,7 @@ 
         $nb_levels = 0;
         
         //Select all '2 PLAC ' tags in the file and create array
-        $places_list=array();
+        $places_list = array();
         $ged_data = Database::prepare(
             'SELECT i_gedcom AS gedcom'.
             ' FROM `##individuals`'.
@@ -404,7 +404,7 @@ 
             $matches = null;
             preg_match_all('/\n2 PLAC (.+)/', $ged_datum, $matches);
             foreach ($matches[1] as $match) {
-                $places_list[$match]=true;
+                $places_list[$match] = true;
             }
         }
         
@@ -415,7 +415,7 @@ 
         foreach ($places_list as $place => $value) {
             $levels = array_filter(array_map('trim', explode(",", $place)));
             $parts = count($levels);
-            if($parts > $max_level) {
+            if ($parts > $max_level) {
                 $max_level = $parts;
                 $places_with_high_level = array($place);
             }
@@ -425,11 +425,11 @@ 
         }
         
         // If empty array, then return null
-        if($max_level == 0) return null;
+        if ($max_level == 0) return null;
                 
         // Else, return the first alphabetical element -- cannot return random to ensure always the same example if used
         usort($places_with_high_level, array('Fisharebest\\Webtrees\\I18N', 'strcasecmp'));        
-        return array_reverse(array_map('trim',explode(',', $places_with_high_level[0])));
+        return array_reverse(array_map('trim', explode(',', $places_with_high_level[0])));
         
     }
     
@@ -441,9 +441,9 @@ 
     public function getOutlineMapsList() {
         $res = array();
         $root_path = WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/';
-        if(is_dir($root_path)){
+        if (is_dir($root_path)) {
             $dir = opendir($root_path);
-            while (($file=readdir($dir))!== false) {
+            while (($file = readdir($dir)) !== false) {
                 if (preg_match('/^[a-zA-Z0-9_]+.xml$/', $file)) {
                     $res[base64_encode($file)] = new OutlineMap($file, true);
                 }

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

Spacing +5 added lines, -5 removed lines

@@ -42,13 +42,13 @@ 
 		
 		<h1><?php echo $this->data->get('title'); ?></h1>
 		
-		<?php if($places_hierarchy['type'] == 'none') { ?>		
+		<?php if ($places_hierarchy['type'] == 'none') { ?>		
 		<div class="warning"><?php echo I18N::translate('No place structure could be determined. Please make sure that at least a place exists.'); ?></div>		
 		<?php } else { ?>
 		
 		<form class="form-horizontal" name="newform" method="post" role="form" action="<?php echo $this->data->get('save_url'); ?>" autocomplete="off">
     		<?php echo Filter::getCsrf(); ?>
-    		<?php if(!$is_new) { ?>
+    		<?php if (!$is_new) { ?>
     		<input type="hidden" name="ga_id" value="<?php echo $ga->getId(); ?>">
     		<?php } ?>
     
@@ -58,7 +58,7 @@ 
     				<?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>
@@ -101,7 +101,7 @@ 
         				<?php echo I18N::translate('Map'); ?>
         			</label>
         			<div class="col-sm-9">
-        				<?php echo FunctionsEdit::selectEditControl('map_file', $this->data->get('map_list') , null, ($is_new || ! $ga->hasMap()) ? '' : base64_encode($ga->getOptions()->getMap()->getFileName()), 'class="form-control"'); ?>
+        				<?php echo FunctionsEdit::selectEditControl('map_file', $this->data->get('map_list'), null, ($is_new || !$ga->hasMap()) ? '' : base64_encode($ga->getOptions()->getMap()->getFileName()), 'class="form-control"'); ?>
         				<p class="small text-muted">
         					<?php echo I18N::translate('Map outline to be used for the result display.'); ?>
         				</p>
@@ -114,7 +114,7 @@ 
         				<?php echo I18N::translate('Map parent level'); ?>
         			</label>
         			<div class="col-sm-9">
-        				<?php echo FunctionsEdit::selectEditControl('map_top_level', $places_hierarchy['hierarchy'], null, $is_new || ! $ga->hasMap() ? '' : $ga->getOptions()->getMapLevel() - 1, 'class="form-control"'); ?>
+        				<?php echo FunctionsEdit::selectEditControl('map_top_level', $places_hierarchy['hierarchy'], null, $is_new || !$ga->hasMap() ? '' : $ga->getOptions()->getMapLevel() - 1, 'class="form-control"'); ?>
         				<p class="small text-muted">
         					<?php echo I18N::translate('Subdivision level of the parent subdivision(s) represented by the map.'); ?><br />
         					<?php echo I18N::translate('For instance, if the map is intended to represent a country by county analysis, then the map parent level would be “Country”, and the analysis level would be “County”.'); ?>

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

Spacing +7 added lines, -7 removed lines

@@ -41,16 +41,16 @@ 
 		
 		<h2>
 			<?php echo $tree->getTitleHtml(); ?>
-			<?php if(count($other_trees) > 0) {?>
+			<?php if (count($other_trees) > 0) {?>
 			<div class="btn-group">
 				<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
 					<?php echo I18N::translate('Change tree'); ?>
 					<span class="caret"></span>
 				</button>
-				<?php foreach($other_trees as $other_tree) { ?>
+				<?php foreach ($other_trees as $other_tree) { ?>
 				<ul class="dropdown-menu" role="menu">
 					<li>
-						<a href="<?php echo $root_url . '&ged=' . $other_tree->getNameUrl(); ?>">
+						<a href="<?php echo $root_url.'&ged='.$other_tree->getNameUrl(); ?>">
 							<i class="fa fa-fw fa-tree"></i>&nbsp;<?php echo $other_tree->getTitleHtml(); ?>
 						</a>
 					</li>
@@ -62,7 +62,7 @@ 
 		
 		<p>
 		<?php $places_hierarchy = $this->data->get('places_hierarchy'); 
-		if($places_hierarchy && $places_hierarchy['type'] != 'none') {
+		if ($places_hierarchy && $places_hierarchy['type'] != 'none') {
 		    switch ($places_hierarchy['type']) {
 		        case 'header':
 		            echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
@@ -76,10 +76,10 @@ 
 		            break;
 		    }
 		    $str_hierarchy = array();
-		    foreach($places_hierarchy['hierarchy'] as $key => $level) {
+		    foreach ($places_hierarchy['hierarchy'] as $key => $level) {
 		        $str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
 		    }
-		    echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
+		    echo '<strong>'.implode(I18N::$list_separator, $str_hierarchy).'</strong>';
 		}
 		?>
 		</p>
@@ -103,7 +103,7 @@ 
     		</tbody>
     	</table>
     	
-        <a type="button" class="btn btn-primary" href="<?php echo $root_url . '@add&ged=' . $tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
+        <a type="button" class="btn btn-primary" href="<?php echo $root_url.'@add&ged='.$tree->getNameUrl(); ?>" title="<?php echo I18N::translate('Add'); ?>">
         	<i class="fa fa-plus"></i>
         	<?php echo I18N::translate('Add'); ?>
         </a>

src/Webtrees/Module/GeoDispersion/AdminConfigController.php

Spacing +44 added lines, -46 removed lines

@@ -71,14 +71,14 @@ 
         $data->set('title', $controller->getPageTitle());
         $data->set('tree', $wt_tree);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+        $data->set('root_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
+        $table_id = 'table-geoanalysis-'.Uuid::uuid4();
         $data->set('table_id', $table_id);
         
         $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);
         
@@ -101,7 +101,7 @@ 
                     processing: true,
                     serverSide : true,
 					ajax : {
-						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='. $wt_tree->getNameUrl().'",
+						url : "module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@jsonGeoAnalysisList&ged='.$wt_tree->getNameUrl().'",
                         type : "POST"
 					},
                     columns: [
@@ -125,7 +125,7 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "GeoAnalysis@setStatus",
                 			    ga_id: ga_id,
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom,
@@ -133,7 +133,7 @@ 
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while editing this analysis:') . '" + err);
+                                alert("' . I18N::translate('An error occured while editing this analysis:').'" + err);
                             },
                             complete: function(result, stat) {
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -146,14 +146,14 @@ 
                             url: "module.php", 
                             type: "GET",
                             data: {
-                			    mod: "' . $this->module->getName() .'",
+                			    mod: "' . $this->module->getName().'",
                                 mod_action:  "GeoAnalysis@delete",
                 			    ga_id: ga_id,
                 			    ged: typeof gedcom === "undefined" ? WT_GEDCOM : gedcom
                             },
                             error: function(result, stat, error) {
                                 var err = typeof result.responseJSON === "undefined" ? error : result.responseJSON.error;
-                                alert("' . I18N::translate('An error occured while deleting this analysis:') . '" + err);
+                                alert("' . I18N::translate('An error occured while deleting this analysis:').'" + err);
                             },
                             complete: function(result, stat) {
                                 geoAnalysisTable.ajax.reload(null, false);
@@ -177,13 +177,13 @@ 
         
         // 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');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
+        foreach ($order as $key => &$value) {
+            switch ($value['column']) {
                 case 3:
                     $value['column'] = 'majgd_descr';
                     break;
@@ -204,11 +204,11 @@ 
         
         $data = array();
         $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
+        foreach ($list as $ga) {
             /** @var GeoAnalysis $ga */
             
             $datum = array();
-            $options= $ga->getOptions();
+            $options = $ga->getOptions();
             
             $datum[0] = '
                 <div class="btn-group">
@@ -218,47 +218,46 @@ 
                     <ul class="dropdown-menu" role="menu">
                        <li>
                             <a href="#" onclick="return set_geoanalysis_status('. $ga->getId().', '.($ga->isEnabled() ? 'false' : 'true').', \''.Filter::escapeJs($wt_tree->getName()).'\');">
-                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> ' . ($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')) . '
+                                <i class="fa fa-fw '.($ga->isEnabled() ? 'fa-times' : 'fa-check').'"></i> '.($ga->isEnabled() ? I18N::translate('Disable') : I18N::translate('Enable')).'
                             </a>
                        </li>
                         <li>
                             <a href="module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@edit&ga_id='.$ga->getId().'&ged='.$wt_tree->getName().'">
-                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit') . '
+                                <i class="fa fa-fw fa-pencil"></i> ' . I18N::translate('Edit').'
                             </a>
                        </li>
                        <li class="divider" />
                        <li>
                             <a href="#" onclick="return delete_geoanalysis('. $ga->getId().', \''.Filter::escapeJs($wt_tree->getName()).'\');">
-                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete') . '
+                                <i class="fa fa-fw fa-trash-o"></i> ' . I18N::translate('Delete').'
                             </a>
                        </li>
                     </ul>
                 </div>';
 		    $datum[1] = $ga->getId();
 		    $datum[2] = $ga->isEnabled() ? 
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
 		    $datum[3] = $ga->getTitle();
 		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
+		    if ($place_hierarchy['type'] == 'header') {
 		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
 		    } elseif ($place_hierarchy['type'] == 'data') {
-		        $datum[4] = $analysis_level . ' (' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+		        $datum[4] = $analysis_level.' ('.$place_hierarchy['hierarchy'][$analysis_level - 1].')';
 		    } else {
 		        $datum[4] = $analysis_level;
 		    }
 		    $datum[5] = $ga->getAnalysisLevel();
 		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
 		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
-		        if($options->getMap()->isLoaded()) {
+		    if ($ga->hasMap()) {
+		        if ($options->getMap()->isLoaded()) {
     		        $datum[6] = $options->getMap()->getDescription();
-    		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+    		        $datum[7] = '<span data-toggle="tooltip" title="'.$options->getMap()->getTopLevelName().'" />';
     		        $top_level = $options->getMapLevel();
-    		        if($place_hierarchy['type'] == 'header') {
+    		        if ($place_hierarchy['type'] == 'header') {
     		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
     		        } elseif ($place_hierarchy['type'] == 'data') {
-    		            $datum[7] .= $top_level . ' (' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+    		            $datum[7] .= $top_level.' ('.$place_hierarchy['hierarchy'][$top_level - 1].')';
     		        } else {
     		            $datum[7] .= $top_level;
     		        }
@@ -269,8 +268,7 @@ 
 		        }
 		    }
 		    $datum[8] = $options->isUsingFlags() ? 
-				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
-				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
+				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
 		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
 		    $data[] = $datum;
@@ -319,24 +317,24 @@ 
         $description    = Filter::post('description');
         $analysislevel  = Filter::postInteger('analysislevel');
         $use_map        = Filter::postBool('use_map');
-        if($use_map) {
+        if ($use_map) {
             $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
+            $map_top_level = Filter::postInteger('map_top_level');
         }
         $use_flags      = Filter::postBool('use_flags');
         $gen_details    = Filter::postInteger('gen_details');
         
         $success = false; 
-        if($ga_id) {
+        if ($ga_id) {
             $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
+            if ($ga) {
                 $ga->setTitle($description);
                 $ga->setAnalysisLevel($analysislevel + 1);
                 $options = $ga->getOptions();
-                if($options) {
+                if ($options) {
                     $options->setUsingFlags($use_flags);
                     $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
+                    if ($use_map) {
                         $options->setMap(new OutlineMap($map_file));
                         $options->setMapLevel($map_top_level + 1);
                     }
@@ -346,7 +344,7 @@ 
                 }
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
-				if($res) {
+				if ($res) {
 					FlashMessages::addMessage(I18N::translate('The geographical dispersion analysis “%s” has been successfully updated', $res->getTitle()), 'success');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$res->getId().'” has been updated.');
 					$ga = $res;
@@ -354,7 +352,7 @@ 
 				}
 				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.');
+					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'.$ga->getId().'” could not be updated. See error log.');
 				}
             }
         } else {
@@ -366,7 +364,7 @@ 
 				$use_flags,
 				$gen_details
 			);
-			if($ga) {
+			if ($ga) {
 				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;
@@ -377,16 +375,16 @@ 
 			}
         }
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $wt_tree->getNameUrl();
+        $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl();
+        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 {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $wt_tree->getNameUrl();
+                $redirection_url = 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@add&ged='.$wt_tree->getNameUrl();
             }
         }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+        header('Location: '.WT_BASE_URL.$redirection_url);
         
     }
      
@@ -416,7 +414,7 @@ 
             ');
         
         $data = new ViewBag();
-        if($ga) {
+        if ($ga) {
             $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
             $data->set('geo_analysis', $ga);
         } else {
@@ -424,9 +422,9 @@ 
         }
         
         $data->set('title', $controller->getPageTitle());
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $wt_tree->getNameUrl());
+        $data->set('admin_config_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig&ged='.$wt_tree->getNameUrl());
         $data->set('module_title', $this->module->getTitle());
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $wt_tree->getNameUrl());
+        $data->set('save_url', 'module.php?mod='.$this->module->getName().'&mod_action=AdminConfig@save&ged='.$wt_tree->getNameUrl());
         $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
         $map_list = array_map(
@@ -439,7 +437,7 @@ 
         $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();