jon48 / webtrees-lib

src/Webtrees/Hook/HookInterfaces/CustomSimpleTagManagerInterface.php

Indentation +14 added lines, -14 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\HookInterfaces;
 
 /**
@@ -18,12 +18,12 @@ 
 interface CustomSimpleTagManagerInterface {
 
 
-    /**
-     * Returns the list of expected tags, classified by type of records.
-     *
-     * @return array List of expected tags
-     */
-    public function hGetExpectedTags();
+	/**
+	 * Returns the list of expected tags, classified by type of records.
+	 *
+	 * @return array List of expected tags
+	 */
+	public function hGetExpectedTags();
     
 	/**
 	 * Return the HTML code to be display for this tag.

src/Webtrees/Family.php

Indentation +4 added lines, -4 removed lines

@@ -40,10 +40,10 @@
 	}
 	
 	/**
-	* Check if this family's marriages are sourced
-	*
-	* @return int Level of sources
-	* */
+	 * Check if this family's marriages are sourced
+	 *
+	 * @return int Level of sources
+	 * */
 	function isMarriageSourced(){
 		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');

src/Webtrees/Fact.php

Indentation +15 added lines, -15 removed lines

@@ -34,26 +34,26 @@
 	protected $fact; 
 	
 	/**
-	* Contructor for the decorator
-	*
-	* @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
-	*/
+	 * Contructor for the decorator
+	 *
+	 * @param \Fisharebest\Webtrees\Fact $fact_in The Fact to extend
+	 */
 	public function __construct(\Fisharebest\Webtrees\Fact $fact_in){
 		$this->fact = $fact_in;
 	}
 	
 	/**
-	* Check if a fact has a date and is sourced
-	* Values:
-	* 		- 0, if no date is found for the fact
-	* 		- -1, if the date is not precise
-	* 		- -2, if the date is precise, but no source is found
-	* 		- 1, if the date is precise, and a source is found
-	* 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
-	* 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
-	*
-	* @return int Level of sources
-	*/
+	 * Check if a fact has a date and is sourced
+	 * Values:
+	 * 		- 0, if no date is found for the fact
+	 * 		- -1, if the date is not precise
+	 * 		- -2, if the date is precise, but no source is found
+	 * 		- 1, if the date is precise, and a source is found
+	 * 		- 2, if the date is precise, a source exists, and is supported by a certificate (requires _ACT usage)
+	 * 		- 3, if the date is precise, a source exists, and the certificate supporting the fact is within an acceptable range of date
+	 *
+	 * @return int Level of sources
+	 */
 	public function isSourced(){
 		$isSourced=0;
 		$date = $this->fact->getDate();

src/Webtrees/Module/WelcomeBlock/WelcomeBlockController.php

Indentation +67 added lines, -67 removed lines

@@ -29,30 +29,30 @@ 
 class WelcomeBlockController extends MvcController
 {   
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * WelcomeBlock@index
-     * 
-     * @param PageController $parent_controller
-     * @param Tree $tree
-     * @param string $block_id
-     * @param string $template
-     * @return $string
-     */
-    public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
-        $view_bag = new ViewBag();
+	/**
+	 * WelcomeBlock@index
+	 * 
+	 * @param PageController $parent_controller
+	 * @param Tree $tree
+	 * @param string $block_id
+	 * @param string $template
+	 * @return $string
+	 */
+	public function index(PageController $parent_controller, Tree $tree, $block_id, $template) {        
+		$view_bag = new ViewBag();
         
-        if($parent_controller && $tree) {
+		if($parent_controller && $tree) {
         
-            $view_bag->set('tree', $tree);
-            $view_bag->set('indi', $parent_controller->getSignificantIndividual());
+			$view_bag->set('tree', $tree);
+			$view_bag->set('indi', $parent_controller->getSignificantIndividual());
         
-            $id = $this->module->getName().$block_id;
-            $class = $this->module->getName().'_block';
-            $parent_controller->addInlineJavascript('
+			$id = $this->module->getName().$block_id;
+			$class = $this->module->getName().'_block';
+			$parent_controller->addInlineJavascript('
                 jQuery("#maj-new_passwd").hide();
                 jQuery("#maj-passwd_click").click(function()
                 {
@@ -63,65 +63,65 @@ 
     				  });
     			');
     
-            if (Auth::isAdmin()) {
-                $title='<a class="icon-admin" title="'.I18N::translate('Preferences').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
-            } else {
-                $title='';
-            }
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
+			if (Auth::isAdmin()) {
+				$title='<a class="icon-admin" title="'.I18N::translate('Preferences').'" href="block_edit.php?block_id='.$block_id.'&amp;ged=' . $tree->getNameHtml() . '&amp;ctype=gedcom"></a>';
+			} else {
+				$title='';
+			}
+			$title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
     
-            $piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
-            $view_bag->set('piwik_enabled', $piwik_enabled);
-            if($piwik_enabled) {
-                $parent_controller->addInlineJavascript(
-                    '$("#piwik_stats")
+			$piwik_enabled = $this->module->getBlockSetting($block_id, 'piwik_enabled', false);
+			$view_bag->set('piwik_enabled', $piwik_enabled);
+			if($piwik_enabled) {
+				$parent_controller->addInlineJavascript(
+					'$("#piwik_stats")
                         .load("module.php?mod='.$this->module->getName().'&mod_action=Piwik&block_id='.$block_id.'");'
-                );
-            }
+				);
+			}
     
-            $content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
+			$content = ViewFactory::make('WelcomeBlock', $this,  new BaseController(), $view_bag)->getHtmlPartial();   
             
-            if ($template) {
-                return Theme::theme()->formatBlock($id, $title, $class, $content);
-            } else {
-                return $content;
-            }
-        }
-    }
+			if ($template) {
+				return Theme::theme()->formatBlock($id, $title, $class, $content);
+			} else {
+				return $content;
+			}
+		}
+	}
     
     
     
-    /**
-     * WelcomeBlock@config
-     * 
-     * @param string $block_id
-     */
-    public function config($block_id = null) {
+	/**
+	 * WelcomeBlock@config
+	 * 
+	 * @param string $block_id
+	 */
+	public function config($block_id = null) {
         
-        if(empty($block_id)) throw new MvcException(404);
+		if(empty($block_id)) throw new MvcException(404);
 
-        if (Filter::postBool('save') && Filter::checkCsrf()) {
-            $this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
-            $this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
-            $this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
-            $this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token'))); 
-            Cache::delete('piwikCountYear', $this->module);          
-            throw new MvcException(200); // Use this instead of exit
-        }
+		if (Filter::postBool('save') && Filter::checkCsrf()) {
+			$this->module->setBlockSetting($block_id, 'piwik_enabled', Filter::postBool('piwik_enabled'));
+			$this->module->setBlockSetting($block_id, 'piwik_url', trim(Filter::postUrl('piwik_url')));
+			$this->module->setBlockSetting($block_id, 'piwik_siteid', trim(Filter::post('piwik_siteid')));
+			$this->module->setBlockSetting($block_id, 'piwik_token', trim(Filter::post('piwik_token'))); 
+			Cache::delete('piwikCountYear', $this->module);          
+			throw new MvcException(200); // Use this instead of exit
+		}
         
-        $view_bag = new ViewBag();
+		$view_bag = new ViewBag();
         
-        // Is Piwik Statistic Enabled ?
-        $view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
-        //Piwik Root Url
-        $view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
-        // Piwik token
-        $view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
-        // Piwik side id
-        $view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
+		// Is Piwik Statistic Enabled ?
+		$view_bag->set('piwik_enabled', $this->module->getBlockSetting($block_id, 'piwik_enabled', '0'));
+		//Piwik Root Url
+		$view_bag->set('piwik_url', $this->module->getBlockSetting($block_id, 'piwik_url', ''));
+		// Piwik token
+		$view_bag->set('piwik_token', $this->module->getBlockSetting($block_id, 'piwik_token', ''));
+		// Piwik side id
+		$view_bag->set('piwik_siteid', $this->module->getBlockSetting($block_id, 'piwik_siteid', ''));
         
-        return ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->getHtmlPartial();
-    }
+		return ViewFactory::make('WelcomeBlockConfig', $this, new BaseController(), $view_bag)->getHtmlPartial();
+	}
     
     
     

src/Webtrees/Module/WelcomeBlock/Views/WelcomeBlockView.php

Indentation +34 added lines, -34 removed lines

@@ -24,16 +24,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        /** @var \Fisharebest\Webtrees\Individual $indi */
-        $indi = $this->data->get('indi');
+	protected function renderContent() {        
+		/** @var \Fisharebest\Webtrees\Individual $indi */
+		$indi = $this->data->get('indi');
         
-        /** @var \Fisharebest\Webtrees\Tree $tree */
-        $tree = $this->data->get('tree');
+		/** @var \Fisharebest\Webtrees\Tree $tree */
+		$tree = $this->data->get('tree');
                 
-        //Welcome section - gedcom title, date, statistics - based on gedcom_block        
-        $content = 
-            '<table>
+		//Welcome section - gedcom title, date, statistics - based on gedcom_block        
+		$content = 
+			'<table>
                 <tr>
                     <td>
                         <a href="pedigree.php?rootid=' . $indi->getXref() . '&amp;ged=' . $tree->getNameUrl() . '">
@@ -46,50 +46,50 @@ 
                         </a>
                     </td>';
         
-        if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
-            $content .= '
+		if (Site::getPreference('USE_REGISTRATION_MODULE') && !Auth::check()) {
+			$content .= '
                     <td>
                         <a href="' . WT_LOGIN_URL . '?action=register">
                             <i class="icon-user_add"></i><br>'.I18N::translate('Request a new user account').'
                         </a>
                     </td>';
-        }
-        $content .= '
+		}
+		$content .= '
                 </tr>
             </table>';
         
-        // Piwik Statistics        
-        if ($this->data->get('piwik_enabled', false)){
-            $content .= '
+		// Piwik Statistics        
+		if ($this->data->get('piwik_enabled', false)){
+			$content .= '
                 <div class="center">
                     <div id="piwik_stats">
                         <i class="icon-loading-small"></i>&nbsp;' . I18N::translate('Retrieving Piwik statistics...') . '
                     </div>
                 </div>';
-        }
+		}
         
-        $content .=  '<hr />';
+		$content .=  '<hr />';
         
-        // Login section - based on login_block
-        if (Auth::check()) {
-            $content .= '
+		// Login section - based on login_block
+		if (Auth::check()) {
+			$content .= '
             <div class="center">
                 <form method="post" action="logout.php" name="logoutform" onsubmit="return true;">
                     <br>' . 
-                    I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') .
-                    '<br><br>
+					I18N::translate('You are signed in as %s.', '<a href="edituser.php" class="name2">' . Auth::user()->getRealNameHtml() . '</a>') .
+					'<br><br>
                     <input type="submit" value="'.I18N::translate('sign out').'">
                     <br><br>
                 </form>
             </div>';
-        } else {
-            $content .= '
+		} else {
+			$content .= '
             <div id="maj-login-box">
                 <form id="maj-login-form" name="maj-login-form" method="post" action="'.WT_LOGIN_URL.'">
 					<input type="hidden" name="action" value="login">
 				    <div>
 					    <label for="maj-username">'. I18N::translate('Username').
-							    '<input type="text" id="maj-username" name="username" class="formField">
+								'<input type="text" id="maj-username" name="username" class="formField">
 						</label>
 					</div>
 					<div>
@@ -103,17 +103,17 @@ 
 					<div>
 						<a href="#" id="maj-passwd_click">'. I18N::translate('Request a new password').'</a>
 					</div>';
-            if (Site::getPreference('USE_REGISTRATION_MODULE')) {
-                $content.= '
+			if (Site::getPreference('USE_REGISTRATION_MODULE')) {
+				$content.= '
                     <div>
                         <a href="'.WT_LOGIN_URL.'?action=register">'. I18N::translate('Request a new user account').'</a>
                     </div>';
-            }
-            $content.= '
+			}
+			$content.= '
                 </form>'; // close "login-form"
              
-            // hidden New Password block
-            $content.= '
+			// hidden New Password block
+			$content.= '
                 <div id="maj-new_passwd">
                     <form id="maj-new_passwd_form" name="new_passwd_form" action="'.WT_LOGIN_URL.'" method="post">
                         <input type="hidden" name="time" value="">
@@ -130,10 +130,10 @@ 
                     </form>
                 </div>
             </div>';//"login-box"
-        }
+		}
         
-        return $content;
-    }
+		return $content;
+	}
     
 
 }

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Indentation +60 added lines, -60 removed lines

@@ -23,77 +23,77 @@
  */
 class PiwikController extends MvcController
 {   
-    /**
-     * Retrieve the number of visitors from Piwik, for a given period.
-     * 
-     * @param string $block_id
-     * @param string $period
-     * @param (null|int) Number of visits
-     */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+	/**
+	 * Retrieve the number of visitors from Piwik, for a given period.
+	 * 
+	 * @param string $block_id
+	 * @param string $period
+	 * @param (null|int) Number of visits
+	 */
+	private function getNumberOfVisitsPiwik($block_id, $period='year'){
     
-        $piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
-        $piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
-        $piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
+		$piwik_url = $this->module->getBlockSetting($block_id, 'piwik_url');
+		$piwik_siteid = $this->module->getBlockSetting($block_id, 'piwik_siteid');
+		$piwik_token = $this->module->getBlockSetting($block_id, 'piwik_token');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
-            $piwik_token && strlen($piwik_token)            
-            ) 
-        {        
-            // calling Piwik REST API
-            $url = $piwik_url;
-            $url .= '?module=API&method=VisitsSummary.getVisits';
-            $url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
-            $url .= '&format=PHP';
-            $url .= '&token_auth='.$piwik_token;
+		if($piwik_url && strlen($piwik_url) > 0 &&
+			$piwik_siteid  && strlen($piwik_siteid) > 0 &&
+			$piwik_token && strlen($piwik_token)            
+			) 
+		{        
+			// calling Piwik REST API
+			$url = $piwik_url;
+			$url .= '?module=API&method=VisitsSummary.getVisits';
+			$url .= '&idSite='.$piwik_siteid.'&period='.$period.'&date=today';
+			$url .= '&format=PHP';
+			$url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
-                $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
-            }
-        }
+			if($fetched = File::fetchUrl($url)) {
+				$content = @unserialize($fetched);
+				if(is_numeric($content)) return $content;
+			}
+		}
     
-        return null;
-    }
+		return null;
+	}
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * Piwik@index
-     */
-    public function index() {  
+	/**
+	 * Piwik@index
+	 */
+	public function index() {  
         
-        $ctrl = new AjaxController();
+		$ctrl = new AjaxController();
         
-        $data = new ViewBag();
-        $data->set('has_stats', false);
+		$data = new ViewBag();
+		$data->set('has_stats', false);
         
-        $block_id = Filter::get('block_id');        
-        if($block_id){
-            $cached_item = Cache::get('piwikCountYear', $this->module);
-            $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
-                $visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
-                if(!is_null($visitCountYear)) {
-                    $cached_item->expiresAt(new \DateTime('tomorrow'));  // Expires the next day at midnight
-                    Cache::save($cached_item, $visitCountYear);
-                }
-            }
+		$block_id = Filter::get('block_id');        
+		if($block_id){
+			$cached_item = Cache::get('piwikCountYear', $this->module);
+			$visitCountYear = $cached_item->get();
+			if(!$cached_item->isHit()) {
+				$visitCountYear = $this->getNumberOfVisitsPiwik($block_id);
+				if(!is_null($visitCountYear)) {
+					$cached_item->expiresAt(new \DateTime('tomorrow'));  // Expires the next day at midnight
+					Cache::save($cached_item, $visitCountYear);
+				}
+			}
             
-            if($visitCountYear){
-                $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+			if($visitCountYear){
+				$visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
+				$visitCountYear = max( 0, $visitCountYear);
                 
-                $data->set('has_stats', true);
-                $data->set('visits_today', $visitCountToday);
-                $data->set('visits_year', $visitCountYear + $visitCountToday);                
-            }
-        }
+				$data->set('has_stats', true);
+				$data->set('visits_today', $visitCountToday);
+				$data->set('visits_year', $visitCountYear + $visitCountToday);                
+			}
+		}
         
-        ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
-    }
+		ViewFactory::make('PiwikStats', $this, $ctrl, $data)->render();        
+	}
     
 }
\ No newline at end of file

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

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

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