jon48 / webtrees-lib

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

Indentation +12 added lines, -12 removed lines

@@ -22,18 +22,18 @@
 	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' .			
-		    ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'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

Indentation +17 added lines, -17 removed lines

@@ -23,17 +23,17 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {      
-        ?>                
+	protected function renderContent() {      
+		?>                
         <div id="maj-sosa-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php  if($this->data->get('is_setup')) { 
-			    $selectedgen = $this->data->get('generation');
-			    $this->renderSosaHeader();
-			    if($this->data->get('has_sosa') ) {
-			         if($selectedgen > 0) {
-			        ?>
+				$selectedgen = $this->data->get('generation');
+				$this->renderSosaHeader();
+				if($this->data->get('has_sosa') ) {
+					 if($selectedgen > 0) {
+					?>
 			<div id="sosalist-tabs">
 				<ul>
 					<li><a href="#sosalist-indi"><?php echo I18N::translate('Individuals'); ?></a></li>
@@ -53,7 +53,7 @@ 
 			<?php        } else { ?>
 			<p class="warning"><?php echo I18N::translate('No ancestor has been found for generation %d', $selectedgen); ?></p>
 			<?php    }
-			    }
+				}
 			} else { ?>
 			<p class="warning"><?php echo I18N::translate('The list could not be displayed. Reasons might be:'); ?><br/>
 				<ul>
@@ -64,15 +64,15 @@ 
 			<?php } ?>
 		</div> 
 		<?php 
-    }
+	}
     
-    /**
-     * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator
-     */
-    protected function renderSosaHeader() {
-        $selectedgen = $this->data->get('generation');
-        $max_gen = $this->data->get('max_gen');
-        ?>
+	/**
+	 * Render the common header to Sosa Lists, made of the generation selector, and the generation navigator
+	 */
+	protected function renderSosaHeader() {
+		$selectedgen = $this->data->get('generation');
+		$max_gen = $this->data->get('max_gen');
+		?>
         
     	<form method="get" name="setgen" action="module.php">
 			<input type="hidden" name="mod" value="<?php echo $this->data->get('url_module');?>">
@@ -117,7 +117,7 @@ 
 		
 		<?php 
 		}
-    }       
+	}       
     
 }
  
\ No newline at end of file

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

Indentation +8 added lines, -8 removed lines

@@ -25,9 +25,9 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        ?>        
+		?>        
         
         <div id="maj-sosa-config-page">
 			<h2><?php echo $this->data->get('title'); ?></h2>
@@ -47,9 +47,9 @@ 
         			</div>
         			<div class="value">
         				<?php 
-        				    $users = $this->data->get('users_settings');
-        				    if(count($users) == 1) {
-        				?>
+							$users = $this->data->get('users_settings');
+							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() ?>
@@ -57,8 +57,8 @@ 
         				<?php  } else if(count($users) > 1) { ?>
         					<select id='maj-sosa-config-select' name="userid">
         					<?php 
-        					$root_indi = $users[0]['rootid'];
-        					foreach ($this->data->get('users_settings') as $user) { ?>
+							$root_indi = $users[0]['rootid'];
+							foreach ($this->data->get('users_settings') as $user) { ?>
         						<option value="<?php echo $user['user']->getUserId(); ?>"><?php echo $user['user']->getRealNameHtml() ?></option>
         					<?php  } ?>
         					</select>
@@ -81,7 +81,7 @@ 
 			</form>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

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

Indentation +83 added lines, -83 removed lines

@@ -31,11 +31,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		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;?>">
@@ -186,42 +186,42 @@ 
 			<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $person) {
-			    /** @var \Fisharebest\Webtrees\Individual $person */
-			    if ($person->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($person->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    $dperson = new \MyArtJaub\Webtrees\Individual($person);
-			    ?>			
+				/** @var \Fisharebest\Webtrees\Individual $person */
+				if ($person->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($person->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				$dperson = new \MyArtJaub\Webtrees\Individual($person);
+				?>			
         		<tr <?php echo $class?>>
         			<td class="transparent"><?php echo $sosa; ?></td>
         			<td class="transparent"><?php echo $person->getXref(); ?></td>
         			<td colspan="2">
         			<?php foreach ($person->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
-        				}
-        				if ($num==$person->getPrimaryName()) {
-        					$class=' class="name2"';
-        					$sex_image=$person->getSexImage();
-        					list($surn, $givn)=explode(',', $name['sort']);
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$title='title="'.strip_tags(GedcomTag::getLabel($name['type'], $person)).'"';
+						}
+						if ($num==$person->getPrimaryName()) {
+							$class=' class="name2"';
+							$sex_image=$person->getSexImage();
+							list($surn, $givn)=explode(',', $name['sort']);
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $person->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dperson->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $person->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $person->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<td style="display:none;"></td>
             		<td>
@@ -232,34 +232,34 @@ 
             		</td>
             		<td>
             		<?php 
-            		if ($birth_dates=$person->getAllBirthDates()) {
-			            foreach ($birth_dates as $num=>$birth_date) {
-    					   if ($num) { ?><br/><?php } ?>
+					if ($birth_dates=$person->getAllBirthDates()) {
+						foreach ($birth_dates as $num=>$birth_date) {
+						   if ($num) { ?><br/><?php } ?>
     						<?php  echo $birth_date->display(true);
-			            }
-            		} else {
-            		    $birth_date=$person->getEstimatedBirthDate();
-            		    if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
-            		        $birth_date->display(true);
-            		    } else {
-            		        echo '&nbsp;';
-            		    }
-            		    $birth_dates[0] = new Date('');
-            		}
-            		?>
+						}
+					} else {
+						$birth_date=$person->getEstimatedBirthDate();
+						if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES')) {
+							$birth_date->display(true);
+						} else {
+							echo '&nbsp;';
+						}
+						$birth_dates[0] = new Date('');
+					}
+					?>
             		</td>
             		<td><?php echo $birth_date->julianDay();?></td>
         			<td>
         			<?php foreach ($person->getAllBirthPlaces() as $n => $birth_place) {
-				        $tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new \Fisharebest\Webtrees\Place($birth_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isBSourced = $dperson->isBirthSourced(); ?>
+						$isBSourced = $dperson->isBirthSourced(); ?>
 				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isBSourced, 'BIRT', 1, 'medium'); ?></td>
 					<td><?php echo $isBSourced; ?></td>
 					<?php } else { ?>
@@ -269,36 +269,36 @@ 
 					<td>
 					<?php 
 					if ($death_dates = $person->getAllDeathDates()) {
-				        foreach ($death_dates as $num => $death_date) {
-					       if ($num) { ?><br/><?php } ?>
+						foreach ($death_dates as $num => $death_date) {
+						   if ($num) { ?><br/><?php } ?>
 					 		<?php echo $death_date->display(true); 
-				        }
-			         } else {
-				        $death_date = $person->getEstimatedDeathDate();
-				        if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES') && $death_date->minimumJulianDay() < WT_CLIENT_JD) {
-					       echo $death_date->display(true);
-        				} elseif ($person->isDead()) {
-        					echo I18N::translate('yes');
-        				} else {
-        					echo '&nbsp;';
-        				}
-                        $death_dates[0] = new Date('');
-			         } ?>
+						}
+					 } else {
+						$death_date = $person->getEstimatedDeathDate();
+						if ($person->getTree()->getPreference('SHOW_EST_LIST_DATES') && $death_date->minimumJulianDay() < WT_CLIENT_JD) {
+						   echo $death_date->display(true);
+						} elseif ($person->isDead()) {
+							echo I18N::translate('yes');
+						} else {
+							echo '&nbsp;';
+						}
+						$death_dates[0] = new Date('');
+					 } ?>
 			         </td>
 			         <td><?php echo $death_date->julianDay(); ?></td>
 			         <td><?php echo Date::getAge($birth_dates[0], $death_dates[0], 2); ?></td>
 			         <td><?php echo Date::getAge($birth_dates[0], $death_dates[0], 1); ?></td>
 			         <td>
         			 <?php foreach ($person->getAllDeathPlaces() as $n => $death_place) {
-        				$tmp = new Place($death_place, $person->getTree());
-        				if ($n) { ?><br><?php } ?>
+						$tmp = new Place($death_place, $person->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?>
         				</a>
         			<?php } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isDSourced = $dperson->isDeathSourced(); ?>
+						$isDSourced = $dperson->isDeathSourced(); ?>
 				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isDSourced, 'DEAT', 1, 'medium'); ?></td>
 					<td><?php echo $isDSourced; ?></td>
 					<?php } else { ?>
@@ -308,29 +308,29 @@ 
 					<td><?php  echo $person->getSex(); ?></td>
 					<td>
 					<?php if (!$person->canShow() || Date::compare($birth_date, new Date(date('Y') - 100)) > 0) {
-					    echo 'Y100';
-        			} else {
-        				echo 'YES';
-        			} ?>
+						echo 'Y100';
+					} else {
+						echo 'YES';
+					} ?>
         			</td>
         			<td>
         			<?php if (Date::compare($death_dates[0], new Date(date('Y') - 100)) > 0) {
-				        echo 'Y100';
-        			} elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) {
-				        echo 'YES';
-        			} else {
-				        echo 'N';
-			         } ?>
+						echo 'Y100';
+					} elseif ($death_dates[0]->minimumJulianDay() || $person->isDead()) {
+						echo 'YES';
+					} else {
+						echo 'N';
+					 } ?>
 			         </td>
 			         <td>
 					<?php if (!$person->getChildFamilies()) {
-					    echo 'R';
+						echo 'R';
 					}  // roots
 					elseif (!$person->isDead() && $person->getNumberOfChildren() < 1) {
-            			echo 'L';
+						echo 'L';
 					} // leaves
 					else {
-					    echo '&nbsp;';
+						echo '&nbsp;';
 					} ?>
 					</td>
 				</tr>
@@ -341,12 +341,12 @@ 
 					<th class="ui-state-default" colspan="22">
 						<div class="center">
 							<?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::number($this->data->get('sosa_count')),
+								I18N::number($this->data->get('sosa_theo')), 
+								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'))).']';
+								echo '['. I18N::translate('%s hidden', I18N::number($this->data->get('sosa_hidden'))).']';
 							} ?>
 						</div>
 					</th>
@@ -380,8 +380,8 @@ 
 				</div>
 			</div>
 		<?php 
-        }
-    }
+		}
+	}
     
 }
  
\ No newline at end of file

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

Indentation +4 added lines, -4 removed lines

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

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

Indentation +87 added lines, -87 removed lines

@@ -32,11 +32,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() { 
+	protected function renderContent() { 
         
-        if($this->data->get('has_sosa', false)) {
-            $table_id = $this->data->get('table_id');            
-        ?>   
+		if($this->data->get('has_sosa', false)) {
+			$table_id = $this->data->get('table_id');            
+		?>   
         
 		<div id="sosa-fam-list" class="sosa-list">
 			<table id="<?php echo $table_id; ?>">
@@ -187,59 +187,59 @@ 
 				<tbody>
 			
 			<?php foreach($this->data->get('sosa_list') as $sosa => $family) {
-			    /** @var \Fisharebest\Webtrees\Family $person */
+				/** @var \Fisharebest\Webtrees\Family $person */
 
-			    //PERSO Create decorator for Family
-			    $dfamily = new Family($family);
+				//PERSO Create decorator for Family
+				$dfamily = new Family($family);
 			    
-			    $husb = $family->getHusband();
-			    if (is_null($husb)) {
-			        $husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
-			    }
-			    $dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-			    $wife = $family->getWife();
-			    if (is_null($wife)) {
-			        $wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
-			    }
-			    $dwife = new \MyArtJaub\Webtrees\Individual($wife);
+				$husb = $family->getHusband();
+				if (is_null($husb)) {
+					$husb = new Individual('H', '0 @H@ INDI', null, $family->getTree());
+				}
+				$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
+				$wife = $family->getWife();
+				if (is_null($wife)) {
+					$wife = new Individual('W', '0 @W@ INDI', null, $family->getTree());
+				}
+				$dwife = new \MyArtJaub\Webtrees\Individual($wife);
 			    
-			    $mdate=$family->getMarriageDate();
+				$mdate=$family->getMarriageDate();
 			    
-			    if ($family->isPendingAddtion()) {
-			        $class = ' class="new"';
-			    } elseif ($family->isPendingDeletion()) {
-			        $class = ' class="old"';
-			    } else {
-			        $class = '';
-			    }
-			    ?>			
+				if ($family->isPendingAddtion()) {
+					$class = ' class="new"';
+				} elseif ($family->isPendingDeletion()) {
+					$class = ' class="old"';
+				} else {
+					$class = '';
+				}
+				?>			
         		<tr <?php echo $class?>>
         			<td class="transparent"><?php echo I18N::translate('%1$d/%2$d', $sosa, ($sosa + 1) % 10); ?></td>
         			<td class="transparent"><?php echo $sosa; ?></td>
         			<!--  HUSBAND -->
         			<td colspan="2">
         			<?php foreach ($husb->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$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']);
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$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']);
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $husb->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dhusb->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $husb->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $husb->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<!-- Dummy column to match colspan in header -->
             		<td style="display:none;"></td>
@@ -255,27 +255,27 @@ 
             		<!--  WIFE -->
         			<td colspan="2">
         			<?php foreach ($wife->getAllNames() as $num=>$name) {
-        				if ($name['type']=='NAME') {
-        					$title='';
-        				} else {
-        					$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']);
-        				} else {
-        					$class='';
-        					$sex_image='';
-        				} ?>
+						if ($name['type']=='NAME') {
+							$title='';
+						} else {
+							$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']);
+						} else {
+							$class='';
+							$sex_image='';
+						} ?>
         				<a <?php echo $title.' '.$class; ?> href="<?php echo $wife->getHtmlUrl(); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($name['full']); ?>
         				</a>
         				<?php echo $sex_image.FunctionsPrint::formatSosaNumbers($dwife->getSosaNumbers(), 1, 'smaller'); ?>
         				<br/>
             		<?php }
-            		echo $wife->getPrimaryParentsNames('parents details1', 'none');
-            		?>
+					echo $wife->getPrimaryParentsNames('parents details1', 'none');
+					?>
             		</td>
             		<!-- Dummy column to match colspan in header -->
             		<td style="display:none;"></td>
@@ -289,31 +289,31 @@ 
             		<td><?php  Date::getAge($wdate, $mdate, 2); ?></td>
             		<td><?php  Date::getAge($wdate, $mdate, 1); ?></td>
             		<td><?php 
-            		if ($marriage_dates = $family->getAllMarriageDates()) {
-        				foreach ($marriage_dates as $n => $marriage_date) {
-        					if ($n) { echo '<br>'; } ?>
+					if ($marriage_dates = $family->getAllMarriageDates()) {
+						foreach ($marriage_dates as $n => $marriage_date) {
+							if ($n) { echo '<br>'; } ?>
         					<div><?php echo $marriage_date->display(true); ?></div>
         				<?php }
-            		} elseif ($family->getFacts('_NMR')) {
-            		    echo I18N::translate('no');
-            		} elseif ($family->getFacts('MARR')) {
-            		    echo I18N::translate('yes');
-            		} else {
-            		    echo '&nbsp;';
-            		} ?>
+					} elseif ($family->getFacts('_NMR')) {
+						echo I18N::translate('no');
+					} elseif ($family->getFacts('MARR')) {
+						echo I18N::translate('yes');
+					} else {
+						echo '&nbsp;';
+					} ?>
             		</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());
-        				if ($n) { ?><br><?php } ?>
+					foreach ($family->getAllMarriagePlaces() as $n => $marriage_place) {
+						$tmp = new Place($marriage_place, $family->getTree());
+						if ($n) { ?><br><?php } ?>
         				<a href="'<?php echo $tmp->getURL(); ?>" title="<?php echo strip_tags($tmp->getFullName()); ?>">
         					<?php echo \Fisharebest\Webtrees\Functions\FunctionsPrint::highlightSearchHits($tmp->getShortName()); ?>
         				</a>
         			<?php  } ?>
         			</td>
         			<?php if (ModuleManager::getInstance()->isOperational(Constants::MODULE_MAJ_ISSOURCED_NAME)) {
-				        $isMSourced = $dfamily->isMarriageSourced(); ?>
+						$isMSourced = $dfamily->isMarriageSourced(); ?>
 				   	<td><?php echo FunctionsPrint::formatIsSourcedIcon('E', $isMSourced, 'MARR', 1, 'medium'); ?></td>
 					<td><?php echo $isMSourced; ?></td>
 					<?php } else { ?>
@@ -326,30 +326,30 @@ 
 					<td><?php 
 					if (!$mdate->isOK()) { echo 'U'; }
 					else {
-					    if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
-					    else { echo 'YES'; }
+						if (Date::compare($mdate, new Date(date('Y') - 100)) > 0) { echo 'Y100'; }
+						else { echo 'YES'; }
 					}
 					if ($family->getFacts(WT_EVENTS_DIV)) { echo 'D'; }
 					if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) {
-					    echo 'M';
+						echo 'M';
 					} ?>
 					</td>
 					<td><?php 
-			         if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
-			         if ($husb->isDead() && !$wife->isDead()) {
-        				if ($wife->getSex() == 'F') { echo 'H'; }
-        				if ($wife->getSex() == 'M') { echo 'W'; } // male partners
-        			}
-        			if (!$husb->isDead() && $wife->isDead()) {
-        				if ($husb->getSex() == 'M') { echo 'W'; }
-        				if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
-        			}
-        			if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
+					 if ($husb->isDead() && $wife->isDead()) { echo 'Y'; }
+					 if ($husb->isDead() && !$wife->isDead()) {
+						if ($wife->getSex() == 'F') { echo 'H'; }
+						if ($wife->getSex() == 'M') { echo 'W'; } // male partners
+					}
+					if (!$husb->isDead() && $wife->isDead()) {
+						if ($husb->getSex() == 'M') { echo 'W'; }
+						if ($husb->getSex() == 'F') { echo  'H'; }  // female partners
+					}
+					if (!$husb->isDead() && !$wife->isDead()) { echo 'N'; } ?>
         			</td>
         			<td><?php 
-			         if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
-			         elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
-			         else { echo '&nbsp;'; } ?>
+					 if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) { echo 'R'; }
+					 elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() < 1) { echo 'L'; }
+					 else { echo '&nbsp;'; } ?>
 			         </td>
 				</tr>
         	<?php } ?>
@@ -387,7 +387,7 @@ 
         <p class="warning"><?php echo I18N::translate('No family has been found for generation %d', $this->data->get('generation')); ?></p>
         <?php 
 		}
-    }
+	}
     
 }
  
\ No newline at end of file

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

Indentation +5 added lines, -5 removed lines

@@ -23,18 +23,18 @@
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
+	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; }
-        }
-    }
+		}
+	}
     
 }
  
\ No newline at end of file

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

Indentation +9 added lines, -9 removed lines

@@ -23,17 +23,17 @@
 
 		Database::exec(
 		   "CREATE TABLE IF NOT EXISTS `##maj_hooks` (".
-	       " majh_id       			INTEGER AUTO_INCREMENT NOT NULL,".
-	       " majh_hook_function		VARCHAR(32)            NOT NULL,".
+		   " majh_id       			INTEGER AUTO_INCREMENT NOT NULL,".
+		   " majh_hook_function		VARCHAR(32)            NOT NULL,".
 		   " majh_hook_context      VARCHAR(32)            NOT NULL DEFAULT 'all',".
-	       " majh_module_name		VARCHAR(32)            NOT NULL,".
-	       " majh_module_priority	INTEGER            	   NOT NULL DEFAULT 99,".
-	       " majh_status      		ENUM('enabled', 'disabled') NOT NULL DEFAULT 'enabled',".		   
-	       " PRIMARY KEY (majh_id),".
-	       " UNIQUE KEY `##maj_hooks_uk` (majh_hook_function, majh_hook_context, majh_module_name),".
-	       " FOREIGN KEY `##module_name_fk1` (majh_module_name)".
+		   " majh_module_name		VARCHAR(32)            NOT NULL,".
+		   " majh_module_priority	INTEGER            	   NOT NULL DEFAULT 99,".
+		   " majh_status      		ENUM('enabled', 'disabled') NOT NULL DEFAULT 'enabled',".		   
+		   " PRIMARY KEY (majh_id),".
+		   " UNIQUE KEY `##maj_hooks_uk` (majh_hook_function, majh_hook_context, majh_module_name),".
+		   " FOREIGN KEY `##module_name_fk1` (majh_module_name)".
 		   " REFERENCES `##module` (module_name) ON DELETE CASCADE ON UPDATE CASCADE".
-	       ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
+		   ") COLLATE utf8_unicode_ci ENGINE=InnoDB"
 		);
 	}
 }

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

Indentation +4 added lines, -4 removed lines

@@ -25,11 +25,11 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        $table_id = $this->data->get('table_id');
+		$table_id = $this->data->get('table_id');
         
-        ?>        
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -79,7 +79,7 @@ 
 		</div>	
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file