jon48 / webtrees-lib

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

src/Webtrees/Module/Sosa/SosaStatsController.php

Indentation +192 added lines, -192 removed lines

@@ -27,229 +27,229 @@
  */
 class SosaStatsController 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;
     
-    /**
-     * Constructor for SosaStatsController
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for SosaStatsController
+	 * @param 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());
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaStats@index
-     */
-    public function index() {
-        $wt_tree = Globals::getTree();
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Sosa Statistics'))
-            ->addInlineJavascript('$(".help_tooltip").tooltip();')
-        ;
+	/**
+	 * SosaStats@index
+	 */
+	public function index() {
+		$wt_tree = Globals::getTree();
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Sosa Statistics'))
+			->addInlineJavascript('$(".help_tooltip").tooltip();')
+		;
 
-        $view_bag = new ViewBag();
-        $view_bag->set('title', $controller->getPageTitle());
-        $view_bag->set('is_setup', false);
+		$view_bag = new ViewBag();
+		$view_bag->set('title', $controller->getPageTitle());
+		$view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
-            $view_bag->set('is_setup', true);
+		if($this->sosa_provider->isSetup()) {
+			$view_bag->set('is_setup', true);
             
-            $view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
+			$view_bag->set('root_indi', $this->sosa_provider->getRootIndi());
             
-            $sosaCount = $this->sosa_provider->getSosaCount();
-            $diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
+			$sosaCount = $this->sosa_provider->getSosaCount();
+			$diffSosaCount = $this->sosa_provider->getDifferentSosaCount();
             
-            $general_stats = array(
-                'sosa_count' => $sosaCount,
-                'distinct_count' => $diffSosaCount,
-                'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
-                'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
-                'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
-            );
-            $view_bag->set('general_stats', $general_stats);
+			$general_stats = array(
+				'sosa_count' => $sosaCount,
+				'distinct_count' => $diffSosaCount,
+				'sosa_rate' => Functions::safeDivision($diffSosaCount, $this->sosa_provider->getTotalIndividuals()),
+				'pedi_collapse' => 1 - Functions::safeDivision($diffSosaCount, $sosaCount),
+				'mean_gen_time' => $this->sosa_provider->getMeanGenerationTime()
+			);
+			$view_bag->set('general_stats', $general_stats);
             
-            $stats_gen = $this->sosa_provider->getStatisticsByGeneration();
-            $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
-            $view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
+			$stats_gen = $this->sosa_provider->getStatisticsByGeneration();
+			$view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$wt_tree->getNameUrl().'&gen=');
+			$view_bag->set('sosaanc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList&ged='.$wt_tree->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
-            $gen_equiv=0;            
-            $generation_stats = array();
+			$gen_theoretical=1;
+			$total_theoretical=0;
+			$prev_diff=0;
+			$prev_known=0.5;
+			$gen_equiv=0;            
+			$generation_stats = array();
             
-            foreach($stats_gen as $gen => $tab){
-                $genY1= I18N::translate('-');
-                $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
-                $total_theoretical += $gen_theoretical;
-                $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
-                $gen_equiv += $perc_sosa_count_theor;
-                $missing=2*$prev_known - $tab['sosaCount'];
-                $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
+			foreach($stats_gen as $gen => $tab){
+				$genY1= I18N::translate('-');
+				$genY2= I18N::translate('-');
+				if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
+				if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
+				$total_theoretical += $gen_theoretical;
+				$perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
+				$gen_equiv += $perc_sosa_count_theor;
+				$missing=2*$prev_known - $tab['sosaCount'];
+				$gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
                 
-                $generation_stats[$gen] = array(
-                    'gen_min_birth' => $genY1,
-                    'gen_max_birth' => $genY2,
-                    'theoretical' => $gen_theoretical,
-                    'known' => $tab['sosaCount'],
-                    'perc_known' => $perc_sosa_count_theor,
-                    'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
-                    'total_known' => $tab['sosaTotalCount'],
-                    'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
-                    'different' => $gen_diff,
-                    'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
-                    'total_different' => $tab['diffSosaTotalCount'],
-                    'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
-                );
+				$generation_stats[$gen] = array(
+					'gen_min_birth' => $genY1,
+					'gen_max_birth' => $genY2,
+					'theoretical' => $gen_theoretical,
+					'known' => $tab['sosaCount'],
+					'perc_known' => $perc_sosa_count_theor,
+					'missing' => $missing,
+					'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+					'total_known' => $tab['sosaTotalCount'],
+					'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
+					'different' => $gen_diff,
+					'perc_different' => Functions::safeDivision($gen_diff, $tab['sosaCount']),
+					'total_different' => $tab['diffSosaTotalCount'],
+					'pedi_collapse' => 1 - Functions::safeDivision($tab['diffSosaTotalCount'], $tab['sosaTotalCount'])
+				);
                 
-                $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
-            }
+				$gen_theoretical = $gen_theoretical * 2;
+				$prev_known=$tab['sosaCount'];
+				$prev_diff=$tab['diffSosaTotalCount'];
+			}
             
-            $view_bag->set('generation_stats', $generation_stats);
-            $view_bag->set('equivalent_gen', $gen_equiv);
+			$view_bag->set('generation_stats', $generation_stats);
+			$view_bag->set('equivalent_gen', $gen_equiv);
             
-            $top10multiancestors = $this->sosa_provider->getTopMultiSosaAncestorsNoTies(10);
-            $top10ancestors = array();
-            if($top10multiancestors !== null && count($top10multiancestors)) {
-                foreach($top10multiancestors as $pid => $count) {
-                    $indi = Individual::getInstance($pid, $wt_tree);
-                    if($indi !== null && $indi->canShowName()) {
-                        array_key_exists($count, $top10ancestors) ?
-                            $top10ancestors[$count][] = $indi:
-                            $top10ancestors[$count] = array($count => $indi);
-                    }
-                }
-            }
-            $view_bag->set('top10multiancestors', $top10ancestors);
+			$top10multiancestors = $this->sosa_provider->getTopMultiSosaAncestorsNoTies(10);
+			$top10ancestors = array();
+			if($top10multiancestors !== null && count($top10multiancestors)) {
+				foreach($top10multiancestors as $pid => $count) {
+					$indi = Individual::getInstance($pid, $wt_tree);
+					if($indi !== null && $indi->canShowName()) {
+						array_key_exists($count, $top10ancestors) ?
+							$top10ancestors[$count][] = $indi:
+							$top10ancestors[$count] = array($count => $indi);
+					}
+				}
+			}
+			$view_bag->set('top10multiancestors', $top10ancestors);
             
-            $view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
-            $view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
+			$view_bag->set('chart_img_g2', $this->htmlAncestorDispersionG2());
+			$view_bag->set('chart_img_g3', $this->htmlAncestorDispersionG3());
             
-        }
+		}
         
-        ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();   
-    }
+		ViewFactory::make('SosaStats', $this, $controller, $view_bag)->render();   
+	}
     
-    /**
-     * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
-     * @return string HTML code
-     */
-     private function htmlAncestorDispersionG2()
-    {
-        $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+	/**
+	 * Returns HTML code for a graph showing the dispersion of ancestors across father & mother
+	 * @return string HTML code
+	 */
+	 private function htmlAncestorDispersionG2()
+	{
+		$ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
+		if(count($ancestorsDispGen2) == 0) return;
         
-        $size = '600x300';
+		$size = '600x300';
         
-        $total = array_sum($ancestorsDispGen2);
-        $father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
-            'color' => '84beff', 
-            'count' => $father_count, 
-            'perc' => Functions::safeDivision($father_count, $total), 
-            'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
-        );
-        $mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
-            'color' => 'ffd1dc', 
-            'count' => $mother_count, 
-            'perc' => Functions::safeDivision($mother_count, $total),
-            'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
-        );
-        $shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
-            'color' => '777777', 
-            'count' => $shared_count, 
-            'perc' => Functions::safeDivision($shared_count, $total),
-            'name' => I18N::translate('Shared')
-        );
+		$total = array_sum($ancestorsDispGen2);
+		$father_count = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
+		$father = array (
+			'color' => '84beff', 
+			'count' => $father_count, 
+			'perc' => Functions::safeDivision($father_count, $total), 
+			'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
+		);
+		$mother_count = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
+		$mother = array (
+			'color' => 'ffd1dc', 
+			'count' => $mother_count, 
+			'perc' => Functions::safeDivision($mother_count, $total),
+			'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
+		);
+		$shared_count = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
+		$shared = array (
+			'color' => '777777', 
+			'count' => $shared_count, 
+			'perc' => Functions::safeDivision($shared_count, $total),
+			'name' => I18N::translate('Shared')
+		);
         
-        $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
-        $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
-        $chl = 
-             $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
-             $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
-             $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
-        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
-    }
+		$chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
+		$chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
+		$chl = 
+			 $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
+			 $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
+			 $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
+		return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+	}
     
-    /**
-     * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
-     * @return string HTML code
-     */
-    private function htmlAncestorDispersionG3()
-    {
-        $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
+	/**
+	 * Returns HTML code for a graph showing the dispersion of ancestors across grand-parents
+	 * @return string HTML code
+	 */
+	private function htmlAncestorDispersionG3()
+	{
+		$ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(3);
         
-        $size = '700x300';
+		$size = '700x300';
         
-        $color_motmot = 'ffd1dc';
-        $color_motfat = 'b998a0';
-        $color_fatfat = '577292';
-        $color_fatmot = '84beff';
-        $color_shared = '777777';
+		$color_motmot = 'ffd1dc';
+		$color_motfat = 'b998a0';
+		$color_fatfat = '577292';
+		$color_fatmot = '84beff';
+		$color_shared = '777777';
     
-        $total_fatfat = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
-        $total_fatmot = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
-        $total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
-        $total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
-        $total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+		$total_fatfat = array_key_exists(1, $ancestorsDispGen2) ? $ancestorsDispGen2[1] : 0;
+		$total_fatmot = array_key_exists(2, $ancestorsDispGen2) ? $ancestorsDispGen2[2] : 0;
+		$total_motfat = array_key_exists(4, $ancestorsDispGen2) ? $ancestorsDispGen2[4] : 0;
+		$total_motmot = array_key_exists(8, $ancestorsDispGen2) ? $ancestorsDispGen2[8] : 0;
+		$total_sha = array_key_exists(-1, $ancestorsDispGen2) ? $ancestorsDispGen2[-1] : 0;
+		$total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
     
-        $chd = $this->arrayToExtendedEncoding(array(
-	    4095 * Functions::safeDivision($total_fatfat, $total), 
-            4095 * Functions::safeDivision($total_fatmot, $total),
-            4095 * Functions::safeDivision($total_sha, $total), 
-            4095 * Functions::safeDivision($total_motfat, $total),
-            4095 * Functions::safeDivision($total_motmot, $total)          
-        ));
-        $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
-        $chl =
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
-            I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
-         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
-    }
+		$chd = $this->arrayToExtendedEncoding(array(
+		4095 * Functions::safeDivision($total_fatfat, $total), 
+			4095 * Functions::safeDivision($total_fatmot, $total),
+			4095 * Functions::safeDivision($total_sha, $total), 
+			4095 * Functions::safeDivision($total_motfat, $total),
+			4095 * Functions::safeDivision($total_motmot, $total)          
+		));
+		$chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
+		$chl =
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
+			I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
+			\Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
+		 return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+	}
 
-    /**
-     * Convert an array to Google Chart encoding
-     * @param arrat $a Array to encode
-     * @return string
-     */
-    private function arrayToExtendedEncoding($a) {
-        $xencoding = WT_GOOGLE_CHART_ENCODING;
+	/**
+	 * Convert an array to Google Chart encoding
+	 * @param arrat $a Array to encode
+	 * @return string
+	 */
+	private function arrayToExtendedEncoding($a) {
+		$xencoding = WT_GOOGLE_CHART_ENCODING;
     
-        $encoding = '';
-        foreach ($a as $value) {
-            if ($value < 0) {
-                $value = 0;
-            }
-            $first  = (int) ($value / 64);
-            $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
-        }
+		$encoding = '';
+		foreach ($a as $value) {
+			if ($value < 0) {
+				$value = 0;
+			}
+			$first  = (int) ($value / 64);
+			$second = $value % 64;
+			$encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+		}
     
-        return $encoding;
-    }
+		return $encoding;
+	}
     
     
 }
\ No newline at end of file

src/Webtrees/Functions/Functions.php

Indentation +24 added lines, -24 removed lines

@@ -129,11 +129,11 @@ 
 	 * @return string Encryption key
 	 */
 	protected static function getBase64EncryptionKey() {	    
-	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		$key = 'STANDARDKEYIFNOSERVER';
+		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
+			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 	    
-	    return $key;
+		return $key;
 	}
 	
 	/**	  
@@ -172,20 +172,20 @@ 
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
 		
 		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
-		    throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
 
-	    $nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
-	    $ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
+		$nonce = mb_substr($encrypted, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, '8bit');
+		$ciphertext = mb_substr($encrypted, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES, null, '8bit');
         
-        $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
+		$decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
 		
-        if($decrypted === false) {
-            throw new \InvalidArgumentException('The message has been tampered with in transit.');
-        }
+		if($decrypted === false) {
+			throw new \InvalidArgumentException('The message has been tampered with in transit.');
+		}
         
-        //sodium_memzero($encrypted);   // Requires PHP 7.2
+		//sodium_memzero($encrypted);   // Requires PHP 7.2
         
-        return $decrypted;
+		return $decrypted;
 	}
 	
 	/**
@@ -196,7 +196,7 @@ 
 	 */
 	public static function encodeFileSystemToUtf8($string){
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+			return iconv('cp1252', 'utf-8//IGNORE',$string);
 		}
 		return $string;
 	}
@@ -261,20 +261,20 @@ 
 	 * @return boolean|string Is supported?
 	 */
 	public static function isImageTypeSupported($reqtype) {
-	    $supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
-	    $reqtype = strtolower($reqtype);
+		$supportByGD = array('jpg'=>'jpeg', 'jpeg'=>'jpeg', 'gif'=>'gif', 'png'=>'png');
+		$reqtype = strtolower($reqtype);
 	
-	    if (empty($supportByGD[$reqtype])) {
-	        return false;
-	    }
+		if (empty($supportByGD[$reqtype])) {
+			return false;
+		}
 	
-	    $type = $supportByGD[$reqtype];
+		$type = $supportByGD[$reqtype];
 	
-	    if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
-	        return $type;
-	    }
+		if (function_exists('imagecreatefrom'.$type) && function_exists('image'.$type)) {
+			return $type;
+		}
 	
-	    return false;
+		return false;
 	}
 		
 }