jon48 / webtrees-lib

src/Webtrees/Module/Sosa/SosaConfigController.php

Indentation +108 added lines, -108 removed lines

@@ -30,63 +30,63 @@ 
  */
 class SosaConfigController extends MvcController
 {      
-    /**
-     * Check if the user can update the sosa ancestors list
-     * 
-     * @return bool
-     */
-    protected function canUpdate() {        
-        $user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
-        return Auth::check() && 
-            ( 
-                $user_id == Auth::user()->getUserId() ||        // Allow update for yourself
-                ($user_id == -1 && Auth::isManager(Globals::getTree()))   // Allow a manager to update the default user
-             );
-    }
+	/**
+	 * Check if the user can update the sosa ancestors list
+	 * 
+	 * @return bool
+	 */
+	protected function canUpdate() {        
+		$user_id = Filter::postInteger('userid', -1) ?: Filter::getInteger('userid', -1);
+		return Auth::check() && 
+			( 
+				$user_id == Auth::user()->getUserId() ||        // Allow update for yourself
+				($user_id == -1 && Auth::isManager(Globals::getTree()))   // Allow a manager to update the default user
+			 );
+	}
     
-    /**
-     * Saves Sosa's user preferences (root individual for the user).
-     * 
-     * @param BaseController $controller
-     * @return bool True is saving successfull
-     */
-    protected function update(BaseController $controller) {
-        $wt_tree = Globals::getTree();
-        if($this->canUpdate() && Filter::checkCsrf()) 
-        {            
-            $indi = Individual::getInstance(Filter::post('rootid'), $wt_tree);
-            $user = User::find(Filter::postInteger('userid', -1));
+	/**
+	 * Saves Sosa's user preferences (root individual for the user).
+	 * 
+	 * @param BaseController $controller
+	 * @return bool True is saving successfull
+	 */
+	protected function update(BaseController $controller) {
+		$wt_tree = Globals::getTree();
+		if($this->canUpdate() && Filter::checkCsrf()) 
+		{            
+			$indi = Individual::getInstance(Filter::post('rootid'), $wt_tree);
+			$user = User::find(Filter::postInteger('userid', -1));
             
-            if($user  && $indi) {
-                $wt_tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
-                $controller->addInlineJavascript('
+			if($user  && $indi) {
+				$wt_tree->setUserPreference($user, 'MAJ_SOSA_ROOT_ID', $indi->getXref());
+				$controller->addInlineJavascript('
                     $( document ).ready(function() {
                         majComputeSosa('.$user->getUserId().');
                     });');
-                FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
-                return true;
-            }
-        }
-        FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
-        return false;
-    }
+				FlashMessages::addMessage(I18N::translate('The preferences have been updated.'));
+				return true;
+			}
+		}
+		FlashMessages::addMessage(I18N::translate('An error occurred while saving data...'), 'danger');
+		return false;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaConfig@index
-     */
-    public function index() {
-        $wt_tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Sosa Configuration'))
-        ->restrictAccess(Auth::check())
-        ->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
-        ->addInlineJavascript('autocomplete();')
-        ->addInlineJavascript('
+	/**
+	 * SosaConfig@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Sosa Configuration'))
+		->restrictAccess(Auth::check())
+		->addExternalJavascript(WT_AUTOCOMPLETE_JS_URL)
+		->addInlineJavascript('autocomplete();')
+		->addInlineJavascript('
             $( document ).ready(function() {
                 $("#bt_sosa_compute").click(function() {
                     majComputeSosa($("#maj_sosa_input_userid, #maj-sosa-config-select option:selected").val());
@@ -103,80 +103,80 @@ 
                   });
             }');
         
-        $action = Filter::post('action');
-        if($action === 'update') $this->update($controller);
+		$action = Filter::post('action');
+		if($action === 'update') $this->update($controller);
         
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('tree', $wt_tree);
-        $view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$wt_tree->getNameUrl());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('tree', $wt_tree);
+		$view_bag->set('form_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaConfig&ged='.$wt_tree->getNameUrl());
         
-        $users_root = array();
-        $users_js_array = 'var users_array = [];';
-        if(Auth::check()) {
-            $root_id = $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
-            $users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
-            $users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
+		$users_root = array();
+		$users_js_array = 'var users_array = [];';
+		if(Auth::check()) {
+			$root_id = $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID');
+			$users_root[] = array( 'user' => Auth::user(), 'rootid' => $root_id);
+			$users_js_array .=  'users_array["'.Auth::user()->getUserId().'"] = "' . $root_id . '";';
             
-            if(Auth::isManager($wt_tree)) {
-                $default_user = User::find(-1);
-                $default_root_id = $wt_tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
-                $users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
-                $users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
-            }
-        }
-        $view_bag->set('users_settings', $users_root);       
+			if(Auth::isManager($wt_tree)) {
+				$default_user = User::find(-1);
+				$default_root_id = $wt_tree->getUserPreference($default_user, 'MAJ_SOSA_ROOT_ID');
+				$users_root[] = array( 'user' => $default_user, 'rootid' => $default_root_id);
+				$users_js_array .=  'users_array["'.$default_user->getUserId().'"] = "' . $default_root_id . '";';
+			}
+		}
+		$view_bag->set('users_settings', $users_root);       
         
-        $controller->addInlineJavascript($users_js_array . '            
+		$controller->addInlineJavascript($users_js_array . '            
                 $("#maj-sosa-config-select").change(function() {
                     $("#rootid").val(users_array[this.value]);
                 });
              ');
         
-        ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaConfig', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * SosaConfig@computeAll
-     */
-    public function computeAll() {        
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+	/**
+	 * SosaConfig@computeAll
+	 */
+	public function computeAll() {        
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
         
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
         
-        $user = User::find(Filter::getInteger('userid', -1));
-        if($user) {
-            $calculator = new SosaCalculator(Globals::getTree(), $user);
-            if($calculator->computeAll()) $view_bag->set('is_success', true);
-        }
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		$user = User::find(Filter::getInteger('userid', -1));
+		if($user) {
+			$calculator = new SosaCalculator(Globals::getTree(), $user);
+			if($calculator->computeAll()) $view_bag->set('is_success', true);
+		}
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
-    /**
-     * SosaConfig@computePartial
-     */
-    public function computePartial() {
-        $wt_tree = Globals::getTree();
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->canUpdate());
+	/**
+	 * SosaConfig@computePartial
+	 */
+	public function computePartial() {
+		$wt_tree = Globals::getTree();
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->canUpdate());
     
-        $view_bag = new ViewBag();
-        $view_bag->set('is_success', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('is_success', false);
     
-        $user = User::find(Filter::getInteger('userid', -1));
-        $indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $wt_tree);
+		$user = User::find(Filter::getInteger('userid', -1));
+		$indi = Individual::getInstance(Filter::get('pid', WT_REGEX_XREF), $wt_tree);
         
-        if($user && $indi) {
-            $calculator = new SosaCalculator($wt_tree, $user);
-            if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
-        }
-        else {
-            $view_bag->set('error', I18N::translate('Non existing individual'));
-        }
+		if($user && $indi) {
+			$calculator = new SosaCalculator($wt_tree, $user);
+			if($calculator->computeFromIndividual($indi)) $view_bag->set('is_success', true);
+		}
+		else {
+			$view_bag->set('error', I18N::translate('Non existing individual'));
+		}
             
-        ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
-    }
+		ViewFactory::make('SosaComputeResult', $this, $controller, $view_bag)->render();
+	}
     
 }
\ No newline at end of file

src/Webtrees/Module/SosaModule.php

Indentation +164 added lines, -164 removed lines

@@ -32,116 +32,116 @@ 
  * Sosa Module.
  */
 class SosaModule 
-    extends AbstractModule 
-    implements  ModuleMenuInterface, 
-                ModuleConfigInterface,
-                HookSubscriberInterface,
-                IndividualHeaderExtenderInterface,
-                RecordNameTextExtenderInterface
+	extends AbstractModule 
+	implements  ModuleMenuInterface, 
+				ModuleConfigInterface,
+				HookSubscriberInterface,
+				IndividualHeaderExtenderInterface,
+				RecordNameTextExtenderInterface
 {
-    // How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
+	// How to update the database schema for this module
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_SOSA_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\Sosa\Schema';
 
-    /** @var string For custom modules - link for support, upgrades, etc. */
-    const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
-    }
-    
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/** @var string For custom modules - link for support, upgrades, etc. */
+	const CUSTOM_WEBSITE = 'https://github.com/jon48/webtrees-lib';
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Sosa” module */ I18N::translate('Sosa');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Sosa” module */ I18N::translate('Calculate and display Sosa ancestors of the root person.');
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**********
+	/**********
      * ModuleConfigInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
+	}
     
-    /**********
+	/**********
      * ModuleMenuInterface
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
-     */
-    public function defaultMenuOrder() {
-        return 5;
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
-     */
-    public function getMenu() { 
-        $wt_tree = Globals::getTree();
-        $menu = null;
-        if(ModuleManager::getInstance()->isOperational($this->getName())) {
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::defaultMenuOrder()
+	 */
+	public function defaultMenuOrder() {
+		return 5;
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleMenuInterface::getMenu()
+	 */
+	public function getMenu() { 
+		$wt_tree = Globals::getTree();
+		$menu = null;
+		if(ModuleManager::getInstance()->isOperational($this->getName())) {
             
-            $root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $wt_tree->getNameUrl() . '&';
-            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
+			$root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $wt_tree->getNameUrl() . '&';
+			$sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
             
-            $menu = clone $sosa_stat_menu;
-            $menu->setClass('menu-maj-sosa');
+			$menu = clone $sosa_stat_menu;
+			$menu->setClass('menu-maj-sosa');
             
-            $submenus = array_filter(array(
-                new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
-                new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
-                $sosa_stat_menu                
-            ));
+			$submenus = array_filter(array(
+				new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
+				new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
+				$sosa_stat_menu                
+			));
             
 
-            if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
-                && $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
-                )
-            {
-                if(count($ga_list) > 0) {
-                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $wt_tree->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
-                }
-            }
+			if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_GEODISP_NAME)
+				&& $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
+				)
+			{
+				if(count($ga_list) > 0) {
+					$submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $wt_tree->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
+				}
+			}
             
-            if(Auth::check()) {
-                $submenus[] = new Menu(
-                    I18N::translate('Sosa Configuration'),
-                    $this->getConfigLink(),
-                    'menu-maj-sosa-configuration',
-                    array('rel' => 'nofollow'));
-            }
+			if(Auth::check()) {
+				$submenus[] = new Menu(
+					I18N::translate('Sosa Configuration'),
+					$this->getConfigLink(),
+					'menu-maj-sosa-configuration',
+					array('rel' => 'nofollow'));
+			}
                         
-            //-- recompute Sosa submenu
-            $controller = Globals::getController();
-            if (!empty($controller) && $controller instanceof IndividualController 
-                && Auth::check() && $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
-                ) {
-                $controller
-                    ->addInlineJavascript('
+			//-- recompute Sosa submenu
+			$controller = Globals::getController();
+			if (!empty($controller) && $controller instanceof IndividualController 
+				&& Auth::check() && $wt_tree->getUserPreference(Auth::user(), 'MAJ_SOSA_ROOT_ID')
+				) {
+				$controller
+					->addInlineJavascript('
                         function majComputeSosaFromIndi(){
                             if($("#computesosadlg").length == 0) {
                                 $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation') .'\"><div id=\"sosaloadingarea\"></div></div>");
@@ -164,87 +164,87 @@ 
 	                         });	
                         }');
                 	
-                $submenus[] = new Menu(
-                    I18N::translate('Complete Sosas'), 
-                    '#', 
-                    'menu-maj-sosa-recompute', 
-                    array(
-                        'rel' => 'nofollow',
-                        'onclick' => 'return majComputeSosaFromIndi();'
-                    ));
-            }
+				$submenus[] = new Menu(
+					I18N::translate('Complete Sosas'), 
+					'#', 
+					'menu-maj-sosa-recompute', 
+					array(
+						'rel' => 'nofollow',
+						'onclick' => 'return majComputeSosaFromIndi();'
+					));
+			}
             
-        }
+		}
         
-        $menu->setSubmenus($submenus);
+		$menu->setSubmenus($submenus);
         
-        return $menu;
+		return $menu;
         
-    }
+	}
     
-    /**********
+	/**********
      * Hooks
      **********/
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */    
-    public function getSubscribedHooks() {
-        return array(
-            'hExtendIndiHeaderIcons' => 20,
-            'hExtendIndiHeaderRight' => 20,
-            'hRecordNameAppend' => 20
-        );
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
-     */
-    public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
-     */
-    public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
-     */
-    public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
-            $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
-     */
-    public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
-        if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
-            $dindi = new Individual($grec);
-            return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, $size);
-        }
-        return '';
-    }
-    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
-     */
-    public function hRecordNamePrepend(GedcomRecord $grec, $size) {}
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */    
+	public function getSubscribedHooks() {
+		return array(
+			'hExtendIndiHeaderIcons' => 20,
+			'hExtendIndiHeaderRight' => 20,
+			'hRecordNameAppend' => 20
+		);
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
+	 */
+	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderLeft()
+	 */
+	public function hExtendIndiHeaderLeft(IndividualController $ctrlIndi) { }
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
+	 */
+	public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
+	 */
+	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
+		if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
+			$dindi = new Individual($grec);
+			return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, $size);
+		}
+		return '';
+	}
+    
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
+	 */
+	public function hRecordNamePrepend(GedcomRecord $grec, $size) {}
     
     
     

src/Webtrees/Module/Hooks/AdminConfigController.php

Indentation +73 added lines, -73 removed lines

@@ -30,87 +30,87 @@ 
  */
 class AdminConfigController extends MvcController
 {
-    /**
-     * Manage updates sent from the AdminConfig@index form.
-     */
-    protected function update() {
-        if(Auth::isAdmin()){
-            $ihooks = HookProvider::getInstance()->getInstalledHooks();
+	/**
+	 * Manage updates sent from the AdminConfig@index form.
+	 */
+	protected function update() {
+		if(Auth::isAdmin()){
+			$ihooks = HookProvider::getInstance()->getInstalledHooks();
             	
-            $module_names= Database::prepare(
-                "SELECT module_name FROM `##module` WHERE status='disabled'"
-            )->fetchOneColumn();
+			$module_names= Database::prepare(
+				"SELECT module_name FROM `##module` WHERE status='disabled'"
+			)->fetchOneColumn();
             	
-            if($ihooks !== null){
-                foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
-                        $array_hook = explode('#', $ihook);
-                        //Update status
-                        $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
-                        $previous_status = $params['status'];
-                        if ($new_status !== null) {
-                            $new_status= $new_status ? 'enabled' : 'disabled';
-                            if($new_status != $previous_status){
-                                $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
-                                    case 'enabled':
-                                        $chook->enable($array_hook[0]);
-                                        break;
-                                    case 'disabled':
-                                        $chook->disable($array_hook[0]);
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                        }
+			if($ihooks !== null){
+				foreach ($ihooks as $ihook => $params) {
+					if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+						$array_hook = explode('#', $ihook);
+						//Update status
+						$new_status= Filter::postBool('status-' . $params['id']);
+						if(in_array($array_hook[0], $module_names)) $new_status = false;
+						$previous_status = $params['status'];
+						if ($new_status !== null) {
+							$new_status= $new_status ? 'enabled' : 'disabled';
+							if($new_status != $previous_status){
+								$chook = new Hook($array_hook[1], $array_hook[2]);
+								switch($new_status){
+									case 'enabled':
+										$chook->enable($array_hook[0]);
+										break;
+									case 'disabled':
+										$chook->disable($array_hook[0]);
+										break;
+									default:
+										break;
+								}
+							}
+						}
                         
-                        //Update priority
-                        $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
-                        $previous_priority = $params['priority'];
-                        if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
-                                $chook = new Hook($array_hook[1], $array_hook[2]);
-                                $chook->setPriority($array_hook[0], $new_priority);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
+						//Update priority
+						$new_priority = Filter::postInteger("moduleorder-{$params['id']}");
+						$previous_priority = $params['priority'];
+						if ($new_priority !== null) {
+							if($new_priority != $previous_priority){
+								$chook = new Hook($array_hook[1], $array_hook[2]);
+								$chook->setPriority($array_hook[0], $new_priority);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {            
-        HookProvider::getInstance()->updateHooks();
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {            
+		HookProvider::getInstance()->updateHooks();
         
-        $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(Globals::getTree());        
-        $ctrl = new PageController();
-        $ctrl
-            ->restrictAccess(Auth::isAdmin())
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
+		$ctrl = new PageController();
+		$ctrl
+			->restrictAccess(Auth::isAdmin())
+			->setPageTitle($this->module->getTitle());
         
-        $table_id = 'table-installedhooks-' . Uuid::uuid4();
+		$table_id = 'table-installedhooks-' . Uuid::uuid4();
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $ctrl->getPageTitle());
-        $view_bag->set('table_id', $table_id);
-        $view_bag->set('hook_list', HookProvider::getInstance()->getRawInstalledHooks());
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $ctrl->getPageTitle());
+		$view_bag->set('table_id', $table_id);
+		$view_bag->set('hook_list', HookProvider::getInstance()->getRawInstalledHooks());
         
-        $ctrl
-        ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-        ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-        ->addInlineJavascript('
+		$ctrl
+		->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+		->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+		->addInlineJavascript('
 		  	jQuery(document).ready(function() {
 				jQuery("#'.$table_id.'").dataTable( {
 					'.I18N::datatablesI18N().',		
@@ -130,7 +130,7 @@ 
 			});
 		');
         
-        ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $ctrl, $view_bag)->render();
+	}
         
 }
\ No newline at end of file

src/Webtrees/Module/MiscExtensionsModule.php

Indentation +72 added lines, -72 removed lines

@@ -32,49 +32,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
 		);
 	}
 	
@@ -89,22 +89,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);	    
 	}
 	
 	/**
@@ -118,13 +118,13 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\PageHeaderExtenderInterface::hPrintHeader()
 	 */
 	public function hPrintHeader() {
-	    $html = '';
-	    if($this->getSetting('MAJ_ADD_HTML_HEADER', 0) == 1){
-	        if(Auth::accessLevel(Globals::getTree()) >= $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(Globals::getTree()) >= $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() {
-	    $wt_tree = Globals::getTree();
-	    $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>';
-	    }
+		$wt_tree = Globals::getTree();
+		$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/GeoDispersionModule.php

Indentation +58 added lines, -58 removed lines

@@ -25,86 +25,86 @@
 class GeoDispersionModule extends AbstractModule implements ModuleConfigInterface, DependentInterface {
     
 	// How to update the database schema for this module
-    const SCHEMA_TARGET_VERSION   = 1;
-    const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
-    const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema';
+	const SCHEMA_TARGET_VERSION   = 1;
+	const SCHEMA_SETTING_NAME     = 'MAJ_GEODISP_SCHEMA_VERSION';
+	const SCHEMA_MIGRATION_PREFIX = '\MyArtJaub\Webtrees\Module\GeoDispersion\Schema';
     
-    /** @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';
         
-    /**
-     * GeoDispersion analysis provider
-     * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider
-     */
-    protected $provider;
+	/**
+	 * GeoDispersion analysis provider
+	 * @var \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Hooks” module */ I18N::translate('Geographical Dispersion');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Hooks” module */ I18N::translate('Display the geographical dispersion of the root person’s Sosa ancestors.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
-     */
-    public function validatePrerequisites() {
-        try {
-            Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\DependentInterface::validatePrerequisites()
+	 */
+	public function validatePrerequisites() {
+		try {
+			Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
             
-            return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
-        }
-        catch (\Exception $ex) {  }
-        return false;
-    }
+			return !is_null(Module::getModuleByName(Constants::MODULE_MAJ_SOSA_NAME));
+		}
+		catch (\Exception $ex) {  }
+		return false;
+	}
     
 	/**
 	 * Get the GeoAnalysis Provider (initialise it if not done yet).
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function getProvider() {
-        if(!$this->provider) {
-            $this->provider = new GeoAnalysisProvider(Globals::getTree());
-        }
-        return $this->provider;
-    }
+	public function getProvider() {
+		if(!$this->provider) {
+			$this->provider = new GeoAnalysisProvider(Globals::getTree());
+		}
+		return $this->provider;
+	}
 	
 	/**
 	 * Set the GeoAnalysis Provider.
 	 *
 	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoAnalysisProvider
 	 */
-    public function setProvider(GeoAnalysisProvider $provider) {
-        $this->provider = $provider;
-    }
+	public function setProvider(GeoAnalysisProvider $provider) {
+		$this->provider = $provider;
+	}
     
 
 }

src/Webtrees/Module/Sosa/SosaListController.php

Indentation +270 added lines, -270 removed lines

@@ -37,67 +37,67 @@ 
  */
 class SosaListController extends MvcController
 {
-    /**
-     * Sosa Provider for the controller
-     * @var SosaProvider $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the controller
+	 * @var SosaProvider $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Generation used for the controller
-     * @var int $generation
-     */
-    protected $generation;
+	/**
+	 * Generation used for the controller
+	 * @var int $generation
+	 */
+	protected $generation;
     
-    /**
-     * ViewBag to hold data for the controller
-     * @var ViewBag $view_bag
-     */
-    protected $view_bag;
+	/**
+	 * ViewBag to hold data for the controller
+	 * @var ViewBag $view_bag
+	 */
+	protected $view_bag;
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
 
-        $this->sosa_provider = new SosaProvider(Globals::getTree(), Auth::user());
+		$this->sosa_provider = new SosaProvider(Globals::getTree(), Auth::user());
 
-        $this->generation = Filter::getInteger('gen');
+		$this->generation = Filter::getInteger('gen');
         
-        $this->view_bag = new ViewBag();
-        $this->view_bag->set('generation', $this->generation);
-        $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+		$this->view_bag = new ViewBag();
+		$this->view_bag->set('generation', $this->generation);
+		$this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
+		$this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
         
-    }
+	}
     
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaList@index
-     */
-    public function index() {
-        $wt_tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Sosa Ancestors'));            
+	/**
+	 * SosaList@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Sosa Ancestors'));            
 
-        $this->view_bag->set('title', $controller->getPageTitle());
+		$this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
-            $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
-            $this->view_bag->set('url_module', $this->module->getName());
-            $this->view_bag->set('url_action', 'SosaList');
-            $this->view_bag->set('url_ged', $wt_tree->getNameUrl()); 
-            $this->view_bag->set('min_gen', 1);
+		if($this->view_bag->get('is_setup', false)) {
+			$this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
+			$this->view_bag->set('url_module', $this->module->getName());
+			$this->view_bag->set('url_action', 'SosaList');
+			$this->view_bag->set('url_ged', $wt_tree->getNameUrl()); 
+			$this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
-                $controller->addInlineJavascript('
+			if($this->view_bag->get('has_sosa', false)) {            
+				$controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
                 
@@ -151,43 +151,43 @@ 
             		);
                 
             	');            
-            }
-        }
+			}
+		}
                 
-        ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render();   
-    }    
+		ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render();   
+	}    
     
 
-    /**
-     * SosaList@missing
-     */
-    public function missing() {
-        $wt_tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Missing Ancestors'));
+	/**
+	 * SosaList@missing
+	 */
+	public function missing() {
+		$wt_tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Missing Ancestors'));
         
-        $this->view_bag->set('title', $controller->getPageTitle());
+		$this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
-            $this->view_bag->set('url_module', $this->module->getName());
-            $this->view_bag->set('url_action', 'SosaList@missing');
-            $this->view_bag->set('url_ged', $wt_tree->getNameUrl());
-            $this->view_bag->set('min_gen', 2);
+		if($this->view_bag->get('is_setup', false)) {
+			$this->view_bag->set('url_module', $this->module->getName());
+			$this->view_bag->set('url_action', 'SosaList@missing');
+			$this->view_bag->set('url_ged', $wt_tree->getNameUrl());
+			$this->view_bag->set('min_gen', 2);
             
-            $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
-            $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
+			$missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
+			$this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
-            $this->view_bag->set('perc_sosa', $perc_sosa);
+			$perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+			$this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
-                $this->view_bag->set('table_id', $table_id);
+			if($this->view_bag->get('has_missing', false)) {
+				$table_id = 'table-sosa-missing-' . Uuid::uuid4();
+				$this->view_bag->set('table_id', $table_id);
                 
-                $controller
-                ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-                ->addInlineJavascript('
+				$controller
+				->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+				->addInlineJavascript('
 				    jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				    jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                     
@@ -239,76 +239,76 @@ 
     				jQuery(".loading-image").css("display", "none");
     			');
                         
-                $unique_indis = array();
-                $sum_missing_different = 0;
-                $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
-                        unset($missing_list[$num]);
-                        continue;
-                    }
-                    $sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
-                    $person = Individual::getInstance($missing_tab['indi'], $wt_tree);
-                    if (!$person || !$person->canShowName()) {
-                        unset($missing_list[$num]);
-                        continue;
-                    }  
-                    $sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
-                    $unique_indis[$person->getXref()] = true;
-                    $missing_tab['indi'] = $person;
-                    $missing_list[$num] = $missing_tab;
-                }
-                $this->view_bag->set('missing_list', $missing_list);
-                $this->view_bag->set('missing_diff_count', $sum_missing_different);
-                $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
-                $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
-            }            
-        }
+				$unique_indis = array();
+				$sum_missing_different = 0;
+				$sum_missing_different_without_hidden = 0;
+				foreach($missing_list as $num => $missing_tab) {
+					if(isset($unique_indis[$missing_tab['indi']])) {
+						unset($missing_list[$num]);
+						continue;
+					}
+					$sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
+					$person = Individual::getInstance($missing_tab['indi'], $wt_tree);
+					if (!$person || !$person->canShowName()) {
+						unset($missing_list[$num]);
+						continue;
+					}  
+					$sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
+					$unique_indis[$person->getXref()] = true;
+					$missing_tab['indi'] = $person;
+					$missing_list[$num] = $missing_tab;
+				}
+				$this->view_bag->set('missing_list', $missing_list);
+				$this->view_bag->set('missing_diff_count', $sum_missing_different);
+				$this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
+				$perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+				$this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
+			}            
+		}
         
-        ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render();
-    }
+		ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render();
+	}
     
-    /**
-     * SosaList@sosalist
-     */
-    public function sosalist() {
+	/**
+	 * SosaList@sosalist
+	 */
+	public function sosalist() {
                 
-        $type = Filter::get('type', 'indi|fam', null);
+		$type = Filter::get('type', 'indi|fam', null);
         
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->generation > 0 || !is_null($type));
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
-            case 'indi':
-                $this->renderSosaListIndi($controller);
-                break;
-            case 'fam':
-                $this->renderFamSosaListIndi($controller);
-                break;
-            default:
-                break;
-        }
+		switch ($type){
+			case 'indi':
+				$this->renderSosaListIndi($controller);
+				break;
+			case 'fam':
+				$this->renderFamSosaListIndi($controller);
+				break;
+			default:
+				break;
+		}
 
-    }
+	}
     
-    /**
-     * Render the Ajax response for the sortable table of Sosa individuals
-     * @param AjaxController $controller
-     */
-    protected function renderSosaListIndi(AjaxController $controller) {
-        $wt_tree = Globals::getTree();
-        $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
-        $this->view_bag->set('has_sosa', false);
+	/**
+	 * Render the Ajax response for the sortable table of Sosa individuals
+	 * @param AjaxController $controller
+	 */
+	protected function renderSosaListIndi(AjaxController $controller) {
+		$wt_tree = Globals::getTree();
+		$listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
+		$this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
-            $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
-            $this->view_bag->set('table_id', $table_id);
+		if(count($listSosa) > 0) {
+			$this->view_bag->set('has_sosa', true);
+			$table_id = 'table-sosa-indi-' . Uuid::uuid4();
+			$this->view_bag->set('table_id', $table_id);
                      
-            $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addInlineJavascript('
+			$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addInlineJavascript('
                 jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
                 jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -375,95 +375,95 @@ 
 				jQuery("#btn-toggle-statistics-'.$table_id.'").click();
            ');
             
-            $stats = new Stats($wt_tree);         
+			$stats = new Stats($wt_tree);         
             
-            // Bad data can cause "longest life" to be huge, blowing memory limits
-            $max_age = min($wt_tree->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1;
-            // Inititialise chart data
-            $deat_by_age = array();
-            for ($age = 0; $age <= $max_age; $age++) {
-                $deat_by_age[$age] = '';
-            }
-            $birt_by_decade = array();
-            $deat_by_decade = array();
-            for ($year = 1550; $year < 2030; $year += 10) {
-                $birt_by_decade[$year] = '';
-                $deat_by_decade[$year] = '';
-            }
+			// Bad data can cause "longest life" to be huge, blowing memory limits
+			$max_age = min($wt_tree->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1;
+			// Inititialise chart data
+			$deat_by_age = array();
+			for ($age = 0; $age <= $max_age; $age++) {
+				$deat_by_age[$age] = '';
+			}
+			$birt_by_decade = array();
+			$deat_by_decade = array();
+			for ($year = 1550; $year < 2030; $year += 10) {
+				$birt_by_decade[$year] = '';
+				$deat_by_decade[$year] = '';
+			}
             
-            $unique_indis = array(); // Don't double-count indis with multiple names.
-            $nb_displayed = 0;
+			$unique_indis = array(); // Don't double-count indis with multiple names.
+			$nb_displayed = 0;
             
-            Individual::load($wt_tree, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
-                $person = Individual::getInstance($pid, $wt_tree);
-                if (!$person || !$person->canShowName()) {
-                    unset($listSosa[$sosa]);
-                    continue;
-                }
-                $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
-                    if (
-                        FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
-                        !isset($unique_indis[$person->getXref()])
-                        ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
-                    }
-                }
-                else {
-                    $birth_dates[0]=new Date('');
-                }
-                if ($death_dates = $person->getAllDeathDates()) {
-                    if (
-                        FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
-                        !isset($unique_indis[$person->getXref()])
-                        ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
-                    }
-                }
-                else {
-                    $death_dates[0] = new Date('');
-                }
-                $age = Date::getAge($birth_dates[0], $death_dates[0], 0);
-                if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) {
-                    $deat_by_age[$age] .= $person->getSex();
-                }
-                $listSosa[$sosa] = $person;
-                $unique_indis[$person->getXref()] = true;
-            }
-            $this->view_bag->set('sosa_list', $listSosa);   
+			Individual::load($wt_tree, $listSosa);
+			foreach($listSosa as $sosa => $pid) {
+				$person = Individual::getInstance($pid, $wt_tree);
+				if (!$person || !$person->canShowName()) {
+					unset($listSosa[$sosa]);
+					continue;
+				}
+				$nb_displayed++;
+				if ($birth_dates=$person->getAllBirthDates()) {
+					if (
+						FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
+						!isset($unique_indis[$person->getXref()])
+						) {
+						$birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+					}
+				}
+				else {
+					$birth_dates[0]=new Date('');
+				}
+				if ($death_dates = $person->getAllDeathDates()) {
+					if (
+						FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
+						!isset($unique_indis[$person->getXref()])
+						) {
+						$deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+					}
+				}
+				else {
+					$death_dates[0] = new Date('');
+				}
+				$age = Date::getAge($birth_dates[0], $death_dates[0], 0);
+				if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) {
+					$deat_by_age[$age] .= $person->getSex();
+				}
+				$listSosa[$sosa] = $person;
+				$unique_indis[$person->getXref()] = true;
+			}
+			$this->view_bag->set('sosa_list', $listSosa);   
             
-            $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
-            $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
+			$this->view_bag->set('sosa_count', count($listSosa));
+			$this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+			$this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
-            $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
+			$this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
             
-            $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
-            $this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death')));
-            $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year')));
-        }
+			$this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
+			$this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death')));
+			$this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year')));
+		}
         
-        ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render();        
-    }
+		ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render();        
+	}
     
-    /**
-     * Render the Ajax response for the sortable table of Sosa family
-     * @param AjaxController $controller
-     */
-    protected function renderFamSosaListIndi(AjaxController $controller) {
-        $wt_tree = Globals::getTree();
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
-        $this->view_bag->set('has_sosa', false);
+	/**
+	 * Render the Ajax response for the sortable table of Sosa family
+	 * @param AjaxController $controller
+	 */
+	protected function renderFamSosaListIndi(AjaxController $controller) {
+		$wt_tree = Globals::getTree();
+		$listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+		$this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
-            $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
-            $this->view_bag->set('table_id', $table_id);
+		if(count($listFamSosa) > 0) {
+			$this->view_bag->set('has_sosa', true);
+			$table_id = 'table-sosa-fam-' . Uuid::uuid4();
+			$this->view_bag->set('table_id', $table_id);
              
-            $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addInlineJavascript('
+			$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -527,67 +527,67 @@ 
 				jQuery("#btn-toggle-statistics-'.$table_id.'").click();
            ');
         
-            $stats = new Stats($wt_tree);        
-            $max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1;
+			$stats = new Stats($wt_tree);        
+			$max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1;
             
-            //-- init chart data
-    		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
-    			$marr_by_age[$age] = '';
-    		}
-    		$birt_by_decade = array();
-    		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
-    			$birt_by_decade[$year] = '';
-    			$marr_by_decade[$year] = '';
-    		}
+			//-- init chart data
+			$marr_by_age = array();
+			for ($age=0; $age<=$max_age; $age++) {
+				$marr_by_age[$age] = '';
+			}
+			$birt_by_decade = array();
+			$marr_by_decade = array();
+			for ($year=1550; $year<2030; $year+=10) {
+				$birt_by_decade[$year] = '';
+				$marr_by_decade[$year] = '';
+			}
     		
-            foreach($listFamSosa as $sosa => $fid) {
-                $sfamily = Family::getInstance($fid, $wt_tree);
-                if(!$sfamily || !$sfamily->canShow()) {
-                    unset($listFamSosa[$sosa]);
-                    continue;
-                }
-                $mdate=$sfamily->getMarriageDate();
+			foreach($listFamSosa as $sosa => $fid) {
+				$sfamily = Family::getInstance($fid, $wt_tree);
+				if(!$sfamily || !$sfamily->canShow()) {
+					unset($listFamSosa[$sosa]);
+					continue;
+				}
+				$mdate=$sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
-                    ($hdate = $husb->getBirthDate()) && 
-                    $hdate->isOK() && $mdate->isOK()) {
-                    if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
-                    }
-                    $hage = Date::getAge($hdate, $mdate, 0);
-                    if ($hage >= 0 && $hage <= $max_age) {
-                        $marr_by_age[$hage] .= $husb->getSex();
-                    }
-                }
+				if( ($husb = $sfamily->getHusband()) && 
+					($hdate = $husb->getBirthDate()) && 
+					$hdate->isOK() && $mdate->isOK()) {
+					if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
+						$birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+					}
+					$hage = Date::getAge($hdate, $mdate, 0);
+					if ($hage >= 0 && $hage <= $max_age) {
+						$marr_by_age[$hage] .= $husb->getSex();
+					}
+				}
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
-                    $wdate->isOK() && $mdate->isOK()) {
-                    if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
-                    }
-                    $wage = Date::getAge($wdate, $mdate, 0);
-                    if ($wage >= 0 && $wage <= $max_age) {
-                        $marr_by_age[$wage] .= $wife->getSex();
-                    }
-                }                
+				if(($wife = $sfamily->getWife()) &&
+					($wdate=$wife->getBirthDate()) &&
+					$wdate->isOK() && $mdate->isOK()) {
+					if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
+						$birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+					}
+					$wage = Date::getAge($wdate, $mdate, 0);
+					if ($wage >= 0 && $wage <= $max_age) {
+						$marr_by_age[$wage] .= $wife->getSex();
+					}
+				}                
 
-                if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
-                }
+				if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
+					$marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+				}
                 
-                $listFamSosa[$sosa] = $sfamily;
-            }
-            $this->view_bag->set('sosa_list', $listFamSosa);
+				$listFamSosa[$sosa] = $sfamily;
+			}
+			$this->view_bag->set('sosa_list', $listFamSosa);
         
-            $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
-            $this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage')));
-            $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage')));
-        }
+			$this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
+			$this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage')));
+			$this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage')));
+		}
         
-        ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render();
-    }
+		ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render();
+	}
     
 }
\ No newline at end of file

src/Webtrees/GedcomRecord.php

Indentation +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-					    return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+						return '<i>'.$fact->getLabel().' '. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. \MyArtJaub\Webtrees\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
 				}
@@ -88,7 +88,7 @@ 
 	public function canDisplayIsSourced($access_level = null){
 		if(!$this->gedcomrecord->canShow($access_level)) return false;
 		if($access_level === null )
-		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+			$access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		$global_facts = Globals::getGlobalFacts();
 		if (isset($global_facts['SOUR'])) {
@@ -127,7 +127,7 @@ 
 	 * @return int Level of sources
 	 */
 	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
+		if(empty($eventslist)) return 0;
 		$isSourced=0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
 		foreach($facts as $fact){

src/Webtrees/Globals.php

Indentation +36 added lines, -36 removed lines

@@ -16,48 +16,48 @@
  */
 class Globals {
     
-    /**
-     * Get global $WT_TREE variable.
-     * 
-     * @return \Fisharebest\Webtrees\Tree
-     */
-    public static function getTree() {
-        global $WT_TREE;
+	/**
+	 * Get global $WT_TREE variable.
+	 * 
+	 * @return \Fisharebest\Webtrees\Tree
+	 */
+	public static function getTree() {
+		global $WT_TREE;
         
-        return $WT_TREE;
-    }
+		return $WT_TREE;
+	}
     
-    /**
-     * Check whether the visitor is a bot.
-     * 
-     * @return boolean
-     */
-    public static function isSearchSpider() {
-        global $SEARCH_SPIDER;
+	/**
+	 * Check whether the visitor is a bot.
+	 * 
+	 * @return boolean
+	 */
+	public static function isSearchSpider() {
+		global $SEARCH_SPIDER;
         
-        return $SEARCH_SPIDER;
-    }
+		return $SEARCH_SPIDER;
+	}
     
-    /**
-     * Get the current controller.
-     * 
-     * @return \Fisharebest\Webtrees\BaseController
-     */
-    public static function getController() {
-        global $controller;
+	/**
+	 * Get the current controller.
+	 * 
+	 * @return \Fisharebest\Webtrees\BaseController
+	 */
+	public static function getController() {
+		global $controller;
         
-        return $controller;
-    }
+		return $controller;
+	}
     
-    /**
-     * Get the global facts
-     * 
-     * @return array
-     */
-    public static function getGlobalFacts() {
-        global $global_facts;
+	/**
+	 * Get the global facts
+	 * 
+	 * @return array
+	 */
+	public static function getGlobalFacts() {
+		global $global_facts;
         
-        return $global_facts;
-    }
+		return $global_facts;
+	}
     
 }

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

Indentation +11 added lines, -11 removed lines

@@ -23,8 +23,8 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {      
-        ?>                
+	protected function renderContent() {      
+		?>                
         <div id="maj-sosa-stats-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
@@ -36,7 +36,7 @@ 
 			<?php } ?>
 			
 			<?php  if($this->data->get('is_setup')) {  
-			    $general_stats = $this->data->get('general_stats'); ?>
+				$general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
 				<div class="maj-row">
@@ -140,13 +140,13 @@ 
 			    <div class="maj-row">
 			    	<div class="label"><?= I18N::translate('%s times', I18N::number($count)); ?></div>
 			    	<div class="value"><?php 
-			    	echo implode(
-			    	    I18N::$list_separator, 
-			    	    array_map(function(Individual $indi) {
-			    	        return '<a href="'. $indi->getHtmlUrl(). '">'. $indi->getFullName() . '&nbsp;' . $indi->getSexImage() . '</a>';
-			    	    }, $indis)
-			    	);
-			    	?></div>
+					echo implode(
+						I18N::$list_separator, 
+						array_map(function(Individual $indi) {
+							return '<a href="'. $indi->getHtmlUrl(). '">'. $indi->getFullName() . '&nbsp;' . $indi->getSexImage() . '</a>';
+						}, $indis)
+					);
+					?></div>
 				</div>
 			<?php } ?>
 			</div>
@@ -162,6 +162,6 @@ 
 			<?php   } else { ?>
 			<div class="center warning"><?php echo I18N::translate('No Sosa root individual has been defined.'); ?></div>
 			<?php }     
-    }
+	}
     
 }
\ No newline at end of file