jon48 / webtrees-lib

src/Webtrees/GedcomRecord.php

Spacing +23 added lines, -23 removed lines

@@ -23,14 +23,14 @@ 
 	protected $gedcomrecord;
 
 	/** @var bool Is the GedcomRecord sourced (cache) */ 
-	protected $_issourced=null;
+	protected $_issourced = null;
 
 	/**
 	 * Contructor for the decorator
 	 *
 	 * @param \Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in The GedcomRecord to extend
 	 */
-	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in){
+	public function __construct(\Fisharebest\Webtrees\GedcomRecord $gedcomrecord_in) {
 		$this->gedcomrecord = $gedcomrecord_in;
 	}
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @return \Fisharebest\Webtrees\GedcomRecord Embedded gedcom record
 	 */
-	public function getDerivedRecord(){
+	public function getDerivedRecord() {
 		return $this->gedcomrecord;
 	}
 	
@@ -85,7 +85,7 @@ 
 			if (($fact->getDate() || $fact->getPlace()) && $fact->canShow()) {
 				switch ($style) {
 					case 10:
-						return '<i>'.$fact->getLabel().' '. mw\Functions\FunctionsPrint::formatFactDateShort($fact) .'&nbsp;'. mw\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1') .'</i>';
+						return '<i>'.$fact->getLabel().' '.mw\Functions\FunctionsPrint::formatFactDateShort($fact).'&nbsp;'.mw\Functions\FunctionsPrint::formatFactPlaceShort($fact, '%1').'</i>';
 						break;
 					default:
 						return $this->gedcomrecord->formatFirstMajorFact($facts, $style);
@@ -101,11 +101,11 @@ 
 	 * @param int $access_level
 	 * @return boolean
 	 */
-	public function canDisplayIsSourced($access_level = null){
+	public function canDisplayIsSourced($access_level = null) {
 		global $global_facts;
 
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
+		if (!$this->gedcomrecord->canShow($access_level)) return false;
+		if ($access_level === null)
 		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
 
 		if (isset($global_facts['SOUR'])) {
@@ -124,14 +124,14 @@ 
 	 *
 	 * @return int Level of sources
 	 */
-	public function isSourced(){
-		if($this->_issourced !== null) return $this->_issourced;
-		$this->_issourced=-1;
+	public function isSourced() {
+		if ($this->_issourced !== null) return $this->_issourced;
+		$this->_issourced = -1;
 		$sourcesfacts = $this->gedcomrecord->getFacts('SOUR');
-		foreach($sourcesfacts as $sourcefact){
-			$this->_issourced=max($this->_issourced, 1);
-			if($sourcefact->getAttribute('_ACT')){
-				$this->_issourced=max($this->_issourced, 2);
+		foreach ($sourcesfacts as $sourcefact) {
+			$this->_issourced = max($this->_issourced, 1);
+			if ($sourcefact->getAttribute('_ACT')) {
+				$this->_issourced = max($this->_issourced, 2);
 			}
 		}
 		return $this->_issourced;
@@ -143,19 +143,19 @@ 
 	 * @param string $eventslist
 	 * @return int Level of sources
 	 */
-	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
-		$isSourced=0;
+	public function isFactSourced($eventslist) {
+	    if (empty($eventslist)) return 0;
+		$isSourced = 0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
-		foreach($facts as $fact){
-			if($isSourced < Fact::MAX_IS_SOURCED_LEVEL){
+		foreach ($facts as $fact) {
+			if ($isSourced < Fact::MAX_IS_SOURCED_LEVEL) {
 				$dfact = new Fact($fact);
 				$tmpIsSourced = $dfact->isSourced();
-				if($tmpIsSourced != 0) {
-					if($isSourced==0) {
-						$isSourced =  $tmpIsSourced;
+				if ($tmpIsSourced != 0) {
+					if ($isSourced == 0) {
+						$isSourced = $tmpIsSourced;
 					}
-					else{
+					else {
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

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/Map/GoogleMapsProvider.php

Spacing +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getProviderPlaceId()
 	 */
 	public function getProviderPlaceId(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()) {
-			$parent = explode (',', $place->getGedcomName());
+		if (!$place->isEmpty()) {
+			$parent = explode(',', $place->getGedcomName());
 			$place_id = 0;
 			$nb_levels = count($parent);
-			for ($i=0; $i < $nb_levels; $i++) {
+			for ($i = 0; $i < $nb_levels; $i++) {
 				$parent[$i] = trim($parent[$i]);
-				if (empty($parent[$i])) $parent[$i]='unknown';// GoogleMap module uses "unknown" while GEDCOM uses , ,
-				$pl_id=Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
+				if (empty($parent[$i])) $parent[$i] = 'unknown'; // GoogleMap module uses "unknown" while GEDCOM uses , ,
+				$pl_id = Database::prepare('SELECT pl_id FROM `##placelocation` WHERE pl_level=? AND pl_parent_id=? AND pl_place LIKE ? ORDER BY pl_place')
 					->execute(array($i, $place_id, $parent[$i]))
 					->fetchOne();
 				if (empty($pl_id)) break;
@@ -48,12 +48,12 @@ 
 	 * @see \MyArtJaub\Webtrees\Map\MapProviderInterface::getPlaceIcon()
 	 */
 	public function getPlaceIcon(\Fisharebest\Webtrees\Place $place) {
-		if(!$place->isEmpty()){
+		if (!$place->isEmpty()) {
 			$place_details =
 				Database::prepare("SELECT SQL_CACHE pl_icon FROM `##placelocation` WHERE pl_id=? ORDER BY pl_place")	
 				->execute(array($this->getProviderPlaceId($place)))
 				->fetchOneRow();
-			if($place_details){
+			if ($place_details) {
 				return WT_MODULES_DIR.'googlemap/'.$place_details->pl_icon;
 			}
 		}

src/Webtrees/Functions/FunctionsPrint.php

Spacing +43 added lines, -43 removed lines

@@ -32,7 +32,7 @@ 
 	 * @return string List of elements
 	 */
 	static public function getListFromArray(array $array) {
-		$n=count($array);
+		$n = count($array);
 		switch ($n) {
 			case 0:
 				return '';
@@ -41,10 +41,10 @@ 
 			default:
 				return implode(
 						/* I18N: list separator */ I18N::translate(', '), 
-						array_slice($array, 0, $n-1)
-					) .
-					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and ') . 
-					$array[$n-1];
+						array_slice($array, 0, $n - 1)
+					).
+					/* I18N: last list separator, " and " in English, " et " in French  */ I18N::translate(' and '). 
+					$array[$n - 1];
 		}
 	}
 
@@ -59,11 +59,11 @@ 
 			\Fisharebest\Webtrees\Fact $fact,
 			\MyArtJaub\Webtrees\Map\MapProviderInterface $mapProvider
 	) {
-		$html='';
-		if($place = $fact->getPlace()) {
-			$iconPlace= $mapProvider->getPlaceIcon($place);	
-			if($iconPlace && strlen($iconPlace) > 0){
-				$html.=	'<div class="fact_flag">'. self::htmlPlaceIcon($place, $iconPlace, 50). '</div>';
+		$html = '';
+		if ($place = $fact->getPlace()) {
+			$iconPlace = $mapProvider->getPlaceIcon($place);	
+			if ($iconPlace && strlen($iconPlace) > 0) {
+				$html .= '<div class="fact_flag">'.self::htmlPlaceIcon($place, $iconPlace, 50).'</div>';
 			}
 		}
 		return $html;
@@ -77,8 +77,8 @@ 
 	 * @param number $size
 	 * @return string HTML code of the inserted flag
 	 */
-	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path , $size = 50) {
-	    return '<img class="flag_gm_h'. $size . '" src="' . $icon_path . '" title="' . $place->getGedcomName() . '" alt="' . $place->getGedcomName() . '" />';
+	public static function htmlPlaceIcon(\Fisharebest\Webtrees\Place $place, $icon_path, $size = 50) {
+	    return '<img class="flag_gm_h'.$size.'" src="'.$icon_path.'" title="'.$place->getGedcomName().'" alt="'.$place->getGedcomName().'" />';
 	}
 	
 	/**
@@ -96,7 +96,7 @@ 
 		$minimum = PHP_INT_MAX;
 		$maximum = 1;
 		foreach ($list as $item => $params) {
-			if(array_key_exists('count', $params)) {
+			if (array_key_exists('count', $params)) {
 				$maximum = max($maximum, $params['count']);
 				$minimum = min($minimum, $params['count']);
 			}
@@ -114,15 +114,15 @@ 
 				$size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
 			}
 			
-			$html .= '<a style="font-size:' . $size . '%" href="' . $url . '">';
+			$html .= '<a style="font-size:'.$size.'%" href="'.$url.'">';
 			if ($totals) {
-				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">' . $text . '</span>', I18N::number($count));
+				$html .= I18N::translate('%1$s (%2$s)', '<span dir="auto">'.$text.'</span>', I18N::number($count));
 			} else {
 				$html .= $text;
 			}
 			$html .= '</a>';
 		}
-		return '<div class="tag_cloud">' . $html . '</div>';
+		return '<div class="tag_cloud">'.$html.'</div>';
 	}
 	
 
@@ -157,11 +157,11 @@ 
 	 * @param bool $isStrong Bolden the name ?
 	 * @return string HTML Code for individual item
 	 */
-	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
+	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true) {
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
-		if($individual && $individual->canShow()){
+		if ($isStrong) $tag = 'strong';
+		if ($individual && $individual->canShow()) {
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
 			$html .= '<a class="list_item" href="'.
@@ -176,7 +176,7 @@ 
 			$html .= '</a>';
 		}
 		else {
-			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
+			$html .= '<span class=\"list_item\"><'.$tag.'>'.I18N::translate('Private').'</'.$tag.'></span>';
 		}
 		return $html;
 	}
@@ -188,22 +188,22 @@ 
 	 * @param boolean $anchor option to print a link to calendar
 	 * @return string HTML code for short date
 	 */
-	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor=false) {
+	public static function formatFactDateShort(\Fisharebest\Webtrees\Fact $fact, $anchor = false) {
 		global $SEARCH_SPIDER;
 
-		$html='';
+		$html = '';
 		$date = $fact->getDate();
-		if($date->isOK()){
-			$html.=' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
+		if ($date->isOK()) {
+			$html .= ' '.$date->Display($anchor && !$SEARCH_SPIDER, '%Y');
 		}
-		else{
+		else {
 			// 1 DEAT Y with no DATE => print YES
 			// 1 BIRT 2 SOUR @S1@ => print YES
 			// 1 DEAT N is not allowed
 			// It is not proper GEDCOM form to use a N(o) value with an event tag to infer that it did not happen.
 			$factdetail = explode(' ', trim($fact->getGedcom()));
 			if (isset($factdetail) && (count($factdetail) == 3 && strtoupper($factdetail[2]) == 'Y') || (count($factdetail) == 4 && $factdetail[2] == 'SOUR')) {
-				$html.=I18N::translate('yes');
+				$html .= I18N::translate('yes');
 			}
 		}
 		return $html;
@@ -217,12 +217,12 @@ 
 	 * @param boolean $anchor option to print a link to placelist
 	 * @return string HTML code for short place
 	 */
-	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
-		$html='';
+	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor = false) {
+		$html = '';
 		
 		if ($fact === null) return $html;
 		$place = $fact->getPlace();
-		if($place){
+		if ($place) {
 			$dplace = new Place($place);
 			$html .= $dplace->htmlFormattedName($format, $anchor);
 		}
@@ -240,21 +240,21 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for the formatted Sosa numbers
 	 */
-	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small'){
+	public static function formatSosaNumbers(array $sosatab, $format = 1, $size = 'small') {
 		$html = '';
-		switch($format){
+		switch ($format) {
 			case 1:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					$html = '<i class="icon-maj-sosa_'.$size.'" title="'.I18N::translate('Sosa').'"></i>';
 				}
 				break;
 			case 2:
-				if(count($sosatab)>0){
+				if (count($sosatab) > 0) {
 					ksort($sosatab);
 					$tmp_html = array();
 					foreach ($sosatab as $sosa => $gen) {
 						$tmp_html[] = sprintf(
-								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen) .'</strong>',
+								'<i class="icon-maj-sosa_%1$s" title="'.I18N::translate('Sosa').'"></i>&nbsp;<strong>%2$d&nbsp;'.I18N::translate('(G%s)', $gen).'</strong>',
 								$size,
 								$sosa
 							);
@@ -280,15 +280,15 @@ 
 	 * @param string $size CSS size for the icon. A CSS style css_$size is required
 	 * @return string HTML code for IsSourced icon
 	 */
-	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag='EVEN', $format = 1, $size='normal'){
-		$html='';
-		$image=null;
-		$title=null;
-		switch($format){
+	public static function formatIsSourcedIcon($sourceType, $isSourced, $tag = 'EVEN', $format = 1, $size = 'normal') {
+		$html = '';
+		$image = null;
+		$title = null;
+		switch ($format) {
 			case 1:
-				switch($sourceType){
+				switch ($sourceType) {
 					case 'E':
-						switch($isSourced){
+						switch ($isSourced) {
 							case 0:
 								$image = 'event_unknown';
 								$title = I18N::translate('%s not found', GedcomTag::getLabel($tag));
@@ -318,7 +318,7 @@ 
 						}
 						break;
 					case 'R':
-						switch($isSourced){
+						switch ($isSourced) {
 							case -1:
 								$image = 'record_notsourced';
 								$title = I18N::translate('%s not sourced', GedcomTag::getLabel($tag));
@@ -339,7 +339,7 @@ 
 					default:
 						break;
 				}
-				if($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
+				if ($image && $title) $html = '<i class="icon-maj-sourced-'.$size.'_'.$image.'" title="'.$title.'"></i>';
 				break;
 			default:
 				break;