jon48 / webtrees-lib

src/Webtrees/Controller/JsonController.php

Indentation +41 added lines, -41 removed lines

@@ -18,50 +18,50 @@
  */
 class JsonController extends BaseController {
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
-     */
-    public function pageHeader() {        
-        header('Content-Type: application/json');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-        // We've displayed the header - display the footer automatically
-        register_shutdown_function(array($this, 'pageFooter'));
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageHeader()
+	 */
+	public function pageHeader() {        
+		header('Content-Type: application/json');
+		header('Cache-Control: no-cache, must-revalidate');
+		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+		// We've displayed the header - display the footer automatically
+		register_shutdown_function(array($this, 'pageFooter'));
         
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
-     */
-    public function pageFooter() {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Controller\BaseController::pageFooter()
+	 */
+	public function pageFooter() {
+		return $this;
+	}
     
-    /**
-     * Restrict access.
-     *
-     * @param bool $condition
-     *
-     * @return $this
-     */
-    public function restrictAccess($condition) {
-        if ($condition !== true) {
-            throw new MvcException(403);
-        }
+	/**
+	 * Restrict access.
+	 *
+	 * @param bool $condition
+	 *
+	 * @return $this
+	 */
+	public function restrictAccess($condition) {
+		if ($condition !== true) {
+			throw new MvcException(403);
+		}
     
-        return $this;
-    }
+		return $this;
+	}
     
-    /**
-     * Encode the data to JSON format.
-     * 
-     * @param array $data Data to encode
-     * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
-     */
-    public function encode(array $data, $options = 0) {
-        echo json_encode($data, $options);
-    }
+	/**
+	 * Encode the data to JSON format.
+	 * 
+	 * @param array $data Data to encode
+	 * @param number $options JSON options mask. See http://php.net/manual/fr/json.constants.php
+	 */
+	public function encode(array $data, $options = 0) {
+		echo json_encode($data, $options);
+	}
 }

src/Webtrees/Module/WelcomeBlock/PiwikController.php

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
         
             if($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if(is_numeric($content)) {
+                	return $content;
+                }
             }
         }
     

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

Spacing +11 added lines, -11 removed lines

@@ -30,14 +30,14 @@ 
      * @param string $period
      * @param (null|int) Number of visits
      */
-    private function getNumberOfVisitsPiwik($block_id, $period='year'){
+    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');
     
-        if($piwik_url && strlen($piwik_url) > 0 &&
-            $piwik_siteid  && strlen($piwik_siteid) > 0 &&
+        if ($piwik_url && strlen($piwik_url) > 0 &&
+            $piwik_siteid && strlen($piwik_siteid) > 0 &&
             $piwik_token && strlen($piwik_token)            
             ) 
         {        
@@ -48,9 +48,9 @@ 
             $url .= '&format=PHP';
             $url .= '&token_auth='.$piwik_token;
         
-            if($fetched = File::fetchUrl($url)) {
+            if ($fetched = File::fetchUrl($url)) {
                 $content = @unserialize($fetched);
-                if(is_numeric($content)) return $content;
+                if (is_numeric($content)) return $content;
             }
         }
     
@@ -72,20 +72,20 @@ 
         $data->set('has_stats', false);
         
         $block_id = Filter::get('block_id');        
-        if($block_id){
+        if ($block_id) {
             $cached_item = Cache::get('piwikCountYear', $this->module);
             $visitCountYear = $cached_item->get();
-            if(!$cached_item->isHit()) {
+            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
+                if (!is_null($visitCountYear)) {
+                    $cached_item->expiresAt(new \DateTime('tomorrow')); // Expires the next day at midnight
                     Cache::save($cached_item, $visitCountYear);
                 }
             }
             
-            if($visitCountYear){
+            if ($visitCountYear) {
                 $visitCountToday = max(0, $this->getNumberOfVisitsPiwik($block_id, 'day'));
-                $visitCountYear = max( 0, $visitCountYear);
+                $visitCountYear = max(0, $visitCountYear);
                 
                 $data->set('has_stats', true);
                 $data->set('visits_today', $visitCountToday);

src/Webtrees/Functions/FunctionsPrintLists.php

Indentation +19 added lines, -19 removed lines

@@ -17,27 +17,27 @@
  */
 class FunctionsPrintLists {
     
-    /**
-     * Copy of core function, which is not public.
-     *
-     * @param Individual $individual
-     *
-     * @return string[]
-     * @see \Fisharebest\Webtrees\Functions\FunctionsPrintLists
-     */
-    public static function sortableNames(Individual $individual) {
-        $names   = $individual->getAllNames();
-        $primary = $individual->getPrimaryName();
+	/**
+	 * Copy of core function, which is not public.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string[]
+	 * @see \Fisharebest\Webtrees\Functions\FunctionsPrintLists
+	 */
+	public static function sortableNames(Individual $individual) {
+		$names   = $individual->getAllNames();
+		$primary = $individual->getPrimaryName();
 
-        list($surn, $givn) = explode(',', $names[$primary]['sort']);
+		list($surn, $givn) = explode(',', $names[$primary]['sort']);
 
-        $givn = str_replace('@P.N.', 'AAAA', $givn);
-        $surn = str_replace('@N.N.', 'AAAA', $surn);
+		$givn = str_replace('@P.N.', 'AAAA', $givn);
+		$surn = str_replace('@N.N.', 'AAAA', $surn);
 
-        return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
-        );
-    }
+		return array(
+			$surn . 'AAAA' . $givn,
+			$givn . 'AAAA' . $surn,
+		);
+	}
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -35,8 +35,8 @@
         $surn = str_replace('@N.N.', 'AAAA', $surn);
 
         return array(
-            $surn . 'AAAA' . $givn,
-            $givn . 'AAAA' . $surn,
+            $surn.'AAAA'.$givn,
+            $givn.'AAAA'.$surn,
         );
     }
 

src/Webtrees/Module/Certificates/Views/CertificatesListView.php

Spacing +5 added lines, -5 removed lines

@@ -39,13 +39,13 @@ 
     			<input type="hidden" name="ged" value="<?= $this->data->get('url_ged') ?>">
     			<select name="city">
     			<?php foreach ($cities as $city) { ?>
-    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
+    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if (trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
     			<?php } ?>
     			</select>
     			<input type="submit" value="<?= I18N::translate('Show') ?>" />
     		</form>
     		
-    		<?php if($this->data->get('has_list', false)) { ?>
+    		<?php if ($this->data->get('has_list', false)) { ?>
     		<div class="loading-image">&nbsp;</div>
     		<div class="certificate-list">
     			<table id="<?= $this->data->get('table_id') ?>">
@@ -62,7 +62,7 @@ 
     				    ?>
     					<tr>
     						<!-- Certificate date -->
-    						<?php if($date = $certificate->getCertificateDate()) { ?>
+    						<?php if ($date = $certificate->getCertificateDate()) { ?>
     						<td data-sort="<?= $date->julianDay() ?>"><?= $date->display() ?></td>
     						<?php } else { ?>
     						<td data-sort="0">&nbsp;</td>
@@ -73,8 +73,8 @@ 
     						<?php 
     						$name = $certificate->getCertificateDetails() ?: '';
     						$sortname = "";
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
+    						$ct_names = preg_match("/([A-Z]{2,})/", $name, $match);
+    						if ($ct_names > 0) $sortname = $match[1].'_';
     						$sortname .= $name;
     						?>
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">

Braces +6 added lines, -2 removed lines

@@ -39,7 +39,8 @@ 
     			<input type="hidden" name="ged" value="<?= $this->data->get('url_ged') ?>">
     			<select name="city">
     			<?php foreach ($cities as $city) { ?>
-    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) echo 'selected="selected"'?> ><?= $city ?></option>
+    				<option value="<?= Functions::encryptToSafeBase64($city) ?>" <?php if(trim($city) == trim($selected_city)) {
+	echo 'selected="selected"'?> ><?= $city ?></option>
     			<?php } ?>
     			</select>
     			<input type="submit" value="<?= I18N::translate('Show') ?>" />
@@ -72,9 +73,12 @@ 
     						<!--  Certificate Name -->
     						<?php 
     						$name = $certificate->getCertificateDetails() ?: '';
+}
     						$sortname = "";
     						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
+    						if($ct_names > 0) {
+    							$sortname = $match[1].'_';
+    						}
     						$sortname .= $name;
     						?>
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">

Indentation +13 added lines, -13 removed lines

@@ -24,12 +24,12 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $cities = $this->data->get('cities');
-        $selected_city = $this->data->get('selected_city');
+		$cities = $this->data->get('cities');
+		$selected_city = $this->data->get('selected_city');
         
-        ?>                
+		?>                
         <div id="maj-cert-list-page" class="center">
 			<h2><?= $this->data->get('title') ?></h2>
 			
@@ -58,8 +58,8 @@ 
     				</thead>
     				<tbody>
     				<?php foreach ($this->data->get('certificate_list') as $certificate) { 
-    				    /** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
-    				    ?>
+						/** @var \MyArtJaub\Webtrees\Module\Certificates\Model\Certificate $certificate */
+						?>
     					<tr>
     						<!-- Certificate date -->
     						<?php if($date = $certificate->getCertificateDate()) { ?>
@@ -71,12 +71,12 @@ 
     						<td><?= Filter::escapeHtml($certificate->getCertificateType() ?: '') ?></td>
     						<!--  Certificate Name -->
     						<?php 
-    						$name = $certificate->getCertificateDetails() ?: '';
-    						$sortname = "";
-    						$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
-    						if($ct_names > 0) $sortname = $match[1].'_';
-    						$sortname .= $name;
-    						?>
+							$name = $certificate->getCertificateDetails() ?: '';
+							$sortname = "";
+							$ct_names=preg_match("/([A-Z]{2,})/", $name, $match);
+							if($ct_names > 0) $sortname = $match[1].'_';
+							$sortname .= $name;
+							?>
     						<td data-sort="<?= Filter::escapeHtml($sortname) ?>">
     							<a href="<?= $certificate->getHtmlUrl() ?>"><?= Filter::escapeHtml($name) ?></a>
     						</td>
@@ -89,7 +89,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Hook/HookInterfaces/CustomSimpleTagManagerInterface.php

Doc Comments +2 added lines

@@ -45,6 +45,7 @@ 
 	 * @param string $element_name Element name from the edit interface, used to POST values for update
 	 * @param string $context Tag context
 	 * @param string $contextid Id of tag context
+	 * @return string
 	 */
 	public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null);
 	
@@ -53,6 +54,7 @@ 
 	 * 
 	 * @param string $context Context of the edition
 	 * @param int $level Level to which add the tags
+	 * @return void
 	 */
 	public function hAddSimpleTag($context, $level);
 

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/Module/WelcomeBlockModule.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
             return $wb_controller->config($block_id);
         }
         catch (MvcException $ex) {
-            if($ex->getHttpCode() != 200) throw $ex;
+            if ($ex->getHttpCode() != 200) throw $ex;
             return;
         }     
     }

Braces +4 added lines, -3 removed lines

@@ -89,9 +89,10 @@
         $wb_controller = new WelcomeBlockController($this);
         try {
             return $wb_controller->config($block_id);
-        }
-        catch (MvcException $ex) {
-            if($ex->getHttpCode() != 200) throw $ex;
+        } catch (MvcException $ex) {
+            if($ex->getHttpCode() != 200) {
+            	throw $ex;
+            }
             return;
         }     
     }

Indentation +63 added lines, -63 removed lines

@@ -21,79 +21,79 @@
  * Welcome Block Module.
  */
 class WelcomeBlockModule extends AbstractModule
-    implements ModuleBlockInterface
+	implements ModuleBlockInterface
 {
-    /** @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';
         
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “WelcomeBlock” module */ I18N::translate('MyArtJaub Welcome Block');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “WelcomeBlock” module */ I18N::translate('The MyArtJaub Welcome block welcomes the visitor to the site, allows a quick login to the site, and displays statistics on visits.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
-     */
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::getBlock()
+	 */
 	public function getBlock($block_id, $template = true, $cfg = array()) {
-        $wb_controller = new WelcomeBlockController($this);           
-        return $wb_controller->index(Globals::getController(), Globals::getTree(), $block_id, $template);
-    }
+		$wb_controller = new WelcomeBlockController($this);           
+		return $wb_controller->index(Globals::getController(), Globals::getTree(), $block_id, $template);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
-     */
-    public function loadAjax() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::loadAjax()
+	 */
+	public function loadAjax() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
-     */
-    public function isUserBlock() {
-        return false;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isUserBlock()
+	 */
+	public function isUserBlock() {
+		return false;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
-     */
-    public function isGedcomBlock() {
-        return true;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::isGedcomBlock()
+	 */
+	public function isGedcomBlock() {
+		return true;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
-     */
-    public function configureBlock($block_id) {
-        $wb_controller = new WelcomeBlockController($this);
-        try {
-            return $wb_controller->config($block_id);
-        }
-        catch (MvcException $ex) {
-            if($ex->getHttpCode() != 200) throw $ex;
-            return;
-        }     
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleBlockInterface::configureBlock()
+	 */
+	public function configureBlock($block_id) {
+		$wb_controller = new WelcomeBlockController($this);
+		try {
+			return $wb_controller->config($block_id);
+		}
+		catch (MvcException $ex) {
+			if($ex->getHttpCode() != 200) throw $ex;
+			return;
+		}     
+	}
 
 }
  
\ No newline at end of file

src/Webtrees/Module/WelcomeBlock/WelcomeBlockController.php

Braces +3 added lines, -1 removed lines

@@ -98,7 +98,9 @@
      */
     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'));

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();
+	}
     
     
     

Spacing +7 added lines, -7 removed lines

@@ -45,7 +45,7 @@ 
     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());
@@ -64,22 +64,22 @@ 
     			');
     
             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>';
+                $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 = '';
             }
-            $title .='<span dir="auto">'.$tree->getTitleHtml().'</span>';
+            $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) {
+            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);
@@ -98,7 +98,7 @@ 
      */
     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'));

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

Braces +3 added lines, -7 removed lines

@@ -293,10 +293,8 @@ 
 						<?= I18N::number($family->getNumberOfChildren()) ?>
 					</td>
 					<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 (!$mdate->isOK()) { echo 'U'; } else {
+					    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) {
@@ -316,9 +314,7 @@ 
         			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 } ?>

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

Braces +4 added lines, -1 removed lines

@@ -184,7 +184,10 @@
 							<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'))).']'; ?>
+									<?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>

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>