jon48 / webtrees-lib

src/Webtrees/Module/MiscExtensions/AdminConfigController.php

Indentation +37 added lines, -37 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {    
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
     
             $this->module->setSetting('MAJ_TITLE_PREFIX', Filter::post('MAJ_TITLE_PREFIX'));
             
@@ -61,7 +61,7 @@ 
      */
     public function index() {
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
      */
     public function index() {
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

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

Spacing +12 added lines, -12 removed lines

@@ -34,26 +34,26 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
             $ihooks = HookProvider::getInstance()->getInstalledHooks();
             	
-            $module_names= Database::prepare(
+            $module_names = Database::prepare(
                 "SELECT module_name FROM `##module` WHERE status='disabled'"
             )->fetchOneColumn();
             	
-            if($ihooks !== null){
+            if ($ihooks !== null) {
                 foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+                    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;
+                        $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){
+                            $new_status = $new_status ? 'enabled' : 'disabled';
+                            if ($new_status != $previous_status) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
+                                switch ($new_status) {
                                     case 'enabled':
                                         $chook->enable($array_hook[0]);
                                         break;
@@ -70,7 +70,7 @@ 
                         $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
                         $previous_priority = $params['priority'];
                         if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
+                            if ($new_priority != $previous_priority) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
                                 $chook->setPriority($array_hook[0], $new_priority);
                             }
@@ -92,7 +92,7 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();
@@ -100,7 +100,7 @@ 
             ->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());

Braces +6 added lines, -2 removed lines

@@ -47,7 +47,9 @@ 
                         $array_hook = explode('#', $ihook);
                         //Update status
                         $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        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';
@@ -92,7 +94,9 @@ 
         HookProvider::getInstance()->updateHooks();
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if($action == 'update' && Filter::checkCsrf()) {
+        	$this->update();
+        }
         
         Theme::theme(new AdministrationTheme)->init(Globals::getTree());        
         $ctrl = new PageController();

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

Spacing +13 added lines, -13 removed lines

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

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/PatronymicLineage/Model/LineageRootNode.php

Indentation +58 added lines, -58 removed lines

@@ -24,68 +24,68 @@
 class LineageRootNode extends LineageNode
 {
     
-    /**
-     * @var Collection $places Places for the lineage node
-     */
-    private $places;
+	/**
+	 * @var Collection $places Places for the lineage node
+	 */
+	private $places;
    
-    /**
-     * @var int $nb_children Number of node childs
-     */
-    private $nb_children;
+	/**
+	 * @var int $nb_children Number of node childs
+	 */
+	private $nb_children;
   
-    /**
-     * Constructor for LineageRootNode
-     *
-     * @param Individual|null $node_indi
-     */
-    public function __construct(?Individual $node_indi = null)
-    {
-        parent::__construct($node_indi, $this);
-        $this->places = new Collection();
-        $this->nb_children = 0;
-    }
+	/**
+	 * Constructor for LineageRootNode
+	 *
+	 * @param Individual|null $node_indi
+	 */
+	public function __construct(?Individual $node_indi = null)
+	{
+		parent::__construct($node_indi, $this);
+		$this->places = new Collection();
+		$this->nb_children = 0;
+	}
    
-    /**
-     * Adds a place to the list of lineage's place
-     *
-     * @param Place $place
-     */
-    public function addPlace(Place $place): void
-    {
-        $place_name = $place->gedcomName();
-        if (mb_strlen($place_name) > 0) {
-            $this->places->put($place_name, $this->places->get($place_name, 0) + 1);
-        }
-    }
+	/**
+	 * Adds a place to the list of lineage's place
+	 *
+	 * @param Place $place
+	 */
+	public function addPlace(Place $place): void
+	{
+		$place_name = $place->gedcomName();
+		if (mb_strlen($place_name) > 0) {
+			$this->places->put($place_name, $this->places->get($place_name, 0) + 1);
+		}
+	}
     
-    /**
-     * Returns the number of child nodes.
-     * This number is more to be used as indication rather than an accurate one.
-     *
-     * @return int
-     */
-    public function numberChildNodes(): int
-    {
-        return $this->nb_children;
-    }
+	/**
+	 * Returns the number of child nodes.
+	 * This number is more to be used as indication rather than an accurate one.
+	 *
+	 * @return int
+	 */
+	public function numberChildNodes(): int
+	{
+		return $this->nb_children;
+	}
    
-    /**
-     * Increments the number of child nodes by one
-     *
-     */
-    public function incrementChildNodes(): void
-    {
-        $this->nb_children++;
-    }
+	/**
+	 * Increments the number of child nodes by one
+	 *
+	 */
+	public function incrementChildNodes(): void
+	{
+		$this->nb_children++;
+	}
    
-    /**
-     * Returns the list of place for the lineage
-     *
-     * @return Collection
-     */
-    public function places(): Collection
-    {
-        return $this->places;
-    }
+	/**
+	 * Returns the list of place for the lineage
+	 *
+	 * @return Collection
+	 */
+	public function places(): Collection
+	{
+		return $this->places;
+	}
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageNode.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function addFamily(Family $fams): object
     {
         if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
+            $this->linked_fams->put($fams->xref(), (object)[
                 'family'   =>  $fams,
                 'children' =>  new Collection()
             ]);
@@ -135,6 +135,6 @@ 
      */
     public function hasFollowUpSurname(): bool
     {
-        return mb_strlen($this->followUpSurname()) > 0 ;
+        return mb_strlen($this->followUpSurname()) > 0;
     }
 }

Indentation +113 added lines, -113 removed lines

@@ -25,117 +25,117 @@
 class LineageNode
 {
 
-    /**
-     * @var Collection $linked_fams Spouse families linked to the node
-     */
-    private $linked_fams;
-
-    /**
-     * @var ?Individual $node_indi Reference individual for the node
-     */
-    private $node_indi;
-
-    /**
-     * @var LineageRootNode $root_node Root node of the lineage
-     */
-    private $root_node;
-
-    /**
-     * @var ?string $alt_surname Linked surname, used to link to another lineage
-     */
-    private $alt_surname;
-
-    /**
-     * Constructor for Lineage node
-     *
-     * @param Individual $node_indi Main individual
-     * @param LineageRootNode $root_node Node of the lineage root
-     * @param null|string $alt_surname Follow-up surname
-     */
-    public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
-    {
-        $this->node_indi = $node_indi;
-        $this->root_node = $root_node;
-        $this->alt_surname = $alt_surname;
-        $this->linked_fams = new Collection();
-    }
-
-    /**
-     * Add a spouse family to the node
-     *
-     * @param Family $fams
-     * @return stdClass
-     */
-    public function addFamily(Family $fams): object
-    {
-        if (!$this->linked_fams->has($fams->xref())) {
-            $this->linked_fams->put($fams->xref(), (object) [
-                'family'   =>  $fams,
-                'children' =>  new Collection()
-            ]);
-        }
-        return $this->linked_fams->get($fams->xref());
-    }
-
-    /**
-     * Add a child LineageNode to the node
-     *
-     * @param Family $fams
-     * @param LineageNode $child
-     */
-    public function addChild(Family $fams, LineageNode $child = null): void
-    {
-        $this->addFamily($fams)->children->push($child);
-        $this->root_node->incrementChildNodes();
-    }
-
-    /**
-     * Returns the node individual
-     *
-     * @return Individual|NULL
-     */
-    public function individual(): ?Individual
-    {
-        return $this->node_indi;
-    }
-
-    /**
-     * Returns the lineage root node individual
-     *
-     * @return LineageRootNode
-     */
-    public function rootNode(): LineageRootNode
-    {
-        return $this->root_node;
-    }
-
-    /**
-     * Returns the spouse families linked to the node
-     *
-     * @return Collection
-     */
-    public function families(): Collection
-    {
-        return $this->linked_fams;
-    }
-
-    /**
-     * Returns the follow-up surname
-     *
-     * @return string
-     */
-    public function followUpSurname(): string
-    {
-        return $this->alt_surname ?? '';
-    }
-
-    /**
-     * Indicates whether the node has a follow up surname
-     *
-     * @return boolean
-     */
-    public function hasFollowUpSurname(): bool
-    {
-        return mb_strlen($this->followUpSurname()) > 0 ;
-    }
+	/**
+	 * @var Collection $linked_fams Spouse families linked to the node
+	 */
+	private $linked_fams;
+
+	/**
+	 * @var ?Individual $node_indi Reference individual for the node
+	 */
+	private $node_indi;
+
+	/**
+	 * @var LineageRootNode $root_node Root node of the lineage
+	 */
+	private $root_node;
+
+	/**
+	 * @var ?string $alt_surname Linked surname, used to link to another lineage
+	 */
+	private $alt_surname;
+
+	/**
+	 * Constructor for Lineage node
+	 *
+	 * @param Individual $node_indi Main individual
+	 * @param LineageRootNode $root_node Node of the lineage root
+	 * @param null|string $alt_surname Follow-up surname
+	 */
+	public function __construct(?Individual $node_indi = null, LineageRootNode $root_node, $alt_surname = null)
+	{
+		$this->node_indi = $node_indi;
+		$this->root_node = $root_node;
+		$this->alt_surname = $alt_surname;
+		$this->linked_fams = new Collection();
+	}
+
+	/**
+	 * Add a spouse family to the node
+	 *
+	 * @param Family $fams
+	 * @return stdClass
+	 */
+	public function addFamily(Family $fams): object
+	{
+		if (!$this->linked_fams->has($fams->xref())) {
+			$this->linked_fams->put($fams->xref(), (object) [
+				'family'   =>  $fams,
+				'children' =>  new Collection()
+			]);
+		}
+		return $this->linked_fams->get($fams->xref());
+	}
+
+	/**
+	 * Add a child LineageNode to the node
+	 *
+	 * @param Family $fams
+	 * @param LineageNode $child
+	 */
+	public function addChild(Family $fams, LineageNode $child = null): void
+	{
+		$this->addFamily($fams)->children->push($child);
+		$this->root_node->incrementChildNodes();
+	}
+
+	/**
+	 * Returns the node individual
+	 *
+	 * @return Individual|NULL
+	 */
+	public function individual(): ?Individual
+	{
+		return $this->node_indi;
+	}
+
+	/**
+	 * Returns the lineage root node individual
+	 *
+	 * @return LineageRootNode
+	 */
+	public function rootNode(): LineageRootNode
+	{
+		return $this->root_node;
+	}
+
+	/**
+	 * Returns the spouse families linked to the node
+	 *
+	 * @return Collection
+	 */
+	public function families(): Collection
+	{
+		return $this->linked_fams;
+	}
+
+	/**
+	 * Returns the follow-up surname
+	 *
+	 * @return string
+	 */
+	public function followUpSurname(): string
+	{
+		return $this->alt_surname ?? '';
+	}
+
+	/**
+	 * Indicates whether the node has a follow up surname
+	 *
+	 * @return boolean
+	 */
+	public function hasFollowUpSurname(): bool
+	{
+		return mb_strlen($this->followUpSurname()) > 0 ;
+	}
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             }
         }
       
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
+        return $root_lineages->sort(function(LineageRootNode $a, LineageRootNode $b) {
 
             if ($a->numberChildNodes() == $b->numberChildNodes()) {
                 return 0;

Indentation +217 added lines, -217 removed lines

@@ -29,221 +29,221 @@
 class LineageBuilder
 {
 
-    /**
-     * @var string $surname Reference surname
-     */
-    private $surname;
-
-    /**
-     * @var Tree $tree Reference tree
-     */
-    private $tree;
-
-    /**
-     * @var IndividualListModule|null $indilist_module
-     */
-    private $indilist_module;
-
-    /**
-     * @var Collection $used_indis Individuals already processed
-     */
-    private $used_indis;
-
-    /**
-     * Constructor for Lineage Builder
-     *
-     * @param string $surname Reference surname
-     * @param Tree $tree Gedcom tree
-     */
-    public function __construct($surname, Tree $tree, IndividualListModule $indilist_module)
-    {
-        $this->surname = $surname;
-        $this->tree = $tree;
-        $this->indilist_module = $indilist_module;
-        $this->used_indis = new Collection();
-    }
-
-    /**
-     * Build all patronymic lineages for the reference surname.
-     *
-     * @return Collection|NULL List of root patronymic lineages
-     */
-    public function buildLineages(): ?Collection
-    {
-        if ($this->indilist_module === null) {
-            return null;
-        }
-
-        $indis = $this->indilist_module->individuals($this->tree, $this->surname, '', '', false, false, I18N::locale());
-        //Warning - the IndividualListModule returns a clone of individuals objects. Cannot be used for object equality
-        if (count($indis) == 0) {
-            return null;
-        }
-
-        $root_lineages = new Collection();
-
-        foreach ($indis as $indi) {
-            /** @var Individual $indi */
-            if ($this->used_indis->get($indi->xref(), false) === false) {
-                $indi_first = $this->getLineageRootIndividual($indi);
-                if ($indi_first !== null) {
-                    // The root lineage needs to be recreated from the Factory, to retrieve the proper object
-                    $indi_first = Registry::individualFactory()->make($indi_first->xref(), $this->tree);
-                }
-                if ($indi_first === null) {
-                    continue;
-                }
-                $this->used_indis->put($indi_first->xref(), true);
-                if ($indi_first->canShow()) {
-                    //Check if the root individual has brothers and sisters, without parents
-                    $indi_first_child_family = $indi_first->childFamilies()->first();
-                    if ($indi_first_child_family !== null) {
-                        $root_node = new LineageRootNode(null);
-                        $root_node->addFamily($indi_first_child_family);
-                    } else {
-                        $root_node = new LineageRootNode($indi_first);
-                    }
-                    $root_node = $this->buildLineage($root_node);
-                    $root_lineages->add($root_node);
-                }
-            }
-        }
-
-        return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
-
-            if ($a->numberChildNodes() == $b->numberChildNodes()) {
-                return 0;
-            }
-            return ($a->numberChildNodes() > $b->numberChildNodes()) ? -1 : 1;
-        });
-    }
-
-    /**
-     * Retrieve the root individual, from any individual, by recursion.
-     * The Root individual is the individual without a father, or without a mother holding the same name.
-     *
-     * @param Individual $indi
-     * @return Individual|NULL Root individual
-     */
-    private function getLineageRootIndividual(Individual $indi): ?Individual
-    {
-        $child_families = $indi->childFamilies();
-        if ($this->used_indis->get($indi->xref(), false) !== false) {
-            return null;
-        }
-
-        foreach ($child_families as $child_family) {
-            /** @var Family $child_family */
-            $child_family->husband();
-            if (($husb = $child_family->husband()) !== null) {
-                if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) == '') {
-                    return $indi;
-                }
-                return $this->getLineageRootIndividual($husb);
-            } elseif (($wife = $child_family->wife()) !== null) {
-                if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
-                    $indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
-                    $wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
-                    if (
-                        $indi->canShowName()
-                        && $wife->canShowName()
-                        && I18N::comparator()($indi_surname, $wife_surname) == 0
-                    ) {
-                            return $this->getLineageRootIndividual($wife);
-                    }
-                }
-                return $indi;
-            }
-        }
-        return $indi;
-    }
-
-    /**
-     * Computes descendent Lineage from a node.
-     * Uses recursion to build the lineage tree
-     *
-     * @param LineageNode $node
-     * @return LineageNode Computed lineage
-     */
-    private function buildLineage(LineageNode $node): LineageNode
-    {
-        $indi_surname = '';
-
-        $indi_node = $node->individual();
-        if ($indi_node !== null) {
-            if ($node->families()->count() == 0) {
-                foreach ($indi_node->spouseFamilies() as $spouse_family) {
-                    $node->addFamily($spouse_family);
-                }
-            }
-
-            $indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
-            $node->rootNode()->addPlace($indi_node->getBirthPlace());
-
-            //Tag the individual as used
-            $this->used_indis->put($indi_node->xref(), true);
-        }
-
-        foreach ($node->families() as $family_node) {
-            /** @var Family $spouse_family */
-            $spouse_family = $family_node->family;
-            $spouse_surname = '';
-            $spouse = null;
-            if (
-                $indi_node !== null &&
-                ($spouse = $spouse_family->spouse($indi_node)) !== null && $spouse->canShowName()
-            ) {
-                $spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
-            }
-
-            $nb_children = $nb_natural = 0;
-
-            foreach ($spouse_family->children() as $child) {
-                if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
-                    $child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
-
-                    $nb_children++;
-                    if ($indi_node !== null && $indi_node->sex() == 'F') { //If the root individual is the mother
-                        //Print only lineages of children with the same surname as their mother
-                        //(supposing they are natural children)
-                        /** @psalm-suppress RedundantCondition */
-                        if (
-                            $spouse === null ||
-                            ($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) != 0)
-                        ) {
-                            if (I18N::comparator()($child_surname, $indi_surname) == 0) {
-                                $nb_natural++;
-                                $node_child = new LineageNode($child, $node->rootNode());
-                                $node_child = $this->buildLineage($node_child);
-                                $node->addChild($spouse_family, $node_child);
-                            }
-                        }
-                    } else { //If the root individual is the father
-                        $nb_natural++;
-                        //Print if the children does not bear the same name as his mother
-                        //(and different from his father)
-                        if (
-                            mb_strlen($child_surname) == 0 ||
-                            mb_strlen($indi_surname) == 0 || mb_strlen($spouse_surname) == 0 ||
-                            I18N::comparator()($child_surname, $indi_surname) == 0 ||
-                            I18N::comparator()($child_surname, $spouse_surname) != 0
-                        ) {
-                            $node_child = new LineageNode($child, $node->rootNode());
-                            $node_child = $this->buildLineage($node_child);
-                        } else {
-                            $node_child = new LineageNode($child, $node->rootNode(), $child_surname);
-                        }
-                        $node->addChild($spouse_family, $node_child);
-                    }
-                }
-            }
-
-            //Do not print other children
-            if (($nb_children - $nb_natural) > 0) {
-                $node->addChild($spouse_family, null);
-            }
-        }
-
-        return $node;
-    }
+	/**
+	 * @var string $surname Reference surname
+	 */
+	private $surname;
+
+	/**
+	 * @var Tree $tree Reference tree
+	 */
+	private $tree;
+
+	/**
+	 * @var IndividualListModule|null $indilist_module
+	 */
+	private $indilist_module;
+
+	/**
+	 * @var Collection $used_indis Individuals already processed
+	 */
+	private $used_indis;
+
+	/**
+	 * Constructor for Lineage Builder
+	 *
+	 * @param string $surname Reference surname
+	 * @param Tree $tree Gedcom tree
+	 */
+	public function __construct($surname, Tree $tree, IndividualListModule $indilist_module)
+	{
+		$this->surname = $surname;
+		$this->tree = $tree;
+		$this->indilist_module = $indilist_module;
+		$this->used_indis = new Collection();
+	}
+
+	/**
+	 * Build all patronymic lineages for the reference surname.
+	 *
+	 * @return Collection|NULL List of root patronymic lineages
+	 */
+	public function buildLineages(): ?Collection
+	{
+		if ($this->indilist_module === null) {
+			return null;
+		}
+
+		$indis = $this->indilist_module->individuals($this->tree, $this->surname, '', '', false, false, I18N::locale());
+		//Warning - the IndividualListModule returns a clone of individuals objects. Cannot be used for object equality
+		if (count($indis) == 0) {
+			return null;
+		}
+
+		$root_lineages = new Collection();
+
+		foreach ($indis as $indi) {
+			/** @var Individual $indi */
+			if ($this->used_indis->get($indi->xref(), false) === false) {
+				$indi_first = $this->getLineageRootIndividual($indi);
+				if ($indi_first !== null) {
+					// The root lineage needs to be recreated from the Factory, to retrieve the proper object
+					$indi_first = Registry::individualFactory()->make($indi_first->xref(), $this->tree);
+				}
+				if ($indi_first === null) {
+					continue;
+				}
+				$this->used_indis->put($indi_first->xref(), true);
+				if ($indi_first->canShow()) {
+					//Check if the root individual has brothers and sisters, without parents
+					$indi_first_child_family = $indi_first->childFamilies()->first();
+					if ($indi_first_child_family !== null) {
+						$root_node = new LineageRootNode(null);
+						$root_node->addFamily($indi_first_child_family);
+					} else {
+						$root_node = new LineageRootNode($indi_first);
+					}
+					$root_node = $this->buildLineage($root_node);
+					$root_lineages->add($root_node);
+				}
+			}
+		}
+
+		return $root_lineages->sort(function (LineageRootNode $a, LineageRootNode $b) {
+
+			if ($a->numberChildNodes() == $b->numberChildNodes()) {
+				return 0;
+			}
+			return ($a->numberChildNodes() > $b->numberChildNodes()) ? -1 : 1;
+		});
+	}
+
+	/**
+	 * Retrieve the root individual, from any individual, by recursion.
+	 * The Root individual is the individual without a father, or without a mother holding the same name.
+	 *
+	 * @param Individual $indi
+	 * @return Individual|NULL Root individual
+	 */
+	private function getLineageRootIndividual(Individual $indi): ?Individual
+	{
+		$child_families = $indi->childFamilies();
+		if ($this->used_indis->get($indi->xref(), false) !== false) {
+			return null;
+		}
+
+		foreach ($child_families as $child_family) {
+			/** @var Family $child_family */
+			$child_family->husband();
+			if (($husb = $child_family->husband()) !== null) {
+				if ($husb->isPendingAddition() && $husb->privatizeGedcom(Auth::PRIV_HIDE) == '') {
+					return $indi;
+				}
+				return $this->getLineageRootIndividual($husb);
+			} elseif (($wife = $child_family->wife()) !== null) {
+				if (!($wife->isPendingAddition() && $wife->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
+					$indi_surname = $indi->getAllNames()[$indi->getPrimaryName()]['surname'];
+					$wife_surname = $wife->getAllNames()[$wife->getPrimaryName()]['surname'];
+					if (
+						$indi->canShowName()
+						&& $wife->canShowName()
+						&& I18N::comparator()($indi_surname, $wife_surname) == 0
+					) {
+							return $this->getLineageRootIndividual($wife);
+					}
+				}
+				return $indi;
+			}
+		}
+		return $indi;
+	}
+
+	/**
+	 * Computes descendent Lineage from a node.
+	 * Uses recursion to build the lineage tree
+	 *
+	 * @param LineageNode $node
+	 * @return LineageNode Computed lineage
+	 */
+	private function buildLineage(LineageNode $node): LineageNode
+	{
+		$indi_surname = '';
+
+		$indi_node = $node->individual();
+		if ($indi_node !== null) {
+			if ($node->families()->count() == 0) {
+				foreach ($indi_node->spouseFamilies() as $spouse_family) {
+					$node->addFamily($spouse_family);
+				}
+			}
+
+			$indi_surname = $indi_node->getAllNames()[$indi_node->getPrimaryName()]['surname'] ?? '';
+			$node->rootNode()->addPlace($indi_node->getBirthPlace());
+
+			//Tag the individual as used
+			$this->used_indis->put($indi_node->xref(), true);
+		}
+
+		foreach ($node->families() as $family_node) {
+			/** @var Family $spouse_family */
+			$spouse_family = $family_node->family;
+			$spouse_surname = '';
+			$spouse = null;
+			if (
+				$indi_node !== null &&
+				($spouse = $spouse_family->spouse($indi_node)) !== null && $spouse->canShowName()
+			) {
+				$spouse_surname = $spouse->getAllNames()[$spouse->getPrimaryName()]['surname'] ?? '';
+			}
+
+			$nb_children = $nb_natural = 0;
+
+			foreach ($spouse_family->children() as $child) {
+				if (!($child->isPendingAddition() && $child->privatizeGedcom(Auth::PRIV_HIDE) == '')) {
+					$child_surname = $child->getAllNames()[$child->getPrimaryName()]['surname'] ?? '';
+
+					$nb_children++;
+					if ($indi_node !== null && $indi_node->sex() == 'F') { //If the root individual is the mother
+						//Print only lineages of children with the same surname as their mother
+						//(supposing they are natural children)
+						/** @psalm-suppress RedundantCondition */
+						if (
+							$spouse === null ||
+							($spouse_surname !== '' && I18N::comparator()($child_surname, $spouse_surname) != 0)
+						) {
+							if (I18N::comparator()($child_surname, $indi_surname) == 0) {
+								$nb_natural++;
+								$node_child = new LineageNode($child, $node->rootNode());
+								$node_child = $this->buildLineage($node_child);
+								$node->addChild($spouse_family, $node_child);
+							}
+						}
+					} else { //If the root individual is the father
+						$nb_natural++;
+						//Print if the children does not bear the same name as his mother
+						//(and different from his father)
+						if (
+							mb_strlen($child_surname) == 0 ||
+							mb_strlen($indi_surname) == 0 || mb_strlen($spouse_surname) == 0 ||
+							I18N::comparator()($child_surname, $indi_surname) == 0 ||
+							I18N::comparator()($child_surname, $spouse_surname) != 0
+						) {
+							$node_child = new LineageNode($child, $node->rootNode());
+							$node_child = $this->buildLineage($node_child);
+						} else {
+							$node_child = new LineageNode($child, $node->rootNode(), $child_surname);
+						}
+						$node->addChild($spouse_family, $node_child);
+					}
+				}
+			}
+
+			//Do not print other children
+			if (($nb_children - $nb_natural) > 0) {
+				$node->addChild($spouse_family, null);
+			}
+		}
+
+		return $node;
+	}
 }

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TokenGenerate.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         
         $token = Functions::generateRandomToken();
         $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        Log::addConfigurationLog($this->module->title() . ' : New token generated.');
+        Log::addConfigurationLog($this->module->title().' : New token generated.');
         
         return response(['token' => $token]);
     }

Indentation +31 added lines, -31 removed lines

@@ -29,35 +29,35 @@
  */
 class TokenGenerate implements RequestHandlerInterface
 {
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
-
-    /**
-     * Constructor for TokenGenerate request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $token = Functions::generateRandomToken();
-        $this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
-        Log::addConfigurationLog($this->module->title() . ' : New token generated.');
-
-        return response(['token' => $token]);
-    }
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
+
+	/**
+	 * Constructor for TokenGenerate request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$token = Functions::generateRandomToken();
+		$this->module->setPreference('MAJ_AT_FORCE_EXEC_TOKEN', $token);
+		Log::addConfigurationLog($this->module->title() . ' : New token generated.');
+
+		return response(['token' => $token]);
+	}
 }

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/AdminConfigPage.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
             $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token);
         }
         
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'title'             =>  $this->module->title(),
             'trigger_token'     =>  $token,
             'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),

Indentation +38 added lines, -38 removed lines

@@ -30,48 +30,48 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    /**
-     * @var AdminTasksModule|null $module
-     */
-    private $module;
+	/**
+	 * @var AdminTasksModule|null $module
+	 */
+	private $module;
 
-    /**
-     * Constructor for Admin Config request handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
-    }
+	/**
+	 * Constructor for Admin Config request handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module = $module_service->findByInterface(AdminTasksModule::class)->first();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
-        if ($token === '') {
-            $token = Functions::generateRandomToken();
-            $this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token);
-        }
+		$token = $this->module->getPreference('MAJ_AT_FORCE_EXEC_TOKEN');
+		if ($token === '') {
+			$token = Functions::generateRandomToken();
+			$this->module->setPreference('PAT_FORCE_EXEC_TOKEN', $token);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'title'             =>  $this->module->title(),
-            'trigger_token'     =>  $token,
-            'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),
-            'new_token_route'   =>  route(TokenGenerate::class),
-            'tasks_data_route'  =>  route(TasksList::class),
-            'js_script_url'     =>  $this->module->assetUrl('js/admintasks.min.js')
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'title'             =>  $this->module->title(),
+			'trigger_token'     =>  $token,
+			'trigger_route'     =>  route(TaskTrigger::class, ['task' => '__TASKNAME__', 'force' => '__TOKEN__']),
+			'new_token_route'   =>  route(TokenGenerate::class),
+			'tasks_data_route'  =>  route(TasksList::class),
+			'js_script_url'     =>  $this->module->assetUrl('js/admintasks.min.js')
+		]);
+	}
 }