jon48 / webtrees-lib

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

Indentation +43 added lines, -43 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,48 +103,48 @@ 
         			<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.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, '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>
@@ -154,23 +154,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>
@@ -195,7 +195,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>
@@ -206,6 +206,6 @@ 
     			<?php } ?>
     		</div> 
     		<?php 
-        }
+		}
 }
  
\ No newline at end of file

src/Webtrees/Module/Sosa/SosaListController.php

Indentation +271 added lines, -271 removed lines

@@ -36,70 +36,70 @@ 
  */
 class SosaListController extends MvcController
 {
-    /**
-     * Sosa Provider for the controller
-     * @var SosaProvider $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the controller
+	 * @var SosaProvider $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Generation used for the controller
-     * @var int $generation
-     */
-    protected $generation;
+	/**
+	 * Generation used for the controller
+	 * @var int $generation
+	 */
+	protected $generation;
     
-    /**
-     * ViewBag to hold data for the controller
-     * @var ViewBag $view_bag
-     */
-    protected $view_bag;
+	/**
+	 * ViewBag to hold data for the controller
+	 * @var ViewBag $view_bag
+	 */
+	protected $view_bag;
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
-     */
-    public function __construct(AbstractModule $module) {
-        global $WT_TREE;
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Mvc\Controller\MvcController::__construct(AbstractModule $module)
+	 */
+	public function __construct(AbstractModule $module) {
+		global $WT_TREE;
         
-        parent::__construct($module);
+		parent::__construct($module);
 
-        $this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
+		$this->sosa_provider = new SosaProvider($WT_TREE, Auth::user());
 
-        $this->generation = Filter::getInteger('gen');
+		$this->generation = Filter::getInteger('gen');
         
-        $this->view_bag = new ViewBag();
-        $this->view_bag->set('generation', $this->generation);
-        $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+		$this->view_bag = new ViewBag();
+		$this->view_bag->set('generation', $this->generation);
+		$this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
+		$this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
         
-    }
+	}
     
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
     
-    /**
-     * SosaList@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * SosaList@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Sosa Ancestors'));            
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Sosa Ancestors'));            
 
-        $this->view_bag->set('title', $controller->getPageTitle());
+		$this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
-            $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
-            $this->view_bag->set('url_module', $this->module->getName());
-            $this->view_bag->set('url_action', 'SosaList');
-            $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); 
-            $this->view_bag->set('min_gen', 1);
+		if($this->view_bag->get('is_setup', false)) {
+			$this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
+			$this->view_bag->set('url_module', $this->module->getName());
+			$this->view_bag->set('url_action', 'SosaList');
+			$this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); 
+			$this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
-                $controller->addInlineJavascript('
+			if($this->view_bag->get('has_sosa', false)) {            
+				$controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
                 
@@ -153,44 +153,44 @@ 
             		);
                 
             	');            
-            }
-        }
+			}
+		}
                 
-        ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render();   
-    }    
+		ViewFactory::make('SosaList', $this, $controller, $this->view_bag)->render();   
+	}    
     
 
-    /**
-     * SosaList@missing
-     */
-    public function missing() {
-        global $WT_TREE;
+	/**
+	 * SosaList@missing
+	 */
+	public function missing() {
+		global $WT_TREE;
         
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Missing Ancestors'));
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Missing Ancestors'));
         
-        $this->view_bag->set('title', $controller->getPageTitle());
+		$this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
-            $this->view_bag->set('url_module', $this->module->getName());
-            $this->view_bag->set('url_action', 'SosaList@missing');
-            $this->view_bag->set('url_ged', $WT_TREE->getNameUrl());
-            $this->view_bag->set('min_gen', 2);
+		if($this->view_bag->get('is_setup', false)) {
+			$this->view_bag->set('url_module', $this->module->getName());
+			$this->view_bag->set('url_action', 'SosaList@missing');
+			$this->view_bag->set('url_ged', $WT_TREE->getNameUrl());
+			$this->view_bag->set('min_gen', 2);
             
-            $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
-            $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
+			$missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
+			$this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
-            $this->view_bag->set('perc_sosa', $perc_sosa);
+			$perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+			$this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
-                $this->view_bag->set('table_id', $table_id);
+			if($this->view_bag->get('has_missing', false)) {
+				$table_id = 'table-sosa-missing-' . Uuid::uuid4();
+				$this->view_bag->set('table_id', $table_id);
                 
-                $controller
-                ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-                ->addInlineJavascript('
+				$controller
+				->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+				->addInlineJavascript('
 				    jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				    jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                     
@@ -242,77 +242,77 @@ 
     				jQuery(".loading-image").css("display", "none");
     			');
                         
-                $unique_indis = array();
-                $sum_missing_different = 0;
-                $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
-                        unset($missing_list[$num]);
-                        continue;
-                    }
-                    $sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
-                    $person = Individual::getInstance($missing_tab['indi'], $WT_TREE);
-                    if (!$person || !$person->canShowName()) {
-                        unset($missing_list[$num]);
-                        continue;
-                    }  
-                    $sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
-                    $unique_indis[$person->getXref()] = true;
-                    $missing_tab['indi'] = $person;
-                    $missing_list[$num] = $missing_tab;
-                }
-                $this->view_bag->set('missing_list', $missing_list);
-                $this->view_bag->set('missing_diff_count', $sum_missing_different);
-                $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
-                $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
-            }            
-        }
+				$unique_indis = array();
+				$sum_missing_different = 0;
+				$sum_missing_different_without_hidden = 0;
+				foreach($missing_list as $num => $missing_tab) {
+					if(isset($unique_indis[$missing_tab['indi']])) {
+						unset($missing_list[$num]);
+						continue;
+					}
+					$sum_missing_different += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
+					$person = Individual::getInstance($missing_tab['indi'], $WT_TREE);
+					if (!$person || !$person->canShowName()) {
+						unset($missing_list[$num]);
+						continue;
+					}  
+					$sum_missing_different_without_hidden += !$missing_tab['has_father'] + !$missing_tab['has_mother'];
+					$unique_indis[$person->getXref()] = true;
+					$missing_tab['indi'] = $person;
+					$missing_list[$num] = $missing_tab;
+				}
+				$this->view_bag->set('missing_list', $missing_list);
+				$this->view_bag->set('missing_diff_count', $sum_missing_different);
+				$this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
+				$perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+				$this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
+			}            
+		}
         
-        ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render();
-    }
+		ViewFactory::make('SosaListMissing', $this, $controller, $this->view_bag)->render();
+	}
     
-    /**
-     * SosaList@sosalist
-     */
-    public function sosalist() {
+	/**
+	 * SosaList@sosalist
+	 */
+	public function sosalist() {
                 
-        $type = Filter::get('type', 'indi|fam', null);
+		$type = Filter::get('type', 'indi|fam', null);
         
-        $controller = new AjaxController();
-        $controller->restrictAccess($this->generation > 0 || !is_null($type));
+		$controller = new AjaxController();
+		$controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
-            case 'indi':
-                $this->renderSosaListIndi($controller);
-                break;
-            case 'fam':
-                $this->renderFamSosaListIndi($controller);
-                break;
-            default:
-                break;
-        }
+		switch ($type){
+			case 'indi':
+				$this->renderSosaListIndi($controller);
+				break;
+			case 'fam':
+				$this->renderFamSosaListIndi($controller);
+				break;
+			default:
+				break;
+		}
 
-    }
+	}
     
-    /**
-     * Render the Ajax response for the sortable table of Sosa individuals
-     * @param AjaxController $controller
-     */
-    protected function renderSosaListIndi(AjaxController $controller) {
-        global $WT_TREE;
+	/**
+	 * Render the Ajax response for the sortable table of Sosa individuals
+	 * @param AjaxController $controller
+	 */
+	protected function renderSosaListIndi(AjaxController $controller) {
+		global $WT_TREE;
         
-        $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
-        $this->view_bag->set('has_sosa', false);
+		$listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
+		$this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
-            $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
-            $this->view_bag->set('table_id', $table_id);
+		if(count($listSosa) > 0) {
+			$this->view_bag->set('has_sosa', true);
+			$table_id = 'table-sosa-indi-' . Uuid::uuid4();
+			$this->view_bag->set('table_id', $table_id);
                      
-            $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addInlineJavascript('
+			$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addInlineJavascript('
                 jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
                 jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -379,96 +379,96 @@ 
 				jQuery("#btn-toggle-statistics-'.$table_id.'").click();
            ');
             
-            $stats = new Stats($WT_TREE);         
+			$stats = new Stats($WT_TREE);         
             
-            // Bad data can cause "longest life" to be huge, blowing memory limits
-            $max_age = min($WT_TREE->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1;
-            // Inititialise chart data
-            $deat_by_age = array();
-            for ($age = 0; $age <= $max_age; $age++) {
-                $deat_by_age[$age] = '';
-            }
-            $birt_by_decade = array();
-            $deat_by_decade = array();
-            for ($year = 1550; $year < 2030; $year += 10) {
-                $birt_by_decade[$year] = '';
-                $deat_by_decade[$year] = '';
-            }
+			// Bad data can cause "longest life" to be huge, blowing memory limits
+			$max_age = min($WT_TREE->getPreference('MAX_ALIVE_AGE'), $stats->LongestLifeAge()) + 1;
+			// Inititialise chart data
+			$deat_by_age = array();
+			for ($age = 0; $age <= $max_age; $age++) {
+				$deat_by_age[$age] = '';
+			}
+			$birt_by_decade = array();
+			$deat_by_decade = array();
+			for ($year = 1550; $year < 2030; $year += 10) {
+				$birt_by_decade[$year] = '';
+				$deat_by_decade[$year] = '';
+			}
             
-            $unique_indis = array(); // Don't double-count indis with multiple names.
-            $nb_displayed = 0;
+			$unique_indis = array(); // Don't double-count indis with multiple names.
+			$nb_displayed = 0;
             
-            Individual::load($WT_TREE, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
-                $person = Individual::getInstance($pid, $WT_TREE);
-                if (!$person || !$person->canShowName()) {
-                    unset($listSosa[$sosa]);
-                    continue;
-                }
-                $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
-                    if (
-                        FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
-                        !isset($unique_indis[$person->getXref()])
-                        ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
-                    }
-                }
-                else {
-                    $birth_dates[0]=new Date('');
-                }
-                if ($death_dates = $person->getAllDeathDates()) {
-                    if (
-                        FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
-                        !isset($unique_indis[$person->getXref()])
-                        ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
-                    }
-                }
-                else {
-                    $death_dates[0] = new Date('');
-                }
-                $age = Date::getAge($birth_dates[0], $death_dates[0], 0);
-                if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) {
-                    $deat_by_age[$age] .= $person->getSex();
-                }
-                $listSosa[$sosa] = $person;
-                $unique_indis[$person->getXref()] = true;
-            }
-            $this->view_bag->set('sosa_list', $listSosa);   
+			Individual::load($WT_TREE, $listSosa);
+			foreach($listSosa as $sosa => $pid) {
+				$person = Individual::getInstance($pid, $WT_TREE);
+				if (!$person || !$person->canShowName()) {
+					unset($listSosa[$sosa]);
+					continue;
+				}
+				$nb_displayed++;
+				if ($birth_dates=$person->getAllBirthDates()) {
+					if (
+						FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
+						!isset($unique_indis[$person->getXref()])
+						) {
+						$birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+					}
+				}
+				else {
+					$birth_dates[0]=new Date('');
+				}
+				if ($death_dates = $person->getAllDeathDates()) {
+					if (
+						FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
+						!isset($unique_indis[$person->getXref()])
+						) {
+						$deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+					}
+				}
+				else {
+					$death_dates[0] = new Date('');
+				}
+				$age = Date::getAge($birth_dates[0], $death_dates[0], 0);
+				if (!isset($unique_indis[$person->getXref()]) && $age >= 0 && $age <= $max_age) {
+					$deat_by_age[$age] .= $person->getSex();
+				}
+				$listSosa[$sosa] = $person;
+				$unique_indis[$person->getXref()] = true;
+			}
+			$this->view_bag->set('sosa_list', $listSosa);   
             
-            $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
-            $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
+			$this->view_bag->set('sosa_count', count($listSosa));
+			$this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+			$this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
-            $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
+			$this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
             
-            $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
-            $this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death')));
-            $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year')));
-        }
+			$this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
+			$this->view_bag->set('chart_deaths', FunctionsPrintLists::chartByDecade($deat_by_decade, I18N::translate('Decade of death')));
+			$this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($deat_by_age, I18N::translate('Age related to death year')));
+		}
         
-        ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render();        
-    }
+		ViewFactory::make('SosaListIndi', $this, $controller, $this->view_bag)->render();        
+	}
     
-    /**
-     * Render the Ajax response for the sortable table of Sosa family
-     * @param AjaxController $controller
-     */
-    protected function renderFamSosaListIndi(AjaxController $controller) {
-        global $WT_TREE;
+	/**
+	 * Render the Ajax response for the sortable table of Sosa family
+	 * @param AjaxController $controller
+	 */
+	protected function renderFamSosaListIndi(AjaxController $controller) {
+		global $WT_TREE;
         
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
-        $this->view_bag->set('has_sosa', false);
+		$listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+		$this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
-            $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
-            $this->view_bag->set('table_id', $table_id);
+		if(count($listFamSosa) > 0) {
+			$this->view_bag->set('has_sosa', true);
+			$table_id = 'table-sosa-fam-' . Uuid::uuid4();
+			$this->view_bag->set('table_id', $table_id);
              
-            $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addInlineJavascript('
+			$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -532,67 +532,67 @@ 
 				jQuery("#btn-toggle-statistics-'.$table_id.'").click();
            ');
         
-            $stats = new Stats($WT_TREE);        
-            $max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1;
+			$stats = new Stats($WT_TREE);        
+			$max_age = max($stats->oldestMarriageMaleAge(), $stats->oldestMarriageFemaleAge()) + 1;
             
-            //-- init chart data
-    		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
-    			$marr_by_age[$age] = '';
-    		}
-    		$birt_by_decade = array();
-    		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
-    			$birt_by_decade[$year] = '';
-    			$marr_by_decade[$year] = '';
-    		}
+			//-- init chart data
+			$marr_by_age = array();
+			for ($age=0; $age<=$max_age; $age++) {
+				$marr_by_age[$age] = '';
+			}
+			$birt_by_decade = array();
+			$marr_by_decade = array();
+			for ($year=1550; $year<2030; $year+=10) {
+				$birt_by_decade[$year] = '';
+				$marr_by_decade[$year] = '';
+			}
     		
-            foreach($listFamSosa as $sosa => $fid) {
-                $sfamily = Family::getInstance($fid, $WT_TREE);
-                if(!$sfamily || !$sfamily->canShow()) {
-                    unset($listFamSosa[$sosa]);
-                    continue;
-                }
-                $mdate=$sfamily->getMarriageDate();
+			foreach($listFamSosa as $sosa => $fid) {
+				$sfamily = Family::getInstance($fid, $WT_TREE);
+				if(!$sfamily || !$sfamily->canShow()) {
+					unset($listFamSosa[$sosa]);
+					continue;
+				}
+				$mdate=$sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
-                    ($hdate = $husb->getBirthDate()) && 
-                    $hdate->isOK() && $mdate->isOK()) {
-                    if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
-                    }
-                    $hage = Date::getAge($hdate, $mdate, 0);
-                    if ($hage >= 0 && $hage <= $max_age) {
-                        $marr_by_age[$hage] .= $husb->getSex();
-                    }
-                }
+				if( ($husb = $sfamily->getHusband()) && 
+					($hdate = $husb->getBirthDate()) && 
+					$hdate->isOK() && $mdate->isOK()) {
+					if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
+						$birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+					}
+					$hage = Date::getAge($hdate, $mdate, 0);
+					if ($hage >= 0 && $hage <= $max_age) {
+						$marr_by_age[$hage] .= $husb->getSex();
+					}
+				}
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
-                    $wdate->isOK() && $mdate->isOK()) {
-                    if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
-                    }
-                    $wage = Date::getAge($wdate, $mdate, 0);
-                    if ($wage >= 0 && $wage <= $max_age) {
-                        $marr_by_age[$wage] .= $wife->getSex();
-                    }
-                }                
+				if(($wife = $sfamily->getWife()) &&
+					($wdate=$wife->getBirthDate()) &&
+					$wdate->isOK() && $mdate->isOK()) {
+					if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
+						$birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+					}
+					$wage = Date::getAge($wdate, $mdate, 0);
+					if ($wage >= 0 && $wage <= $max_age) {
+						$marr_by_age[$wage] .= $wife->getSex();
+					}
+				}                
 
-                if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
-                }
+				if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
+					$marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+				}
                 
-                $listFamSosa[$sosa] = $sfamily;
-            }
-            $this->view_bag->set('sosa_list', $listFamSosa);
+				$listFamSosa[$sosa] = $sfamily;
+			}
+			$this->view_bag->set('sosa_list', $listFamSosa);
         
-            $this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
-            $this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage')));
-            $this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage')));
-        }
+			$this->view_bag->set('chart_births', FunctionsPrintLists::chartByDecade($birt_by_decade, I18N::translate('Decade of birth')));
+			$this->view_bag->set('chart_marriages', FunctionsPrintLists::chartByDecade($marr_by_decade, I18N::translate('Decade of marriage')));
+			$this->view_bag->set('chart_ages', FunctionsPrintLists::chartByAge($marr_by_age, I18N::translate('Age in year of marriage')));
+		}
         
-        ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render();
-    }
+		ViewFactory::make('SosaListFam', $this, $controller, $this->view_bag)->render();
+	}
     
 }
\ No newline at end of file

src/Webtrees/Module/WelcomeBlockModule.php

Indentation +64 added lines, -64 removed lines

@@ -20,81 +20,81 @@
  * 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()) {
-        global $controller, $WT_TREE;
+		global $controller, $WT_TREE;
         
-        $wb_controller = new WelcomeBlockController($this);           
-        return $wb_controller->index($controller, $WT_TREE, $block_id, $template);
-    }
+		$wb_controller = new WelcomeBlockController($this);           
+		return $wb_controller->index($controller, $WT_TREE, $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/Sosa/Views/SosaStatsView.php

Indentation +4 added lines, -4 removed lines

@@ -22,8 +22,8 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {      
-        ?>                
+	protected function renderContent() {      
+		?>                
         <div id="maj-sosa-stats-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
@@ -35,7 +35,7 @@ 
 			<?php } ?>
 			
 			<?php  if($this->data->get('is_setup')) {  
-			    $general_stats = $this->data->get('general_stats'); ?>
+				$general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
 				<div class="maj-row">
@@ -140,7 +140,7 @@ 
 			<?php   } else { ?>
 			<div class="center warning"><?php echo I18N::translate('No Sosa root individual has been defined.'); ?></div>
 			<?php }     
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/AdminConfigController.php

Indentation +216 added lines, -216 removed lines

@@ -35,59 +35,59 @@ 
  */
 class AdminConfigController extends MvcController
 {    
-    /**
-     * GeoAnalysis Provider
-     * @var GeoAnalysisProvider $provider
-     */
-    protected $provider;    
+	/**
+	 * GeoAnalysis Provider
+	 * @var GeoAnalysisProvider $provider
+	 */
+	protected $provider;    
     
-    /**
-     * Constructor for Admin Config controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
+	/**
+	 * Constructor for Admin Config controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
         
-        $this->provider = $this->module->getProvider();
-    }    
+		$this->provider = $this->module->getProvider();
+	}    
     
-    /**
-     * Pages
-     */
+	/**
+	 * Pages
+	 */
         
-    /**
-     * AdminConfig@index
-     */
-    public function index() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@index
+	 */
+	public function index() {
+		global $WT_TREE;
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);
-        $controller = new PageController();
-        $controller
-            ->restrictAccess(Auth::isManager($WT_TREE))
-            ->setPageTitle($this->module->getTitle());
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);
+		$controller = new PageController();
+		$controller
+			->restrictAccess(Auth::isManager($WT_TREE))
+			->setPageTitle($this->module->getTitle());
         
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('tree', $WT_TREE);
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('tree', $WT_TREE);
         
-        $data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
+		$data->set('root_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig');
                 
-        $table_id = 'table-geoanalysis-' . Uuid::uuid4();
-        $data->set('table_id', $table_id);
+		$table_id = 'table-geoanalysis-' . Uuid::uuid4();
+		$data->set('table_id', $table_id);
         
-        $other_trees = array();
-        foreach (Tree::getAll() as $tree) {
-            if($tree->getTreeId() != $WT_TREE->getTreeId()) $other_trees[] = $tree;
-        }      
-        $data->set('other_trees', $other_trees);
+		$other_trees = array();
+		foreach (Tree::getAll() as $tree) {
+			if($tree->getTreeId() != $WT_TREE->getTreeId()) $other_trees[] = $tree;
+		}      
+		$data->set('other_trees', $other_trees);
         
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
         
-        $controller
-            ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-            ->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
-            ->addInlineJavascript('
+		$controller
+			->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+			->addExternalJavascript(WT_DATATABLES_BOOTSTRAP_JS_URL)
+			->addInlineJavascript('
 				jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                 
@@ -119,7 +119,7 @@ 
 				});
                 
                 ')
-                ->addInlineJavascript('				
+				->addInlineJavascript('				
                     function set_geoanalysis_status(ga_id, status, gedcom) {
                 		jQuery.ajax({
                             url: "module.php", 
@@ -163,55 +163,55 @@ 
                 ');
         
         
-        ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('AdminConfig', $this, $controller, $data)->render();
+	}
 
-    /**
-     * AdminConfig@jsonGeoAnalysisList
-     */
-    public function jsonGeoAnalysisList() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@jsonGeoAnalysisList
+	 */
+	public function jsonGeoAnalysisList() {
+		global $WT_TREE;
         
-        $controller = new JsonController();
-        $controller
-            ->restrictAccess(Auth::isManager($WT_TREE));
+		$controller = new JsonController();
+		$controller
+			->restrictAccess(Auth::isManager($WT_TREE));
         
-        // Generate an AJAX/JSON response for datatables to load a block of rows
-        $search = Filter::postArray('search');
-        if($search) $search = $search['value'];
-        $start  = Filter::postInteger('start');
-        $length = Filter::postInteger('length');
-        $order  = Filter::postArray('order');
+		// Generate an AJAX/JSON response for datatables to load a block of rows
+		$search = Filter::postArray('search');
+		if($search) $search = $search['value'];
+		$start  = Filter::postInteger('start');
+		$length = Filter::postInteger('length');
+		$order  = Filter::postArray('order');
         
-        foreach($order as $key => &$value) {
-            switch($value['column']) {
-                case 3:
-                    $value['column'] = 'majgd_descr';
-                    break;
-                case 5;
-                    $value['column'] = 'majgd_sublevel';
-                    break;
-                default:
-                    unset($order[$key]);
-            }
-        }
+		foreach($order as $key => &$value) {
+			switch($value['column']) {
+				case 3:
+					$value['column'] = 'majgd_descr';
+					break;
+				case 5;
+					$value['column'] = 'majgd_sublevel';
+					break;
+				default:
+					unset($order[$key]);
+			}
+		}
         
-        /** @var GeoAnalysisProvider $provider */
-        $provider = $this->module->getProvider();
+		/** @var GeoAnalysisProvider $provider */
+		$provider = $this->module->getProvider();
         
-        $list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
-        $recordsFiltered = count($list);
-        $recordsTotal = $this->provider->getGeoAnalysisCount();
+		$list = $provider->getFilteredGeoAnalysisList($search, $order, $start, $length);
+		$recordsFiltered = count($list);
+		$recordsTotal = $this->provider->getGeoAnalysisCount();
         
-        $data = array();
-        $place_hierarchy = $this->provider->getPlacesHierarchy();
-        foreach($list as $ga) {
-            /** @var GeoAnalysis $ga */
+		$data = array();
+		$place_hierarchy = $this->provider->getPlacesHierarchy();
+		foreach($list as $ga) {
+			/** @var GeoAnalysis $ga */
             
-            $datum = array();
-            $options= $ga->getOptions();
+			$datum = array();
+			$options= $ga->getOptions();
             
-            $datum[0] = '
+			$datum[0] = '
                 <div class="btn-group">
                     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                         <i class="fa fa-pencil"></i><span class="caret"></span>
@@ -235,108 +235,108 @@ 
                        </li>
                     </ul>
                 </div>';
-		    $datum[1] = $ga->getId();
-		    $datum[2] = $ga->isEnabled() ? 
+			$datum[1] = $ga->getId();
+			$datum[2] = $ga->isEnabled() ? 
 				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Enabled').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('Disabled').'</span>';
-		    $datum[3] = $ga->getTitle();
-		    $analysis_level = $ga->getAnalysisLevel();
-		    if($place_hierarchy['type'] == 'header') {
-		        $datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
-		    } else {
-		        $datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
-		    }
-		    $datum[5] = $ga->getAnalysisLevel();
-		    $datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    $datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
-		    if($ga->hasMap()) {
-		        $datum[6] = $options->getMap()->getDescription();
-		        $datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
-		        $top_level = $options->getMapLevel();
-		        if($place_hierarchy['type'] == 'header') {
-		            $datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
-		        } else {
-		            $datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
-		        }
-		        $datum[7] .= '</span>';
-		    }
-		    $datum[8] = $options->isUsingFlags() ? 
+			$datum[3] = $ga->getTitle();
+			$analysis_level = $ga->getAnalysisLevel();
+			if($place_hierarchy['type'] == 'header') {
+				$datum[4] = $place_hierarchy['hierarchy'][$analysis_level - 1];
+			} else {
+				$datum[4] = $analysis_level . '(' . $place_hierarchy['hierarchy'][$analysis_level - 1] . ')';
+			}
+			$datum[5] = $ga->getAnalysisLevel();
+			$datum[6] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			$datum[7] = '<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('None').'</span>';
+			if($ga->hasMap()) {
+				$datum[6] = $options->getMap()->getDescription();
+				$datum[7] = '<span data-toggle="tooltip" title="' . $options->getMap()->getTopLevelName() . '" />';
+				$top_level = $options->getMapLevel();
+				if($place_hierarchy['type'] == 'header') {
+					$datum[7] .= $place_hierarchy['hierarchy'][$top_level - 1];
+				} else {
+					$datum[7] .= $top_level . '(' . $place_hierarchy['hierarchy'][$top_level - 1] . ')';
+				}
+				$datum[7] .= '</span>';
+			}
+			$datum[8] = $options->isUsingFlags() ? 
 				'<i class="fa fa-check"></i><span class="sr-only">'.I18N::translate('Yes').'</span>' : 
 				'<i class="fa fa-times"></i><span class="sr-only">'.I18N::translate('No').'</span>';
-		    $datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
+			$datum[9] = $options->getMaxDetailsInGen() > 0 ? $options->getMaxDetailsInGen() : I18N::translate('All');
 		    
-		    $data[] = $datum;
-        }
+			$data[] = $datum;
+		}
         
-        $controller->pageHeader();
+		$controller->pageHeader();
         
-        $controller->encode(array(
-            'draw'            => Filter::getInteger('draw'),
-            'recordsTotal'    => $recordsTotal,
-            'recordsFiltered' => $recordsFiltered,
-            'data'            => $data
-        ));
+		$controller->encode(array(
+			'draw'            => Filter::getInteger('draw'),
+			'recordsTotal'    => $recordsTotal,
+			'recordsFiltered' => $recordsFiltered,
+			'data'            => $data
+		));
         
-    }
+	}
 
-    /**
-     * AdminConfig@edit
-     */
-    public function edit() {
-        $ga_id = Filter::getInteger('ga_id');
-        $ga = $this->provider->getGeoAnalysis($ga_id, false);
+	/**
+	 * AdminConfig@edit
+	 */
+	public function edit() {
+		$ga_id = Filter::getInteger('ga_id');
+		$ga = $this->provider->getGeoAnalysis($ga_id, false);
         
-        $this->renderEdit($ga);
-    }
+		$this->renderEdit($ga);
+	}
     
-    /**
-     * AdminConfig@add
-     */
-    public function add() {
-        $this->renderEdit(null);
-    }
+	/**
+	 * AdminConfig@add
+	 */
+	public function add() {
+		$this->renderEdit(null);
+	}
     
-    /**
-     * AdminConfig@save
-     */
-    public function save() {
-        global $WT_TREE;
+	/**
+	 * AdminConfig@save
+	 */
+	public function save() {
+		global $WT_TREE;
         
-        $tmp_contrl = new PageController();
-        $tmp_contrl->restrictAccess(
-            Auth::isManager($WT_TREE) 
-            && Filter::checkCsrf()
-         );
+		$tmp_contrl = new PageController();
+		$tmp_contrl->restrictAccess(
+			Auth::isManager($WT_TREE) 
+			&& Filter::checkCsrf()
+		 );
         
-        $ga_id          = Filter::postInteger('ga_id');
-        $description    = Filter::post('description');
-        $analysislevel  = Filter::postInteger('analysislevel');
-        $use_map        = Filter::postBool('use_map');
-        if($use_map) {
-            $map_file   = base64_decode(Filter::post('map_file'));
-            $map_top_level   = Filter::postInteger('map_top_level');
-        }
-        $use_flags      = Filter::postBool('use_flags');
-        $gen_details    = Filter::postInteger('gen_details');
+		$ga_id          = Filter::postInteger('ga_id');
+		$description    = Filter::post('description');
+		$analysislevel  = Filter::postInteger('analysislevel');
+		$use_map        = Filter::postBool('use_map');
+		if($use_map) {
+			$map_file   = base64_decode(Filter::post('map_file'));
+			$map_top_level   = Filter::postInteger('map_top_level');
+		}
+		$use_flags      = Filter::postBool('use_flags');
+		$gen_details    = Filter::postInteger('gen_details');
         
-        $success = false; 
-        if($ga_id) {
-            $ga = $this->provider->getGeoAnalysis($ga_id, false);
-            if($ga) {
-                $ga->setTitle($description);
-                $ga->setAnalysisLevel($analysislevel + 1);
-                $options = $ga->getOptions();
-                if($options) {
-                    $options->setUsingFlags($use_flags);
-                    $options->setMaxDetailsInGen($gen_details);
-                    if($use_map) {
-                        $options->setMap(new OutlineMap($map_file));
-                        $options->setMapLevel($map_top_level + 1);
-                    }
-                    else {
-                        $options->setMap(null);
-                    }
-                }
+		$success = false; 
+		if($ga_id) {
+			$ga = $this->provider->getGeoAnalysis($ga_id, false);
+			if($ga) {
+				$ga->setTitle($description);
+				$ga->setAnalysisLevel($analysislevel + 1);
+				$options = $ga->getOptions();
+				if($options) {
+					$options->setUsingFlags($use_flags);
+					$options->setMaxDetailsInGen($gen_details);
+					if($use_map) {
+						$options->setMap(new OutlineMap($map_file));
+						$options->setMapLevel($map_top_level + 1);
+					}
+					else {
+						$options->setMap(null);
+					}
+				}
 				
 				$res = $this->provider->updateGeoAnalysis($ga);
 				if($res) {
@@ -349,8 +349,8 @@ 
 					FlashMessages::addMessage(I18N::translate('An error occured while updating the geographical dispersion analysis “%s”', $ga->getTitle()), 'danger');
 					Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID “'. $ga->getId() .'” could not be updated. See error log.');
 				}
-            }
-        } else {
+			}
+		} else {
 			$ga = $this->provider->createGeoAnalysis(
 				$description,
 				$analysislevel + 1,
@@ -368,34 +368,34 @@ 
 				FlashMessages::addMessage(I18N::translate('An error occured while adding the geographical dispersion analysis “%s”', $description), 'danger');
 				Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis “'.$description.'” could not be added. See error log.');
 			}
-        }
+		}
         
-        $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl();
-        if(!$success) {			
-            if($ga) {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $WT_TREE->getNameUrl();
-            }
-            else {
-                $redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $WT_TREE->getNameUrl();
-            }
-        }        
-        header('Location: ' . WT_BASE_URL . $redirection_url);
+		$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl();
+		if(!$success) {			
+			if($ga) {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@edit&ga_id='. $ga->getId() .'&ged=' . $WT_TREE->getNameUrl();
+			}
+			else {
+				$redirection_url = 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@add&ged=' . $WT_TREE->getNameUrl();
+			}
+		}        
+		header('Location: ' . WT_BASE_URL . $redirection_url);
         
-    }
+	}
      
 	/**
 	 * Renders the edit form, whether it is an edition of an existing GeoAnalysis, or the addition of a new one.
 	 * 
 	 * @param (GeoAnalysis!null) $ga GeoAnalysis to edit
 	 */
-    protected function renderEdit(GeoAnalysis $ga = null) {
-        global $WT_TREE;
+	protected function renderEdit(GeoAnalysis $ga = null) {
+		global $WT_TREE;
         
-        Theme::theme(new AdministrationTheme)->init($WT_TREE);
-        $controller = new PageController();        
-        $controller
-            ->restrictAccess(Auth::isManager($WT_TREE))
-            ->addInlineJavascript('
+		Theme::theme(new AdministrationTheme)->init($WT_TREE);
+		$controller = new PageController();        
+		$controller
+			->restrictAccess(Auth::isManager($WT_TREE))
+			->addInlineJavascript('
                 function toggleMapOptions() {
                     if($("input:radio[name=\'use_map\']:checked").val() == 1) {
                         $("#map_options").show();
@@ -409,34 +409,34 @@ 
                 toggleMapOptions();
             ');
         
-        $data = new ViewBag();
-        if($ga) {
-            $controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
-            $data->set('geo_analysis', $ga);
-        } else {
-            $controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
-        }
+		$data = new ViewBag();
+		if($ga) {
+			$controller->setPageTitle(I18N::translate('Edit the geographical dispersion analysis'));
+			$data->set('geo_analysis', $ga);
+		} else {
+			$controller->setPageTitle(I18N::translate('Add a geographical dispersion analysis'));
+		}
         
-        $data->set('title', $controller->getPageTitle());
-        $data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl());
-        $data->set('module_title', $this->module->getTitle());
-        $data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $WT_TREE->getNameUrl());
-        $data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
+		$data->set('title', $controller->getPageTitle());
+		$data->set('admin_config_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig&ged=' . $WT_TREE->getNameUrl());
+		$data->set('module_title', $this->module->getTitle());
+		$data->set('save_url', 'module.php?mod=' . $this->module->getName() . '&mod_action=AdminConfig@save&ged=' . $WT_TREE->getNameUrl());
+		$data->set('places_hierarchy', $this->provider->getPlacesHierarchy());
     
-        $map_list = array_map(
-            function(OutlineMap $map) {
-                return $map->getDescription();
-            },
-            $this->provider->getOutlineMapsList()
-            );
-        asort($map_list);
-        $data->set('map_list', $map_list);
+		$map_list = array_map(
+			function(OutlineMap $map) {
+				return $map->getDescription();
+			},
+			$this->provider->getOutlineMapsList()
+			);
+		asort($map_list);
+		$data->set('map_list', $map_list);
     
-        $gen_details = array(0 => I18N::translate('All'));
-        for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
-        $data->set('generation_details', $gen_details);
+		$gen_details = array(0 => I18N::translate('All'));
+		for($i = 1; $i <= 10 ; $i++) $gen_details[$i] = $i;
+		$data->set('generation_details', $gen_details);
     
-        ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
-    }
+		ViewFactory::make('GeoAnalysisEdit', $this, $controller, $data)->render();
+	}
     
 }
\ No newline at end of file

src/Webtrees/Module/Certificates/CertificateController.php

Indentation +148 added lines, -148 removed lines

@@ -32,158 +32,158 @@ 
  */
 class CertificateController extends MvcController
 {
-    /**
-     * Certificate Provider
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Certificate Provider
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * Constructor for Certificate controller
-     * @param AbstractModule $module
-     */
-    public function __construct(AbstractModule $module) {
-        parent::__construct($module);
-        
-        $this->provider = $this->module->getProvider();
-    }
+	/**
+	 * Constructor for Certificate controller
+	 * @param AbstractModule $module
+	 */
+	public function __construct(AbstractModule $module) {
+		parent::__construct($module);
+        
+		$this->provider = $this->module->getProvider();
+	}
     
     
-    /**
-     * Pages
-     */
-        
-    /**
-     * Certificate@index
-     */
-    public function index() {
-        global $WT_TREE;
-        
-        $controller = new PageController();
-        $controller
-        ->setPageTitle(I18N::translate('Certificate'))
-        ->restrictAccess(
-            $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)
-        );
-        
-        $cid = Filter::get('cid');
-        
-        $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
-            $certificate = Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
-        }
-        
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        
-        $data->set('has_certif', false);
-        if($certificate) {
-            $controller->restrictAccess($certificate->canShow());
-            $data->set('title', $certificate->getTitle());
-            $data->set('has_certif', true);
-            $data->set('certificate', $certificate);
+	/**
+	 * Pages
+	 */
+        
+	/**
+	 * Certificate@index
+	 */
+	public function index() {
+		global $WT_TREE;
+        
+		$controller = new PageController();
+		$controller
+		->setPageTitle(I18N::translate('Certificate'))
+		->restrictAccess(
+			$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)
+		);
+        
+		$cid = Filter::get('cid');
+        
+		$certificate = null;
+		if(!empty($cid) && strlen($cid) > 22){
+			$certificate = Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
+		}
+        
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+        
+		$data->set('has_certif', false);
+		if($certificate) {
+			$controller->restrictAccess($certificate->canShow());
+			$data->set('title', $certificate->getTitle());
+			$data->set('has_certif', true);
+			$data->set('certificate', $certificate);
             
-            $data->set(
-                'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $WT_TREE->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
-            );
+			$data->set(
+				'url_certif_city', 
+				'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
+					'&mod_action=Certificate@listAll' .
+					'&ged=' . $WT_TREE->getNameUrl() .
+					'&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+			);
             
-            $controller->addInlineJavascript('
+			$controller->addInlineJavascript('
                 jQuery("#certificate-tabs").tabs();
 			    jQuery("#certificate-tabs").css("visibility", "visible");    
             ');
             
-            $data->set('has_linked_indis', false);
-            $data->set('has_linked_fams', false);
+			$data->set('has_linked_indis', false);
+			$data->set('has_linked_fams', false);
             
-            $linked_indis = $certificate->linkedIndividuals();
-            $linked_fams = $certificate->linkedFamilies();
+			$linked_indis = $certificate->linkedIndividuals();
+			$linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
-                $data->set('has_linked_indis', true);
-                $data->set('linked_indis', $linked_indis);
-            }
+			if($linked_indis && count($linked_indis) > 0) {
+				$data->set('has_linked_indis', true);
+				$data->set('linked_indis', $linked_indis);
+			}
             
-            if(!empty($linked_fams)) {
-                $data->set('has_linked_fams', true);
-                $data->set('linked_fams', $linked_fams);
-            }
-        }
-        
-        ViewFactory::make('Certificate', $this, $controller, $data)->render();
-    }
+			if(!empty($linked_fams)) {
+				$data->set('has_linked_fams', true);
+				$data->set('linked_fams', $linked_fams);
+			}
+		}
+        
+		ViewFactory::make('Certificate', $this, $controller, $data)->render();
+	}
     
-    /**
-     * Certificate@image
-     */
-    public function image() {      
-        global $WT_TREE;
+	/**
+	 * Certificate@image
+	 */
+	public function image() {      
+		global $WT_TREE;
         
-        $cid   = Filter::get('cid');
-        $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
+		$cid   = Filter::get('cid');
+		$certificate = null;
+		if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
         
-        $imageBuilder = new ImageBuilder($certificate);
+		$imageBuilder = new ImageBuilder($certificate);
         
-        if (!empty(Filter::get('cb'))) {
-            $imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
-        }
+		if (!empty(Filter::get('cb'))) {
+			$imageBuilder->setExpireOffset($imageBuilder->getExpireOffset() * 7);
+		}
         
-        $imageBuilder
-            ->setShowWatermark(Auth::accessLevel($WT_TREE) >= $this->module->getSetting('MAJ_SHOW_NO_WATERMARK', Auth::PRIV_HIDE))
-            ->setFontMaxSize($this->module->getSetting('MAJ_WM_FONT_MAXSIZE', 18))
-            ->setFontColor($this->module->getSetting('MAJ_WM_FONT_COLOR', '#4D6DF3'))
-        ;
+		$imageBuilder
+			->setShowWatermark(Auth::accessLevel($WT_TREE) >= $this->module->getSetting('MAJ_SHOW_NO_WATERMARK', Auth::PRIV_HIDE))
+			->setFontMaxSize($this->module->getSetting('MAJ_WM_FONT_MAXSIZE', 18))
+			->setFontColor($this->module->getSetting('MAJ_WM_FONT_COLOR', '#4D6DF3'))
+		;
         
-        $imageBuilder->render();
+		$imageBuilder->render();
         
-    }
+	}
     
-    /**
-     * Certificate@listAll
-     */
-    public function listAll() {
-        global $WT_TREE;
-        
-        $controller = new PageController();
-        $controller
-            ->setPageTitle(I18N::translate('Certificates'))
-            ->restrictAccess(
-                $this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)
-            );
-        
-        $city = Filter::get('city');
-        
-        if(!empty($city) && strlen($city) > 22){
-            $city = Functions::decryptFromSafeBase64($city);
-            $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
-        }
-        
-        $data = new ViewBag();
-        $data->set('title', $controller->getPageTitle());
-        $data->set('url_module', $this->module->getName());
-        $data->set('url_action', 'Certificate@listAll');
-        $data->set('url_ged', $WT_TREE->getNameUrl());
-        
-        $data->set('cities', $this->provider->getCitiesList());
-        $data->set('selected_city', $city);
-        
-        $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+	/**
+	 * Certificate@listAll
+	 */
+	public function listAll() {
+		global $WT_TREE;
+        
+		$controller = new PageController();
+		$controller
+			->setPageTitle(I18N::translate('Certificates'))
+			->restrictAccess(
+				$this->module->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)
+			);
+        
+		$city = Filter::get('city');
+        
+		if(!empty($city) && strlen($city) > 22){
+			$city = Functions::decryptFromSafeBase64($city);
+			$controller->setPageTitle(I18N::translate('Certificates for %s', $city));
+		}
+        
+		$data = new ViewBag();
+		$data->set('title', $controller->getPageTitle());
+		$data->set('url_module', $this->module->getName());
+		$data->set('url_action', 'Certificate@listAll');
+		$data->set('url_ged', $WT_TREE->getNameUrl());
+        
+		$data->set('cities', $this->provider->getCitiesList());
+		$data->set('selected_city', $city);
+        
+		$data->set('has_list', false);        
+		if(!empty($city)) {            
+			$table_id = 'table-certiflist-' . Uuid::uuid4();
             
-            $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
-                $data->set('has_list', true);
-                $data->set('table_id', $table_id);
-                $data->set('certificate_list', $certif_list);
+			$certif_list = $this->provider->getCertificatesList($city);            
+			if(!empty($certif_list)) {                
+				$data->set('has_list', true);
+				$data->set('table_id', $table_id);
+				$data->set('certificate_list', $certif_list);
                 
-                $controller
-                    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-                    ->addInlineJavascript('
+				$controller
+					->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+					->addInlineJavascript('
 				        jQuery.fn.dataTableExt.oSort["text-asc"] = textCompareAsc;
 				        jQuery.fn.dataTableExt.oSort["text-desc"] = textCompareDesc;
                         
@@ -205,29 +205,29 @@ 
         				jQuery(".certificate-list").css("visibility", "visible");
         				jQuery(".loading-image").css("display", "none");
                     ');
-            }
-        }
+			}
+		}
         
-        ViewFactory::make('CertificatesList', $this, $controller, $data)->render();
+		ViewFactory::make('CertificatesList', $this, $controller, $data)->render();
         
-    }
+	}
     
-    /**
-     * Certificate@autocomplete
-     */
-    public function autocomplete() {
-        global $WT_TREE;
+	/**
+	 * Certificate@autocomplete
+	 */
+	public function autocomplete() {
+		global $WT_TREE;
         
-        $controller = new JsonController();
+		$controller = new JsonController();
         
-        $city = Filter::get('city');
-        $contains = Filter::get('term');        
+		$city = Filter::get('city');
+		$contains = Filter::get('term');        
 
-        $controller
-            ->restrictAccess(Auth::isEditor($WT_TREE) && !empty($city) && !empty($contains))
-            ->pageHeader();
+		$controller
+			->restrictAccess(Auth::isEditor($WT_TREE) && !empty($city) && !empty($contains))
+			->pageHeader();
         
-        $listCert = $this->provider->getCertificatesListBeginWith($city, $contains); 
-        $controller->encode($listCert);
-    }
+		$listCert = $this->provider->getCertificatesListBeginWith($city, $contains); 
+		$controller->encode($listCert);
+	}
 }
\ No newline at end of file

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

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/RecordNameTextExtenderInterface.php

Indentation +8 added lines, -8 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;
 
 use Fisharebest\Webtrees\GedcomRecord;

src/Webtrees/Hook/HookInterfaces/FactSourceTextExtenderInterface.php

Indentation +8 added lines, -8 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;
 
 /**