jon48 / webtrees-lib

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

Spacing +11 added lines, -11 removed lines

@@ -22,17 +22,17 @@
 	public function upgrade() {
 
 		Database::exec(
-		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` (' .
-	        ' majs_gedcom_id      INTEGER 	        NOT NULL,' .
-		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,' . 
-		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,' . // Allow to calculate sosa on 64 generations
-            ' majs_i_id           VARCHAR(20)	    NOT NULL,' .	
-            ' majs_gen            TINYINT			NULL,' .
-            ' majs_birth_year	  SMALLINT			NULL,' .
-            ' majs_death_year	  SMALLINT			NULL,' .
-            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),' .
-		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,' .
-		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE' .			
+		    'CREATE TABLE IF NOT EXISTS `##maj_sosa` ('.
+	        ' majs_gedcom_id      INTEGER 	        NOT NULL,'.
+		    ' majs_user_id        INTEGER           NOT NULL DEFAULT -1,'. 
+		    ' majs_sosa           BIGINT UNSIGNED 	NOT NULL,'.// Allow to calculate sosa on 64 generations
+            ' majs_i_id           VARCHAR(20)	    NOT NULL,'.	
+            ' majs_gen            TINYINT			NULL,'.
+            ' majs_birth_year	  SMALLINT			NULL,'.
+            ' majs_death_year	  SMALLINT			NULL,'.
+            ' PRIMARY KEY (majs_gedcom_id, majs_user_id, majs_sosa),'.
+		    ' FOREIGN KEY `##gedcom_id_fk1` (majs_gedcom_id) REFERENCES `##gedcom` (gedcom_id) ON DELETE CASCADE,'.
+		    ' FOREIGN KEY `##user_id_fk1` (majs_user_id) REFERENCES `##user` (user_id) ON DELETE CASCADE'.			
 		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}

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

Spacing +2 added lines, -2 removed lines

@@ -48,13 +48,13 @@
         			<div class="value">
         				<?php 
         				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
+        				    if (count($users) == 1) {
         				?>
         					<label>
         						<input id="maj_sosa_input_userid" type="hidden" name="userid" value="<?php echo $users[0]['user']->getUserId(); ?>" />
         						<?php echo $users[0]['user']->getRealNameHtml() ?>
         					</label>
-        				<?php  } else if(count($users) > 1) { ?>
+        				<?php  } else if (count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
         					$root_indi = $users[0]['rootid'];

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

Spacing +21 added lines, -21 removed lines

@@ -33,12 +33,12 @@ 
 	 */
     protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
+        if ($this->data->get('has_sosa', false)) {
             $table_id = $this->data->get('table_id');            
         ?>   
         
         <div id="sosa-indi-list" class="sosa-list">
-        	<table id="<?php echo $table_id;?>">
+        	<table id="<?php echo $table_id; ?>">
 				<thead>
     				<tr>
     					<th colspan="22">
@@ -185,7 +185,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"';
@@ -201,18 +201,18 @@ 
         			<td class="transparent"><?php echo $person->getXref(); ?></td>
         			<td colspan="2">
         			<?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();
-        					list($surn, $givn)=explode(',', $name['sort']);
+        				if ($num == $person->getPrimaryName()) {
+        					$class = ' class="name2"';
+        					$sex_image = $person->getSexImage();
+        					list($surn, $givn) = explode(',', $name['sort']);
         				} else {
-        					$class='';
-        					$sex_image='';
+        					$class = '';
+        					$sex_image = '';
         				} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -225,20 +225,20 @@ 
             		</td>
             		<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>
             		<td>
             		<?php 
-            		if ($birth_dates=$person->getAllBirthDates()) {
+            		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();
+            		    $birth_date = $person->getEstimatedBirthDate();
             		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
             		        $birth_date->display(true);
             		    } else {
@@ -248,7 +248,7 @@ 
             		}
             		?>
             		</td>
-            		<td><?php echo $birth_date->julianDay();?></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());
@@ -343,10 +343,10 @@ 
 							<?php echo 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>
@@ -358,7 +358,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/SosaStatsView.php

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
         <div id="maj-sosa-stats-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
-			<?php  if($this->data->get('is_setup')) {  
+			<?php  if ($this->data->get('is_setup')) {  
 			    $general_stats = $this->data->get('general_stats'); ?>
 			<h3><?php echo I18N::translate('General statistics'); ?></h3>
 			<div class="maj-table">
@@ -50,7 +50,7 @@ 
 				</div>
 				<div class="maj-row">
 					<div class="label"><?php echo I18N::translate('Mean generation time'); ?></div>
-					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'],  I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
+					<div class="value"><?php echo I18N::plural('%s year', '%s years', $general_stats['mean_gen_time'], I18N::number($general_stats['mean_gen_time'], 1)); ?></div>
 				</div>
 			</div>
 			
@@ -90,7 +90,7 @@ 
 					</tr>
 				</thead>
 				<tbody>
-					<?php foreach($this->data->get('generation_stats') as $gen => $row) { ?>
+					<?php foreach ($this->data->get('generation_stats') as $gen => $row) { ?>
 					<tr class="maj-row">
 						<td class="label"><?php echo I18N::translate('<strong>G%d</strong>', $gen); ?></td>
 						<td class="label"><?php echo I18N::translate('%1$s <> %2$s', $row['gen_min_birth'], $row['gen_max_birth']); ?></td>
@@ -104,7 +104,7 @@ 
 						<td class="value"><?php echo I18N::number($row['different']); ?></td>
 						<td class="value left percent_container">
 							<div class="percent_frame">
-								<div class="percent_cell" style="width:<?php echo 100*$row['perc_different'] ?>%;">
+								<div class="percent_cell" style="width:<?php echo 100 * $row['perc_different'] ?>%;">
 									&nbsp;<?php echo I18N::percentage($row['perc_different']); ?>&nbsp;
 								</div>
 							</div>
@@ -117,7 +117,7 @@ 
 				<tfoot>
 					<tr class="maj-row">
 						<td class="label" colspan="13">
-							<?php echo I18N::translate('Generation-equivalent: %s generations', I18N::number($this->data->get('equivalent_gen'),2)); ?>
+							<?php echo I18N::translate('Generation-equivalent: %s generations', I18N::number($this->data->get('equivalent_gen'), 2)); ?>
 						</td>
 					</tr>
 				</tfoot>
@@ -126,8 +126,8 @@ 
 			
 			<h3><?php echo I18N::translate('Known Sosa ancestors\' family dispersion'); ?></h3>
 			<div class="center">
-				<?php echo $this->data->get('chart_img_g2') ?: '' ; ?>
-				<?php echo $this->data->get('chart_img_g3') ?: '' ; ?>				
+				<?php echo $this->data->get('chart_img_g2') ?: ''; ?>
+				<?php echo $this->data->get('chart_img_g3') ?: ''; ?>				
 				<!--  <canvas id="chart_ancestors_g2" width="300" height="300"></canvas>  -->
 			</div>
 			

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/Views/SosaListMissingView.php

Spacing +23 added lines, -23 removed lines

@@ -36,15 +36,15 @@ 
             <div id="maj-sosa-missing-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_missing', false)) {
+    			    if ($this->data->get('has_missing', false)) {
     			        $missing_list = $this->data->get('missing_list');
     			        $table_id = $this->data->get('table_id');
     			        ?>
     			<div id="sosa-indi-missing" class="smissing-list">
-                	<table id="<?php echo $table_id;?>">
+                	<table id="<?php echo $table_id; ?>">
         				<thead>     
             				<tr>
     							<th colspan="16">
@@ -112,7 +112,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 */
@@ -130,18 +130,18 @@ 
                 			<td class="transparent"><?php echo $person->getXref(); ?></td>
                 			<td colspan="2">
                 			<?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();
-                					list($surn, $givn)=explode(',', $name['sort']);
+                				if ($num == $person->getPrimaryName()) {
+                					$class = ' class="name2"';
+                					$sex_image = $person->getSexImage();
+                					list($surn, $givn) = explode(',', $name['sort']);
                 				} else {
-                					$class='';
-                					$sex_image='';
+                					$class = '';
+                					$sex_image = '';
                 				} ?>
                 				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
                 					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
@@ -154,10 +154,10 @@ 
                     		</td>
                     		<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 if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
         				        $isISourced = $dperson->isSourced(); ?>
@@ -167,17 +167,17 @@ 
         					<td>&nbsp;</td>
         					<td></td>
         					<?php } ?>
-        					<td><?php echo $missing_tab['has_father'] ? '&nbsp;' : 'X';?></td>
-        					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X';?></td>
+        					<td><?php echo $missing_tab['has_father'] ? '&nbsp;' : 'X'; ?></td>
+        					<td><?php echo $missing_tab['has_mother'] ? '&nbsp;' : 'X'; ?></td>
         					<td>
                     		<?php 
-                    		if ($birth_dates=$person->getAllBirthDates()) {
+                    		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();
+                    		    $birth_date = $person->getEstimatedBirthDate();
                     		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
                     		        $birth_date->display(true);
                     		    } else {
@@ -187,7 +187,7 @@ 
                     		}
                     		?>
                     		</td>
-                    		<td><?php echo $birth_date->julianDay();?></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());
@@ -218,9 +218,9 @@ 
 									$missing_hidden = $this->data->get('missing_hidden');
 									?>
 									<?php echo I18N::translate('Number of different missing ancestors: %s', I18N::number($this->data->get('missing_diff_count'))); ?>
-									<?php if($this->data->get('missing_hidden') > 0) echo ' ['. I18N::translate('%s hidden', I18N::number($this->data->get('missing_hidden'))).']'; ?>
-									<?php echo ' - ' . I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?>
-									<?php echo ' [' . 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'))).']'; ?>
+									<?php echo ' - '.I18N::translate('Generation complete at %s', I18N::percentage($this->data->get('perc_sosa'), 2)); ?>
+									<?php echo ' ['.I18N::translate('Potential %s', I18N::percentage($this->data->get('perc_sosa_potential'), 2)).']'; ?>
 								</div>
 							</td>
 						</tr>

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;