jon48 / webtrees-lib

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

Spacing +76 added lines, -76 removed lines

@@ -84,18 +84,18 @@ 
      * @param User $user
      */
     public function __construct(Tree $tree, User $user = null) {
-        if(self::$default_user === null) 
+        if (self::$default_user === null) 
             self::$default_user = User::find(-1);
         
         $this->tree = $tree;
         $this->user = $user;
         $this->is_setup = true;
-        if($this->user === null) $this->user = Auth::user();
-        if(strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
+        if ($this->user === null) $this->user = Auth::user();
+        if (strlen($this->user->getUserId()) == 0) $this->user = self::$default_user;
         
         // Check if the user, or the default user, has a root already setup;
-        if(!$this->getRootIndi()) {
-            if($this->user == self::$default_user) {  // If the default user is not setup
+        if (!$this->getRootIndi()) {
+            if ($this->user == self::$default_user) {  // If the default user is not setup
                 $this->is_setup = false;
             }
             else {
@@ -129,7 +129,7 @@ 
      * Remove all Sosa entries related to the gedcom file and user
      */
     public function deleteAll() {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id= :tree_id and majs_user_id = :user_id ')
@@ -145,12 +145,12 @@ 
      * @param int $sosa
      */
     public function deleteAncestors($sosa) {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         $gen = Functions::getGeneration($sosa);
         Database::prepare(
             'DELETE FROM `##maj_sosa`'.
-            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id' .
-            ' AND majs_gen >= :gen' .
+            ' WHERE majs_gedcom_id=:tree_id and majs_user_id = :user_id'.
+            ' AND majs_gen >= :gen'.
             ' AND FLOOR(majs_sosa / (POW(2, (majs_gen - :gen)))) = :sosa'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(), 
@@ -165,7 +165,7 @@ 
      * @param array $sosa_records
      */
     public function insertOrUpdate($sosa_records) {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         
         $treeid = $this->tree->getTreeId();
         $userid = $this->user->getUserId();
@@ -173,9 +173,9 @@ 
         $values_table = array();
         
         $i = 0;
-        foreach  ($sosa_records as $row) {
+        foreach ($sosa_records as $row) {
             $gen = Functions::getGeneration($row['sosa']);
-            if($gen <= self::MAX_DB_GENERATIONS) {
+            if ($gen <= self::MAX_DB_GENERATIONS) {
                 $questionmarks_table[] = 
                     '(:tree_id'.$i.', :user_id'.$i.', :sosa'.$i.', :indi_id'.$i.', :gen'.$i.', :byear'.$i.', :dyear'.$i.')';
                 $values_table = array_merge(
@@ -194,9 +194,9 @@ 
             $i++;
         }
         
-        $sql = 'REPLACE INTO `##maj_sosa`' .
-            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)' .
-            ' VALUES '. implode(',', $questionmarks_table);
+        $sql = 'REPLACE INTO `##maj_sosa`'.
+            ' (majs_gedcom_id, majs_user_id, majs_sosa, majs_i_id, majs_gen, majs_birth_year, majs_death_year)'.
+            ' VALUES '.implode(',', $questionmarks_table);
         Database::prepare($sql)->execute($values_table);
     }
     
@@ -212,7 +212,7 @@ 
      * @return array Array of sosa numbers
      */
     public function getSosaNumbers(Individual $indi) {
-        if(!$this->is_setup) return array();
+        if (!$this->is_setup) return array();
         return Database::prepare(
                 'SELECT majs_sosa, majs_gen FROM `##maj_sosa`'.
                 ' WHERE majs_i_id=:indi_id AND majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -229,7 +229,7 @@ 
      * @return number Last generation if found, 1 otherwise
      */
     public function getLastGeneration() {
-        if(!$this->is_setup) return;
+        if (!$this->is_setup) return;
         return Database::prepare(
                 'SELECT MAX(majs_gen) FROM `##maj_sosa`'.
                 ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'
@@ -249,13 +249,13 @@ 
      * @param int $ged_id ID of the gedcom file
      * @return array Associative array of Sosa ancestors, with their generation, comma separated
      */
-    public function getAllSosaWithGenerations(){
-        if(!$this->is_setup) return array();
+    public function getAllSosaWithGenerations() {
+        if (!$this->is_setup) return array();
         return Database::prepare(
-            'SELECT majs_i_id AS indi,' .
-            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations' .
-            ' FROM `##maj_sosa`' .
-            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id' .
+            'SELECT majs_i_id AS indi,'.
+            ' GROUP_CONCAT(DISTINCT majs_gen ORDER BY majs_gen ASC SEPARATOR ",") AS generations'.
+            ' FROM `##maj_sosa`'.
+            ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' GROUP BY majs_i_id'
         )->execute(array(
             'tree_id' => $this->tree->getTreeId(),
@@ -269,13 +269,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_list_by_gen)
+    public function getSosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();
+        if (!$this->sosa_list_by_gen)
             $this->sosa_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_list_by_gen[$gen])) {
                 $this->sosa_list_by_gen[$gen] = Database::prepare(
                     'SELECT majs_sosa AS sosa, majs_i_id AS indi'.
                     ' FROM `##maj_sosa`'.
@@ -300,13 +300,13 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa families
      */
-    public function getFamilySosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();
-        if(!$this->sosa_fam_list_by_gen)
+    public function getFamilySosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();
+        if (!$this->sosa_fam_list_by_gen)
             $this->sosa_fam_list_by_gen = array();
         
-        if($gen){
-            if(!isset($this->sosa_fam_list_by_gen[$gen])){
+        if ($gen) {
+            if (!isset($this->sosa_fam_list_by_gen[$gen])) {
                 $this->sosa_fam_list_by_gen[$gen] = Database::prepare(
                     'SELECT s1.majs_sosa AS sosa, f_id AS fam'.
                     ' FROM `##families`'.
@@ -336,9 +336,9 @@ 
      * @param number $gen Generation
      * @return array Array of Sosa individuals
      */
-    public function getMissingSosaListAtGeneration($gen){
-        if(!$this->is_setup) return array();    
-        if($gen){
+    public function getMissingSosaListAtGeneration($gen) {
+        if (!$this->is_setup) return array();    
+        if ($gen) {
             return $this->sosa_list_by_gen[$gen] = Database::prepare(
                 'SELECT schild.majs_sosa sosa, schild.majs_i_id indi, sfat.majs_sosa IS NOT NULL has_father, smot.majs_sosa IS NOT NULL has_mother'.
                 ' FROM `##maj_sosa` schild'.
@@ -375,10 +375,10 @@ 
      * @return array Statistics array
      */
     public function getStatisticsByGeneration() {
-        if(!$this->is_setup) return array();
-        if(!$this->statistics_tab) {
+        if (!$this->is_setup) return array();
+        if (!$this->statistics_tab) {
             $this->statistics_tab = array();
-            if($maxGeneration = $this->getLastGeneration()) {
+            if ($maxGeneration = $this->getLastGeneration()) {
                 for ($gen = 1; $gen <= $maxGeneration; $gen++) {
                     $birthStats = $this->getStatsBirthYearInGeneration($gen);
                     $this->statistics_tab[$gen] = array(
@@ -401,9 +401,9 @@ 
 	 * @return int
 	 */
 	public function getTotalIndividuals() {
-	    if(!$this->is_setup) return 0;
+	    if (!$this->is_setup) return 0;
 	    return Database::prepare(
-	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`' .
+	        'SELECT SQL_CACHE COUNT(*) FROM `##individuals`'.
 	        ' WHERE i_file = :tree_id')
 	        ->execute(array('tree_id' => $this->tree->getTreeId()))
 	        ->fetchOne() ?: 0;
@@ -414,10 +414,10 @@ 
      *
      * @return number Number of Sosas
      */
-    public function getSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
             ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -431,10 +431,10 @@ 
      * @param number $gen Generation
      * @return number Number of Sosas in generation
      */
-    public function getSosaCountAtGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountAtGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen= :gen')
         ->execute(array(
@@ -450,10 +450,10 @@ 
      * @param number $gen Generation
      * @return number Total number of Sosas up to generation
      */
-    public function getSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(majs_sosa) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -468,10 +468,10 @@ 
      *
      * @return number Total number of distinct individual
      */
-    public function getDifferentSosaCount(){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCount() {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id')
         ->execute(array(
                 'tree_id' => $this->tree->getTreeId(), 
@@ -485,10 +485,10 @@ 
      * @param number $gen Generation
      * @return number Number of distinct Sosa individuals up to generation
      */
-    public function getDifferentSosaCountUpToGeneration($gen){
-        if(!$this->is_setup) return 0;
+    public function getDifferentSosaCountUpToGeneration($gen) {
+        if (!$this->is_setup) return 0;
         return Database::prepare(
-            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`' .
+            'SELECT SQL_CACHE COUNT(DISTINCT majs_i_id) FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen <= :gen')
         ->execute(array(
@@ -508,11 +508,11 @@ 
      * @param number $gen Generation
      * @return array Birth statistics array
      */
-    public function getStatsBirthYearInGeneration($gen){
-        if(!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
+    public function getStatsBirthYearInGeneration($gen) {
+        if (!$this->is_setup) return array('first' => 0, 'avg' => 0, 'last' => 0);
         return Database::prepare(
             'SELECT MIN(majs_birth_year) AS first, AVG(majs_birth_year) AS avg, MAX(majs_birth_year) AS last'.
-            ' FROM `##maj_sosa`' .
+            ' FROM `##maj_sosa`'.
             ' WHERE majs_gedcom_id=:tree_id AND majs_user_id=:user_id'.
             ' AND majs_gen=:gen AND NOT majs_birth_year = :birth_year')
             ->execute(array(
@@ -528,26 +528,26 @@ 
      *
      * @return number|NULL Mean generation time
      */
-    public function getMeanGenerationTime(){
-        if(!$this->is_setup) return;
-        if(!$this->statistics_tab){
+    public function getMeanGenerationTime() {
+        if (!$this->is_setup) return;
+        if (!$this->statistics_tab) {
             $this->getStatisticsByGeneration();
         }
         //Linear regression on x=generation and y=birthdate
         $sum_xy = 0;
-        $sum_x=0;
-        $sum_y=0;
-        $sum_x2=0;
-        $n=count($this->statistics_tab);
-        foreach($this->statistics_tab as $gen=>$stats){
-            $sum_xy+=$gen*$stats['avgBirth'];
-            $sum_x+=$gen;
-            $sum_y+=$stats['avgBirth'];
-            $sum_x2+=$gen*$gen;
+        $sum_x = 0;
+        $sum_y = 0;
+        $sum_x2 = 0;
+        $n = count($this->statistics_tab);
+        foreach ($this->statistics_tab as $gen=>$stats) {
+            $sum_xy += $gen * $stats['avgBirth'];
+            $sum_x += $gen;
+            $sum_y += $stats['avgBirth'];
+            $sum_x2 += $gen * $gen;
         }
-        $denom=($n*$sum_x2)-($sum_x*$sum_x);
-        if($denom!=0){
-            return -(($n*$sum_xy)-($sum_x*$sum_y))/($denom);
+        $denom = ($n * $sum_x2) - ($sum_x * $sum_x);
+        if ($denom != 0) {
+            return -(($n * $sum_xy) - ($sum_x * $sum_y)) / ($denom);
         }
         return null;
     }
@@ -575,14 +575,14 @@ 
      * @return array
      */
     public function getAncestorDispersionForGen($gen) {
-        if(!$this->is_setup || $gen > 11) return array();  // Going further than 11 gen will be out of range in the query
+        if (!$this->is_setup || $gen > 11) return array(); // Going further than 11 gen will be out of range in the query
         return Database::prepare(
             'SELECT branches, count(i_id)'.
             ' FROM ('.
             '   SELECT i_id,'.
             '       CASE'.
             '           WHEN CEIL(LOG2(SUM(branch))) = LOG2(SUM(branch)) THEN SUM(branch)'.
-            '           ELSE -1'.   // We put all ancestors shared between some branches in the same bucket
+            '           ELSE -1'.// We put all ancestors shared between some branches in the same bucket
             '       END branches'.
             '   FROM ('.
             '       SELECT DISTINCT majs_i_id i_id,'.

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>