jon48 / webtrees-lib

src/Webtrees/Hook/HookInterfaces/RecordNameTextExtenderInterface.php

Doc Comments +2 added lines

@@ -22,6 +22,7 @@ 
 	 * 
 	 * @param GedcomRecord $grec Gedcom record
 	 * @param string $size Prepend size
+	 * @return void
 	 */
 	public function hRecordNamePrepend(GedcomRecord $grec, $size);
 	
@@ -30,6 +31,7 @@ 
 	 * 
 	 * @param GedcomRecord $grec Gedcom record
 	 * @param string $size Append size
+	 * @return string
 	 */
 	public function hRecordNameAppend(GedcomRecord $grec, $size);
 	

src/Webtrees/Module/IsSourcedModule.php

Indentation +60 added lines, -60 removed lines

@@ -28,29 +28,29 @@ 
 class IsSourcedModule extends AbstractModule 
 implements ModuleSidebarInterface, HookSubscriberInterface, IndividualHeaderExtenderInterface, RecordNameTextExtenderInterface
 {
-    /** @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('Sourced events');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Module\AbstractModule::getTitle()
+	 */
+	public function getTitle() {
+		return I18N::translate('Sourced events');
+	}
     
    /**
     * {@inheritDoc}
     * @see \Fisharebest\Webtrees\Module\AbstractModule::getDescription()
     */
-    public function getDescription() {
-        return I18N::translate('Indicate if events related to an record are sourced.');
-    }
+	public function getDescription() {
+		return I18N::translate('Indicate if events related to an record are sourced.');
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
 	public function getSubscribedHooks() {
 		return array(
  			'hExtendIndiHeaderIcons' => 10,
@@ -63,12 +63,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
-	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
-	    }
-	    return '';
+		if($ctrlIndi){
+			$dindi = new Individual($ctrlIndi->getSignificantIndividual());
+			if ($dindi->canDisplayIsSourced()) 
+				return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+		}
+		return '';
 	}
 	
 	/**
@@ -94,15 +94,15 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
 	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){
-	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
-	        $dindi = new Individual($grec);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
-	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
-	    }
-	    return $html;
+		$html = '';
+		if($grec instanceof \Fisharebest\Webtrees\Individual){
+			$dindi = new Individual($grec);
+			$html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
+			$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
+			if($grec->isDead())
+				$html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+		}
+		return $html;
 	}
 	
 	/**
@@ -110,7 +110,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::defaultSidebarOrder()
 	 */
 	public function defaultSidebarOrder() {
-	    return 15;
+		return 15;
 	}
 	
 	/**
@@ -118,7 +118,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
 	public function hasSidebarContent(){ 
-	    return true;
+		return true;
 	}
 	
 	/**
@@ -126,7 +126,7 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarAjaxContent()
 	 */
 	public function getSidebarAjaxContent() {
-	    return '';
+		return '';
 	}
 	
 	/**
@@ -134,17 +134,17 @@ 
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::getSidebarContent()
 	 */
 	public function getSidebarContent() {
-	    global $controller;
+		global $controller;
 	    
-	    ob_start();
-	    $root = $controller->getSignificantIndividual();
-	    if ($root) {
-	        $dindi = new Individual($root);
+		ob_start();
+		$root = $controller->getSignificantIndividual();
+		if ($root) {
+			$dindi = new Individual($root);
 	        	
-	        if (!$dindi->canDisplayIsSourced()) {
-	            echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>';
-	        } else {
-	            echo '
+			if (!$dindi->canDisplayIsSourced()) {
+				echo '<div class="error">', I18N::translate('This information is private and cannot be shown.'), '</div>';
+			} else {
+				echo '
 	                <table class="issourcedtable">
 	                   <tr>
 	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
@@ -155,35 +155,35 @@ 
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td>
 	                   </tr>';
 	            
-	            $fams = $root->getSpouseFamilies();
-	            ($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
-	            foreach($fams as $fam){
-	                $dfam = new Family($fam);
-	                echo '
+				$fams = $root->getSpouseFamilies();
+				($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
+				foreach($fams as $fam){
+					$dfam = new Family($fam);
+					echo '
 	                    <tr>
 	                       <td class="slabel right">
 	                           <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR');
-	                if($ct > 1){
-	                    echo ' ',$nb;
-	                    $nb++;
-	                }
-	                echo '     </a>
+					if($ct > 1){
+						echo ' ',$nb;
+						$nb++;
+					}
+					echo '     </a>
 	                       </td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dfam->isMarriageSourced(), 'MARR', 1).'</td>
 	                   </tr>';
-	            }
+				}
 	            
-	            if( $root->isDead() )
-	                echo '
+				if( $root->isDead() )
+					echo '
 	                    <tr>
 	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            
-	            echo '</table>';
-	        }
-	    }
-	    return ob_get_clean();	    
+				echo '</table>';
+			}
+		}
+		return ob_get_clean();	    
 	}
 	
 	

Spacing +15 added lines, -15 removed lines

@@ -63,7 +63,7 @@ 
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
 	 */
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-	    if($ctrlIndi){
+	    if ($ctrlIndi) {
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
 	        if ($dindi->canDisplayIsSourced()) 
 	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
@@ -87,19 +87,19 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNamePrepend()
 	 */
-	public function hRecordNamePrepend(GedcomRecord $grec, $size){ }
+	public function hRecordNamePrepend(GedcomRecord $grec, $size) { }
 	
 	/**
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
 	 */
-	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small'){
+	public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
 	    $html = '';
-	    if($grec instanceof \Fisharebest\Webtrees\Individual){
+	    if ($grec instanceof \Fisharebest\Webtrees\Individual) {
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
+	        if ($grec->isDead())
 	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
 	    }
 	    return $html;
@@ -117,7 +117,7 @@ 
 	 * {@inheritDoc}
 	 * @see \Fisharebest\Webtrees\Module\ModuleSidebarInterface::hasSidebarContent()
 	 */
-	public function hasSidebarContent(){ 
+	public function hasSidebarContent() { 
 	    return true;
 	}
 	
@@ -147,24 +147,24 @@ 
 	            echo '
 	                <table class="issourcedtable">
 	                   <tr>
-	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI') . '</td>
+	                       <td class="slabel"> ' . GedcomTag::getLabel('INDI').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1).'</td>
 	                   </tr>
 	                   <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('BIRT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('BIRT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1).'</td>
 	                   </tr>';
 	            
 	            $fams = $root->getSpouseFamilies();
-	            ($ct = count($fams)) > 1 ? $nb=1 : $nb=' ';	            
-	            foreach($fams as $fam){
+	            ($ct = count($fams)) > 1 ? $nb = 1 : $nb = ' ';	            
+	            foreach ($fams as $fam) {
 	                $dfam = new Family($fam);
 	                echo '
 	                    <tr>
 	                       <td class="slabel right">
-	                           <a href="' . $fam->getHtmlUrl() . '"> '. GedcomTag::getLabel('MARR');
-	                if($ct > 1){
-	                    echo ' ',$nb;
+	                           <a href="' . $fam->getHtmlUrl().'"> '.GedcomTag::getLabel('MARR');
+	                if ($ct > 1) {
+	                    echo ' ', $nb;
 	                    $nb++;
 	                }
 	                echo '     </a>
@@ -173,10 +173,10 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
+	            if ($root->isDead())
 	                echo '
 	                    <tr>
-	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
+	                       <td class="slabel">' . GedcomTag::getLabel('DEAT').'</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
 	            

Braces +9 added lines, -6 removed lines

@@ -65,8 +65,9 @@ 
 	public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
 	    if($ctrlIndi){
 	        $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-	        if ($dindi->canDisplayIsSourced()) 
-	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        if ($dindi->canDisplayIsSourced()) {
+	        	            return FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, 'large');
+	        }
 	    }
 	    return '';
 	}
@@ -99,8 +100,9 @@ 
 	        $dindi = new Individual($grec);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('R', $dindi->isSourced(), 'INDI', 1, $size);
 	        $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isBirthSourced(), 'BIRT', 1, $size);
-	        if($grec->isDead())
-	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+	        if($grec->isDead()) {
+	        	            $html .= FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1, $size);
+	        }
 	    }
 	    return $html;
 	}
@@ -173,12 +175,13 @@ 
 	                   </tr>';
 	            }
 	            
-	            if( $root->isDead() )
-	                echo '
+	            if( $root->isDead() ) {
+	            	                echo '
 	                    <tr>
 	                       <td class="slabel">' . GedcomTag::getLabel('DEAT') . '</td>
 	                       <td class="svalue">' . FunctionsPrint::formatIsSourcedIcon('E', $dindi->isDeathSourced(), 'DEAT', 1).'</td>
 	                   </tr>';
+	            }
 	            
 	            echo '</table>';
 	        }

src/Webtrees/Module/SosaModule.php

Indentation +163 added lines, -163 removed lines

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

Spacing +15 added lines, -15 removed lines

@@ -80,7 +80,7 @@ 
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=SosaConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=SosaConfig';
     }
     
     /**********
@@ -103,17 +103,17 @@ 
         global $WT_TREE, $controller;
         
         $menu = null;
-        if(ModuleManager::getInstance()->isOperational($this->getName())) {
+        if (ModuleManager::getInstance()->isOperational($this->getName())) {
             
-            $root_url = 'module.php?mod=' . $this->getName() . '&ged=' . $WT_TREE->getNameUrl() . '&';
-            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url . 'mod_action=SosaStats', 'menu-maj-sosa-stats');
+            $root_url = 'module.php?mod='.$this->getName().'&ged='.$WT_TREE->getNameUrl().'&';
+            $sosa_stat_menu = new Menu(I18N::translate('Sosa Statistics'), $root_url.'mod_action=SosaStats', 'menu-maj-sosa-stats');
             
             $menu = clone $sosa_stat_menu;
             $menu->setClass('menu-maj-sosa');
             
             $submenus = array_filter(array(
-                new Menu(I18N::translate('Sosa Ancestors'), $root_url . 'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
-                new Menu(I18N::translate('Missing Ancestors'), $root_url . 'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
+                new Menu(I18N::translate('Sosa Ancestors'), $root_url.'mod_action=SosaList', 'menu-maj-sosa-list', array('rel' => 'nofollow')),
+                new Menu(I18N::translate('Missing Ancestors'), $root_url.'mod_action=SosaList@missing', 'menu-maj-sosa-missing', array('rel' => 'nofollow')),
                 $sosa_stat_menu                
             ));
             
@@ -122,12 +122,12 @@ 
                 && $ga_list = Module::getModuleByName(Constants::MODULE_MAJ_GEODISP_NAME)->getProvider()->getGeoAnalysisList()
                 )
             {
-                if(count($ga_list) > 0) {
-                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod=' . Constants::MODULE_MAJ_GEODISP_NAME . '&ged=' . $WT_TREE->getNameUrl() . '&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
+                if (count($ga_list) > 0) {
+                    $submenus[] = new Menu(I18N::translate('Geographical Dispersion'), 'module.php?mod='.Constants::MODULE_MAJ_GEODISP_NAME.'&ged='.$WT_TREE->getNameUrl().'&mod_action=GeoAnalysis@listAll', 'menu-maj-sosa-geodispersion');
                 }
             }
             
-            if(Auth::check()) {
+            if (Auth::check()) {
                 $submenus[] = new Menu(
                     I18N::translate('Sosa Configuration'),
                     $this->getConfigLink(),
@@ -143,7 +143,7 @@ 
                     ->addInlineJavascript('
                         function majComputeSosaFromIndi(){
                             if($("#computesosadlg").length == 0) {
-                                $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation') .'\"><div id=\"sosaloadingarea\"></div></div>");
+                                $("body").append("<div id=\"computesosadlg\" title=\"'. I18N::translate('Sosas computation').'\"><div id=\"sosaloadingarea\"></div></div>");
                             }
 	                        $("#computesosadlg").dialog({
                                 modal: true,
@@ -152,7 +152,7 @@ 
 		                        open: function(event, ui) {
 			                        $("button.ui-dialog-titlebar-close").hide();
                                     $("#sosaloadingarea").empty().html("<i class=\"icon-loading-small\"></i>");
-			                        $("#sosaloadingarea").load("module.php?mod=' . $this->getName() . '&mod_action=SosaConfig@computePartial&ged='. $WT_TREE->getNameUrl() .'&userid='.Auth::user()->getUserId().'&pid=' . $controller->getSignificantIndividual()->getXref() . '", 
+			                        $("#sosaloadingarea").load("module.php?mod=' . $this->getName().'&mod_action=SosaConfig@computePartial&ged='.$WT_TREE->getNameUrl().'&userid='.Auth::user()->getUserId().'&pid='.$controller->getSignificantIndividual()->getXref().'", 
 					                   function(){
 						                  $("button.ui-dialog-titlebar-close").show();
                                           setTimeout(function(){
@@ -202,7 +202,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderIcons()
      */
     public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
+        if ($ctrlIndi) {
             $dindi = new Individual($ctrlIndi->getSignificantIndividual());
             return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
         }
@@ -220,9 +220,9 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtenderInterface::hExtendIndiHeaderRight()
      */
     public function hExtendIndiHeaderRight(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
+        if ($ctrlIndi) {
             $dindi = new Individual($ctrlIndi->getSignificantIndividual());
-            return array('indi-header-sosa',  FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
+            return array('indi-header-sosa', FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 2, 'normal'));
         }
         return '';
     }
@@ -232,7 +232,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtenderInterface::hRecordNameAppend()
      */
     public function hRecordNameAppend(GedcomRecord $grec, $size = 'small') {
-        if($grec instanceof \Fisharebest\Webtrees\Individual){ // Only apply to individuals
+        if ($grec instanceof \Fisharebest\Webtrees\Individual) { // Only apply to individuals
             $dindi = new Individual($grec);
             return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, $size);
         }

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

Indentation +93 added lines, -93 removed lines

@@ -32,11 +32,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
 		<div id="sosa-fam-list" class="sosa-list">
 			<table id="<?php echo $table_id; ?>">
@@ -176,61 +176,61 @@ 
 				<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
-			    /** @var \Fisharebest\Webtrees\Family $person */
+				/** @var \Fisharebest\Webtrees\Family $person */
 
-			    //PERSO Create decorator for Family
-			    $dfamily = new Family($family);
+				//PERSO Create decorator for Family
+				$dfamily = new Family($family);
 			    
-			    $husb = $family->getHusband();
-			    if (is_null($husb)) {
-			        $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
-			    }
-			    $wife = $family->getWife();
-			    if (is_null($wife)) {
-			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
-			    }
+				$husb = $family->getHusband();
+				if (is_null($husb)) {
+					$husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
+				}
+				$wife = $family->getWife();
+				if (is_null($wife)) {
+					$wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
+				}
 			    
-			    $mdate=$family->getMarriageDate();
+				$mdate=$family->getMarriageDate();
 			    
-			    if ($family->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($family->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    ?>			
+				if ($family->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($family->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				?>			
         		<tr <?= $class ?>>
         			<td class="transparent" data-sort="<?= $sosa ?>"><?= I18N::translate('%1$d/%2$d', $sosa, ($sosa + 1) % 10) ?></td>
         			<!--  HUSBAND -->
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($husb); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">        			
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
-        				}
-        				if ($num==$husb->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$husb->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
+						}
+						if ($num==$husb->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$husb->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image;
-        				echo implode('&nbsp;',
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
-        				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $husb, 'smaller')); 
-        				?>
+						echo implode('&nbsp;',
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
+							->get('hRecordNameAppend')
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $husb, 'smaller')); 
+						?>
         				<br/>
             		<?php }
-            		echo $husb->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $husb->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $hdate=$husb->getBirthDate(); ?>
@@ -239,60 +239,60 @@ 
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($wife); ?>
         			<td colspan="2">
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
-        				}
-        				if ($num==$wife->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$wife->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
+						}
+						if ($num==$wife->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$wife->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
         				</a>
         				<?= $sex_image;
-        				echo implode('&nbsp;',
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
-        				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $wife, 'smaller'));
-        				?>
+						echo implode('&nbsp;',
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
+							->get('hRecordNameAppend')
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $wife, 'smaller'));
+						?>
         				<br/>
             		<?php }
-            		echo $wife->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $wife->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $wdate=$wife->getBirthDate(); ?>
             		<td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>"><?= Date::getAge($wdate, $mdate, 2) ?></td>
             		<td data-sort="<?= $mdate->julianDay() ?>"><?php 
-            		if ($marriage_dates = $family->getAllMarriageDates()) {
-        				foreach ($marriage_dates as $n => $marriage_date) {
-        					if ($n) { echo '<br>'; } ?>
+					if ($marriage_dates = $family->getAllMarriageDates()) {
+						foreach ($marriage_dates as $n => $marriage_date) {
+							if ($n) { echo '<br>'; } ?>
         					<div><?= $marriage_date->display(true) ?></div>
         				<?php }
-            		} elseif ($family->getFacts('_NMR')) {
-            		    echo I18N::translate('no');
-            		} elseif ($family->getFacts('MARR')) {
-            		    echo I18N::translate('yes');
-            		} else {
-            		    echo '&nbsp;';
-            		} ?>
+					} elseif ($family->getFacts('_NMR')) {
+						echo I18N::translate('no');
+					} elseif ($family->getFacts('MARR')) {
+						echo I18N::translate('yes');
+					} else {
+						echo '&nbsp;';
+					} ?>
             		</td>
             		<td><?php 
-            		foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
-				        $tmp = new Place($marriage_place, $family->getTree());
-        				if ($n) { ?><br><?php } ?>
+					foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
+						$tmp = new Place($marriage_place, $family->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php  } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isMSourced = $dfamily->isMarriageSourced(); ?>
+						$isMSourced = $dfamily->isMarriageSourced(); ?>
 				   	<td data-sort=<?= $isMSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isMSourced, 'MARR', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td>&nbsp;</td>
@@ -303,30 +303,30 @@ 
 					<td hidden><?php 
 					if (!$mdate->isOK()) { echo 'U'; }
 					else {
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
-					    else { echo 'YES'; }
+						if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
+						else { echo 'YES'; }
 					}
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
-					    echo 'M';
+						echo 'M';
 					} ?>
 					</td>
 					<td hidden><?php 
-			         if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
-			         if ($husb->isDead() && !$wife->isDead()) {
-        				if ($wife->getSex() == 'F') { echo 'H'; }
-        				if ($wife->getSex() == 'M') { echo 'W'; } // male partners
-        			}
-        			if (!$husb->isDead() && $wife->isDead()) {
-        				if ($husb->getSex() == 'M') { echo 'W'; }
-        				if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
-        			}
-        			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
+					 if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
+					 if ($husb->isDead() && !$wife->isDead()) {
+						if ($wife->getSex() == 'F') { echo 'H'; }
+						if ($wife->getSex() == 'M') { echo 'W'; } // male partners
+					}
+					if (!$husb->isDead() && $wife->isDead()) {
+						if ($husb->getSex() == 'M') { echo 'W'; }
+						if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
+					}
+					if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
         			</td>
         			<td hidden><?php 
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
-			         else { echo '&nbsp;'; } ?>
+					 if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
+					 elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
+					 else { echo '&nbsp;'; } ?>
 			         </td>
 				</tr>
         	<?php } ?>
@@ -364,7 +364,7 @@ 
         <p class="warning"><?= I18N::translate('No family has been found for generation %d', $this->data->get('generation')) ?></p>
         <?php 
 		}
-    }
+	}
     
 }
  
\ No newline at end of file

Spacing +25 added lines, -25 removed lines

@@ -34,7 +34,7 @@ 
 	 */
     protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
+        if ($this->data->get('has_sosa', false)) {
             $table_id = $this->data->get('table_id');            
         ?>   
         
@@ -52,7 +52,7 @@ 
 										class="ui-state-default"
 										title="<?php echo I18N::translate('Show individuals who are alive or couples where both partners are alive.'); ?>"
 									>
-									<?php echo I18N::translate('Both alive');?>
+									<?php echo I18N::translate('Both alive'); ?>
 									</button>
 									<button
 										type="button"
@@ -61,7 +61,7 @@ 
 										class="ui-state-default"
 										title="<?php echo I18N::translate('Show couples where only the female partner is dead.'); ?>"
 									>
-									<?php echo I18N::translate('Widower');?>
+									<?php echo I18N::translate('Widower'); ?>
 									</button>
 									<button
 										type="button"
@@ -175,7 +175,7 @@ 
 				</thead>
 				<tbody>
 			
-			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
+			<?php foreach ($this->data->get('sosa_list') as $sosa => $family) {
 			    /** @var \Fisharebest\Webtrees\Family $person */
 
 			    //PERSO Create decorator for Family
@@ -190,7 +190,7 @@ 
 			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
 			    }
 			    
-			    $mdate=$family->getMarriageDate();
+			    $mdate = $family->getMarriageDate();
 			    
 			    if ($family->isPendingAddtion()) {
 			        $class = ' class="new"';
@@ -206,17 +206,17 @@ 
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($husb); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">        			
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $husb)).'"';
         				}
-        				if ($num==$husb->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$husb->getSexImage();
+        				if ($num == $husb->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $husb->getSexImage();
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -225,7 +225,7 @@ 
         				echo implode('&nbsp;',
         				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
         				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $husb, 'smaller')); 
+        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $husb, 'smaller')); 
         				?>
         				<br/>
             		<?php }
@@ -233,23 +233,23 @@ 
             		?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
-            		<?php $hdate=$husb->getBirthDate(); ?>
+            		<?php $hdate = $husb->getBirthDate(); ?>
             		<td class="center" data-sort="<?= Date::getAge($hdate, $mdate, 1) ?>"><?= Date::getAge($hdate, $mdate, 2) ?></td>
             		<!--  WIFE -->            		
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($wife); ?>
         			<td colspan="2">
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $wife)).'"';
         				}
-        				if ($num==$wife->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$wife->getSexImage();
+        				if ($num == $wife->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $wife->getSexImage();
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?= $title.' '.$class ?> href="<?= $wife->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
@@ -258,7 +258,7 @@ 
         				echo implode('&nbsp;',
         				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
         				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $wife, 'smaller'));
+        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $wife, 'smaller'));
         				?>
         				<br/>
             		<?php }
@@ -266,7 +266,7 @@ 
             		?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
-            		<?php $wdate=$wife->getBirthDate(); ?>
+            		<?php $wdate = $wife->getBirthDate(); ?>
             		<td class="center" data-sort="<?= Date::getAge($wdate, $mdate, 1) ?>"><?= Date::getAge($wdate, $mdate, 2) ?></td>
             		<td data-sort="<?= $mdate->julianDay() ?>"><?php 
             		if ($marriage_dates = $family->getAllMarriageDates()) {

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

Indentation +47 added lines, -47 removed lines

@@ -30,16 +30,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        ?>
+	protected function renderContent() {
+		?>
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?= $this->data->get('title') ?></h2>
     			
     			<?php  if($this->data->get('is_setup')) { 
-    			    $this->renderSosaHeader();
-    			    if($this->data->get('has_missing', false)) {
-    			        $table_id = $this->data->get('table_id');
-    			        ?>
+					$this->renderSosaHeader();
+					if($this->data->get('has_missing', false)) {
+						$table_id = $this->data->get('table_id');
+						?>
     			<div id="sosa-indi-missing" class="smissing-list">
                 	<table id="<?= $table_id ?>">
         				<thead>     
@@ -103,52 +103,52 @@ 
         			<tbody>
         			
         			<?php foreach($this->data->get('missing_list') as $missing_tab) {
-        			    $person = $missing_tab['indi'];
+						$person = $missing_tab['indi'];
         			    
-        			    /** @var \Fisharebest\Webtrees\Individual $person */
-        			    if ($person->isPendingAddtion()) {
-        			        $class = ' class="new"';
-        			    } elseif ($person->isPendingDeletion()) {
-        			        $class = ' class="old"';
-        			    } else {
-        			        $class = '';
-        			    }
-        			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-        			    list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person);
-        			    ?>			
+						/** @var \Fisharebest\Webtrees\Individual $person */
+						if ($person->isPendingAddtion()) {
+							$class = ' class="new"';
+						} elseif ($person->isPendingDeletion()) {
+							$class = ' class="old"';
+						} else {
+							$class = '';
+						}
+						$dperson = new \MyArtJaub\Webtrees\Individual($person);
+						list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person);
+						?>			
                 		<tr <?= $class ?>>
                 			<td class="transparent"><?= $missing_tab['sosa'] ?></td>
                 			<td class="transparent"><?= $person->getXref() ?></td>
                 			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
                 			<?php foreach ($person->getAllNames() as $num=>$name) {
-                				if ($name['type']=='NAME') {
-                					$title='';
-                				} else {
-                					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-                				}
-                				if ($num==$person->getPrimaryName()) {
-                					$class=' class="name2"';
-                					$sex_image=$person->getSexImage();
-                				} else {
-                					$class='';
-                					$sex_image='';
-                				} ?>
+								if ($name['type']=='NAME') {
+									$title='';
+								} else {
+									$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+								}
+								if ($num==$person->getPrimaryName()) {
+									$class=' class="name2"';
+									$sex_image=$person->getSexImage();
+								} else {
+									$class='';
+									$sex_image='';
+								} ?>
                 				<a <?= $title.' '.$class ?> href="<?= $person->getHtmlUrl() ?>">
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
                 				</a>
                 				<?= $sex_image;
-                				echo implode('&nbsp;',
-                				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
-                				    ->get('hRecordNameAppend')
-                				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller'));  ?>
+								echo implode('&nbsp;',
+									\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
+									->get('hRecordNameAppend')
+									->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller'));  ?>
                 				<br/>
                     		<?php }
-                    		echo $person->getPrimaryParentsNames('parents details1', 'none');
-                    		?>
+							echo $person->getPrimaryParentsNames('parents details1', 'none');
+							?>
                     		</td>
 							<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>             		
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isISourced = $dperson->isSourced(); ?>
+								$isISourced = $dperson->isSourced(); ?>
         				   	<td data-sort="<?= $isISourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('R', $isISourced, 'INDI', 1, 'medium') ?></td>
         					<?php } else { ?>
         					<td>&nbsp;</td>
@@ -158,23 +158,23 @@ 
                     		<?php $birth_dates = $person->getAllBirthDates(); ?>
                     		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
                     		<?php                     		
-                    		foreach ($birth_dates as $n => $birth_date) {
-                    		    if ($n > 0) { ?> <br> <?php  } 
-                    		    echo $birth_date->display(true);
-                    		}
-                    		?>
+							foreach ($birth_dates as $n => $birth_date) {
+								if ($n > 0) { ?> <br> <?php  } 
+								echo $birth_date->display(true);
+							}
+							?>
                     		</td>
                 			<td>
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-        				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-                				if ($n > 0) { ?><br><?php } ?>
+								$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+								if ($n > 0) { ?><br><?php } ?>
                 				<a href="'<?= $tmp->getURL(); ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
                 				</a>
                 			<?php } ?>
                 			</td>
         					<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isBSourced = $dperson->isBirthSourced(); ?>
+								$isBSourced = $dperson->isBirthSourced(); ?>
         				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
         					<?php } else { ?>
         					<td>&nbsp;</td>
@@ -199,7 +199,7 @@ 
     			 <?php } else if ($this->data->get('generation', 0) > 0) { ?> 
     			<p><?= I18N::translate('No ancestors are missing for this generation. Generation complete at %s.', I18N::percentage($this->data->get('perc_sosa'), 2)) ?></p>
     			    <?php }   			    
-    			} else { ?>
+				} else { ?>
     			<p class="warning"><?= I18N::translate('The list could not be displayed. Reasons might be:') ?><br/>
     				<ul>
     					<li><?= I18N::translate('No Sosa root individual has been defined.') ?></li>
@@ -210,6 +210,6 @@ 
     			<?php } ?>
     		</div> 
     		<?php 
-        }
+		}
 }
  
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -35,9 +35,9 @@ 
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?= $this->data->get('title') ?></h2>
     			
-    			<?php  if($this->data->get('is_setup')) { 
+    			<?php  if ($this->data->get('is_setup')) { 
     			    $this->renderSosaHeader();
-    			    if($this->data->get('has_missing', false)) {
+    			    if ($this->data->get('has_missing', false)) {
     			        $table_id = $this->data->get('table_id');
     			        ?>
     			<div id="sosa-indi-missing" class="smissing-list">
@@ -102,7 +102,7 @@ 
         				</thead>
         			<tbody>
         			
-        			<?php foreach($this->data->get('missing_list') as $missing_tab) {
+        			<?php foreach ($this->data->get('missing_list') as $missing_tab) {
         			    $person = $missing_tab['indi'];
         			    
         			    /** @var \Fisharebest\Webtrees\Individual $person */
@@ -121,17 +121,17 @@ 
                 			<td class="transparent"><?= $person->getXref() ?></td>
                 			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
                 			<?php foreach ($person->getAllNames() as $num=>$name) {
-                				if ($name['type']=='NAME') {
-                					$title='';
+                				if ($name['type'] == 'NAME') {
+                					$title = '';
                 				} else {
-                					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+                					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
                 				}
-                				if ($num==$person->getPrimaryName()) {
-                					$class=' class="name2"';
-                					$sex_image=$person->getSexImage();
+                				if ($num == $person->getPrimaryName()) {
+                					$class = ' class="name2"';
+                					$sex_image = $person->getSexImage();
                 				} else {
-                					$class='';
-                					$sex_image='';
+                					$class = '';
+                					$sex_image = '';
                 				} ?>
                 				<a <?= $title.' '.$class ?> href="<?= $person->getHtmlUrl() ?>">
                 					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
@@ -140,7 +140,7 @@ 
                 				echo implode('&nbsp;',
                 				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
                 				    ->get('hRecordNameAppend')
-                				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller'));  ?>
+                				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); ?>
                 				<br/>
                     		<?php }
                     		echo $person->getPrimaryParentsNames('parents details1', 'none');
@@ -188,9 +188,9 @@ 
 							<td class="ui-state-default" colspan="11">
 								<div class="center">
 									<?= I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))) ?>
-									<?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
-									<?= ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)) ?>
-									<?= ' [' . I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'),2)).']' ?>
+									<?php if ($this->data->get('missing_hidden') > 0) echo ' ['.I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
+									<?= ' - '.I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)) ?>
+									<?= ' ['.I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'), 2)).']' ?>
 								</div>
 							</td>
 						</tr>

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

Indentation +71 added lines, -71 removed lines

@@ -31,11 +31,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
         <div id="sosa-indi-list" class="sosa-list">
         	<table id="<?= $table_id ?>">
@@ -177,67 +177,67 @@ 
 			<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
-			    /** @var \Fisharebest\Webtrees\Individual $person */
-			    if ($person->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($person->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-			    ?>			
+				/** @var \Fisharebest\Webtrees\Individual $person */
+				if ($person->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($person->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				$dperson = new \MyArtJaub\Webtrees\Individual($person);
+				?>			
         		<tr <?= $class ?>>
         			<td class="transparent"><?= $sosa ?></td>
         			<td hidden><?= $person->getXref() ?></td>
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-        				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+						}
+						if ($num==$person->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$person->getSexImage();
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
         				</a>
         				<?= $sex_image;
-        				echo implode('&nbsp;',
-        				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
-        				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
-        				?>
+						echo implode('&nbsp;',
+							\MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
+							->get('hRecordNameAppend')
+							->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
+						?>
         				<br/>
             		<?php }
-            		echo $person->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $person->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td hidden data-sort="<?= Filter::escapeHtml($surn_givn) ?>"></td>
             		<?php $birth_dates = $person->getAllBirthDates(); ?>
             		<td data-sort="<?= $person->getEstimatedBirthDate()->julianDay() ?>">
             		<?php foreach ($birth_dates as $n => $birth_date) {
-    					   if ($n > 0) { ?><br/><?php } ?>
+						   if ($n > 0) { ?><br/><?php } ?>
     						<?php  echo $birth_date->display(true);
-			        } ?>
+					} ?>
             		</td>
         			<td>
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-        				if ($n > 0) { ?><br><?php } ?>
+						$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+						if ($n > 0) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isBSourced = $dperson->isBirthSourced(); ?>
+						$isBSourced = $dperson->isBirthSourced(); ?>
 				   	<td data-sort="<?= $isBSourced ?>"><?= FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td>&nbsp;</td>
@@ -245,63 +245,63 @@ 
 					<?php $death_dates = $person->getAllDeathDates(); ?>
 					<td data-sort="<?= $person->getEstimatedDeathDate()->julianDay() ?>">
 					<?php foreach ($death_dates as $num => $death_date) {
-					       if ($num) { ?><br/><?php } ?>
+						   if ($num) { ?><br/><?php } ?>
 					 		<?php echo $death_date->display(true); 
-				     } ?>
+					 } ?>
 			         </td>
 			         <?php if (isset($birth_dates[0]) && isset($death_dates[0])) {
-			             $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
-			             $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
-			         } else {
-			             $age_at_death      = '';
-			             $age_at_death_sort = PHP_INT_MAX;
-			         } ?>
+						 $age_at_death = Date::getAge($birth_dates[0], $death_dates[0], 0);
+						 $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0], 2);
+					 } else {
+						 $age_at_death      = '';
+						 $age_at_death_sort = PHP_INT_MAX;
+					 } ?>
 			         <td class="center" data-sort="<?= $age_at_death_sort ?>"><?= $age_at_death ?></td>
 			         <td>
         			 <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) {
-        				$tmp = new Place($death_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new Place($death_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?= $tmp->getURL() ?>" title="<?= strip_tags($tmp->getFullName()) ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()) ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        			    if($person->isDead()) {
-        			        $isDSourced = $dperson->isDeathSourced(); ?>
+						if($person->isDead()) {
+							$isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td>
 					<?php } else { ?>
 					<td data-sort="-99">&nbsp;</td>
 					<?php } 
-        			} else { ?>
+					} else { ?>
 					<td>&nbsp;</td>
 					<?php } ?>
 					<td hidden><?= $person->getSex() ?></td>
 					<td hidden>
 					<?php if (!$person->canShow() || Date::compare($person->getEstimatedBirthDate(), new Date(date('Y') - 100)) > 0) {
-					    echo 'Y100';
-        			} else {
-        				echo 'YES';
-        			} ?>
+						echo 'Y100';
+					} else {
+						echo 'YES';
+					} ?>
         			</td>
         			<td hidden>
         			<?php if (isset($death_dates[0]) && Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) {
-				        echo 'Y100';
-        			} elseif ($person->isDead()) {
-				        echo 'YES';
-        			} else {
-				        echo 'N';
-			         } ?>
+						echo 'Y100';
+					} elseif ($person->isDead()) {
+						echo 'YES';
+					} else {
+						echo 'N';
+					 } ?>
 			         </td>
 			         <td hidden>
 					<?php if (!$person->getChildFamilies()) {
-					    echo 'R';
+						echo 'R';
 					}  // roots
 					elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) {
-            			echo 'L';
+						echo 'L';
 					} // leaves
 					else {
-					    echo '&nbsp;';
+						echo '&nbsp;';
 					} ?>
 					</td>
 				</tr>
@@ -312,12 +312,12 @@ 
 					<th class="ui-state-default" colspan="15">
 						<div class="center">
 							<?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
-							    I18N::number($this->data->get('sosa_count')),
-							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
-							    ) ?>
+								I18N::number($this->data->get('sosa_count')),
+								I18N::number($this->data->get('sosa_theo')), 
+								I18N::percentage($this->data->get('sosa_ratio'),2)
+								) ?>
 							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+								echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -351,8 +351,8 @@ 
 				</div>
 			</div>
 		<?php 
-        }
-    }
+		}
+	}
     
 }
  
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 	 */
     protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
+        if ($this->data->get('has_sosa', false)) {
             $table_id = $this->data->get('table_id');            
         ?>   
         
@@ -176,7 +176,7 @@ 
 				</thead>
 			<tbody>
 			
-			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
+			<?php foreach ($this->data->get('sosa_list') as $sosa => $person) {
 			    /** @var \Fisharebest\Webtrees\Individual $person */
 			    if ($person->isPendingAddtion()) {
 			        $class = ' class="new"';
@@ -193,17 +193,17 @@ 
         			<?php list($surn_givn, $givn_surn) = FunctionsPrintLists::sortableNames($person); ?>
         			<td colspan="2" data-sort="<?= Filter::escapeHtml($givn_surn) ?>">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
+        				if ($name['type'] == 'NAME') {
+        					$title = '';
         				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+        					$title = 'title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
         				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
+        				if ($num == $person->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $person->getSexImage();
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?= $title.' '.$class; ?> href="<?= $person->getHtmlUrl() ?>">
         					<?= \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']) ?>
@@ -212,7 +212,7 @@ 
         				echo implode('&nbsp;',
         				    \MyArtJaub\Webtrees\Hook\HookProvider::getInstance()
         				    ->get('hRecordNameAppend')
-        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME),  $person, 'smaller')); 
+        				    ->executeOnlyFor(array(Constants::MODULE_MAJ_SOSA_NAME), $person, 'smaller')); 
         				?>
         				<br/>
             		<?php }
@@ -267,7 +267,7 @@ 
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        			    if($person->isDead()) {
+        			    if ($person->isDead()) {
         			        $isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td data-sort=<?= $isDSourced ?>><?= FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium') ?></td>
 					<?php } else { ?>
@@ -314,10 +314,10 @@ 
 							<?= I18N::translate('Number of Sosa ancestors: %1$s known / %2$s theoretical (%3$s)',
 							    I18N::number($this->data->get('sosa_count')),
 							    I18N::number($this->data->get('sosa_theo')), 
-							    I18N::percentage($this->data->get('sosa_ratio'),2)
+							    I18N::percentage($this->data->get('sosa_ratio'), 2)
 							    ) ?>
-							<?php if($this->data->get('sosa_hidden') > 0) {
-							    echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
+							<?php if ($this->data->get('sosa_hidden') > 0) {
+							    echo '['.I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -329,7 +329,7 @@ 
 								<button type="button" class="ui-state-default btn-toggle-parents">
 									<?= I18N::translate('Show parents') ?>
 								</button>
-								<button id="btn-toggle-statistics-<?= $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics">
+								<button id="btn-toggle-statistics-<?= $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics">
 									<?= I18N::translate('Show statistics charts') ?>
 								</button>
 							</div>

src/Webtrees/Hook/Hook.php

Indentation +19 added lines, -19 removed lines

@@ -1,13 +1,13 @@ 
 <?php
  /**
- * webtrees-lib: MyArtJaub library for webtrees
- *
- * @package MyArtJaub\Webtrees
- * @subpackage Hook
- * @author Jonathan Jaubart <dev@jaubart.com>
- * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
- */
+  * webtrees-lib: MyArtJaub library for webtrees
+  *
+  * @package MyArtJaub\Webtrees
+  * @subpackage Hook
+  * @author Jonathan Jaubart <dev@jaubart.com>
+  * @copyright Copyright (c) 2011-2016, Jonathan Jaubart
+  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
+  */
 namespace MyArtJaub\Webtrees\Hook;
 
 use Fisharebest\Webtrees\Database;
@@ -137,17 +137,17 @@ 
 	 * @return array Results of the hook executions
 	 */
 	public function executeOnlyFor(array $module_names) {
-	    $result = array();
-	    if(HookProvider::getInstance()->isModuleOperational()){
-	       $params = func_get_args();
-	       array_shift($params);
-    	    foreach ($module_names as $module_name) {
-    	        if($module = Module::getModuleByName($module_name)) {
-    	            $result[] = call_user_func_array(array($module, $this->hook_function), $params);
-    	        }
-    	    }
-	    }
-	    return $result;
+		$result = array();
+		if(HookProvider::getInstance()->isModuleOperational()){
+		   $params = func_get_args();
+		   array_shift($params);
+			foreach ($module_names as $module_name) {
+				if($module = Module::getModuleByName($module_name)) {
+					$result[] = call_user_func_array(array($module, $this->hook_function), $params);
+				}
+			}
+		}
+		return $result;
 	}
 
 	/**

Spacing +23 added lines, -23 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $hook_function_in Hook function to be subscribed or executed
 	 * @param string $hook_context_in Hook context to be subscribed or executed
 	 */
-	public function __construct($hook_function_in, $hook_context_in = 'all'){
+	public function __construct($hook_function_in, $hook_context_in = 'all') {
 		$this->hook_function = $hook_function_in;
 		$this->hook_context = $hook_context_in;
 	}
@@ -47,8 +47,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function subscribe($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function subscribe($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			Database::prepare(
 					"INSERT IGNORE INTO `##maj_hooks` (majh_hook_function, majh_hook_context, majh_module_name)".
 					" VALUES (?, ?, ?)"
@@ -62,8 +62,8 @@ 
 	 * @param string $hsubscriber Name of the subscriber module
 	 * @param int $priority Priority of execution
 	 */
-	public function setPriority($hsubscriber, $priority){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function setPriority($hsubscriber, $priority) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_module_priority=?".
@@ -79,8 +79,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function enable($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function enable($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_status='enabled'".
@@ -96,8 +96,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function disable($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function disable($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"UPDATE `##maj_hooks`".
 			" SET majh_status='disabled'".
@@ -113,8 +113,8 @@ 
 	 *
 	 * @param string $hsubscriber Name of the subscriber module
 	 */
-	public function remove($hsubscriber){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function remove($hsubscriber) {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 		Database::prepare(
 			"DELETE FROM `##maj_hooks`".
 			" WHERE majh_hook_function=?".
@@ -138,11 +138,11 @@ 
 	 */
 	public function executeOnlyFor(array $module_names) {
 	    $result = array();
-	    if(HookProvider::getInstance()->isModuleOperational()){
+	    if (HookProvider::getInstance()->isModuleOperational()) {
 	       $params = func_get_args();
 	       array_shift($params);
     	    foreach ($module_names as $module_name) {
-    	        if($module = Module::getModuleByName($module_name)) {
+    	        if ($module = Module::getModuleByName($module_name)) {
     	            $result[] = call_user_func_array(array($module, $this->hook_function), $params);
     	        }
     	    }
@@ -156,17 +156,17 @@ 
 	 *
 	 * @return array Results of the hook executions
 	 */
-	public function execute(){
+	public function execute() {
 		$result = array();
-		if(HookProvider::getInstance()->isModuleOperational()){
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			$params = func_get_args();
 			$sqlquery = '';
 			$sqlparams = array($this->hook_function);
-			if($this->hook_context != 'all') {
+			if ($this->hook_context != 'all') {
 				$sqlparams = array($this->hook_function, $this->hook_context);
 				$sqlquery = " OR majh_hook_context=?";
 			}
-			$module_names=Database::prepare(
+			$module_names = Database::prepare(
 					"SELECT majh_module_name AS module, majh_module_priority AS priority FROM `##maj_hooks`".
 					" WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'".
 					" ORDER BY majh_module_priority ASC, module ASC"
@@ -183,15 +183,15 @@ 
 	 *
 	 * @return int Number of active modules
 	 */
-	public function getNumberActiveModules(){
-		if(HookProvider::getInstance()->isModuleOperational()){
+	public function getNumberActiveModules() {
+		if (HookProvider::getInstance()->isModuleOperational()) {
 			$sqlquery = '';
 			$sqlparams = array($this->hook_function);
-			if($this->hook_context != 'all') {
+			if ($this->hook_context != 'all') {
 				$sqlparams = array($this->hook_function, $this->hook_context);
 				$sqlquery = " OR majh_hook_context=?";
 			}
-			$module_names=Database::prepare(
+			$module_names = Database::prepare(
 					"SELECT majh_module_name AS modules FROM `##maj_hooks`".
 					" WHERE majh_hook_function = ? AND (majh_hook_context='all'".$sqlquery.") AND majh_status='enabled'"
 			)->execute($sqlparams)->fetchOneColumn();
@@ -205,8 +205,8 @@ 
 	 *
 	 * @return bool True is active modules exist, false otherwise
 	 */
-	public function hasAnyActiveModule(){
-		return ($this->getNumberActiveModules()>0);
+	public function hasAnyActiveModule() {
+		return ($this->getNumberActiveModules() > 0);
 	}
 
 }