jon48 / webtrees-lib

src/Webtrees/Module/IsSourcedModule.php

Spacing +15 added lines, -15 removed lines

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

src/Webtrees/Module/SosaModule.php

Spacing +15 added lines, -15 removed lines

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

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

Spacing +25 added lines, -25 removed lines

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

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

Spacing +15 added lines, -15 removed lines

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

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

Spacing +16 added lines, -16 removed lines

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

src/Webtrees/Hook/Hook.php

Spacing +23 added lines, -23 removed lines

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