jon48 / webtrees-lib

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

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $table_id = $this->data->get('table_id');
+		$table_id = $this->data->get('table_id');
         
-        ?>        
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -79,7 +79,7 @@ 
 		</div>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -60,13 +60,13 @@
 							?>
 							<tr>
 								<td>
-									<input type="hidden" name="hook-<?php echo $hook->id;?>" value="yes" >
-									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status)=='enabled'); ?>
+									<input type="hidden" name="hook-<?php echo $hook->id; ?>" value="yes" >
+									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status) == 'enabled'); ?>
 								</td>
-								<td><?php echo (($hook->status)=='enabled'); ?></td>
+								<td><?php echo (($hook->status) == 'enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if ($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>

Braces +4 added lines, -1 removed lines

@@ -66,7 +66,10 @@
 								<td><?php echo (($hook->status)=='enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if($mod = Module::getModuleByName($hook->module)) {
+	echo $mod->getTitle();
+}
+?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>

src/Webtrees/Module/ModuleManager.php

Indentation +52 added lines, -52 removed lines

@@ -49,62 +49,62 @@
 	}
 	
 	/**
-     * Protected constructor.
-     */
-    protected function __construct()
-    {
-    	$this->modules_list = array();
-    }
+	 * Protected constructor.
+	 */
+	protected function __construct()
+	{
+		$this->modules_list = array();
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
-     */
-    public function isOperational($moduleName) {
-    	if(!array_key_exists($moduleName, $this->modules_list)) {
-    		if($module = fw\Module::getModuleByName($moduleName)) {
-    			if($module instanceof DependentInterface) {
-    				if($module->validatePrerequisites()) {
-    					$this->modules_list[$moduleName] = TRUE;
-    					return true;
-    				} else {
-    					// Do not cache the result,
-    					// as they could change by the next call to the method
-    					return false;
-    				}
-    			}
-    			else {
-    				$this->modules_list[$moduleName] = TRUE;
-    				return true;
-    			}
-    		}
-    		else {
-    			$this->modules_list[$moduleName] = FALSE;
-    		}
-    	}
-    	return $this->modules_list[$moduleName];
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
+	 */
+	public function isOperational($moduleName) {
+		if(!array_key_exists($moduleName, $this->modules_list)) {
+			if($module = fw\Module::getModuleByName($moduleName)) {
+				if($module instanceof DependentInterface) {
+					if($module->validatePrerequisites()) {
+						$this->modules_list[$moduleName] = TRUE;
+						return true;
+					} else {
+						// Do not cache the result,
+						// as they could change by the next call to the method
+						return false;
+					}
+				}
+				else {
+					$this->modules_list[$moduleName] = TRUE;
+					return true;
+				}
+			}
+			else {
+				$this->modules_list[$moduleName] = FALSE;
+			}
+		}
+		return $this->modules_list[$moduleName];
     	
-    }
+	}
     
 
-    /**
-     * Private clone method to prevent cloning of the instance of the
-     * *ModuleManager* instance.
-     *
-     * @return void
-     */
-    private function __clone()
-    {
-    }
+	/**
+	 * Private clone method to prevent cloning of the instance of the
+	 * *ModuleManager* instance.
+	 *
+	 * @return void
+	 */
+	private function __clone()
+	{
+	}
 
-    /**
-     * Private unserialize method to prevent unserializing of the *ModuleManager*
-     * instance.
-     *
-     * @return void
-     */
-    private function __wakeup()
-    {
-    }
+	/**
+	 * Private unserialize method to prevent unserializing of the *ModuleManager*
+	 * instance.
+	 *
+	 * @return void
+	 */
+	private function __wakeup()
+	{
+	}
     
 }

Spacing +4 added lines, -4 removed lines

@@ -61,10 +61,10 @@
      * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
      */
     public function isOperational($moduleName) {
-    	if(!array_key_exists($moduleName, $this->modules_list)) {
-    		if($module = fw\Module::getModuleByName($moduleName)) {
-    			if($module instanceof DependentInterface) {
-    				if($module->validatePrerequisites()) {
+    	if (!array_key_exists($moduleName, $this->modules_list)) {
+    		if ($module = fw\Module::getModuleByName($moduleName)) {
+    			if ($module instanceof DependentInterface) {
+    				if ($module->validatePrerequisites()) {
     					$this->modules_list[$moduleName] = TRUE;
     					return true;
     				} else {

Braces +2 added lines, -4 removed lines

@@ -72,13 +72,11 @@
     					// as they could change by the next call to the method
     					return false;
     				}
-    			}
-    			else {
+    			} else {
     				$this->modules_list[$moduleName] = TRUE;
     				return true;
     			}
-    		}
-    		else {
+    		} else {
     			$this->modules_list[$moduleName] = FALSE;
     		}
     	}

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

Indentation +8 added lines, -8 removed lines

@@ -28,15 +28,15 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        if (Module::getModuleByName('ckeditor')) {
-            CkeditorModule::enableEditor($this->ctrl);
-        }
+		if (Module::getModuleByName('ckeditor')) {
+			CkeditorModule::enableEditor($this->ctrl);
+		}
         
-        /** @var AbstractModule $module  */
-        $module = $this->data->get('module');        
-        ?>        
+		/** @var AbstractModule $module  */
+		$module = $this->data->get('module');        
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -187,7 +187,7 @@ 
         </form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

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

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 	 *
      * @return (OutlineMap|null)
      */
-    public function getMap(){
+    public function getMap() {
         return $this->map;
     }
     
@@ -64,7 +64,7 @@ 
 	 *
 	 * @return int
 	 */
-    public function getMapLevel(){
+    public function getMapLevel() {
         return $this->map_level;
     }
     
@@ -84,7 +84,7 @@ 
 	 *
 	 * @return bool
 	 */
-    public function isUsingFlags(){
+    public function isUsingFlags() {
         return $this->use_flags;
     }
     
@@ -104,7 +104,7 @@ 
 	 *
 	 * @return int
 	 */
-    public function getMaxDetailsInGen(){
+    public function getMaxDetailsInGen() {
         return $this->max_details_in_gen;
     }
     

Indentation +40 added lines, -40 removed lines

@@ -15,58 +15,58 @@ 
  */
 class GeoDisplayOptions {
     
-    /**
+	/**
 	 * Outline map to be used for diaplay
-     * @var (null|OutlineMap) $map
-     */
-    protected $map;
+	 * @var (null|OutlineMap) $map
+	 */
+	protected $map;
     
 	/**
 	 * Level in the Gedcom hierarchy of the parent level of the outline map.
 	 * @var int $map_level
 	 */
-    protected $map_level;
+	protected $map_level;
     
 	/**
 	 * Option to use flags in places display, instead of or in addition to the name.
 	 * @var bool $use_flags
 	 */
-    protected $use_flags;
+	protected $use_flags;
     
 	/**
 	 * Option to define the number of top places to display in the generation view.
 	 * @var int $max_details_in_gen
 	 */
-    protected $max_details_in_gen;
+	protected $max_details_in_gen;
     
-    /**
+	/**
 	 * Get the outline map to use for display.
 	 *
-     * @return (OutlineMap|null)
-     */
-    public function getMap(){
-        return $this->map;
-    }
+	 * @return (OutlineMap|null)
+	 */
+	public function getMap(){
+		return $this->map;
+	}
     
 	/**
 	 * Set the outline map to use for display.
 	 *
-     * @param (OutlineMap|null) $map
+	 * @param (OutlineMap|null) $map
 	 * @return self Enable method-chaining
-     */
-    public function setMap(OutlineMap $map = null) {
-        $this->map = $map;
-        return $this;
-    }
+	 */
+	public function setMap(OutlineMap $map = null) {
+		$this->map = $map;
+		return $this;
+	}
     
 	/**
 	 * Get the level of the map parent place
 	 *
 	 * @return int
 	 */
-    public function getMapLevel(){
-        return $this->map_level;
-    }
+	public function getMapLevel(){
+		return $this->map_level;
+	}
     
 	/**
 	 * Set the level of the map parent place
@@ -74,19 +74,19 @@ 
 	 * @param int $maplevel
 	 * @return self Enable method-chaining
 	 */
-    public function setMapLevel($maplevel) {
-        $this->map_level = $maplevel;
-        return $this;
-    }
+	public function setMapLevel($maplevel) {
+		$this->map_level = $maplevel;
+		return $this;
+	}
     
 	/**
 	 * Get whether flags should be used in places display
 	 *
 	 * @return bool
 	 */
-    public function isUsingFlags(){
-        return $this->use_flags;
-    }
+	public function isUsingFlags(){
+		return $this->use_flags;
+	}
     
 	/**
 	 * Set whether flags should be used in places display
@@ -94,19 +94,19 @@ 
 	 * @param bool $use_flags
 	 * @return self Enable method-chaining
 	 */
-    public function setUsingFlags($use_flags) {
-        $this->use_flags = $use_flags;
-        return $this;
-    }
+	public function setUsingFlags($use_flags) {
+		$this->use_flags = $use_flags;
+		return $this;
+	}
     
 	/**
 	 * Get the number of Top Places in the generation view
 	 *
 	 * @return int
 	 */
-    public function getMaxDetailsInGen(){
-        return $this->max_details_in_gen;
-    }
+	public function getMaxDetailsInGen(){
+		return $this->max_details_in_gen;
+	}
     
 	/**
 	 * Set the number of Top Places in the generation view
@@ -114,10 +114,10 @@ 
 	 * @param int $max_details_in_gen
 	 * @return self Enable method-chaining
 	 */
-    public function setMaxDetailsInGen($max_details_in_gen) {
-        $this->max_details_in_gen = $max_details_in_gen;
-        return $this;
-    }
+	public function setMaxDetailsInGen($max_details_in_gen) {
+		$this->max_details_in_gen = $max_details_in_gen;
+		return $this;
+	}
                    
 }
  
\ No newline at end of file

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

Indentation +27 added lines, -27 removed lines

@@ -19,49 +19,49 @@ 
 	 * Width of the map (in pixels).
 	 * @var int $width
 	 */
-    public $width;
+	public $width;
 	
 	/**
 	 * Height of the map (in pixels).
 	 * @var int $height
 	 */
-    public $height;
+	public $height;
 	
 	/**
 	 * Background color for the map shapes with values (when no transparency if applied).
 	 * @var string $max_color
 	 */
-    public $max_color;
+	public $max_color;
 	
 	/**
 	 * Background color for the map shapes when hovered.
 	 * @var string $hover_color
 	 */
-    public $hover_color;
+	public $hover_color;
 	
 	/**
 	 * Background color for the map.
 	 * @var string $background_color
 	 */
-    public $background_color;
+	public $background_color;
 	
 	/**
 	 * Border color for the map.
 	 * @var string $background_stroke
 	 */
-    public $background_stroke;
+	public $background_stroke;
 	
 	/**
 	 * Default color for the shapes (without any value).
 	 * @var string $default_color
 	 */
-    public $default_color;
+	public $default_color;
 	
 	/**
 	 * Default border color for the shapes.
 	 * @var string $default_stroke
 	 */
-    public $default_stroke;
+	public $default_stroke;
     
 	/**
 	 * Constructor for OutlineMapCanvas.
@@ -75,25 +75,25 @@ 
 	 * @param string $default_color Default background color for the shapes
 	 * @param string $default_stroke Default border color for the shapes
 	 */
-    public function __construct(
-        $width,
-        $height,
-        $max_color,
-        $hover_color,
-        $background_color,
-        $background_stroke,
-        $default_color,
-        $default_stroke
-     ) {
-        $this->width = $width;
-        $this->height = $height;
-        $this->max_color = $max_color;
-        $this->hover_color = $hover_color;
-        $this->background_color = $background_color;
-        $this->background_stroke = $background_stroke;
-        $this->default_color = $default_color;
-        $this->default_stroke = $default_stroke;
-    }
+	public function __construct(
+		$width,
+		$height,
+		$max_color,
+		$hover_color,
+		$background_color,
+		$background_stroke,
+		$default_color,
+		$default_stroke
+	 ) {
+		$this->width = $width;
+		$this->height = $height;
+		$this->max_color = $max_color;
+		$this->hover_color = $hover_color;
+		$this->background_color = $background_color;
+		$this->background_stroke = $background_stroke;
+		$this->default_color = $default_color;
+		$this->default_stroke = $default_stroke;
+	}
     
     
 }

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; 
                         }
                     }

Indentation +178 added lines, -178 removed lines

@@ -24,64 +24,64 @@ 
 	 * Geo Analysis ID
 	 * @var int $id
 	 */
-    protected $id;
+	protected $id;
     
 	/**
 	 * Geo Analysis Title
 	 * @var string $title
 	 */
-    protected $title;
+	protected $title;
     
 	/**
 	 * Level of the Gedcom hierarchy for the analysis
 	 * @var int $analysis_level
 	 */
-    protected $analysis_level;
+	protected $analysis_level;
     
-    /**
-     * Display options
-     * @var GeoDisplayOptions $options
-     */
-    protected $options;
+	/**
+	 * Display options
+	 * @var GeoDisplayOptions $options
+	 */
+	protected $options;
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Is the analysis enabled
-     * @var bool $enabled
-     */
-    protected $enabled;
+	/**
+	 * Is the analysis enabled
+	 * @var bool $enabled
+	 */
+	protected $enabled;
     
-    /**
-     * Constructor for GeoAnalysis.
-     *
-     * @param Tree $tree Reference tree
+	/**
+	 * Constructor for GeoAnalysis.
+	 *
+	 * @param Tree $tree Reference tree
 	 * @param int $id GeoAnalysis ID
 	 * @param string $title GeoAnalysis title
 	 * @param int $analysis_level Analysis level
 	 * @param (GeoDisplayOptions|null) $options Display options
 	 * @param bool $enabled Is analysis enabled
-     */
-    public function __construct(Tree $tree, $id, $title, $analysis_level, GeoDisplayOptions $options = null, $enabled = true) {
-        $this->tree = $tree;
-        $this->id = $id;
-        $this->title = $title;
-        $this->analysis_level = $analysis_level;
-        $this->options = $options;
-        $this->enabled = $enabled;
-    }
+	 */
+	public function __construct(Tree $tree, $id, $title, $analysis_level, GeoDisplayOptions $options = null, $enabled = true) {
+		$this->tree = $tree;
+		$this->id = $id;
+		$this->title = $title;
+		$this->analysis_level = $analysis_level;
+		$this->options = $options;
+		$this->enabled = $enabled;
+	}
     
 	/**
 	 * Get the analysis title
 	 * @return string
 	 */
-    public function getTitle() {
-        return $this->title;
-    }
+	public function getTitle() {
+		return $this->title;
+	}
     
 	/**
 	 * Set the analysis title
@@ -89,53 +89,53 @@ 
 	 * @param string $title
 	 * @return self Enable method-chaining
 	 */
-    public function setTitle($title) {
-        $this->title = $title;
-        return $this;
-    }
+	public function setTitle($title) {
+		$this->title = $title;
+		return $this;
+	}
     
 	/**
 	 * Get the analysis ID
 	 * @return int
 	 */
-    public function getId() {
-        return $this->id;
-    }
+	public function getId() {
+		return $this->id;
+	}
     
 	/**
 	 * Get the analysis status (enabled/disabled)
 	 * @return bool
 	 */
-    public function isEnabled() {
-        return $this->enabled;
-    }
+	public function isEnabled() {
+		return $this->enabled;
+	}
     
-    /**
-     * Get analysis options
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions
-     */
-    public function getOptions() {
-        return $this->options;
-    }
+	/**
+	 * Get analysis options
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions
+	 */
+	public function getOptions() {
+		return $this->options;
+	}
     
 	/**
-     * Set analysis options
+	 * Set analysis options
 	 *
-     * @param \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions $options
+	 * @param \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions $options
 	 * @return self Enable method-chaining
-     */
-    public function setOptions(GeoDisplayOptions $options) {
-        $this->options = $options;
-        return $this;
-    }
+	 */
+	public function setOptions(GeoDisplayOptions $options) {
+		$this->options = $options;
+		return $this;
+	}
     
 	/**
 	 * Get analysis level
 	 * @return int
 	 */
-    public function getAnalysisLevel() {
-        return $this->analysis_level;
-    }
+	public function getAnalysisLevel() {
+		return $this->analysis_level;
+	}
     
 	/**
 	 * Get analysis level
@@ -143,19 +143,19 @@ 
 	 * @param int $analysis_level
 	 * @return self Enable method-chaining
 	 */
-    public function setAnalysisLevel($analysis_level) {
-        $this->analysis_level = $analysis_level;
-        return $this;
-    }
+	public function setAnalysisLevel($analysis_level) {
+		$this->analysis_level = $analysis_level;
+		return $this;
+	}
     
 	/**
 	 * Check whether the analysis has a linked map
 	 *
 	 * @return bool
 	 */
-    public function hasMap() {
-        return $this->options && $this->options->getMap();
-    }
+	public function hasMap() {
+		return $this->options && $this->options->getMap();
+	}
     
 	/**
 	 * Get the URL for the GeoAnalysis.
@@ -163,120 +163,120 @@ 
 	 * @return string
 	 */
 	 public function getHtmlUrl() {
-        return 'module.php?mod='. Constants::MODULE_MAJ_GEODISP_NAME . '&mod_action=GeoAnalysis&ga_id=' . $this->getId() . '&ged=' . $this->tree->getNameUrl();
-    }
+		return 'module.php?mod='. Constants::MODULE_MAJ_GEODISP_NAME . '&mod_action=GeoAnalysis&ga_id=' . $this->getId() . '&ged=' . $this->tree->getNameUrl();
+	}
     
-    /**
-     * Return the dispersion analysis tables.
-     * Two arrays are returned :
-     * 	- the General analysis, which returns the number of ancestors for each place found, plus 4 additional indicators :
-     * 		- knownsum : Number of known places
-     * 		- unknown : Number of unknown places
-     * 		- max : Maximum count of ancestors within a place
-     * 		- other : Other places (not in the top level area)
-     * - the Generations analysis, which returns the number of ancestors for each place found for each generation, plus 3 additional indicators within each generation :
-     * 		- sum : Number of known places
-     * 		- unknown : Number of unknown places
-     * 		- other : Other places (not in the top level area)
-     *
-     * @param array $sosalist List of all sosas
-     * @return array Array of the general and generations table
-     */
-    public function getAnalysisResults($sosalist) {
-        $placesDispGeneral = null;
-        $placesDispGenerations = null;
+	/**
+	 * Return the dispersion analysis tables.
+	 * Two arrays are returned :
+	 * 	- the General analysis, which returns the number of ancestors for each place found, plus 4 additional indicators :
+	 * 		- knownsum : Number of known places
+	 * 		- unknown : Number of unknown places
+	 * 		- max : Maximum count of ancestors within a place
+	 * 		- other : Other places (not in the top level area)
+	 * - the Generations analysis, which returns the number of ancestors for each place found for each generation, plus 3 additional indicators within each generation :
+	 * 		- sum : Number of known places
+	 * 		- unknown : Number of unknown places
+	 * 		- other : Other places (not in the top level area)
+	 *
+	 * @param array $sosalist List of all sosas
+	 * @return array Array of the general and generations table
+	 */
+	public function getAnalysisResults($sosalist) {
+		$placesDispGeneral = null;
+		$placesDispGenerations = null;
         
-        if($sosalist && count($sosalist) > 0) {
-            $placesDispGeneral['knownsum'] = 0;
-            $placesDispGeneral['unknown'] = 0;
-            $placesDispGeneral['max'] = 0;
-            $placesDispGeneral['places'] = array();
-            foreach($sosalist as $sosaid => $gens) {
-                $sosa = Individual::getIntance($sosaid, $this->tree);
-                $place =$sosa->getSignificantPlace();
-                $genstab = explode(',', $gens);
-                $isUnknown=true;
-                if($sosa->getDerivedRecord()->canShow() && !is_null($place)){
-                    $levels = array_reverse(array_map('trim',explode(',', $place)));
-                    if(count($levels)>= $this->analysis_level){                        
-                        $toplevelvalues = array();
-                        if($this->hasMap()
-                            && $this->options->getMap()->isLoaded()
-                            && $toplevelvalue = $this->options->getMap()->getTopLevelName()
-                        ) {
-                            $toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
-                        }
-                        if(!$this->hasMap() 
-                            || is_null($this->options->getMapLevel()) 
-                            || ( $this->options->getMap()->isLoaded() && $this->options->getMap()->getTopLevelName() == '*') 
-                            || (
-                                $this->options->getMapLevel() <= $this->analysis_level 
-                                && $this->options->getMapLevel() > 0
-                                && count($levels) >= $this->options->getMapLevel()
-                                && in_array(strtolower($levels[$this->options->getMapLevel()-1]), $toplevelvalues)
-                            )
-                        ) {
-                            $placest = implode(I18N::$list_separator, array_slice($levels, 0, $this->analysis_level));
-                            if(isset($placesDispGeneral['places'][$placest])) {
-                                $placesDispGeneral['places'][$placest] += 1;
-                            }
-                            else { 
-                                $placesDispGeneral['places'][$placest] = 1;
-                            }
-                            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 { 
-                                    $placesDispGenerations[$gen]['places'][$placest] = 1;
-                                }
-                                if(isset($placesDispGenerations[$gen]['sum'])) {
-                                    $placesDispGenerations[$gen]['sum'] += 1;
-                                }
-                                else { 
-                                    $placesDispGenerations[$gen]['sum'] = 1;
-                                }
-                            }
-                        }
-                        else{
-                            if(isset($placesDispGeneral['other'])) {
-                                $placesDispGeneral['other'] += 1;
-                            }
-                            else { 
-                                $placesDispGeneral['other'] = 1;
-                            }
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['other'])) {
-                                    $placesDispGenerations[$gen]['other'] += 1;
-                                }
-                                else { 
-                                    $placesDispGenerations[$gen]['other'] = 1;
-                                }
-                            }
-                        }
-                        $placesDispGeneral['knownsum'] += 1;
-                        $isUnknown = false;
-                    }
-                }
-                if($isUnknown){
-                    $placesDispGeneral['unknown'] += 1;
-                    foreach($genstab as $gen) {
-                        if(isset($placesDispGenerations[$gen]['unknown'])) { 
-                            $placesDispGenerations[$gen]['unknown'] += 1;
-                        }
-                        else { 
-                            $placesDispGenerations[$gen]['unknown'] = 1; 
-                        }
-                    }
-                }
-            }
+		if($sosalist && count($sosalist) > 0) {
+			$placesDispGeneral['knownsum'] = 0;
+			$placesDispGeneral['unknown'] = 0;
+			$placesDispGeneral['max'] = 0;
+			$placesDispGeneral['places'] = array();
+			foreach($sosalist as $sosaid => $gens) {
+				$sosa = Individual::getIntance($sosaid, $this->tree);
+				$place =$sosa->getSignificantPlace();
+				$genstab = explode(',', $gens);
+				$isUnknown=true;
+				if($sosa->getDerivedRecord()->canShow() && !is_null($place)){
+					$levels = array_reverse(array_map('trim',explode(',', $place)));
+					if(count($levels)>= $this->analysis_level){                        
+						$toplevelvalues = array();
+						if($this->hasMap()
+							&& $this->options->getMap()->isLoaded()
+							&& $toplevelvalue = $this->options->getMap()->getTopLevelName()
+						) {
+							$toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
+						}
+						if(!$this->hasMap() 
+							|| is_null($this->options->getMapLevel()) 
+							|| ( $this->options->getMap()->isLoaded() && $this->options->getMap()->getTopLevelName() == '*') 
+							|| (
+								$this->options->getMapLevel() <= $this->analysis_level 
+								&& $this->options->getMapLevel() > 0
+								&& count($levels) >= $this->options->getMapLevel()
+								&& in_array(strtolower($levels[$this->options->getMapLevel()-1]), $toplevelvalues)
+							)
+						) {
+							$placest = implode(I18N::$list_separator, array_slice($levels, 0, $this->analysis_level));
+							if(isset($placesDispGeneral['places'][$placest])) {
+								$placesDispGeneral['places'][$placest] += 1;
+							}
+							else { 
+								$placesDispGeneral['places'][$placest] = 1;
+							}
+							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 { 
+									$placesDispGenerations[$gen]['places'][$placest] = 1;
+								}
+								if(isset($placesDispGenerations[$gen]['sum'])) {
+									$placesDispGenerations[$gen]['sum'] += 1;
+								}
+								else { 
+									$placesDispGenerations[$gen]['sum'] = 1;
+								}
+							}
+						}
+						else{
+							if(isset($placesDispGeneral['other'])) {
+								$placesDispGeneral['other'] += 1;
+							}
+							else { 
+								$placesDispGeneral['other'] = 1;
+							}
+							foreach($genstab as $gen) {
+								if(isset($placesDispGenerations[$gen]['other'])) {
+									$placesDispGenerations[$gen]['other'] += 1;
+								}
+								else { 
+									$placesDispGenerations[$gen]['other'] = 1;
+								}
+							}
+						}
+						$placesDispGeneral['knownsum'] += 1;
+						$isUnknown = false;
+					}
+				}
+				if($isUnknown){
+					$placesDispGeneral['unknown'] += 1;
+					foreach($genstab as $gen) {
+						if(isset($placesDispGenerations[$gen]['unknown'])) { 
+							$placesDispGenerations[$gen]['unknown'] += 1;
+						}
+						else { 
+							$placesDispGenerations[$gen]['unknown'] = 1; 
+						}
+					}
+				}
+			}
            
-        }        
+		}        
         
-        return array($placesDispGeneral, $placesDispGenerations);        
-    }
+		return array($placesDispGeneral, $placesDispGenerations);        
+	}
     
                    
 }

Spacing +25 added lines, -25 removed lines

@@ -163,7 +163,7 @@ 
 	 * @return string
 	 */
 	 public function getHtmlUrl() {
-        return 'module.php?mod='. Constants::MODULE_MAJ_GEODISP_NAME . '&mod_action=GeoAnalysis&ga_id=' . $this->getId() . '&ged=' . $this->tree->getNameUrl();
+        return 'module.php?mod='.Constants::MODULE_MAJ_GEODISP_NAME.'&mod_action=GeoAnalysis&ga_id='.$this->getId().'&ged='.$this->tree->getNameUrl();
     }
     
     /**
@@ -186,53 +186,53 @@ 
         $placesDispGeneral = null;
         $placesDispGenerations = null;
         
-        if($sosalist && count($sosalist) > 0) {
+        if ($sosalist && count($sosalist) > 0) {
             $placesDispGeneral['knownsum'] = 0;
             $placesDispGeneral['unknown'] = 0;
             $placesDispGeneral['max'] = 0;
             $placesDispGeneral['places'] = array();
-            foreach($sosalist as $sosaid => $gens) {
+            foreach ($sosalist as $sosaid => $gens) {
                 $sosa = Individual::getIntance($sosaid, $this->tree);
-                $place =$sosa->getSignificantPlace();
+                $place = $sosa->getSignificantPlace();
                 $genstab = explode(',', $gens);
-                $isUnknown=true;
-                if($sosa->getDerivedRecord()->canShow() && !is_null($place)){
-                    $levels = array_reverse(array_map('trim',explode(',', $place)));
-                    if(count($levels)>= $this->analysis_level){                        
+                $isUnknown = true;
+                if ($sosa->getDerivedRecord()->canShow() && !is_null($place)) {
+                    $levels = array_reverse(array_map('trim', explode(',', $place)));
+                    if (count($levels) >= $this->analysis_level) {                        
                         $toplevelvalues = array();
-                        if($this->hasMap()
+                        if ($this->hasMap()
                             && $this->options->getMap()->isLoaded()
                             && $toplevelvalue = $this->options->getMap()->getTopLevelName()
                         ) {
-                            $toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
+                            $toplevelvalues = array_map('trim', explode(',', strtolower($toplevelvalue)));
                         }
-                        if(!$this->hasMap() 
+                        if (!$this->hasMap() 
                             || is_null($this->options->getMapLevel()) 
-                            || ( $this->options->getMap()->isLoaded() && $this->options->getMap()->getTopLevelName() == '*') 
+                            || ($this->options->getMap()->isLoaded() && $this->options->getMap()->getTopLevelName() == '*') 
                             || (
                                 $this->options->getMapLevel() <= $this->analysis_level 
                                 && $this->options->getMapLevel() > 0
                                 && count($levels) >= $this->options->getMapLevel()
-                                && in_array(strtolower($levels[$this->options->getMapLevel()-1]), $toplevelvalues)
+                                && in_array(strtolower($levels[$this->options->getMapLevel() - 1]), $toplevelvalues)
                             )
                         ) {
                             $placest = implode(I18N::$list_separator, array_slice($levels, 0, $this->analysis_level));
-                            if(isset($placesDispGeneral['places'][$placest])) {
+                            if (isset($placesDispGeneral['places'][$placest])) {
                                 $placesDispGeneral['places'][$placest] += 1;
                             }
                             else { 
                                 $placesDispGeneral['places'][$placest] = 1;
                             }
-                            if($placesDispGeneral['places'][$placest]>$placesDispGeneral['max'])
+                            if ($placesDispGeneral['places'][$placest] > $placesDispGeneral['max'])
                                 $placesDispGeneral['max'] = $placesDispGeneral['places'][$placest];
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['places'][$placest])) {
+                            foreach ($genstab as $gen) {
+                                if (isset($placesDispGenerations[$gen]['places'][$placest])) {
                                     $placesDispGenerations[$gen]['places'][$placest] += 1;
                                 }
                                 else { 
                                     $placesDispGenerations[$gen]['places'][$placest] = 1;
                                 }
-                                if(isset($placesDispGenerations[$gen]['sum'])) {
+                                if (isset($placesDispGenerations[$gen]['sum'])) {
                                     $placesDispGenerations[$gen]['sum'] += 1;
                                 }
                                 else { 
@@ -240,15 +240,15 @@ 
                                 }
                             }
                         }
-                        else{
-                            if(isset($placesDispGeneral['other'])) {
+                        else {
+                            if (isset($placesDispGeneral['other'])) {
                                 $placesDispGeneral['other'] += 1;
                             }
                             else { 
                                 $placesDispGeneral['other'] = 1;
                             }
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['other'])) {
+                            foreach ($genstab as $gen) {
+                                if (isset($placesDispGenerations[$gen]['other'])) {
                                     $placesDispGenerations[$gen]['other'] += 1;
                                 }
                                 else { 
@@ -260,10 +260,10 @@ 
                         $isUnknown = false;
                     }
                 }
-                if($isUnknown){
+                if ($isUnknown) {
                     $placesDispGeneral['unknown'] += 1;
-                    foreach($genstab as $gen) {
-                        if(isset($placesDispGenerations[$gen]['unknown'])) { 
+                    foreach ($genstab as $gen) {
+                        if (isset($placesDispGenerations[$gen]['unknown'])) { 
                             $placesDispGenerations[$gen]['unknown'] += 1;
                         }
                         else { 

src/Webtrees/Module/GeoDispersion/Schema/Migration0.php

Indentation +12 added lines, -12 removed lines

@@ -24,18 +24,18 @@
 	 */
 	public function upgrade() {
 		Database::exec(
-            'CREATE TABLE IF NOT EXISTS `##maj_geodispersion` ('.
-            ' majgd_id       	INTEGER AUTO_INCREMENT NOT NULL,'.
-            ' majgd_file      	INTEGER 	 		NOT NULL,'.
-            ' majgd_descr		VARCHAR(70)			NOT NULL,'.
-            ' majgd_sublevel	TINYINT				NOT NULL,'.
-            ' majgd_map			VARCHAR(70)			NULL,'.
-            ' majgd_toplevel	TINYINT				NULL,'.
-            ' majgd_status      ENUM(\'enabled\', \'disabled\') NOT NULL DEFAULT \'enabled\','.
-            ' majgd_useflagsgen	ENUM(\'yes\', \'no\') NOT NULL DEFAULT \'no\','.
-            ' majgd_detailsgen	TINYINT				NOT NULL DEFAULT 0,'.
-            ' PRIMARY KEY (majgd_id)'.
-            ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'CREATE TABLE IF NOT EXISTS `##maj_geodispersion` ('.
+			' majgd_id       	INTEGER AUTO_INCREMENT NOT NULL,'.
+			' majgd_file      	INTEGER 	 		NOT NULL,'.
+			' majgd_descr		VARCHAR(70)			NOT NULL,'.
+			' majgd_sublevel	TINYINT				NOT NULL,'.
+			' majgd_map			VARCHAR(70)			NULL,'.
+			' majgd_toplevel	TINYINT				NULL,'.
+			' majgd_status      ENUM(\'enabled\', \'disabled\') NOT NULL DEFAULT \'enabled\','.
+			' majgd_useflagsgen	ENUM(\'yes\', \'no\') NOT NULL DEFAULT \'no\','.
+			' majgd_detailsgen	TINYINT				NOT NULL DEFAULT 0,'.
+			' PRIMARY KEY (majgd_id)'.
+			') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}
 }

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

Indentation +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var GeoAnalysis $ga */
-        $ga = $this->data->get('geo_analysis');
-        $is_new = is_null($ga);
+		/** @var GeoAnalysis $ga */
+		$ga = $this->data->get('geo_analysis');
+		$is_new = is_null($ga);
         
-        $places_hierarchy = $this->data->get('places_hierarchy');
-        ?>        
+		$places_hierarchy = $this->data->get('places_hierarchy');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -155,7 +155,7 @@ 
     	</form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

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>

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 		
 		<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 } ?>
     
@@ -54,7 +54,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>
@@ -97,7 +97,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>
@@ -110,7 +110,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/GeoAnalysisView.php

Indentation +6 added lines, -6 removed lines

@@ -24,16 +24,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        ?>                
+	protected function renderContent() {        
+		?>                
         <div id="maj-geodisp-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
 			if($this->data->get('has_analysis', false)) { 
-			    /** @var GeoAnalysis $ga  */
-    		    $ga = $this->data->get('geoanalysis');
-    		?>
+				/** @var GeoAnalysis $ga  */
+				$ga = $this->data->get('geoanalysis');
+			?>
     		
     		<div id="geodispersion-panel">
     			<h3><?php echo $ga->getTitle() ?></h3>
@@ -66,7 +66,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
-			if($this->data->get('has_analysis', false)) { 
+			if ($this->data->get('has_analysis', false)) { 
 			    /** @var GeoAnalysis $ga  */
     		    $ga = $this->data->get('geoanalysis');
     		?>