jon48 / webtrees-lib

src/Webtrees/Module/AdminTasksModule.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
     public function getConfigLink() {
         Database::updateSchema(self::SCHEMA_MIGRATION_PREFIX, self::SCHEMA_SETTING_NAME, self::SCHEMA_TARGET_VERSION);
         
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -83,7 +83,7 @@ 
     public function getProvider() {
         global $WT_TREE;
         
-        if(!$this->provider) {
+        if (!$this->provider) {
             $this->provider = new GeoAnalysisProvider($WT_TREE);
         }
         return $this->provider;

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

Spacing +55 added lines, -55 removed lines

@@ -54,30 +54,30 @@ 
 	public function buildLineages() {				
 		$indis = \Fisharebest\Webtrees\Query\QueryName::individuals($this->tree, $this->surname, null, null, false, false);
 		
-		if(count($indis) == 0) return null;
+		if (count($indis) == 0) return null;
 		
 		$root_lineages = array();
 		
-		foreach($indis as $indi) {
+		foreach ($indis as $indi) {
 			$pid = $indi->getXref();
-			if(!isset($this->used_indis[$pid])){
+			if (!isset($this->used_indis[$pid])) {
 				//Find the root of the lineage
 				/** @var Fisharebest\Webtrees\Individual $indiFirst  */
-				$indiFirst= $this->getLineageRootIndividual($indi);
-				if($indiFirst){
+				$indiFirst = $this->getLineageRootIndividual($indi);
+				if ($indiFirst) {
 					$this->used_indis[$indiFirst->getXref()] = true;
-					if($indiFirst->canShow()){
+					if ($indiFirst->canShow()) {
 						//Check if the root individual has brothers and sisters, without parents
 						$indiChildFamily = $indiFirst->getPrimaryChildFamily();
-						if($indiChildFamily !== null){
+						if ($indiChildFamily !== null) {
 							$root_node = new LineageRootNode(null); 
 							$root_node->addFamily($indiChildFamily);
 						}
-						else{
+						else {
 							$root_node = new LineageRootNode($indiFirst);
 						}
 						$root_node = $this->buildLineage($root_node);		
-						if($root_node) $root_lineages[] = $root_node;
+						if ($root_node) $root_lineages[] = $root_node;
 					}
 				}
 			}
@@ -94,45 +94,45 @@ 
 	 * @return (Individual|null) Root individual
 	 */
 	protected function getLineageRootIndividual(Individual $indi) {
-		$is_first=false;
+		$is_first = false;
 		$dindi = new \MyArtJaub\Webtrees\Individual($indi);
-		$indi_surname=$dindi->getUnprotectedPrimarySurname();
+		$indi_surname = $dindi->getUnprotectedPrimarySurname();
 		$resIndi = $indi;
-		while(!$is_first){
+		while (!$is_first) {
 			//Get the individual parents family
-			$fam=$resIndi->getPrimaryChildFamily();
-			if($fam){
-				$husb=$fam->getHusband();
-				$wife=$fam->getWife();
+			$fam = $resIndi->getPrimaryChildFamily();
+			if ($fam) {
+				$husb = $fam->getHusband();
+				$wife = $fam->getWife();
 				//If the father exists, take him
-				if($husb){
+				if ($husb) {
 					$dhusb = new \MyArtJaub\Webtrees\Individual($husb);
-					$dhusb->isNewAddition() ? $is_first = true : $resIndi=$husb;
+					$dhusb->isNewAddition() ? $is_first = true : $resIndi = $husb;
 				}
 				//If only a mother exists
-				else if($wife){
+				else if ($wife) {
 					$dwife = new \MyArtJaub\Webtrees\Individual($wife);
-					$wife_surname=$dwife->getUnprotectedPrimarySurname();
+					$wife_surname = $dwife->getUnprotectedPrimarySurname();
 					//Check if the child is a natural child of the mother (based on the surname - Warning : surname must be identical)
-					if(!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0){
-						$resIndi=$wife;
+					if (!$dwife->isNewAddition() && I18N::strcasecmp($wife_surname, $indi_surname) == 0) {
+						$resIndi = $wife;
 					}
-					else{
-						$is_first=true;
+					else {
+						$is_first = true;
 					}
 				}
-				else{
-					$is_first=true;
+				else {
+					$is_first = true;
 				}
 			}
-			else{
-				$is_first=true;
+			else {
+				$is_first = true;
 			}
 		}
-		if(isset($this->used_indis[$resIndi->getXref()])){
+		if (isset($this->used_indis[$resIndi->getXref()])) {
 			return null;
 		}
-		else{
+		else {
 			return $resIndi;
 		}
 	}
@@ -145,15 +145,15 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if ($node === null) return;
 		
 		$indi_surname = null;
 		
 		$indi_node = $node->getIndividual();			
-		if($indi_node) {
-			if(count($node->getFamiliesNodes()) == 0) {
+		if ($indi_node) {
+			if (count($node->getFamiliesNodes()) == 0) {
 				$indiSpouseFamilies = $indi_node->getSpouseFamilies();
-				foreach($indiSpouseFamilies as $indiSpouseFamily) {
+				foreach ($indiSpouseFamilies as $indiSpouseFamily) {
 					$node->addFamily($indiSpouseFamily);
 				}
 			}
@@ -162,62 +162,62 @@ 
 			$indi_surname = $dindi_node->getUnprotectedPrimarySurname();
 			
 			//Get the estimated birth place and put it in the place table
-			$place=$dindi_node->getEstimatedBirthPlace(false);
-			if($place && strlen($place) > 0){
-				$place=trim($place);
+			$place = $dindi_node->getEstimatedBirthPlace(false);
+			if ($place && strlen($place) > 0) {
+				$place = trim($place);
 				$node->getRootNode()->addPlace(new Place($place, $this->tree));
 			}
 				
 			//Tag the individual as used
-			$this->used_indis[$indi_node->getXref()]=true;
+			$this->used_indis[$indi_node->getXref()] = true;
 		}
 		
-		foreach($node->getFamiliesNodes() as $family) {
+		foreach ($node->getFamiliesNodes() as $family) {
 			$spouse_surname = null;
-			if($indi_node && $spouse = $family->getSpouse($indi_node)) {
+			if ($indi_node && $spouse = $family->getSpouse($indi_node)) {
 				$dspouse = new \MyArtJaub\Webtrees\Individual($spouse);
-				$spouse_surname=$dspouse->getUnprotectedPrimarySurname();
+				$spouse_surname = $dspouse->getUnprotectedPrimarySurname();
 			}
 			
 			$children = $family->getChildren();
 
-			$nbChildren=0;
-			$nbNatural=0;
+			$nbChildren = 0;
+			$nbNatural = 0;
 			
-			foreach($children as $child){
+			foreach ($children as $child) {
 				$dchild = new \MyArtJaub\Webtrees\Individual($child);
-				$child_surname=$dchild->getUnprotectedPrimarySurname();
+				$child_surname = $dchild->getUnprotectedPrimarySurname();
 				
-				if(!$dchild->isNewAddition()) {
+				if (!$dchild->isNewAddition()) {
 					$nbChildren++;
 					//If the root individual is the mother
-					if($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
+					if ($indi_node && I18N::strcasecmp($indi_node->getSex(), 'F') == 0) {
 						//Print only lineages of children with the same surname as their mother (supposing they are natural children)
-						if(!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)){
-							if(I18N::strcasecmp($child_surname, $indi_surname) == 0){
+						if (!$spouse || ($spouse_surname && I18N::strcasecmp($child_surname, $spouse_surname) != 0)) {
+							if (I18N::strcasecmp($child_surname, $indi_surname) == 0) {
 								$nbNatural++;
 								$node_child = new LineageNode($child, $node->getRootNode());							
 								$node_child = $this->buildLineage($node_child);
-								if($node_child) $node->addChild($family, $node_child);
+								if ($node_child) $node->addChild($family, $node_child);
 							}
 						}
 					}
 					//If the root individual is the father
 					else {
 						//Print if the children does not bear the same name as his mother (and different from his father)
-						if( strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
+						if (strlen($child_surname) == 0 || strlen($indi_surname) == 0 || strlen($spouse_surname) == 0 ||
 							I18N::strcasecmp($child_surname, $indi_surname) == 0 ||
-							I18N::strcasecmp($child_surname, $spouse_surname) != 0 )
+							I18N::strcasecmp($child_surname, $spouse_surname) != 0)
 						{
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 						else {
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode(), $child_surname);
-							if($node_child) $node->addChild($family, $node_child);
+							if ($node_child) $node->addChild($family, $node_child);
 						}
 					}
 				}
@@ -225,7 +225,7 @@ 
 
 
 			//Do not print other children
-			if(($nbChildren-$nbNatural)>0){
+			if (($nbChildren - $nbNatural) > 0) {
 				$node->addChild($family, null);
 			}
 		}

src/Webtrees/Module/PatronymicLineage/Views/LineageView.php

Spacing +30 added lines, -30 removed lines

@@ -36,12 +36,12 @@ 
         /** @var \Fisharebest\Webtrees\Tree $tree */
         $tree = $this->data->get('tree');
         
-        echo '<h2 class="center">', $this->data->get('title') , '</h2>';
+        echo '<h2 class="center">', $this->data->get('title'), '</h2>';
         echo '<p class="center alpha_index">', implode(' | ', $this->getInitialLettersList()), '</p>';
          
-        if($this->data->get('issurnames', false)) {
+        if ($this->data->get('issurnames', false)) {
             $surns = $this->data->get('surnameslist', array());
-            $extra_params = array ('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
+            $extra_params = array('mod' => Constants::MODULE_MAJ_PATROLIN_NAME, 'mod_action' => 'Lineage');
             // Show the surname list
             switch ($tree->getPreference('SURNAME_LIST_STYLE')) {
                 case 'style1':
@@ -59,16 +59,16 @@ 
         else if ($this->data->get('islineages', false)) {
             //Link to indilist
             echo '<p class="center"><strong>'.
-                '<a href="indilist.php?ged=' . $tree->getNameUrl() . '&surname=' . rawurlencode($this->data->get('surname')) .'">'. 
+                '<a href="indilist.php?ged='.$tree->getNameUrl().'&surname='.rawurlencode($this->data->get('surname')).'">'. 
                 I18N::translate('Go to the list of individuals with surname %s', $this->data->get('legend')).
                 '</a></strong></p>';
             
             $lineages = $this->data->get('lineages', null);
             $nb_lineages = count($lineages);
-            if(is_null($lineages) || $nb_lineages == 0) {
+            if (is_null($lineages) || $nb_lineages == 0) {
             	echo '<p class="center"><span class="warning">',
             		I18N::translate('No individuals with surname %s has been found. Please try another name.',
-            			'<span dir="auto">' . $this->data->get('legend') . '</span>'),
+            			'<span dir="auto">'.$this->data->get('legend').'</span>'),
             			'</span></p>';
             } else { 
             	
@@ -79,9 +79,9 @@ 
             	
             	echo '<div class="list_value_wrap">';            	
             	
-            	foreach($lineages as $i => $lineage) {
+            	foreach ($lineages as $i => $lineage) {
             		$this->printRootLineage($lineage);
-            		if($i < $nb_lineages - 1) echo '<hr />';
+            		if ($i < $nb_lineages - 1) echo '<hr />';
             	}
             	
             	echo '</div>';
@@ -104,7 +104,7 @@ 
         $list = array();
         /** @var \Fisharebest\Webtrees\Tree $tree */
         $tree = $this->data->get('tree');
-		$script_base_url = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+		$script_base_url = WT_SCRIPT_NAME.'?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME.'&mod_action=Lineage';
 		
         foreach (QueryName::surnameAlpha($tree, false, false) as $letter => $count) {
             switch ($letter) {
@@ -120,9 +120,9 @@ 
             }
             if ($count) {
                 if ($letter == $this->data->get('alpha')) {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" class="warning" title="' . I18N::number($count) . '">' . $html . '</a>';
+                    $list[] = '<a href="'.$script_base_url.'&alpha='.rawurlencode($letter).'&amp;ged='.$tree->getNameUrl().'" class="warning" title="'.I18N::number($count).'">'.$html.'</a>';
                 } else {
-                    $list[] = '<a href="' . $script_base_url . '&alpha=' . rawurlencode($letter) . '&amp;ged=' . $tree->getNameUrl() . '" title="' . I18N::number($count) . '">' . $html . '</a>';
+                    $list[] = '<a href="'.$script_base_url.'&alpha='.rawurlencode($letter).'&amp;ged='.$tree->getNameUrl().'" title="'.I18N::number($count).'">'.$html.'</a>';
                 }
             } else {
                 $list[] = $html;
@@ -132,9 +132,9 @@ 
         // Search spiders don't get the "show all" option as the other links give them everything.
         if (!Auth::isSearchEngine()) {
             if ($this->data->get('show_all') === 'yes') {
-                $list[] = '<span class="warning">' . I18N::translate('All') . '</span>';
+                $list[] = '<span class="warning">'.I18N::translate('All').'</span>';
             } else {
-                $list[] = '<a href="' . $script_base_url . '&show_all=yes' . '&amp;ged=' . $tree->getNameUrl() . '">' . I18N::translate('All') . '</a>';
+                $list[] = '<a href="'.$script_base_url.'&show_all=yes'.'&amp;ged='.$tree->getNameUrl().'">'.I18N::translate('All').'</a>';
             }
         }
     
@@ -147,11 +147,11 @@ 
      */
     private function printRootLineage(LineageRootNode $node) {    	
     	print '<div class="patrolin_tree">';
-    	if($node->getIndividual() === null) {
+    	if ($node->getIndividual() === null) {
     		$fam_nodes = $node->getFamiliesNodes();
-    		foreach($fam_nodes as $fam){
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
+    		foreach ($fam_nodes as $fam) {
+    			foreach ($fam_nodes[$fam] as $child_node) {
+    				if ($child_node) {
     					$this->printLineage($child_node);
     				}
     			}
@@ -163,7 +163,7 @@ 
     	echo '</div>';
     	
     	$places = $node->getPlaces();
-    	if($places && count($places)>0){
+    	if ($places && count($places) > 0) {
     		echo '<div class="patrolin_places">';
     		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlPlacesCloud($places, false, $this->data->get('tree'));
     		echo '</div>';
@@ -178,34 +178,34 @@ 
     	
     	echo '<ul>';
     	$fam_nodes = $node->getFamiliesNodes();
-    	if(count($fam_nodes) > 0) {
+    	if (count($fam_nodes) > 0) {
     		$is_first_family = true;
-    		foreach($fam_nodes as $fam) {
+    		foreach ($fam_nodes as $fam) {
     			$node_indi = $node->getIndividual();
     			echo '<li>';
-    			if($is_first_family){
+    			if ($is_first_family) {
     				echo FunctionsPrint::htmlIndividualForList($node_indi);
     			}
-				else{
+				else {
 					echo FunctionsPrint::htmlIndividualForList($node_indi, false);
 				}
 				//Get individual's spouse
 				$dfam = new Family($fam);
-				$spouse=$dfam->getSpouseById($node_indi);
+				$spouse = $dfam->getSpouseById($node_indi);
 				//Print the spouse if relevant
-				if($spouse){
+				if ($spouse) {
 					$marrdate = I18N::translate('yes');
 					$marryear = '';
 					echo '&nbsp;<a href="'.$fam->getHtmlUrl().'">';
-					if ($fam->getMarriageYear()){
+					if ($fam->getMarriageYear()) {
 						$marrdate = strip_tags($fam->getMarriageDate()->Display());
 						$marryear = $fam->getMarriageYear();
 					}
 					echo '<span class="details1" title="'.$marrdate.'"><i class="icon-rings"></i>'.$marryear.'</span></a>&nbsp;';
 					echo FunctionsPrint::htmlIndividualForList($spouse);
 				}
-    			foreach($fam_nodes[$fam] as $child_node) {
-    				if($child_node) {
+    			foreach ($fam_nodes[$fam] as $child_node) {
+    				if ($child_node) {
     					$this->printLineage($child_node);
     				}
     				else {
@@ -218,10 +218,10 @@ 
     	else {
     		echo '<li>';
     		echo \MyArtJaub\Webtrees\Functions\FunctionsPrint::htmlIndividualForList($node->getIndividual());
-    		if($node->hasFollowUpSurname()) {
-    			$url_base = WT_SCRIPT_NAME . '?mod=' . \MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME . '&mod_action=Lineage';
+    		if ($node->hasFollowUpSurname()) {
+    			$url_base = WT_SCRIPT_NAME.'?mod='.\MyArtJaub\Webtrees\Constants::MODULE_MAJ_PATROLIN_NAME.'&mod_action=Lineage';
     			echo '&nbsp;'.
-    				'<a href="' . $url_base . '&surname=' . rawurlencode($node->getFollowUpSurname()) . '&amp;ged=' . $this->data->get('tree')->getNameUrl() . '">'.
+    				'<a href="'.$url_base.'&surname='.rawurlencode($node->getFollowUpSurname()).'&amp;ged='.$this->data->get('tree')->getNameUrl().'">'.
     				'('.I18N::translate('Go to %s lineages', $node->getFollowUpSurname()).')'.
     				'</a>';
     		}

src/Webtrees/Module/Certificates/Model/CertificateFileProvider.php

Spacing +23 added lines, -23 removed lines

@@ -52,24 +52,24 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getRealCertificatesDirectory()
      */
-    public function getRealCertificatesDirectory(){
-        return WT_DATA_DIR . $this->root_path;
+    public function getRealCertificatesDirectory() {
+        return WT_DATA_DIR.$this->root_path;
     }
     
     /**
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCitiesList()
      */
-    public function getCitiesList(){
-        if(!isset($this->cities_list) || is_null($this->cities_list)){
+    public function getCitiesList() {
+        if (!isset($this->cities_list) || is_null($this->cities_list)) {
             $certdir = $this->getRealCertificatesDirectory();
             $this->cities_list = array();
     
             $dir = opendir($certdir);
             
-            while($entry = readdir($dir)){
-                if($entry != '.' && $entry != '..' && is_dir($certdir.$entry)){
-                    $this->cities_list[]= Functions::encodeFileSystemToUtf8($entry);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && is_dir($certdir.$entry)) {
+                    $this->cities_list[] = Functions::encodeFileSystemToUtf8($entry);
                 }
             }
             sort($this->cities_list);
@@ -81,21 +81,21 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesList()
      */
-    public function getCertificatesList($selCity){
+    public function getCertificatesList($selCity) {
     
         $selCity = Functions::encodeUtf8ToFileSystem($selCity);
     
         $certdir = $this->getRealCertificatesDirectory();
-        $tabCertif= array();
+        $tabCertif = array();
     
-        if(is_dir($certdir.$selCity)){
-            $dir=opendir($certdir.$selCity);
-            while($entry = readdir($dir)){
-                if($entry!='.' && $entry!='..' && !is_dir($certdir.$entry.'/')){
+        if (is_dir($certdir.$selCity)) {
+            $dir = opendir($certdir.$selCity);
+            while ($entry = readdir($dir)) {
+                if ($entry != '.' && $entry != '..' && !is_dir($certdir.$entry.'/')) {
                     $path = Functions::encodeFileSystemToUtf8($selCity.'/'.$entry);
                     $certificate = new Certificate($path, $this->tree, $this);
-                    if(Functions::isImageTypeSupported($certificate->extension())){
-                        $tabCertif[] = 	$certificate;
+                    if (Functions::isImageTypeSupported($certificate->extension())) {
+                        $tabCertif[] = $certificate;
                     }
                 }
             }
@@ -107,17 +107,17 @@ 
      * {@inhericDoc}
      * @see \MyArtJaub\Webtrees\Module\Certificates\Model\CertificateProviderInterface::getCertificatesListBeginWith()
      */
-    public function getCertificatesListBeginWith($city, $contains, $limit= 9999){
-        $tabFiles= array();
-        $dirPath= $this->getRealCertificatesDirectory() . Functions::encodeUtf8ToFileSystem($city).'/';
+    public function getCertificatesListBeginWith($city, $contains, $limit = 9999) {
+        $tabFiles = array();
+        $dirPath = $this->getRealCertificatesDirectory().Functions::encodeUtf8ToFileSystem($city).'/';
         $contains = utf8_decode($contains);
         $nbCert = 0;
     
-        if(is_dir($dirPath)){
-            $dir=opendir($dirPath);
-            while(($entry = readdir($dir)) && $nbCert < $limit){
-                if($entry!='.' && $entry!='..' && $entry!='Thumbs.db' &&!is_dir($dirPath.$entry.'/') && stripos($entry, $contains)!== false){
-                    $tabFiles[]= Functions::encodeFileSystemToUtf8($entry);
+        if (is_dir($dirPath)) {
+            $dir = opendir($dirPath);
+            while (($entry = readdir($dir)) && $nbCert < $limit) {
+                if ($entry != '.' && $entry != '..' && $entry != 'Thumbs.db' && !is_dir($dirPath.$entry.'/') && stripos($entry, $contains) !== false) {
+                    $tabFiles[] = Functions::encodeFileSystemToUtf8($entry);
                     $nbCert++;
                 }
             }

src/Webtrees/Module/Hooks/AdminConfigController.php

Spacing +12 added lines, -12 removed lines

@@ -33,26 +33,26 @@ 
      * Manage updates sent from the AdminConfig@index form.
      */
     protected function update() {
-        if(Auth::isAdmin()){
+        if (Auth::isAdmin()) {
             $ihooks = HookProvider::getInstalledHooks();
             	
-            $module_names= Database::prepare(
+            $module_names = Database::prepare(
                 "SELECT module_name FROM `##module` WHERE status='disabled'"
             )->fetchOneColumn();
             	
-            if($ihooks !== null){
+            if ($ihooks !== null) {
                 foreach ($ihooks as $ihook => $params) {
-                    if(Filter::post('hook-' . $params['id']) === 'yes') {                    
+                    if (Filter::post('hook-'.$params['id']) === 'yes') {                    
                         $array_hook = explode('#', $ihook);
                         //Update status
-                        $new_status= Filter::postBool('status-' . $params['id']);
-                        if(in_array($array_hook[0], $module_names)) $new_status = false;
+                        $new_status = Filter::postBool('status-'.$params['id']);
+                        if (in_array($array_hook[0], $module_names)) $new_status = false;
                         $previous_status = $params['status'];
                         if ($new_status !== null) {
-                            $new_status= $new_status ? 'enabled' : 'disabled';
-                            if($new_status != $previous_status){
+                            $new_status = $new_status ? 'enabled' : 'disabled';
+                            if ($new_status != $previous_status) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
-                                switch($new_status){
+                                switch ($new_status) {
                                     case 'enabled':
                                         $chook->enable($array_hook[0]);
                                         break;
@@ -69,7 +69,7 @@ 
                         $new_priority = Filter::postInteger("moduleorder-{$params['id']}");
                         $previous_priority = $params['priority'];
                         if ($new_priority !== null) {
-                            if($new_priority != $previous_priority){
+                            if ($new_priority != $previous_priority) {
                                 $chook = new Hook($array_hook[1], $array_hook[2]);
                                 $chook->setPriority($array_hook[0], $new_priority);
                             }
@@ -93,7 +93,7 @@ 
         HookProvider::updateHooks();
         
         $action = Filter::post('action');        
-        if($action == 'update' && Filter::checkCsrf()) $this->update();
+        if ($action == 'update' && Filter::checkCsrf()) $this->update();
         
         Theme::theme(new AdministrationTheme)->init($WT_TREE);        
         $ctrl = new PageController();
@@ -101,7 +101,7 @@ 
             ->restrictAccess(Auth::isAdmin())
             ->setPageTitle($this->module->getTitle());
         
-        $table_id = 'table-installedhooks-' . Uuid::uuid4();
+        $table_id = 'table-installedhooks-'.Uuid::uuid4();
 
         $view_bag = new ViewBag();
         $view_bag->set('title', $ctrl->getPageTitle());

src/Webtrees/Module/CertificatesModule.php

Spacing +22 added lines, -22 removed lines

@@ -67,7 +67,7 @@ 
      * @see \Fisharebest\Webtrees\Module\ModuleConfigInterface::getConfigLink()
      */
     public function getConfigLink() {
-        return 'module.php?mod=' . $this->getName() . '&mod_action=AdminConfig';
+        return 'module.php?mod='.$this->getName().'&mod_action=AdminConfig';
     }
     
     /**
@@ -92,7 +92,7 @@ 
      */
     public function getMenu(Tree $tree, $reference = null) {
         $tree_url = $tree ? $tree->getNameUrl() : '';
-        return new Menu($this->getTitle(), 'module.php?mod=' . $this->getName() . '&mod_action=Certificate@listAll&ged=' . $tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
+        return new Menu($this->getTitle(), 'module.php?mod='.$this->getName().'&mod_action=Certificate@listAll&ged='.$tree_url, 'menu-maj-list-certificate', array('rel' => 'nofollow'));
     }
     
     /**
@@ -102,27 +102,27 @@ 
     public function hFactSourcePrepend($srec) {
         global $WT_TREE;
         
-        $html='';
-        $sid=null;
+        $html = '';
+        $sid = null;
         
-        if($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)){
+        if ($this->getSetting('MAJ_SHOW_CERT', Auth::PRIV_HIDE) >= Auth::accessLevel($WT_TREE)) {
             if (!$srec || strlen($srec) == 0) return $html;
             	
             $certificate = null;
             $subrecords = explode("\n", $srec);
             $levelSOUR = substr($subrecords[0], 0, 1);
             if (preg_match('~^'.$levelSOUR.' SOUR @('.WT_REGEX_XREF.')@$~', $subrecords[0], $match)) {
-                $sid=$match[1];
+                $sid = $match[1];
             };
             $nb_subrecords = count($subrecords);
-            for ($i=0; $i < $nb_subrecords; $i++) {
+            for ($i = 0; $i < $nb_subrecords; $i++) {
                 $subrecords[$i] = trim($subrecords[$i]);
                 $tag = substr($subrecords[$i], 2, 4);
                 $text = substr($subrecords[$i], 7);
-                if($tag == '_ACT') $certificate= new Certificate($text, $WT_TREE, $this->getProvider());
+                if ($tag == '_ACT') $certificate = new Certificate($text, $WT_TREE, $this->getProvider());
             }
             	
-            if($certificate && $certificate->canShow())
+            if ($certificate && $certificate->canShow())
                 $html = $this->getDisplay_ACT($certificate, $sid);
                 	
         }
@@ -149,9 +149,9 @@ 
      */
     public function hHtmlSimpleTagDisplay($tag, $value, $context = null, $contextid = null) {
         $html = '';
-        switch($tag){
+        switch ($tag) {
             case '_ACT':
-                if($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
+                if ($context == 'SOUR') $html = $this->getDisplay_ACT($value, $contextid);
                 break;
         }
         return $html;
@@ -166,7 +166,7 @@ 
         
         $html = '';
 		
-		switch($tag){
+		switch ($tag) {
 			case '_ACT':
 				$element_id = Uuid::uuid4();
 				$controller
@@ -174,14 +174,14 @@ 
 					->addExternalJavascript(WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/autocomplete.js')
 					->addExternalJavascript(WT_STATIC_URL.WT_MODULES_DIR.$this->getName().'/js/updatecertificatevalues.js');
 				$certificate = null;
-				if($value){
+				if ($value) {
 					$certificate = new Certificate($value, $WT_TREE, $this->getProvider());
 				}
 				$tabCities = $this->getProvider()->getCitiesList();
 				$html .= '<select id="certifCity'.$element_id.'" class="_CITY">';
-				foreach ($tabCities as $cities){
-					$selectedCity='';
-					if($certificate && $cities== $certificate->getCity()) $selectedCity='selected="true"';
+				foreach ($tabCities as $cities) {
+					$selectedCity = '';
+					if ($certificate && $cities == $certificate->getCity()) $selectedCity = 'selected="true"';
 					$html .= '<option value="'.$cities.'" '.$selectedCity.' />'.$cities.'</option>';
 				}
 				$html .= '</select>';
@@ -199,7 +199,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hAddSimpleTag()
      */
     public function hAddSimpleTag($context, $level) {
-        switch($context){
+        switch ($context) {
             case 'SOUR':
                 FunctionsEdit::addSimpleTag($level.' _ACT');
                 break;
@@ -211,7 +211,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hHasHelpTextTag()
      */
     public function hHasHelpTextTag($tag) {
-        switch($tag){
+        switch ($tag) {
 			case '_ACT':
 				return true;
 				break;
@@ -224,7 +224,7 @@ 
      * @see \MyArtJaub\Webtrees\Hook\HookInterfaces\CustomSimpleTagManagerInterface::hGetHelpTextTag()
      */
     public function hGetHelpTextTag($tag) {
-        switch($tag){
+        switch ($tag) {
             case '_ACT':
                 return array(
                 I18N::translate('Certificate'),
@@ -242,7 +242,7 @@ 
     public function getProvider() {
         global $WT_TREE;
     
-        if(!$this->provider) {
+        if (!$this->provider) {
             $root_path = $this->getSetting('MAJ_CERT_ROOTDIR', 'certificates/');
             $this->provider = new CertificateFileProvider($root_path, $WT_TREE);
         }
@@ -256,9 +256,9 @@ 
      * @param Certificate $certificatePath Certificate (as per the GEDCOM)
      * @param string|null $sid Linked Source ID, if it exists
      */
-    protected function getDisplay_ACT(Certificate $certificate, $sid = null){    
+    protected function getDisplay_ACT(Certificate $certificate, $sid = null) {    
         $html = '';
-        if($certificate){
+        if ($certificate) {
             $certificate->setSource($sid);
             $html = $certificate->displayImage('icon');
         }

src/Webtrees/Module/GeoDispersion/GeoAnalysisController.php

Spacing +38 added lines, -38 removed lines

@@ -69,7 +69,7 @@ 
         
         $ga_id = Filter::getInteger('ga_id');        
         
-        if($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
+        if ($ga_id && $ga = $this->provider->getGeoAnalysis($ga_id)) {
             $data->set('has_analysis', true);
             $data->set('geoanalysis', $ga);
             
@@ -82,7 +82,7 @@ 
                 jQuery.get(
 					"module.php",
 					{
-                        "mod" : "'. $this->module->getName() .'",  
+                        "mod" : "'. $this->module->getName().'",  
                         "mod_action": "GeoAnalysis@dataTabs",
                         "ga_id" : "'.$ga_id.'"
                     },
@@ -114,7 +114,7 @@ 
         $data->set('has_list', false);
         
         $ga_list = $this->provider->getGeoAnalysisList();
-        if(count($ga_list) > 0 ) {
+        if (count($ga_list) > 0) {
              $data->set('has_list', true);
              $data->set('geoanalysislist', $ga_list);
         }
@@ -140,19 +140,19 @@ 
         );
         
         $status = Filter::getBool('status');
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
+        $res = array('geoanalysis' => $ga->getId(), 'error' => null);
+        try {
             $this->provider->setGeoAnalysisStatus($ga, $status);
             $res['status'] = $status;
-			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '. ($status ? 'enabled' : 'disabled') .'.');
+			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been '.($status ? 'enabled' : 'disabled').'.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be ' . ($status ? 'enabled' : 'disabled') .'. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be '.($status ? 'enabled' : 'disabled').'. Error: '.$ex->getMessage());
         }
         
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
         
         echo \Zend_Json::encode($res);
     }
@@ -174,18 +174,18 @@ 
             && $ga
             );
             
-        $res = array('geoanalysis' => $ga->getId() , 'error' => null);
-        try{
+        $res = array('geoanalysis' => $ga->getId(), 'error' => null);
+        try {
             $this->provider->deleteGeoAnalysis($ga);
 			Log::addConfigurationLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" has been deleted.');
         }
         catch (\Exception $ex) {
             $res['error'] = $ex->getMessage();
-			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '. $ex->getMessage());
+			Log::addErrorLog('Module '.$this->module->getName().' : Geo Analysis ID "'.$ga->getId().'" could not be deleted. Error: '.$ex->getMessage());
         }
     
         $controller->pageHeader();
-        if($res['error']) http_response_code(500);
+        if ($res['error']) http_response_code(500);
     
         echo \Zend_Json::encode($res);
     }
@@ -211,9 +211,9 @@ 
         list($placesDispGeneral, $placesDispGenerations) = $ga->getAnalysisResults($sosa_provider->getAllSosaWithGenerations());
         
         $flags = array();
-        if($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
+        if ($placesDispGeneral && $ga->getOptions() && $ga->getOptions()->isUsingFlags()) {
             $mapProvider = new GoogleMapsProvider();            
-            foreach($placesDispGeneral['places'] as $place => $count) {
+            foreach ($placesDispGeneral['places'] as $place => $count) {
                 $flags[$place] = $mapProvider->getPlaceIcon(new Place($place, $WT_TREE));
             }
         }
@@ -232,15 +232,15 @@ 
 	 * @param (null|array) $flags Array of flags
 	 * @return string HTML code for the general tab
 	 */
-    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags= null) {
+    protected function htmlPlacesAnalysisGeneralTab(GeoAnalysis $ga, $placesGeneralResults, $flags = null) {
         global $WT_TREE;
         
-        if(!empty($placesGeneralResults)){
+        if (!empty($placesGeneralResults)) {
             $data = new ViewBag();
             
             $nb_found = $placesGeneralResults['knownsum'];
             $nb_other = 0;
-            if(isset($placesGeneralResults['other'])) $nb_other =$placesGeneralResults['other'];
+            if (isset($placesGeneralResults['other'])) $nb_other = $placesGeneralResults['other'];
             $nb_unknown = $placesGeneralResults['unknown'];
             
             $data->set('stats_gen_nb_found', $nb_found);
@@ -249,28 +249,28 @@ 
             
             $data->set('use_flags', $ga->getOptions() && $ga->getOptions()->isUsingFlags());
             
-            if($ga->hasMap()) {
+            if ($ga->hasMap()) {
                 $max = $placesGeneralResults['max'];
                 $map = $ga->getOptions()->getMap();
                 $results_by_subdivs = $map->getSubdivisions();
                 $places_mappings = $map->getPlacesMappings();
                 foreach ($placesGeneralResults['places'] as $location => $count) {
-                    $levelvalues = array_reverse(array_map('trim',explode(',', $location)));
+                    $levelvalues = array_reverse(array_map('trim', explode(',', $location)));
                     $level_map = $ga->getAnalysisLevel() - $ga->getOptions()->getMapLevel();
-                    if($level_map >= 0 && $level_map < count($levelvalues)) {
-                        $levelref = $levelvalues[0] . '@' . $levelvalues[$level_map];
-                        if(!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
+                    if ($level_map >= 0 && $level_map < count($levelvalues)) {
+                        $levelref = $levelvalues[0].'@'.$levelvalues[$level_map];
+                        if (!isset($results_by_subdivs[$levelref])) { $levelref = $levelvalues[0]; }
                     }
                     else {
                         $levelref = $levelvalues[0];
                     }
-                    if(isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
-                    if(isset($results_by_subdivs[$levelref])) {
+                    if (isset($places_mappings[$levelref])) $levelref = $places_mappings[$levelref];
+                    if (isset($results_by_subdivs[$levelref])) {
                         $count_subd = isset($results_by_subdivs[$levelref]['count']) ? $results_by_subdivs[$levelref]['count'] : 0;
-                        $count_subd  += $count;
+                        $count_subd += $count;
                         $results_by_subdivs[$levelref]['count'] = $count_subd;   
                         $results_by_subdivs[$levelref]['transparency'] = Functions::safeDivision($count_subd, $max);
-                        if($ga->getOptions()->isUsingFlags() && $flags) {
+                        if ($ga->getOptions()->isUsingFlags() && $flags) {
                             $results_by_subdivs[$levelref]['place'] = new Place($location, $WT_TREE);
                             $results_by_subdivs[$levelref]['flag'] = $flags[$location];
                         }
@@ -292,7 +292,7 @@ 
             }
         }
         else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the general analysis.') . '</p>';
+            $html = '<p class="warning">'.I18N::translate('No data is available for the general analysis.').'</p>';
         }
         return $html;
     }
@@ -308,7 +308,7 @@ 
     protected function htmlPlacesAnalysisGenerationsTab(GeoAnalysis $ga, $placesGenerationsResults, $flags = null) {
         global $WT_TREE;
         
-        if(!empty($placesGenerationsResults) && $ga->getOptions()){
+        if (!empty($placesGenerationsResults) && $ga->getOptions()) {
             $data = new ViewBag();
             
             ksort($placesGenerationsResults);
@@ -321,26 +321,26 @@ 
             $data->set('display_all_places', $display_all_places);
             
             $results_by_gen = array();
-            foreach($placesGenerationsResults as $gen => $genData){
+            foreach ($placesGenerationsResults as $gen => $genData) {
                 $sum = 0;
                 $other = 0;
                 $unknown = 0;
-                if(isset($genData['sum'])) $sum = $genData['sum'];
-                if(isset($genData['other'])) $other = $genData['other'];
-                if(isset($genData['unknown'])) $unknown = $genData['unknown'];
+                if (isset($genData['sum'])) $sum = $genData['sum'];
+                if (isset($genData['other'])) $other = $genData['other'];
+                if (isset($genData['unknown'])) $unknown = $genData['unknown'];
                 
-                if($sum > 0) {                
+                if ($sum > 0) {                
                     $results_by_gen[$gen]['sum'] = $sum;
                     $results_by_gen[$gen]['other'] = $other;
                     $results_by_gen[$gen]['unknown'] = $unknown;
                     $results_by_gen[$gen]['places'] = array();                    
                     arsort($genData['places']);
                     
-                    if($display_all_places){
-                        foreach($genData['places'] as $placename=> $count){
+                    if ($display_all_places) {
+                        foreach ($genData['places'] as $placename=> $count) {
                             $results_by_gen[$gen]['places'][$placename]['count'] = $count;
                             
-                            if($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != ''){
+                            if ($ga->getOptions() && $ga->getOptions()->isUsingFlags() && ($flag = $flags[$placename]) != '') {
                                 $results_by_gen[$gen]['places'][$placename]['place'] = new Place($placename, $WT_TREE);
                                 $results_by_gen[$gen]['places'][$placename]['flag'] = $flag;
                             }
@@ -348,7 +348,7 @@ 
                     }
                     else {
                         $tmp = $genData['places'];
-                        if($other > 0) {
+                        if ($other > 0) {
                             $tmp = array_slice($tmp, 0, 5, true);
                             $tmp['other'] = $other;
                             arsort($tmp);  
@@ -364,7 +364,7 @@ 
             
         }
         else {
-            $html = '<p class="warning">' . I18N::translate('No data is available for the generations analysis.') . '</p>';
+            $html = '<p class="warning">'.I18N::translate('No data is available for the generations analysis.').'</p>';
         }
         return $html;
     }

src/Webtrees/Module/Certificates/CertificateController.php

Spacing +15 added lines, -15 removed lines

@@ -69,7 +69,7 @@ 
         $cid = Filter::get('cid');
         
         $certificate = null;
-        if(!empty($cid) && strlen($cid) > 22){
+        if (!empty($cid) && strlen($cid) > 22) {
             $certificate = Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
         }
         
@@ -77,7 +77,7 @@ 
         $data->set('title', $controller->getPageTitle());
         
         $data->set('has_certif', false);
-        if($certificate) {
+        if ($certificate) {
             $controller->restrictAccess($certificate->canShow());
             $data->set('title', $certificate->getTitle());
             $data->set('has_certif', true);
@@ -85,10 +85,10 @@ 
             
             $data->set(
                 'url_certif_city', 
-                'module.php?mod=' . Constants::MODULE_MAJ_CERTIF_NAME . 
-                    '&mod_action=Certificate@listAll' .
-                    '&ged=' . $WT_TREE->getNameUrl() .
-                    '&city=' . Functions::encryptToSafeBase64($certificate->getCity())
+                'module.php?mod='.Constants::MODULE_MAJ_CERTIF_NAME. 
+                    '&mod_action=Certificate@listAll'.
+                    '&ged='.$WT_TREE->getNameUrl().
+                    '&city='.Functions::encryptToSafeBase64($certificate->getCity())
             );
             
             $controller->addInlineJavascript('
@@ -102,12 +102,12 @@ 
             $linked_indis = $certificate->linkedIndividuals();
             $linked_fams = $certificate->linkedFamilies();
                         
-            if($linked_indis && count($linked_indis) > 0) {
+            if ($linked_indis && count($linked_indis) > 0) {
                 $data->set('has_linked_indis', true);
                 $data->set('linked_indis', $linked_indis);
             }
             
-            if(!empty($linked_fams)) {
+            if (!empty($linked_fams)) {
                 $data->set('has_linked_fams', true);
                 $data->set('linked_fams', $linked_fams);
             }
@@ -122,9 +122,9 @@ 
     public function image() {      
         global $WT_TREE;
         
-        $cid   = Filter::get('cid');
+        $cid = Filter::get('cid');
         $certificate = null;
-        if(!empty($cid)) $certificate =  Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
+        if (!empty($cid)) $certificate = Certificate::getInstance($cid, $WT_TREE, null, $this->provider);
         
         $imageBuilder = new ImageBuilder($certificate);
         
@@ -157,7 +157,7 @@ 
         
         $city = Filter::get('city');
         
-        if(!empty($city) && strlen($city) > 22){
+        if (!empty($city) && strlen($city) > 22) {
             $city = Functions::decryptFromSafeBase64($city);
             $controller->setPageTitle(I18N::translate('Certificates for %s', $city));
         }
@@ -172,11 +172,11 @@ 
         $data->set('selected_city', $city);
         
         $data->set('has_list', false);        
-        if(!empty($city)) {            
-            $table_id = 'table-certiflist-' . Uuid::uuid4();
+        if (!empty($city)) {            
+            $table_id = 'table-certiflist-'.Uuid::uuid4();
             
             $certif_list = $this->provider->getCertificatesList($city);            
-            if(!empty($certif_list)) {                
+            if (!empty($certif_list)) {                
                 $data->set('has_list', true);
                 $data->set('table_id', $table_id);
                 $data->set('certificate_list', $certif_list);
@@ -191,7 +191,7 @@ 
         				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
                         
                         jQuery("#'.$table_id.'").dataTable( {
-        					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+        					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					    '.I18N::datatablesI18N().',
     					    jQueryUI: true,
         					autoWidth: false,

src/Webtrees/Module/Sosa/SosaListController.php

Spacing +47 added lines, -47 removed lines

@@ -70,7 +70,7 @@ 
         $this->view_bag = new ViewBag();
         $this->view_bag->set('generation', $this->generation);
         $this->view_bag->set('max_gen', $this->sosa_provider->getLastGeneration());
-        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0)> 0);
+        $this->view_bag->set('is_setup', $this->sosa_provider->isSetup() && $this->view_bag->get('max_gen', 0) > 0);
         
     }
     
@@ -91,14 +91,14 @@ 
 
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('has_sosa', $this->generation > 0 && $this->sosa_provider->getSosaCountAtGeneration($this->generation) > 0);
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList');
             $this->view_bag->set('url_ged', $WT_TREE->getNameUrl()); 
             $this->view_bag->set('min_gen', 1);
             
-            if($this->view_bag->get('has_sosa', false)) {            
+            if ($this->view_bag->get('has_sosa', false)) {            
                 $controller->addInlineJavascript('
             		jQuery("#sosalist-tabs").tabs();
             		jQuery("#sosalist-tabs").css("visibility", "visible");
@@ -108,7 +108,7 @@ 
             			{
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $WT_TREE->getNameUrl(). '",
+                            "ged" : "' . $WT_TREE->getNameUrl().'",
                             "type" : "indi",
                             "gen" : "'.$this->generation.'"
                         },
@@ -133,7 +133,7 @@ 
                         {
                             "mod" : "'.$this->module->getName().'",
                             "mod_action": "SosaList@sosalist",
-                            "ged" : "' . $WT_TREE->getNameUrl(). '",
+                            "ged" : "' . $WT_TREE->getNameUrl().'",
                             "type" : "fam",
                             "gen" : "'.$this->generation.'"
                         },
@@ -172,7 +172,7 @@ 
         
         $this->view_bag->set('title', $controller->getPageTitle());
         
-        if($this->view_bag->get('is_setup', false)) {
+        if ($this->view_bag->get('is_setup', false)) {
             $this->view_bag->set('url_module', $this->module->getName());
             $this->view_bag->set('url_action', 'SosaList@missing');
             $this->view_bag->set('url_ged', $WT_TREE->getNameUrl());
@@ -181,11 +181,11 @@ 
             $missing_list = $this->sosa_provider->getMissingSosaListAtGeneration($this->generation);
             $this->view_bag->set('has_missing', $this->generation > 0 && count($missing_list) > 0);
             
-            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation -1));
+            $perc_sosa = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation), pow(2, $this->generation - 1));
             $this->view_bag->set('perc_sosa', $perc_sosa);
             
-            if($this->view_bag->get('has_missing', false)) {
-                $table_id = 'table-sosa-missing-' . Uuid::uuid4();
+            if ($this->view_bag->get('has_missing', false)) {
+                $table_id = 'table-sosa-missing-'.Uuid::uuid4();
                 $this->view_bag->set('table_id', $table_id);
                 
                 $controller
@@ -198,7 +198,7 @@ 
     				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
                     
     				jQuery("#'.$table_id.'").dataTable( {
-                        dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+                        dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
     					'.I18N::datatablesI18N().',
     					jQueryUI: true,
     					autoWidth:false,
@@ -229,14 +229,14 @@ 
     					pagingType: "full_numbers"
     			   });
     			
-    				jQuery("#' . $table_id . '")
+    				jQuery("#' . $table_id.'")
     				/* Filter buttons in table header */
     				.on("click", "button[data-filter-column]", function() {
     					var btn = jQuery(this);
     					// De-activate the other buttons in this button group
     					btn.siblings().removeClass("ui-state-active");
     					// Apply (or clear) this filter
-    					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+    					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
     					if (btn.hasClass("ui-state-active")) {
     						btn.removeClass("ui-state-active");
     						col.search("").draw();
@@ -253,8 +253,8 @@ 
                 $unique_indis = array();
                 $sum_missing_different = 0;
                 $sum_missing_different_without_hidden = 0;
-                foreach($missing_list as $num => $missing_tab) {
-                    if(isset($unique_indis[$missing_tab['indi']])) {
+                foreach ($missing_list as $num => $missing_tab) {
+                    if (isset($unique_indis[$missing_tab['indi']])) {
                         unset($missing_list[$num]);
                         continue;
                     }
@@ -272,7 +272,7 @@ 
                 $this->view_bag->set('missing_list', $missing_list);
                 $this->view_bag->set('missing_diff_count', $sum_missing_different);
                 $this->view_bag->set('missing_hidden', $sum_missing_different - $sum_missing_different_without_hidden);
-                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation-2));
+                $perc_sosa_potential = Functions::safeDivision($this->sosa_provider->getSosaCountAtGeneration($this->generation - 1), pow(2, $this->generation - 2));
                 $this->view_bag->set('perc_sosa_potential', $perc_sosa_potential);
             }            
         }
@@ -290,7 +290,7 @@ 
         $controller = new AjaxController();
         $controller->restrictAccess($this->generation > 0 || !is_null($type));
         
-        switch ($type){
+        switch ($type) {
             case 'indi':
                 $this->renderSosaListIndi($controller);
                 break;
@@ -313,9 +313,9 @@ 
         $listSosa = $this->sosa_provider->getSosaListAtGeneration($this->generation); 
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listSosa) > 0) {
+        if (count($listSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-indi-' . Uuid::uuid4();
+            $table_id = 'table-sosa-indi-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
                      
             $controller
@@ -327,8 +327,8 @@ 
 				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
             
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
-					' . I18N::datatablesI18N() . ',
+					dom: \'<"H"<"filtersH_' . $table_id.'">T<"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
+					' . I18N::datatablesI18N().',
 					jQueryUI: true,
 					autoWidth: false,
 					processing: true,
@@ -364,7 +364,7 @@ 
 					pagingType: "full_numbers"
 			   });
             
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -373,7 +373,7 @@ 
 				/* Hide/show statistics */
 				.on("click", ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#indi_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#indi_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -381,7 +381,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -416,30 +416,30 @@ 
             $nb_displayed = 0;
             
             Individual::load($WT_TREE, $listSosa);
-            foreach($listSosa as $sosa => $pid) {
+            foreach ($listSosa as $sosa => $pid) {
                 $person = Individual::getInstance($pid, $WT_TREE);
                 if (!$person || !$person->canShowName()) {
                     unset($listSosa[$sosa]);
                     continue;
                 }
                 $nb_displayed++;
-                if ($birth_dates=$person->getAllBirthDates()) {
+                if ($birth_dates = $person->getAllBirthDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($birth_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear()/10)*10] .= $person->getSex();
+                        $birt_by_decade[(int)($birth_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
-                    $birth_dates[0]=new Date('');
+                    $birth_dates[0] = new Date('');
                 }
                 if ($death_dates = $person->getAllDeathDates()) {
                     if (
                         FunctionsPrint::isDateWithinChartsRange($death_dates[0]) &&
                         !isset($unique_indis[$person->getXref()])
                         ) {
-                        $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
+                        $deat_by_decade[(int)($death_dates[0]->gregorianYear() / 10) * 10] .= $person->getSex();
                     }
                 }
                 else {
@@ -455,7 +455,7 @@ 
             $this->view_bag->set('sosa_list', $listSosa);   
             
             $this->view_bag->set('sosa_count', count($listSosa));
-            $this->view_bag->set('sosa_theo', pow(2, $this->generation-1));
+            $this->view_bag->set('sosa_theo', pow(2, $this->generation - 1));
             $this->view_bag->set('sosa_ratio', Functions::safeDivision($this->view_bag->get('sosa_count'), $this->view_bag->get('sosa_theo')));
             
             $this->view_bag->set('sosa_hidden', $this->view_bag->get('sosa_count') - $nb_displayed);
@@ -475,12 +475,12 @@ 
     protected function renderFamSosaListIndi(AjaxController $controller) {
         global $WT_TREE;
         
-        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation);;
+        $listFamSosa = $this->sosa_provider->getFamilySosaListAtGeneration($this->generation); ;
         $this->view_bag->set('has_sosa', false);
         
-        if(count($listFamSosa) > 0) {
+        if (count($listFamSosa) > 0) {
             $this->view_bag->set('has_sosa', true);
-            $table_id = 'table-sosa-fam-' . Uuid::uuid4();
+            $table_id = 'table-sosa-fam-'.Uuid::uuid4();
             $this->view_bag->set('table_id', $table_id);
              
             $controller
@@ -492,7 +492,7 @@ 
 				jQuery.fn.dataTableExt.oSort["num-html-desc"]=function(a,b) {a=parseFloat(a.replace(/<[^<]*>/, "")); b=parseFloat(b.replace(/<[^<]*>/, "")); return (a>b) ? -1 : (a<b ? 1 : 0);};
         
                 jQuery("#'.$table_id.'").dataTable( {
-					dom: \'<"H"<"filtersH_' . $table_id . '"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_' . $table_id . '">>\',
+					dom: \'<"H"<"filtersH_' . $table_id.'"><"dt-clear">pf<"dt-clear">irl>t<"F"pl<"dt-clear"><"filtersF_'.$table_id.'">>\',
                     '.I18N::datatablesI18N(array(16, 32, 64, 128, -1)).',
 					jQueryUI: true,
 					autoWidth: false,
@@ -529,7 +529,7 @@ 
 					pagingType: "full_numbers"
 			   });
 					
-				jQuery("#' . $table_id . '")
+				jQuery("#' . $table_id.'")
 				/* Hide/show parents */
 				.on("click", ".btn-toggle-parents", function() {
 					jQuery(this).toggleClass("ui-state-active");
@@ -538,7 +538,7 @@ 
 				/* Hide/show statistics */
 				.on("click",  ".btn-toggle-statistics", function() {
 					jQuery(this).toggleClass("ui-state-active");
-					jQuery("#fam_list_table-charts_' . $table_id . '").slideToggle();
+					jQuery("#fam_list_table-charts_' . $table_id.'").slideToggle();
 				})
 				/* Filter buttons in table header */
 				.on("click", "button[data-filter-column]", function() {
@@ -546,7 +546,7 @@ 
 					// De-activate the other buttons in this button group
 					btn.siblings().removeClass("ui-state-active");
 					// Apply (or clear) this filter
-					var col = jQuery("#' . $table_id . '").DataTable().column(btn.data("filter-column"));
+					var col = jQuery("#' . $table_id.'").DataTable().column(btn.data("filter-column"));
 					if (btn.hasClass("ui-state-active")) {
 						btn.removeClass("ui-state-active");
 						col.search("").draw();
@@ -566,29 +566,29 @@ 
             
             //-- init chart data
     		$marr_by_age = array();
-    		for ($age=0; $age<=$max_age; $age++) {
+    		for ($age = 0; $age <= $max_age; $age++) {
     			$marr_by_age[$age] = '';
     		}
     		$birt_by_decade = array();
     		$marr_by_decade = array();
-    		for ($year=1550; $year<2030; $year+=10) {
+    		for ($year = 1550; $year < 2030; $year += 10) {
     			$birt_by_decade[$year] = '';
     			$marr_by_decade[$year] = '';
     		}
     		
-            foreach($listFamSosa as $sosa => $fid) {
+            foreach ($listFamSosa as $sosa => $fid) {
                 $sfamily = Family::getInstance($fid, $WT_TREE);
-                if(!$sfamily || !$sfamily->canShow()) {
+                if (!$sfamily || !$sfamily->canShow()) {
                     unset($sfamily[$sosa]);
                     continue;
                 }
-                $mdate=$sfamily->getMarriageDate();
+                $mdate = $sfamily->getMarriageDate();
                 
-                if( ($husb = $sfamily->getHusband()) && 
+                if (($husb = $sfamily->getHusband()) && 
                     ($hdate = $husb->getBirthDate()) && 
                     $hdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($hdate)) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                        $birt_by_decade[(int)($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
                     }
                     $hage = Date::getAge($hdate, $mdate, 0);
                     if ($hage >= 0 && $hage <= $max_age) {
@@ -596,11 +596,11 @@ 
                     }
                 }
                 
-                if(($wife = $sfamily->getWife()) &&
-                    ($wdate=$wife->getBirthDate()) &&
+                if (($wife = $sfamily->getWife()) &&
+                    ($wdate = $wife->getBirthDate()) &&
                     $wdate->isOK() && $mdate->isOK()) {
                     if (FunctionsPrint::isDateWithinChartsRange($wdate)) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                        $birt_by_decade[(int)($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
                     }
                     $wage = Date::getAge($wdate, $mdate, 0);
                     if ($wage >= 0 && $wage <= $max_age) {
@@ -609,7 +609,7 @@ 
                 }                
 
                 if ($mdate->isOK() && FunctionsPrint::isDateWithinChartsRange($mdate) && $husb && $wife) {
-                    $marr_by_decade[(int) ($mdate->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex();
+                    $marr_by_decade[(int)($mdate->gregorianYear() / 10) * 10] .= $husb->getSex().$wife->getSex();
                 }
                 
                 $listFamSosa[$sosa] = $sfamily;