jon48 / webtrees-lib

src/Webtrees/Module/MiscExtensionsModule.php

Spacing +13 added lines, -13 removed lines

@@ -59,7 +59,7 @@ 
      * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
      */
     public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -88,19 +88,19 @@ 
 	    $res = '';
 	    $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	    $titles = $dindi->getTitles();
-	    if(count($titles)>0){
+	    if (count($titles) > 0) {
 	        $res = '
 	            <dl>
 	               <dt class="label">'.I18N::translate('Titles').'</dt>';
-            foreach($titles as $title=>$props){
+            foreach ($titles as $title=>$props) {
                 $res .= 
-                    '<dd class="field">' . $title. ' ' .
-                    FunctionsPrint::getListFromArray($props) .
+                    '<dd class="field">'.$title.' '.
+                    FunctionsPrint::getListFromArray($props).
                     '</dd>';
             }
-            $res .=  '</dl>';
+            $res .= '</dl>';
         }
-	    return array( 'indi-header-titles' , $res);	    
+	    return array('indi-header-titles', $res);	    
 	}
 	
 	/**
@@ -117,8 +117,8 @@ 
 	    global $WT_TREE;
 	    
 	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
+	    if ($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1) {
+	        if (Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE) && !Filter::getBool('noheader')) {
 	            $html .= $this->getSetting('MAJ_HTML_HEADER', '');
 	        }
 	    }	
@@ -133,19 +133,19 @@ 
 	    global $WT_TREE;
 	     
 	    $html = '';
-	    if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
+	    if ($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1) {
 	        $html .= '<br/>';
 	        $html .= '<div class="center">';
 	        $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
-	        if($cnil_ref != ''){
+	        if ($cnil_ref != '') {
 	            $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
 	        }
 	        $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
 	        $html .= '</div>';
 	    }
 	    
-	    if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
-	        if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
+	    if ($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1) {
+	        if (Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE) && !Filter::getBool('nofooter')) {
 	            $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
 	        }
 	    }

Indentation +72 added lines, -72 removed lines

@@ -30,49 +30,49 @@ 
 class MiscExtensionsModule extends AbstractModule 
 implements HookSubscriberInterface, IndividualHeaderExtenderInterface, PageHeaderExtenderInterface, PageFooterExtenderInterface, ModuleConfigInterface
 {    
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
-     */
-    public function getTitle() {
-        return I18N::translate('Miscellaneous extensions');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Miscellaneous extensions');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
-    }
+	public function getDescription() {
+		return I18N::translate('Miscellaneous extensions for <strong>webtrees</strong>.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
 	public function getSubscribedHooks() {
 		return array(
-		    'hExtendIndiHeaderLeft' => 20,
-		    'hPrintHeader' => 20,
-		    'hPrintFooter' => 20
+			'hExtendIndiHeaderLeft' => 20,
+			'hPrintHeader' => 20,
+			'hPrintFooter' => 20
 		);
 	}
 	
@@ -87,22 +87,22 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
 	 */
 	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { 
-	    $res = '';
-	    $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	    $titles = $dindi->getTitles();
-	    if(count($titles)>0){
-	        $res = '
+		$res = '';
+		$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+		$titles = $dindi->getTitles();
+		if(count($titles)>0){
+			$res = '
 	            <dl>
 	               <dt class="label">'.I18N::translate('Titles').'</dt>';
-            foreach($titles as $title=>$props){
-                $res .= 
-                    '<dd class="field">' . $title. ' ' .
-                    FunctionsPrint::getListFromArray($props) .
-                    '</dd>';
-            }
-            $res .=  '</dl>';
-        }
-	    return array( 'indi-header-titles' , $res);	    
+			foreach($titles as $title=>$props){
+				$res .= 
+					'<dd class="field">' . $title. ' ' .
+					FunctionsPrint::getListFromArray($props) .
+					'</dd>';
+			}
+			$res .=  '</dl>';
+		}
+		return array( 'indi-header-titles' , $res);	    
 	}
 	
 	/**
@@ -116,15 +116,15 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageHeaderExtenderInterface::hPrintHeader()
 	 */
 	public function hPrintHeader() {	 
-	    global $WT_TREE;
+		global $WT_TREE;
 	    
-	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
-	            $html .= $this->getSetting('MAJ_HTML_HEADER', '');
-	        }
-	    }	
-	    return $html;
+		$html = '';
+		if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
+			if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE)  && !Filter::getBool('noheader')){
+				$html .= $this->getSetting('MAJ_HTML_HEADER', '');
+			}
+		}	
+		return $html;
 	}
 	
 	/**
@@ -132,26 +132,26 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageFooterExtenderInterface::hPrintFooter()
 	 */
 	public function hPrintFooter() {
-	    global $WT_TREE;
+		global $WT_TREE;
 	     
-	    $html = '';
-	    if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
-	        $html .= '<br/>';
-	        $html .= '<div class="center">';
-	        $cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
-	        if($cnil_ref != ''){
-	            $html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
-	        }
-	        $html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
-	        $html .= '</div>';
-	    }
+		$html = '';
+		if($this->getSetting('MAJ_DISPLAY_CNIL', 0) == 1){
+			$html .= '<br/>';
+			$html .= '<div class="center">';
+			$cnil_ref = $this->getSetting('MAJ_CNIL_REFERENCE', '');
+			if($cnil_ref != ''){
+				$html .= I18N::translate('This site has been notified to the French National Commission for Data protection (CNIL) and registered under number %s. ', $cnil_ref);
+			}
+			$html .= I18N::translate('In accordance with the French Data protection Act (<em>Loi Informatique et Libertés</em>) of January 6th, 1978, you have the right to access, modify, rectify and delete personal information that pertains to you. To exercice this right, please contact %s, and provide your name, address and a proof of your identity.', Theme::theme()->contactLink(User::find($WT_TREE->getPreference('WEBMASTER_USER_ID'))));
+			$html .= '</div>';
+		}
 	    
-	    if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
-	        if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
-	            $html .= $this->getSetting('MAJ_HTML_FOOTER', '');
-	        }
-	    }
-	    return $html;
+		if($this->getSetting('MAJ_ADD_HTML_FOOTER', 0) == 1){
+			if(Auth::accessLevel($WT_TREE) >= $this->getSetting('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE)  && !Filter::getBool('nofooter')){
+				$html .= $this->getSetting('MAJ_HTML_FOOTER', '');
+			}
+		}
+		return $html;
 	}
 	
 }

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/AdminConfigController.php

Indentation +39 added lines, -39 removed lines

@@ -28,56 +28,56 @@
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
-        global $WT_TREE;
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {
+		global $WT_TREE;
     
-        if(Auth::isAdmin()){
+		if(Auth::isAdmin()){
     
-            $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
+			$this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
+			$this->module->setSetting('MAJ_ADD_HTML_HEADER', Filter::postInteger('MAJ_ADD_HTML_HEADER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_HEADER', Filter::postInteger('MAJ_SHOW_HTML_HEADER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_HEADER', Filter::post('MAJ_HTML_HEADER'));
             
-            $this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
-            $this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
-            $this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
+			$this->module->setSetting('MAJ_ADD_HTML_FOOTER', Filter::postInteger('MAJ_ADD_HTML_FOOTER', 0, 1));
+			$this->module->setSetting('MAJ_SHOW_HTML_FOOTER', Filter::postInteger('MAJ_SHOW_HTML_FOOTER', Auth::PRIV_HIDE, Auth::PRIV_PRIVATE, Auth::PRIV_HIDE));
+			$this->module->setSetting('MAJ_HTML_FOOTER', Filter::post('MAJ_HTML_FOOTER'));
             
-            $this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
-            $this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
+			$this->module->setSetting('MAJ_DISPLAY_CNIL', Filter::postInteger('MAJ_DISPLAY_CNIL', 0, 1));
+			$this->module->setSetting('MAJ_CNIL_REFERENCE', Filter::post('MAJ_CNIL_REFERENCE'));
                 
-            FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
+			FlashMessages::addMessage(I18N::translate('The preferences for the module “%s” have been updated.', $this->module->getTitle()), 'success');
     
-            return;
-        }
-    }
+			return;
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {      
-        global $WT_TREE;
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {      
+		global $WT_TREE;
         
-        $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+		$action = Filter::post('action');        
+		if($action == 'update' && Filter::checkCsrf()) $this->update();
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
             
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('module', $this->module);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('module', $this->module);
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
     protected function update() {
         global $WT_TREE;
     
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
     
             $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
@@ -66,7 +66,7 @@ 
         global $WT_TREE;
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init($WT_TREE);        
         $ctrl = new PageController();

Braces +3 added lines, -1 removed lines

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

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

Indentation +175 added lines, -175 removed lines

@@ -25,64 +25,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
@@ -90,53 +90,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
@@ -144,19 +144,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.
@@ -164,117 +164,117 @@ 
 	 * @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() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
-                            $toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
-                        }
-                        if(!$this->hasMap() 
-                            || is_null($this->options->getMapLevel()) 
-                            || $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() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
+							$toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
+						}
+						if(!$this->hasMap() 
+							|| is_null($this->options->getMapLevel()) 
+							|| $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 +24 added lines, -24 removed lines

@@ -164,7 +164,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();
     }
     
     /**
@@ -187,50 +187,50 @@ 
         $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() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
-                            $toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
+                        if ($this->hasMap() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
+                            $toplevelvalues = array_map('trim', explode(',', strtolower($toplevelvalue)));
                         }
-                        if(!$this->hasMap() 
+                        if (!$this->hasMap() 
                             || is_null($this->options->getMapLevel()) 
                             || $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 { 
@@ -238,15 +238,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 { 
@@ -258,10 +258,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 { 

Braces +10 added lines, -16 removed lines

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

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

Indentation +124 added lines, -124 removed lines

@@ -21,175 +21,175 @@
 	 * Name of the file containing the description of the map.
 	 * @var string $filename
 	 */
-    protected $filename;
+	protected $filename;
     
 	/**
 	 * Indicates whether the description has been loaded from the file.
 	 * @var bool $is_loaded
 	 */
-    protected $is_loaded;
+	protected $is_loaded;
     
 	/**
 	 * Description/title of the map.
 	 * @var string $description
 	 */
-    protected $description;
+	protected $description;
     
 	/**
 	 * Name(s) of the parent level(s) of the map.
 	 * @var string $is_loaded
 	 */
-    protected $top_level_name;
+	protected $top_level_name;
     
-    /**
-     * Map canvas
-     * @var OutlineMapCanvas $canvas
-     */
-    protected $canvas;
+	/**
+	 * Map canvas
+	 * @var OutlineMapCanvas $canvas
+	 */
+	protected $canvas;
     
-    /**
-     * Map subdivisions
-     * @var array $subdivisions
-     */
-    protected $subdivisions;
+	/**
+	 * Map subdivisions
+	 * @var array $subdivisions
+	 */
+	protected $subdivisions;
     
-    /**
-     * Places mappings
-     * @var array $subdivisions
-     */
-    protected $mappings;
+	/**
+	 * Places mappings
+	 * @var array $subdivisions
+	 */
+	protected $mappings;
     
-    /**
-     * Constructor for GeoAnalysisMap.
-     *
-     * @param string $filename Outline map file name
-     * @param bool $load Should the map be loaded immediately
-     */
-    public function __construct($filename, $load = false) {
-        $this->filename = $filename;
-        $this->is_loaded = false;
-        $this->subdivisions = array();
-        $this->mappings = array();
-        if($load) $this->load();
-    }
+	/**
+	 * Constructor for GeoAnalysisMap.
+	 *
+	 * @param string $filename Outline map file name
+	 * @param bool $load Should the map be loaded immediately
+	 */
+	public function __construct($filename, $load = false) {
+		$this->filename = $filename;
+		$this->is_loaded = false;
+		$this->subdivisions = array();
+		$this->mappings = array();
+		if($load) $this->load();
+	}
     
-    /**
-     * Load the map settings contained within its XML representation
-     *
-     * XML structure :
-     * 	- displayName : Display name of the map
-     * 	- topLevel : Values of the top level subdivisions (separated by commas, if multiple)
-     * 	- canvas : all settings related to the map canvas.
-     * 		- width : canvas width, in px
-     * 		- height : canvas height, in px
-     * 		- maxcolor : color to identify places with ancestors, RGB hexadecimal
-     * 		- hovercolor : same as previous, color when mouse is hovering the place, RGB hexadecimal
-     * 		- bgcolor : map background color, RGB hexadecimal
-     * 		- bgstroke : map stroke color, RGB hexadecimal
-     * 		- defaultcolor : default color of places, RGB hexadecimal
-     * 		- defaultstroke : default stroke color, RGB hexadecimal
-     * 	- subdvisions : for each subdivision :
+	/**
+	 * Load the map settings contained within its XML representation
+	 *
+	 * XML structure :
+	 * 	- displayName : Display name of the map
+	 * 	- topLevel : Values of the top level subdivisions (separated by commas, if multiple)
+	 * 	- canvas : all settings related to the map canvas.
+	 * 		- width : canvas width, in px
+	 * 		- height : canvas height, in px
+	 * 		- maxcolor : color to identify places with ancestors, RGB hexadecimal
+	 * 		- hovercolor : same as previous, color when mouse is hovering the place, RGB hexadecimal
+	 * 		- bgcolor : map background color, RGB hexadecimal
+	 * 		- bgstroke : map stroke color, RGB hexadecimal
+	 * 		- defaultcolor : default color of places, RGB hexadecimal
+	 * 		- defaultstroke : default stroke color, RGB hexadecimal
+	 * 	- subdvisions : for each subdivision :
 	 *		- id : Subdivision id, must be compatible with PHP variable constraints, and unique
-     * 		- name: Display name for the place
+	 * 		- name: Display name for the place
 	 *		- parent: if any, describe to which parent level the place if belonging to
-     * 		- <em>Element value<em> : SVG description of the subdvision shape
+	 * 		- <em>Element value<em> : SVG description of the subdvision shape
 	 *	- mapping : for each subdivision :
 	 *		- name : Name of the place to map
-     * 		- mapto: Name of the place to map to
+	 * 		- mapto: Name of the place to map to
 	 * 
-     */
-    protected function load() {
-        if(file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)){
-            $xml = simplexml_load_file(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename);
-            if($xml){
-                $this->description = trim($xml->displayName);
-                $this->top_level_name = trim($xml->topLevel);
-                $this->canvas = new OutlineMapCanvas(
-                    trim($xml->canvas->width),
-                    trim($xml->canvas->height), 
-                    trim($xml->canvas->maxcolor), 
-                    trim($xml->canvas->hovercolor), 
-                    trim($xml->canvas->bgcolor),
-                    trim($xml->canvas->bgstroke),
-                    trim($xml->canvas->defaultcolor), 
-                    trim($xml->canvas->defaultstroke)
-                );
-                foreach($xml->subdivisions->children() as $subdivision){
-                    $attributes = $subdivision->attributes();
-                    $key = trim($attributes['name']);
-                    if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
-                    $this->subdivisions[$key] = array(
-                        'id' => trim($attributes['id']),
-                        'displayname' => trim($attributes['name']),
-                        'coord' => trim($subdivision[0])
-                    );
-                }
-                if(isset($xml->mappings)) {
-                    foreach($xml->mappings->children() as $mappings){
-                        $attributes = $mappings->attributes();
-                        $this->mappings[trim($attributes['name'])] = trim($attributes['mapto']);
-                    }
-                }
-                $this->is_loaded = true;
-                return;
-            }
-        }        
-        throw new \Exception('The Outline Map could not be loaded from XML.');
-    }
+	 */
+	protected function load() {
+		if(file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)){
+			$xml = simplexml_load_file(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename);
+			if($xml){
+				$this->description = trim($xml->displayName);
+				$this->top_level_name = trim($xml->topLevel);
+				$this->canvas = new OutlineMapCanvas(
+					trim($xml->canvas->width),
+					trim($xml->canvas->height), 
+					trim($xml->canvas->maxcolor), 
+					trim($xml->canvas->hovercolor), 
+					trim($xml->canvas->bgcolor),
+					trim($xml->canvas->bgstroke),
+					trim($xml->canvas->defaultcolor), 
+					trim($xml->canvas->defaultstroke)
+				);
+				foreach($xml->subdivisions->children() as $subdivision){
+					$attributes = $subdivision->attributes();
+					$key = trim($attributes['name']);
+					if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
+					$this->subdivisions[$key] = array(
+						'id' => trim($attributes['id']),
+						'displayname' => trim($attributes['name']),
+						'coord' => trim($subdivision[0])
+					);
+				}
+				if(isset($xml->mappings)) {
+					foreach($xml->mappings->children() as $mappings){
+						$attributes = $mappings->attributes();
+						$this->mappings[trim($attributes['name'])] = trim($attributes['mapto']);
+					}
+				}
+				$this->is_loaded = true;
+				return;
+			}
+		}        
+		throw new \Exception('The Outline Map could not be loaded from XML.');
+	}
     
 	/**
 	 * Get the map file name.
 	 * @return string
 	 */
-    public function getFileName() {
-        if(!$this->is_loaded) $this->load();
-        return $this->filename;
-    }
+	public function getFileName() {
+		if(!$this->is_loaded) $this->load();
+		return $this->filename;
+	}
     
 	/**
 	 * Get the map file name.
 	 * @return string
 	 */
-    public function getDescription() {
-        if(!$this->is_loaded) $this->load();
-        return $this->description;
-    }
+	public function getDescription() {
+		if(!$this->is_loaded) $this->load();
+		return $this->description;
+	}
     
 	/**
 	 * Get the name of the map parent level. 
 	 * @return string
 	 */
-    public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
-        return $this->top_level_name;
-    }    
+	public function getTopLevelName() {
+		if(!$this->is_loaded) $this->load();
+		return $this->top_level_name;
+	}    
     
-    /**
-     * Get the Outline Map canvas.
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
-     */
-    public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
-        return $this->canvas;
-    }
+	/**
+	 * Get the Outline Map canvas.
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
+	 */
+	public function getCanvas() {
+		if(!$this->is_loaded) $this->load();
+		return $this->canvas;
+	}
     
 	/**
-     * Get the subdivisions of the map.
-     * @return array
-     */
-    public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
-        return $this->subdivisions;
-    }
+	 * Get the subdivisions of the map.
+	 * @return array
+	 */
+	public function getSubdivisions() {
+		if(!$this->is_loaded) $this->load();
+		return $this->subdivisions;
+	}
     
 	/**
-     * Get the places mappings of the map.
-     * @return array
-     */
-    public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
-        return $this->mappings;
-    }
+	 * Get the places mappings of the map.
+	 * @return array
+	 */
+	public function getPlacesMappings() {
+		if(!$this->is_loaded) $this->load();
+		return $this->mappings;
+	}
                    
 }
  
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -70,7 +70,7 @@ 
         $this->is_loaded = false;
         $this->subdivisions = array();
         $this->mappings = array();
-        if($load) $this->load();
+        if ($load) $this->load();
     }
     
     /**
@@ -99,9 +99,9 @@ 
 	 * 
      */
     protected function load() {
-        if(file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)){
+        if (file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)) {
             $xml = simplexml_load_file(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename);
-            if($xml){
+            if ($xml) {
                 $this->description = trim($xml->displayName);
                 $this->top_level_name = trim($xml->topLevel);
                 $this->canvas = new OutlineMapCanvas(
@@ -114,18 +114,18 @@ 
                     trim($xml->canvas->defaultcolor), 
                     trim($xml->canvas->defaultstroke)
                 );
-                foreach($xml->subdivisions->children() as $subdivision){
+                foreach ($xml->subdivisions->children() as $subdivision) {
                     $attributes = $subdivision->attributes();
                     $key = trim($attributes['name']);
-                    if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
+                    if (isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
                     $this->subdivisions[$key] = array(
                         'id' => trim($attributes['id']),
                         'displayname' => trim($attributes['name']),
                         'coord' => trim($subdivision[0])
                     );
                 }
-                if(isset($xml->mappings)) {
-                    foreach($xml->mappings->children() as $mappings){
+                if (isset($xml->mappings)) {
+                    foreach ($xml->mappings->children() as $mappings) {
                         $attributes = $mappings->attributes();
                         $this->mappings[trim($attributes['name'])] = trim($attributes['mapto']);
                     }
@@ -142,7 +142,7 @@ 
 	 * @return string
 	 */
     public function getFileName() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->filename;
     }
     
@@ -151,7 +151,7 @@ 
 	 * @return string
 	 */
     public function getDescription() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->description;
     }
     
@@ -160,7 +160,7 @@ 
 	 * @return string
 	 */
     public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->top_level_name;
     }    
     
@@ -169,7 +169,7 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
      */
     public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->canvas;
     }
     
@@ -178,7 +178,7 @@ 
      * @return array
      */
     public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->subdivisions;
     }
     
@@ -187,7 +187,7 @@ 
      * @return array
      */
     public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->mappings;
     }
                    

Braces +24 added lines, -8 removed lines

@@ -70,7 +70,9 @@ 
         $this->is_loaded = false;
         $this->subdivisions = array();
         $this->mappings = array();
-        if($load) $this->load();
+        if($load) {
+        	$this->load();
+        }
     }
     
     /**
@@ -117,7 +119,9 @@ 
                 foreach($xml->subdivisions->children() as $subdivision){
                     $attributes = $subdivision->attributes();
                     $key = trim($attributes['name']);
-                    if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
+                    if(isset($attributes['parent'])) {
+                    	$key .= '@'.trim($attributes['parent']);
+                    }
                     $this->subdivisions[$key] = array(
                         'id' => trim($attributes['id']),
                         'displayname' => trim($attributes['name']),
@@ -142,7 +146,9 @@ 
 	 * @return string
 	 */
     public function getFileName() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->filename;
     }
     
@@ -151,7 +157,9 @@ 
 	 * @return string
 	 */
     public function getDescription() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->description;
     }
     
@@ -160,7 +168,9 @@ 
 	 * @return string
 	 */
     public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->top_level_name;
     }    
     
@@ -169,7 +179,9 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
      */
     public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->canvas;
     }
     
@@ -178,7 +190,9 @@ 
      * @return array
      */
     public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->subdivisions;
     }
     
@@ -187,7 +201,9 @@ 
      * @return array
      */
     public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
+        if(!$this->is_loaded) {
+        	$this->load();
+        }
         return $this->mappings;
     }
                    

src/Webtrees/Module/GeoDispersion/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'
 		);
 	}
 }