jon48 / webtrees-lib

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

Spacing +14 added lines, -14 removed lines

@@ -28,11 +28,11 @@ 
         <div id="maj-sosa-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
-			<?php  if($this->data->get('is_setup')) { 
+			<?php  if ($this->data->get('is_setup')) { 
 			    $selectedgen = $this->data->get('generation');
 			    $this->renderSosaHeader();
-			    if($this->data->get('has_sosa') ) {
-			         if($selectedgen > 0) {
+			    if ($this->data->get('has_sosa')) {
+			         if ($selectedgen > 0) {
 			        ?>
 			<div id="sosalist-tabs">
 				<ul>
@@ -75,9 +75,9 @@ 
         ?>
         
     	<form method="get" name="setgen" action="module.php">
-			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
-			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action');?>">
-			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged');?>">
+			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module'); ?>">
+			<input type="hidden" name="mod_action" value="<?php echo $this->data->get('url_action'); ?>">
+			<input type="hidden" name="ged" value="<?php echo $this->data->get('url_ged'); ?>">
 			<div class="maj-table">
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Choose generation') ?></div>
@@ -85,9 +85,9 @@ 
 				<div class="maj-row">
 					<div class="value">
 						<select name="gen">							
-						<?php for($i=$this->data->get('min_gen'); $i <= $max_gen;$i++) {?>
+						<?php for ($i = $this->data->get('min_gen'); $i <= $max_gen; $i++) {?>
 							<option value="<?php echo $i; ?>"
-							<?php if($selectedgen && $selectedgen==$i) { ?> selected="true" <?php } ?>
+							<?php if ($selectedgen && $selectedgen == $i) { ?> selected="true" <?php } ?>
                 			><?php echo I18N::translate('Generation %d', $i); ?>
                 			</option>
                 		<?php } ?>
@@ -95,21 +95,21 @@ 
                 	</div>
                 </div>
       		</div>
-      		<input type="submit" value="<?php echo I18N::translate('Show');?>" />
+      		<input type="submit" value="<?php echo I18N::translate('Show'); ?>" />
       		<br />
       	</form>
-      	<?php if($selectedgen > 0) { ?>
+      	<?php if ($selectedgen > 0) { ?>
 		<h4>
-			<?php if($selectedgen > $this->data->get('min_gen')) { ?>
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen-1; ?>">
+			<?php if ($selectedgen > $this->data->get('min_gen')) { ?>
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen - 1; ?>">
 				<i class="icon-ldarrow" title="<?php echo I18N::translate('Previous generation'); ?>" ></i>
 			</a>
 			&nbsp;&nbsp;
 			<?php } ?>
 			<?php echo I18N::translate('Generation %d', $selectedgen); ?>
-			<?php if($selectedgen < $max_gen) { ?>
+			<?php if ($selectedgen < $max_gen) { ?>
 			&nbsp;&nbsp;
-			<a href="module.php?mod=<?php echo $this->data->get('url_module');?>&mod_action=<?php echo $this->data->get('url_action');?>&ged=<?php echo $this->data->get('url_ged');?>&gen=<?php echo $selectedgen+1; ?>">
+			<a href="module.php?mod=<?php echo $this->data->get('url_module'); ?>&mod_action=<?php echo $this->data->get('url_action'); ?>&ged=<?php echo $this->data->get('url_ged'); ?>&gen=<?php echo $selectedgen + 1; ?>">
 				<i class="icon-rdarrow" title="<?php echo I18N::translate('Next generation'); ?>" ></i>
 			</a>
 			<?php } ?>

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

Spacing +31 added lines, -31 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 deceased.'); ?>"
 									>
-									<?php echo I18N::translate('Widower');?>
+									<?php echo I18N::translate('Widower'); ?>
 									</button>
 									<button
 										type="button"
@@ -186,7 +186,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
@@ -203,7 +203,7 @@ 
 			    }
 			    $dwife = new \MyArtJaub\Webtrees\Individual($wife);
 			    
-			    $mdate=$family->getMarriageDate();
+			    $mdate = $family->getMarriageDate();
 			    
 			    if ($family->isPendingAddtion()) {
 			        $class = ' class="new"';
@@ -219,18 +219,18 @@ 
         			<!--  HUSBAND -->
         			<td colspan="2">
         			<?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();
-        					list($surn, $givn)=explode(',', $name['sort']);
+        				if ($num == $husb->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $husb->getSexImage();
+        					list($surn, $givn) = explode(',', $name['sort']);
         				} 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']); ?>
@@ -244,29 +244,29 @@ 
             		<!-- Dummy column to match colspan in header -->
             		<td style="display:none;"></td>
             		<td>
-            			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
+            			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
             		</td>
             		<td>
-            			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
+            			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
             		</td>
-            		<?php $hdate=$husb->getBirthDate(); ?>
+            		<?php $hdate = $husb->getBirthDate(); ?>
             		<td><?php  Date::getAge($hdate, $mdate, 2); ?></td>
             		<td><?php  Date::getAge($hdate, $mdate, 1); ?></td>
             		<!--  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();
-        					list($surn, $givn)=explode(',', $name['sort']);
+        				if ($num == $wife->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $wife->getSexImage();
+        					list($surn, $givn) = explode(',', $name['sort']);
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $wife->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -280,12 +280,12 @@ 
             		<!-- Dummy column to match colspan in header -->
             		<td style="display:none;"></td>
             		<td>
-            			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)) . 'AAAA' . Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
+            			<?php echo Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)).'AAAA'.Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)); ?>
             		</td>
             		<td>
-            			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)) . 'AAAA' . Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
+            			<?php echo Filter::escapeHtml(str_replace('@N.N.', 'AAAA', $surn)).'AAAA'.Filter::escapeHtml(str_replace('@P.N.', 'AAAA', $givn)); ?>
             		</td>
-            		<?php $wdate=$wife->getBirthDate(); ?>
+            		<?php $wdate = $wife->getBirthDate(); ?>
             		<td><?php  Date::getAge($wdate, $mdate, 2); ?></td>
             		<td><?php  Date::getAge($wdate, $mdate, 1); ?></td>
             		<td><?php 
@@ -302,7 +302,7 @@ 
             		    echo '&nbsp;';
             		} ?>
             		</td>
-            		<td><?php echo $marriage_dates ? $marriage_date->julianDay() : 0;  ?></td>
+            		<td><?php echo $marriage_dates ? $marriage_date->julianDay() : 0; ?></td>
             		<td><?php 
             		foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
 				        $tmp = new Place($marriage_place, $family->getTree());
@@ -362,7 +362,7 @@ 
 								<button type="button" class="ui-state-default btn-toggle-parents">
 									<?php echo I18N::translate('Show parents') ?>
 								</button>
-								<button id="btn-toggle-statistics-<?php echo $table_id ;?>" type="button" class="ui-state-default btn-toggle-statistics">
+								<button id="btn-toggle-statistics-<?php echo $table_id; ?>" type="button" class="ui-state-default btn-toggle-statistics">
 									<?php echo I18N::translate('Show statistics charts') ?>
 								</button>
 							</div>

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

Spacing +2 added lines, -2 removed lines

@@ -25,14 +25,14 @@
 	 */
     protected function renderContent() {        
         
-        if($this->data->get('is_success', false)) {
+        if ($this->data->get('is_success', false)) {
         ?>        
         	<i class="icon-maj-success" title="<?php echo I18N::translate('Success'); ?>"></i>&nbsp;
         	<?php echo I18N::translate('Success'); ?>
         <?php } else { ?>
 			<i class="icon-maj-error" title="<?php echo I18N::translate('Error'); ?>"></i>&nbsp;
 			<?php echo I18N::translate('Error'); ?>
-			<?php if($error = $this->data->get('error')) { echo '&nbsp;-&nbsp;' . $error; }
+			<?php if ($error = $this->data->get('error')) { echo '&nbsp;-&nbsp;'.$error; }
         }
     }
     

src/Webtrees/Module/Sosa/SosaStatsController.php

Spacing +33 added lines, -33 removed lines

@@ -64,7 +64,7 @@ 
         $view_bag->set('title', $controller->getPageTitle());
         $view_bag->set('is_setup', false);
         
-        if($this->sosa_provider->isSetup()) {
+        if ($this->sosa_provider->isSetup()) {
             $view_bag->set('is_setup', true);
             
             $sosaCount = $this->sosa_provider->getSosaCount();
@@ -82,23 +82,23 @@ 
             $stats_gen = $this->sosa_provider->getStatisticsByGeneration();
             $view_bag->set('missinganc_url', 'module.php?mod='.$this->module->getName().'&mod_action=SosaList@missing&ged='.$WT_TREE->getNameUrl().'&gen=');
             
-            $gen_theoretical=1;
-            $total_theoretical=0;
-            $prev_diff=0;
-            $prev_known=0.5;
-            $gen_equiv=0;            
+            $gen_theoretical = 1;
+            $total_theoretical = 0;
+            $prev_diff = 0;
+            $prev_known = 0.5;
+            $gen_equiv = 0;            
             $generation_stats = array();
             
-            foreach($stats_gen as $gen => $tab){
-                $genY1= I18N::translate('-');
-                $genY2= I18N::translate('-');
-                if($tab['firstBirth']>0) $genY1=$tab['firstBirth'];
-                if($tab['lastBirth']>0) $genY2=$tab['lastBirth'];
+            foreach ($stats_gen as $gen => $tab) {
+                $genY1 = I18N::translate('-');
+                $genY2 = I18N::translate('-');
+                if ($tab['firstBirth'] > 0) $genY1 = $tab['firstBirth'];
+                if ($tab['lastBirth'] > 0) $genY2 = $tab['lastBirth'];
                 $total_theoretical += $gen_theoretical;
                 $perc_sosa_count_theor = Functions::safeDivision($tab['sosaCount'], $gen_theoretical);
                 $gen_equiv += $perc_sosa_count_theor;
-                $missing=2*$prev_known - $tab['sosaCount'];
-                $gen_diff=$tab['diffSosaTotalCount']-$prev_diff;
+                $missing = 2 * $prev_known - $tab['sosaCount'];
+                $gen_diff = $tab['diffSosaTotalCount'] - $prev_diff;
                 
                 $generation_stats[$gen] = array(
                     'gen_min_birth' => $genY1,
@@ -107,7 +107,7 @@ 
                     'known' => $tab['sosaCount'],
                     'perc_known' => $perc_sosa_count_theor,
                     'missing' => $missing,
-                    'perc_missing' => 1-Functions::safeDivision($tab['sosaCount'], 2*$prev_known),
+                    'perc_missing' => 1 - Functions::safeDivision($tab['sosaCount'], 2 * $prev_known),
                     'total_known' => $tab['sosaTotalCount'],
                     'perc_total_known' => Functions::safeDivision($tab['sosaTotalCount'], $total_theoretical),
                     'different' => $gen_diff,
@@ -117,8 +117,8 @@ 
                 );
                 
                 $gen_theoretical = $gen_theoretical * 2;
-                $prev_known=$tab['sosaCount'];
-                $prev_diff=$tab['diffSosaTotalCount'];
+                $prev_known = $tab['sosaCount'];
+                $prev_diff = $tab['diffSosaTotalCount'];
             }
             
             $view_bag->set('generation_stats', $generation_stats);
@@ -139,7 +139,7 @@ 
      private function htmlAncestorDispersionG2()
     {
         $ancestorsDispGen2 = $this->sosa_provider->getAncestorDispersionForGen(2);
-        if(count($ancestorsDispGen2) == 0) return;
+        if (count($ancestorsDispGen2) == 0) return;
         
         $size = '600x300';
         $sizes = explode('x', $size);
@@ -150,21 +150,21 @@ 
         
         $total = array_sum($ancestorsDispGen2);
         $father_count = isset($ancestorsDispGen2[1]) ? $ancestorsDispGen2[1] : 0;
-        $father = array (
+        $father = array(
             'color' => '84beff', 
             'count' => $father_count, 
             'perc' => Functions::safeDivision($father_count, $total), 
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fat')            
         );
         $mother_count = isset($ancestorsDispGen2[2]) ? $ancestorsDispGen2[2] : 0;
-        $mother = array (
+        $mother = array(
             'color' => 'ffd1dc', 
             'count' => $mother_count, 
             'perc' => Functions::safeDivision($mother_count, $total),
             'name' => \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('mot')
         );
         $shared_count = isset($ancestorsDispGen2[-1]) ? $ancestorsDispGen2[-1] : 0;
-        $shared = array (
+        $shared = array(
             'color' => '777777', 
             'count' => $shared_count, 
             'perc' => Functions::safeDivision($shared_count, $total),
@@ -174,10 +174,10 @@ 
         $chd = $this->arrayToExtendedEncoding(array(4095 * $father['perc'], 4095 * $shared['perc'], 4095 * $mother['perc']));
         $chart_title = I18N::translate('Known Sosa ancestors\' dispersion');
         $chl = 
-             $father['name'] . ' - ' . I18N::percentage($father['perc'], 1) . '|' .
-             $shared['name'] . ' - ' . I18N::percentage($shared['perc'], 1) . '|' .
-             $mother['name'] . ' - ' . I18N::percentage($mother['perc'], 1);
-        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+             $father['name'].' - '.I18N::percentage($father['perc'], 1).'|'.
+             $shared['name'].' - '.I18N::percentage($shared['perc'], 1).'|'.
+             $mother['name'].' - '.I18N::percentage($mother['perc'], 1);
+        return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$father['color']},{$shared['color']},{$mother['color']}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"".$chart_title."\" title=\"".$chart_title."\" />";
     }
     
     /**
@@ -201,7 +201,7 @@ 
         $total_motfat = $ancestorsDispGen2[4] ?: 0;
         $total_motmot = $ancestorsDispGen2[8] ?: 0;
         $total_sha = $ancestorsDispGen2[-1] ?: 0;
-        $total = $total_fatfat + $total_fatmot + $total_motfat+ $total_motmot + $total_sha;
+        $total = $total_fatfat + $total_fatmot + $total_motfat + $total_motmot + $total_sha;
     
         $chd = $this->arrayToExtendedEncoding(array(
             4095 * $total_fatfat / $total, 
@@ -212,12 +212,12 @@ 
         ));
         $chart_title = I18N::translate('Known Sosa ancestors\' dispersion - G3');
         $chl =
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1) . '|' .
-            I18N::translate('Shared') . ' - ' . I18N::percentage(Functions::safeDivision($total_sha, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat') . ' - ' . I18N::percentage(Functions::safeDivision($total_motfat, $total), 1) . '|' .
-            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot') . ' - ' . I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
-         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"" . $chart_title . "\" title=\"" . $chart_title . "\" />";
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatfat').' - '.I18N::percentage(Functions::safeDivision($total_fatfat, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('fatmot').' - '.I18N::percentage(Functions::safeDivision($total_fatmot, $total), 1).'|'.
+            I18N::translate('Shared').' - '.I18N::percentage(Functions::safeDivision($total_sha, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motfat').' - '.I18N::percentage(Functions::safeDivision($total_motfat, $total), 1).'|'.
+            \Fisharebest\Webtrees\Functions\Functions::getRelationshipNameFromPath('motmot').' - '.I18N::percentage(Functions::safeDivision($total_motmot, $total), 1);
+         return "<img src=\"https://chart.googleapis.com/chart?cht=p&chp=1.5708&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_fatfat},{$color_fatmot},{$color_shared},{$color_motfat},{$color_motmot}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" alt=\"".$chart_title."\" title=\"".$chart_title."\" />";
     }
 
     /**
@@ -233,9 +233,9 @@ 
             if ($value < 0) {
                 $value = 0;
             }
-            $first  = (int) ($value / 64);
+            $first  = (int)($value / 64);
             $second = $value % 64;
-            $encoding .= $xencoding[(int) $first] . $xencoding[(int) $second];
+            $encoding .= $xencoding[(int)$first].$xencoding[(int)$second];
         }
     
         return $encoding;

src/Webtrees/Module/PatronymicLineage/Model/LineageNode.php

Spacing +3 added lines, -3 removed lines

@@ -57,7 +57,7 @@ 
 	 * @param Fisharebest\Webtrees\Family $fams
 	 */
 	public function addFamily(Family $fams) {
-		if($fams && !isset($this->linked_fams[$fams])) {
+		if ($fams && !isset($this->linked_fams[$fams])) {
 			$this->linked_fams[$fams] = array();
 		}
 	}
@@ -69,7 +69,7 @@ 
 	 * @param LineageNode $child
 	 */
 	public function addChild(Family $fams, LineageNode $child = null) {
-		if($fams) {
+		if ($fams) {
 			$this->addFamily($fams);
 			$tmp = $this->linked_fams[$fams];
 			$tmp[] = $child;
@@ -119,7 +119,7 @@ 
 	 * @return boolean
 	 */
 	public function hasFollowUpSurname() {
-		return !is_null($this->alt_surname) && strlen($this->alt_surname) > 0 ;
+		return !is_null($this->alt_surname) && strlen($this->alt_surname) > 0;
 	}
 	
 }

src/Webtrees/Module/PatronymicLineage/Model/LineageRootNode.php

Spacing +4 added lines, -4 removed lines

@@ -37,12 +37,12 @@
 	 * @param Place $place
 	 */
 	public function addPlace(Place $place) {
-		if(!is_null($place) && !$place->isEmpty()){
+		if (!is_null($place) && !$place->isEmpty()) {
 			$place_name = $place->getFullName();
-			if(isset($this->places[$place_name])){
-				$this->places[$place_name]+=1;
+			if (isset($this->places[$place_name])) {
+				$this->places[$place_name] += 1;
 			}
-			else{
+			else {
 				$this->places[$place_name] = 1;
 			}
 		}

src/Webtrees/Module/PatronymicLineage/LineageController.php

Spacing +6 added lines, -6 removed lines

@@ -92,14 +92,14 @@ 
             $this->show     = 'lineage'; // SURN list makes no sense here
         } elseif ($this->alpha) {
             $this->show_all = 'no';
-            $this->legend   = Filter::escapeHtml($this->alpha) . '…';
+            $this->legend   = Filter::escapeHtml($this->alpha).'…';
             $this->show     = Filter::get('show', 'surn|lineage', 'surn');
         } else {
             $this->show_all = 'no';
             $this->legend   = '…';
             $this->show     = 'none'; // Don't show lists until something is chosen
         }
-        $this->legend = '<span dir="auto">' . $this->legend . '</span>';
+        $this->legend = '<span dir="auto">'.$this->legend.'</span>';
           
     }
     
@@ -152,7 +152,7 @@ 
         global $WT_TREE;
         
         $controller = new PageController();
-        $controller->setPageTitle(I18N::translate('Patronymic Lineages') . ' : ' . $this->legend);
+        $controller->setPageTitle(I18N::translate('Patronymic Lineages').' : '.$this->legend);
         
         $view_bag = new ViewBag();
         $view_bag->set('title', $controller->getPageTitle());
@@ -161,15 +161,15 @@ 
         $view_bag->set('surname', $this->surname);
         $view_bag->set('legend', $this->legend);
         $view_bag->set('show_all', $this->show_all);
-        if($this->isShowingSurnames()) {
+        if ($this->isShowingSurnames()) {
             $view_bag->set('issurnames', true);
             $view_bag->set('surnameslist', $this->getSurnamesList());
         }
-        if($this->isShowingLineages()) {
+        if ($this->isShowingLineages()) {
             $view_bag->set('islineages', true);
             $view_bag->set('lineages', $this->getLineages());
 
-            if ($this->show_all==='no') {
+            if ($this->show_all === 'no') {
             	$view_bag->set('table_title', I18N::translate('Individuals in %s lineages', $this->legend));
             }
             else {

src/Webtrees/Module/SosaModule.php

Spacing +15 added lines, -15 removed lines

@@ -77,7 +77,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';
     }
     
     /**********
@@ -100,17 +100,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                
             ));
             
@@ -119,12 +119,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(),
@@ -140,7 +140,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,
@@ -149,7 +149,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(){
@@ -199,7 +199,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtender::hExtendIndiHeaderIcons()
      */
     public function hExtendIndiHeaderIcons(IndividualController $ctrlIndi) {
-        if($ctrlIndi){
+        if ($ctrlIndi) {
             $dindi = new Individual($ctrlIndi->getSignificantIndividual());
             return FunctionsPrint::formatSosaNumbers($dindi->getSosaNumbers(), 1, 'large');
         }
@@ -217,9 +217,9 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\IndividualHeaderExtender::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 '';
     }
@@ -229,7 +229,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\RecordNameTextExtender::hRecordNameAppend()
      */
     public function hRecordNameAppend(GedcomRecord $grec) {
-        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, 'small');
         }

src/Webtrees/Module/Hooks/Views/AdminConfigView.php

Spacing +4 added lines, -4 removed lines

@@ -60,13 +60,13 @@
 							?>
 							<tr>
 								<td>
-									<input type="hidden" name="hook-<?php echo $hook->id;?>" value="yes" >
-									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status)=='enabled'); ?>
+									<input type="hidden" name="hook-<?php echo $hook->id; ?>" value="yes" >
+									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status) == 'enabled'); ?>
 								</td>
-								<td><?php echo (($hook->status)=='enabled'); ?></td>
+								<td><?php echo (($hook->status) == 'enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if ($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>