jon48 / webtrees-lib

src/Webtrees/Module/CertificatesModule.php

Indentation +178 added lines, -178 removed lines

@@ -29,143 +29,143 @@ 
  * Certificates Module.
  */
 class CertificatesModule 
-    extends AbstractModule 
-    implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface
+	extends AbstractModule 
+	implements HookSubscriberInterface, ModuleConfigInterface, ModuleMenuItemInterface, FactSourceTextExtenderInterface, CustomSimpleTagManagerInterface
 {
-    /** @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';
         
-    /**
-     * Provider for Certificates
-     * @var CertificateProviderInterface $provider
-     */
-    protected $provider;
+	/**
+	 * Provider for Certificates
+	 * @var CertificateProviderInterface $provider
+	 */
+	protected $provider;
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getTitle() {
-        return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getTitle() {
+		return /* I18N: Name of the “Certificates” module */ I18N::translate('Certificates');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function getDescription() {
-        return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function getDescription() {
+		return /* I18N: Description of the “Certificates” module */ I18N::translate('Display and edition of certificates linked to sources.');
+	}
     
-    /**
-     * {@inhericDoc}
-     */
-    public function modAction($mod_action) {
-        \MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
-    }
+	/**
+	 * {@inhericDoc}
+	 */
+	public function modAction($mod_action) {
+		\MyArtJaub\Webtrees\Mvc\Dispatcher::getInstance()->handle($this, $mod_action);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
-     */
-    public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
+	 */
+	public function getConfigLink() {
+		return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
-     */
-    public function getSubscribedHooks() {
-        return array(
-            'hFactSourcePrepend' => 50,
-            'hGetExpectedTags' => 50,
-            'hHtmlSimpleTagDisplay#_ACT' => 50,
-            'hHtmlSimpleTagEditor#_ACT'	=> 50,
-            'hAddSimpleTag#SOUR'	=> 50,
-            'hHasHelpTextTag#_ACT'	=> 50,
-            'hGetHelpTextTag#_ACT'	=> 50
-        );
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookSubscriberInterface::getSubscribedHooks()
+	 */
+	public function getSubscribedHooks() {
+		return array(
+			'hFactSourcePrepend' => 50,
+			'hGetExpectedTags' => 50,
+			'hHtmlSimpleTagDisplay#_ACT' => 50,
+			'hHtmlSimpleTagEditor#_ACT'	=> 50,
+			'hAddSimpleTag#SOUR'	=> 50,
+			'hHasHelpTextTag#_ACT'	=> 50,
+			'hGetHelpTextTag#_ACT'	=> 50
+		);
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
-     */
-    public function getMenu(Tree $tree, $reference = null) {
-        $tree_url = $tree ? $tree->getNameUrl() : '';
-        return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Module\ModuleMenuItemInterface::getMenu()
+	 */
+	public function getMenu(Tree $tree, $reference = null) {
+		$tree_url = $tree ? $tree->getNameUrl() : '';
+		return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
-     */
-    public function hFactSourcePrepend($srec) {
-        global $WT_TREE;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourcePrepend()
+	 */
+	public function hFactSourcePrepend($srec) {
+		global $WT_TREE;
         
-        $html='';
-        $sid=null;
+		$html='';
+		$sid=null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
-            if (!$srec || strlen($srec) == 0) return $html;
+		if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
+			if (!$srec || strlen($srec) == 0) return $html;
             	
-            $certificate = null;
-            $subrecords = explode("\n", $srec);
-            $levelSOUR = substr($subrecords[0], 0, 1);
-            $match = null;
-            if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
-            };
-            $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
-                $subrecords[$i] = trim($subrecords[$i]);
-                $tag = substr($subrecords[$i], 2, 4);
-                $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
-            }
+			$certificate = null;
+			$subrecords = explode("\n", $srec);
+			$levelSOUR = substr($subrecords[0], 0, 1);
+			$match = null;
+			if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
+				$sid=$match[1];
+			};
+			$nb_subrecords = count($subrecords);
+			for ($i=0; $i < $nb_subrecords; $i++) {
+				$subrecords[$i] = trim($subrecords[$i]);
+				$tag = substr($subrecords[$i], 2, 4);
+				$text = substr($subrecords[$i], 7);
+				if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+			}
             	
-            if($certificate && $certificate->canShow())
-                $html = $this->getDisplay_ACT($certificate, $sid);
+			if($certificate && $certificate->canShow())
+				$html = $this->getDisplay_ACT($certificate, $sid);
                 	
-        }
-        return $html;
-    }
+		}
+		return $html;
+	}
    
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
-     */
-    public function hFactSourceAppend($srec) { }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\FactSourceTextExtenderInterface::hFactSourceAppend()
+	 */
+	public function hFactSourceAppend($srec) { }
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
-     */
-    public function hGetExpectedTags() {
-        return array('SOUR' => '_ACT');
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetExpectedTags()
+	 */
+	public function hGetExpectedTags() {
+		return array('SOUR' => '_ACT');
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
-     */
-    public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
-        $html = '';
-        switch($tag){
-            case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
-                break;
-        }
-        return $html;
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagDisplay()
+	 */
+	public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
+		$html = '';
+		switch($tag){
+			case '_ACT':
+				if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+				break;
+		}
+		return $html;
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
-     */
-    public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
-        global $controller, $WT_TREE;
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHtmlSimpleTagEditor()
+	 */
+	public function hHtmlSimpleTagEditor($tag, $value = null, $element_id = '', $element_name = '', $context = null, $contextid = null) {
+		global $controller, $WT_TREE;
         
-        $html = '';
+		$html = '';
 		
 		switch($tag){
 			case '_ACT':
@@ -193,77 +193,77 @@ 
 		}
 		
 		return $html;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
-     */
-    public function hAddSimpleTag($context, $level) {
-        switch($context){
-            case 'SOUR':
-                FunctionsEdit::addSimpleTag($level.' _ACT');
-                break;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
+	 */
+	public function hAddSimpleTag($context, $level) {
+		switch($context){
+			case 'SOUR':
+				FunctionsEdit::addSimpleTag($level.' _ACT');
+				break;
+		}
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
-     */
-    public function hHasHelpTextTag($tag) {
-        switch($tag){
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
+	 */
+	public function hHasHelpTextTag($tag) {
+		switch($tag){
 			case '_ACT':
 				return true;
 		}
 		return false;
-    }
+	}
     
-    /**
-     * {@inhericDoc}
-     * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
-     */
-    public function hGetHelpTextTag($tag) {
-        switch($tag){
-            case '_ACT':
-                return array(
-                I18N::translate('Certificate'),
-                '<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
-            default:
-                return null;
-        }
-    }
+	/**
+	 * {@inhericDoc}
+	 * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
+	 */
+	public function hGetHelpTextTag($tag) {
+		switch($tag){
+			case '_ACT':
+				return array(
+				I18N::translate('Certificate'),
+				'<p>'.I18N::translate('Path to a certificate linked to a source reference.').'</p>');
+			default:
+				return null;
+		}
+	}
 
-    /**
-     * Returns the default Certificate File Provider, as configured in the module
-     *
-     * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
-     */
-    public function getProvider() {
-        global $WT_TREE;
+	/**
+	 * Returns the default Certificate File Provider, as configured in the module
+	 *
+	 * @return \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface
+	 */
+	public function getProvider() {
+		global $WT_TREE;
     
-        if(!$this->provider) {
-            $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
-            $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
-        }
-        return $this->provider;
-    }
+		if(!$this->provider) {
+			$root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
+			$this->provider = new CertificateFileProvider($root_path, $WT_TREE);
+		}
+		return $this->provider;
+	}
     
     
-    /**
-     * Return the HTML code for custom simple tag _ACT
-     *
-     * @param Certificate $certificatePath Certificate (as per the GEDCOM)
-     * @param string|null $sid Linked Source ID, if it exists
-     */
-    protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
-        $html = '';
-        if($certificate){
-            $certificate->setSource($sid);
-            $html = $certificate->displayImage('icon');
-        }
-        return $html;
-    }
+	/**
+	 * Return the HTML code for custom simple tag _ACT
+	 *
+	 * @param Certificate $certificatePath Certificate (as per the GEDCOM)
+	 * @param string|null $sid Linked Source ID, if it exists
+	 */
+	protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
+		$html = '';
+		if($certificate){
+			$certificate->setSource($sid);
+			$html = $certificate->displayImage('icon');
+		}
+		return $html;
+	}
 
 }
  
\ No newline at end of file

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

Indentation +52 added lines, -52 removed lines

@@ -29,16 +29,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        ?>
+	protected function renderContent() {
+		?>
             <div id="maj-sosa-missing-page" class="center">
     			<h2><?php echo $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="<?php echo $table_id;?>">
         				<thead>     
@@ -109,44 +109,44 @@ 
         			<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);
-        			    ?>			
+						/** @var \Fisharebest\Webtrees\Individual $person */
+						if ($person->isPendingAddtion()) {
+							$class = ' class="new"';
+						} elseif ($person->isPendingDeletion()) {
+							$class = ' class="old"';
+						} else {
+							$class = '';
+						}
+						$dperson = new \MyArtJaub\Webtrees\Individual($person);
+						?>			
                 		<tr <?php echo $class?>>
                 			<td class="transparent"><?php echo $missing_tab['sosa']; ?></td>
                 			<td class="transparent"><?php echo $person->getXref(); ?></td>
                 			<td colspan="2">
                 			<?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();
-                					list($surn, $givn)=explode(',', $name['sort']);
-                				} 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();
+									list($surn, $givn)=explode(',', $name['sort']);
+								} else {
+									$class='';
+									$sex_image='';
+								} ?>
                 				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
                 					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
                 				</a>
                 				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller'); ?>
                 				<br/>
                     		<?php }
-                    		echo $person->getPrimaryParentsNames('parents details1', 'none');
-                    		?>
+							echo $person->getPrimaryParentsNames('parents details1', 'none');
+							?>
                     		</td>
                     		<td style="display:none;"></td>
                     		<td>
@@ -156,7 +156,7 @@ 
                     			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
                     		</td>                    		
                 			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-        				        $isISourced = $dperson->isSourced(); ?>
+								$isISourced = $dperson->isSourced(); ?>
         				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('R', $isISourced, 'INDI', 1, 'medium'); ?></td>
         					<td><?php echo $isISourced; ?></td>
         					<?php } else { ?>
@@ -167,34 +167,34 @@ 
         					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X';?></td>
         					<td>
                     		<?php 
-                    		if ($birth_dates=$person->getAllBirthDates()) {
-        			            foreach ($birth_dates as $num=>$birth_date) {
-            					   if ($num) { ?><br/><?php } ?>
+							if ($birth_dates=$person->getAllBirthDates()) {
+								foreach ($birth_dates as $num=>$birth_date) {
+								   if ($num) { ?><br/><?php } ?>
             						<?php  echo $birth_date->display(true);
-        			            }
-                    		} else {
-                    		    $birth_date=$person->getEstimatedBirthDate();
-                    		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-                    		        $birth_date->display(true);
-                    		    } else {
-                    		        echo '&nbsp;';
-                    		    }
-                    		    $birth_dates[0] = new Date('');
-                    		}
-                    		?>
+								}
+							} else {
+								$birth_date=$person->getEstimatedBirthDate();
+								if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
+									$birth_date->display(true);
+								} else {
+									echo '&nbsp;';
+								}
+								$birth_dates[0] = new Date('');
+							}
+							?>
                     		</td>
                     		<td><?php echo $birth_date->julianDay();?></td>
                 			<td>
                 			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-        				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-                				if ($n) { ?><br><?php } ?>
+								$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+								if ($n) { ?><br><?php } ?>
                 				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
                 					<?php echo \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><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium'); ?></td>
         					<td><?php echo $isBSourced; ?></td>
         					<?php } else { ?>
@@ -221,7 +221,7 @@ 
     			 <?php } else { ?> 
     			<p><?php echo 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"><?php echo I18N::translate('The list could not be displayed. Reasons might be:'); ?><br/>
     				<ul>
     					<li><?php echo I18N::translate('No Sosa root individual has been defined.'); ?></li>
@@ -232,6 +232,6 @@ 
     			<?php } ?>
     		</div> 
     		<?php 
-        }
+		}
 }
  
\ No newline at end of file

src/Webtrees/Module/Sosa/Model/SosaCalculator.php

Indentation +97 added lines, -97 removed lines

@@ -19,116 +19,116 @@
  */
 class SosaCalculator {
     
-    /**
-     * Maximium size for the temporary Sosa table
-     * @var int TMP_SOSA_TABLE_LIMIT
-     */
-    const TMP_SOSA_TABLE_LIMIT = 1000;
+	/**
+	 * Maximium size for the temporary Sosa table
+	 * @var int TMP_SOSA_TABLE_LIMIT
+	 */
+	const TMP_SOSA_TABLE_LIMIT = 1000;
     
-    /**
-     * Reference user
-     * @var Fisharebest\Webtrees\User $user
-     */
-    protected $user;
+	/**
+	 * Reference user
+	 * @var Fisharebest\Webtrees\User $user
+	 */
+	protected $user;
     
-    /**
-     * Reference tree
-     * @var Fisharebest\Webtrees\Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Fisharebest\Webtrees\Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Sosa Provider for the calculator
-     * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider
-     */
-    protected $sosa_provider;
+	/**
+	 * Sosa Provider for the calculator
+	 * @var \MyArtJaub\Webtrees\Module\Sosa\Model\SosaCalculator $sosa_provider
+	 */
+	protected $sosa_provider;
     
-    /**
-     * Temporary Sosa table, used during construction
-     * @var array $tmp_sosa_table
-     */
-    protected $tmp_sosa_table;
+	/**
+	 * Temporary Sosa table, used during construction
+	 * @var array $tmp_sosa_table
+	 */
+	protected $tmp_sosa_table;
     
-    /**
-     * Constructor for the Sosa Calculator
-     * @param Tree $tree
-     * @param User $user
-     */
-    public function __construct(Tree $tree, User $user) {        
-        $this->tree = $tree;
-        $this->user = $user;
+	/**
+	 * Constructor for the Sosa Calculator
+	 * @param Tree $tree
+	 * @param User $user
+	 */
+	public function __construct(Tree $tree, User $user) {        
+		$this->tree = $tree;
+		$this->user = $user;
         
-        $this->sosa_provider = new SosaProvider($this->tree, $this->user);;
-    }
+		$this->sosa_provider = new SosaProvider($this->tree, $this->user);;
+	}
     
-    /**
-     * Compute all Sosa ancestors from the user's root individual.
-     * @return bool Result of the computation
-     */
-    public function computeAll() {
-        $root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
-        $indi = Individual::getInstance($root_id, $this->tree);
-        if($indi){
-            $this->sosa_provider->deleteAll();
-            $this->addNode($indi, 1);
-            $this->flushTmpSosaTable(true);
-            return true;
-        }     
-        return false;
-    }
+	/**
+	 * Compute all Sosa ancestors from the user's root individual.
+	 * @return bool Result of the computation
+	 */
+	public function computeAll() {
+		$root_id = $this->tree->getUserPreference($this->user, 'MAJ_SOSA_ROOT_ID');        
+		$indi = Individual::getInstance($root_id, $this->tree);
+		if($indi){
+			$this->sosa_provider->deleteAll();
+			$this->addNode($indi, 1);
+			$this->flushTmpSosaTable(true);
+			return true;
+		}     
+		return false;
+	}
     
-    /**
-     * Compute all Sosa Ancestors from a specified Individual
-     * @param Individual $indi
-     * @return bool Result of the computation
-     */
-    public function computeFromIndividual(Individual $indi) {
-        $dindi = new \MyArtJaub\Webtrees\Individual($indi);
-        $current_sosas = $dindi->getSosaNumbers();
-        foreach($current_sosas as $current_sosa => $gen) {
-            $this->sosa_provider->deleteAncestors($current_sosa);
-            $this->addNode($indi, $current_sosa);
-        }
-        $this->flushTmpSosaTable(true);
-        return true;
-    }
+	/**
+	 * Compute all Sosa Ancestors from a specified Individual
+	 * @param Individual $indi
+	 * @return bool Result of the computation
+	 */
+	public function computeFromIndividual(Individual $indi) {
+		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
+		$current_sosas = $dindi->getSosaNumbers();
+		foreach($current_sosas as $current_sosa => $gen) {
+			$this->sosa_provider->deleteAncestors($current_sosa);
+			$this->addNode($indi, $current_sosa);
+		}
+		$this->flushTmpSosaTable(true);
+		return true;
+	}
     
-    /**
-     * Recursive method to add individual to the Sosa table, and flush it regularly
-     * @param Individual $indi Individual to add
-     * @param int $sosa Individual's sosa
-     */
-    protected function addNode(Individual $indi, $sosa) {                
-        $birth_year = $indi->getEstimatedBirthDate()->gregorianYear();
-        $death_year = $indi->getEstimatedDeathDate()->gregorianYear();
+	/**
+	 * Recursive method to add individual to the Sosa table, and flush it regularly
+	 * @param Individual $indi Individual to add
+	 * @param int $sosa Individual's sosa
+	 */
+	protected function addNode(Individual $indi, $sosa) {                
+		$birth_year = $indi->getEstimatedBirthDate()->gregorianYear();
+		$death_year = $indi->getEstimatedDeathDate()->gregorianYear();
         
-        $this->tmp_sosa_table[] = array(
-            'indi' => $indi->getXref(), 
-            'sosa' => $sosa, 
-            'birth_year' => $birth_year,
-            'death_year' => $death_year
-        );
+		$this->tmp_sosa_table[] = array(
+			'indi' => $indi->getXref(), 
+			'sosa' => $sosa, 
+			'birth_year' => $birth_year,
+			'death_year' => $death_year
+		);
         
-        $this->flushTmpSosaTable();
+		$this->flushTmpSosaTable();
         
-        if($fam = $indi->getPrimaryChildFamily()) {
-            if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
-            if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
-        }
-    }
+		if($fam = $indi->getPrimaryChildFamily()) {
+			if($husb = $fam->getHusband()) $this->addNode($husb, 2 * $sosa);
+			if($wife = $fam->getWife()) $this->addNode($wife, 2 * $sosa + 1);
+		}
+	}
     
-    /**
-     * Write sosas in the table, if the number of items is superior to the limit, or if forced.
-     *
-     * @param bool $force Should the flush be forced
-     */
-    protected function flushTmpSosaTable($force = false) {
-        if( count($this->tmp_sosa_table)> 0 && 
-            ($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
-                $this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
-                $this->tmp_sosa_table = array();
-        }
-    }
+	/**
+	 * Write sosas in the table, if the number of items is superior to the limit, or if forced.
+	 *
+	 * @param bool $force Should the flush be forced
+	 */
+	protected function flushTmpSosaTable($force = false) {
+		if( count($this->tmp_sosa_table)> 0 && 
+			($force ||  count($this->tmp_sosa_table) >= self::TMP_SOSA_TABLE_LIMIT)){            
+				$this->sosa_provider->insertOrUpdate($this->tmp_sosa_table);
+				$this->tmp_sosa_table = array();
+		}
+	}
                
 }
  
\ No newline at end of file

src/Webtrees/Module/AdminTasks/Tasks/HealthCheckEmailTask.php

Indentation +21 added lines, -21 removed lines

@@ -29,11 +29,11 @@ 
  */
 class HealthCheckEmailTask extends AbstractTask implements ConfigurableTaskInterface {
     
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle()
-     */
-    public function getTitle() {
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getTitle()
+	 */
+	public function getTitle() {
 		return I18N::translate('Healthcheck Email');
 	}
 	
@@ -41,7 +41,7 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::getDefaultFrequency()
 	 */
-    public function getDefaultFrequency() {
+	public function getDefaultFrequency() {
 		return 10080;  // = 1 week = 7 * 24 * 60 min
 	}
     
@@ -49,7 +49,7 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\AdminTasks\Model\AbstractTask::executeSteps()
 	 */
-    protected function executeSteps() {
+	protected function executeSteps() {
 	
 		$res = false;		
 		
@@ -63,14 +63,14 @@ 
 		$interval = max($this->frequency, $interval_sincelast);
 		$nbdays = ceil($interval / (24 * 60));
 				
-        // Check for updates
-        $latest_version_txt = Functions::fetchLatestVersion();
-        if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
-        	list($latest_version, , $download_url) = explode('|', $latest_version_txt);
-        } else {
-        	// Cannot determine the latest version
-        	list($latest_version, , $download_url) = explode('|', '||');
-        }
+		// Check for updates
+		$latest_version_txt = Functions::fetchLatestVersion();
+		if (preg_match('/^[0-9.]+\|[0-9.]+\|/', $latest_version_txt)) {
+			list($latest_version, , $download_url) = explode('|', $latest_version_txt);
+		} else {
+			// Cannot determine the latest version
+			list($latest_version, , $download_url) = explode('|', '||');
+		}
 		
 		// Users statistics
 		$warnusers = 0;
@@ -213,15 +213,15 @@ 
 		$html = '
 			<div class="form-group">
     			<label class="control-label col-sm-3"> '.
-    				I18N::translate('Enable healthcheck emails for') .
-    			'</label>
+					I18N::translate('Enable healthcheck emails for') .
+				'</label>
     			<div class="col-sm-9">';
 
 		foreach(Tree::getAll() as $tree){
 			if(Auth::isManager($tree)){	
-			    $html .= '<div class="form-group row">
+				$html .= '<div class="form-group row">
 			        <span class="col-sm-3 control-label">' .
-			             $tree->getTitle() .
+						 $tree->getTitle() .
 					'</span>
 					 <div class="col-sm-2">';
 				$html .= FunctionsEdit::editFieldYesNo('HEALTHCHECK_ENABLED_' . $tree->getTreeId(), $tree->getPreference('MAJ_AT_'.$this->getName().'_ENABLED', 1), 'class="radio-inline"');
@@ -230,8 +230,8 @@ 
 		}
 		
 		$html .= '	<p class="small text-muted">'.
-    					I18N::translate('Enable the health check emails for each of the selected trees.') .
-    				'</p>
+						I18N::translate('Enable the health check emails for each of the selected trees.') .
+					'</p>
     			</div>
     		</div>';
 			

src/Webtrees/Module/AdminTasks/Schema/Migration0.php

Indentation +10 added lines, -10 removed lines

@@ -24,16 +24,16 @@
 	 */
 	public function upgrade() {
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_admintasks` ('.
-		    ' majat_name 		    VARCHAR(32)                      NOT NULL,'.
-		    ' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
-		    ' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
-		    ' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
-		    ' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
-		    ' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
-		    ' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
-		    ' PRIMARY KEY (majat_name)'.
-		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'CREATE TABLE IF NOT EXISTS `##maj_admintasks` ('.
+			' majat_name 		    VARCHAR(32)                      NOT NULL,'.
+			' majat_status          ENUM(\'enabled\',\'disabled\') 	 NOT NULL DEFAULT \'disabled\','.
+			' majat_last_run 		DATETIME 					     NOT NULL DEFAULT \'2000-01-01 00:00:00\','.
+			' majat_last_result 	TINYINT(1)					     NOT NULL DEFAULT 1,'.		// 0 means error, 1 is success
+			' majat_frequency		INTEGER						     NOT NULL DEFAULT 10080,'.	// In min, Default every week
+			' majat_nb_occur	 	SMALLINT					     NOT NULL DEFAULT 0,'.
+			' majat_running 		TINYINT(1)					     NOT NULL DEFAULT 0,'.
+			' PRIMARY KEY (majat_name)'.
+			') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}
 }

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGenerationsView.php

Indentation +93 added lines, -93 removed lines

@@ -24,89 +24,89 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {       
+	protected function renderContent() {       
 
-        $max_details_gen = $this->data->get('max_details_gen');
-        $analysis_level = $this->data->get('analysis_level');
-        $results_by_gen = $this->data->get('results_by_generations');
-        $display_all_places = $this->data->get('display_all_places', true);
+		$max_details_gen = $this->data->get('max_details_gen');
+		$analysis_level = $this->data->get('analysis_level');
+		$results_by_gen = $this->data->get('results_by_generations');
+		$display_all_places = $this->data->get('display_all_places', true);
         
-        $html = 
-        '<div id="geodispersion_gen">
+		$html = 
+		'<div id="geodispersion_gen">
         	<table id="geodispersion_gentable" class="center">';
             
-        foreach($results_by_gen as $gen => $genData){
-            $html .= 
-            '<tr>
+		foreach($results_by_gen as $gen => $genData){
+			$html .= 
+			'<tr>
                 <td class="descriptionbox">' .
-                    I18N::translate("Generation %s", I18N::number($gen)).
-                    ($display_all_places ? '<br />' : ' ').
-                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
-                '</td>
+					I18N::translate("Generation %s", I18N::number($gen)).
+					($display_all_places ? '<br />' : ' ').
+					I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
+				'</td>
                  <td class="optionbox left">'.
-                    ($display_all_places ? 
-                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
-                        $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
-                     ) .
-                '</ditdv>
+					($display_all_places ? 
+						$this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
+						$this->htmlGenerationTopPlacesRow($genData, $analysis_level)
+					 ) .
+				'</ditdv>
             </tr>';
-        }       
+		}       
         
-        $html.= 
-            '</table>
+		$html.= 
+			'</table>
             <div class="left">
                 <strong>' . I18N::translate('Interpretation help:') . '</strong>
                 <br />'.
-                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
-                '<br />';
-        if(!is_null($max_details_gen) && $max_details_gen == 0){
-            $html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
-            $html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
-        }
-        else{
-            $html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
-            $html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
-        }
-        $html.= 
-            '</div>
+				I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
+				'<br />';
+		if(!is_null($max_details_gen) && $max_details_gen == 0){
+			$html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
+			$html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
+		}
+		else{
+			$html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
+			$html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
+		}
+		$html.= 
+			'</div>
         </div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
     
-    /**
-     * Return the HTML code to display a row with all places found in a generation.
-     *
-     * @param array $data Data array
-     * @param int $analysis_level Level of subdivision of analysis
-     * @return string HTML code for all places row
-     */
-    protected function htmlGenerationAllPlacesRow($data, $analysis_level) {
-        $html =
-        '<table class="geodispersion_bigrow">
+	/**
+	 * Return the HTML code to display a row with all places found in a generation.
+	 *
+	 * @param array $data Data array
+	 * @param int $analysis_level Level of subdivision of analysis
+	 * @return string HTML code for all places row
+	 */
+	protected function htmlGenerationAllPlacesRow($data, $analysis_level) {
+		$html =
+		'<table class="geodispersion_bigrow">
             <tr>';
         
-        $sum_gen = $data['sum'];
-        $unknownother = $data['unknown'] + $data['other'];
-        foreach($data['places'] as $placename=> $dataplace){
-            $levels = array_map('trim',explode(',', $placename));
-            $content = '';
-            if(isset($dataplace['flag'])){
-                $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
-            }
-            else{
-                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
-            }
-            $count = $dataplace['count'];
-            $content .= I18N::number($count);
-            $perc = Functions::safeDivision($count, $sum_gen + $unknownother);
-            $perc2= Functions::safeDivision($count, $sum_gen);
-            if($perc2>=0.1) 
-                $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
-            $content .= '</td>';
+		$sum_gen = $data['sum'];
+		$unknownother = $data['unknown'] + $data['other'];
+		foreach($data['places'] as $placename=> $dataplace){
+			$levels = array_map('trim',explode(',', $placename));
+			$content = '';
+			if(isset($dataplace['flag'])){
+				$content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
+			}
+			else{
+				$content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
+			}
+			$count = $dataplace['count'];
+			$content .= I18N::number($count);
+			$perc = Functions::safeDivision($count, $sum_gen + $unknownother);
+			$perc2= Functions::safeDivision($count, $sum_gen);
+			if($perc2>=0.1) 
+				$content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+			$content .= '</td>';
                
-            $html .= '
+			$html .= '
                 <td class="geodispersion_rowitem" width="'.max(round(100*$perc, 0),1).'%">
                     <table>
                         <tr>
@@ -118,46 +118,46 @@ 
                         </tr>
                     </table>
                 </td>';
-        }
+		}
         
-        if($unknownother>0){
-            $perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
-            $html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
-            if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
-            $html .='</td>';
-        }
+		if($unknownother>0){
+			$perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
+			$html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
+			if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+			$html .='</td>';
+		}
         
-        $html .= 
-            '</tr>
+		$html .= 
+			'</tr>
         </table>';
-        return $html;
-    }
+		return $html;
+	}
     
 	/**
 	 * Returns the HTML code fo display a row of the Top Places found for a generation.
 	 *
 	 * @param array $data Data array
-     * @param int $analysis_level Level of subdivision of analysis
+	 * @param int $analysis_level Level of subdivision of analysis
 	 * @return string HTML code for Top Places row
 	 */
-    protected function htmlGenerationTopPlacesRow($data, $analysis_level) {
-        $tmp_places = array();
-        $sum_gen = $data['sum'];
-        $other = $data['other'];
+	protected function htmlGenerationTopPlacesRow($data, $analysis_level) {
+		$tmp_places = array();
+		$sum_gen = $data['sum'];
+		$other = $data['other'];
         
-        foreach($data['places'] as $placename => $count) {
-            if($placename != 'other'){
-                $levels = array_map('trim',explode(',', $placename));
-                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
-            }
-            else{
-                $placename = I18N::translate('Other places');
-            }
-            $tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	
-        }
+		foreach($data['places'] as $placename => $count) {
+			if($placename != 'other'){
+				$levels = array_map('trim',explode(',', $placename));
+				$placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
+			}
+			else{
+				$placename = I18N::translate('Other places');
+			}
+			$tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	
+		}
         
-        return implode(I18N::$list_separator, $tmp_places);
-    }
+		return implode(I18N::$list_separator, $tmp_places);
+	}
     
 }
  
\ No newline at end of file