jon48 / webtrees-lib

src/Webtrees/Cache.php

Braces +6 added lines, -2 removed lines

@@ -80,7 +80,9 @@ 
 	 *
 	 */
 	protected function checkInit(){
-		if(!$this->is_init) $this->init();
+		if(!$this->is_init) {
+			$this->init();
+		}
 	}
 	
 	/**
@@ -93,7 +95,9 @@ 
 	protected function getKeyName($value, AbstractModule $mod = null){
 	    $this->checkInit();
 		$mod_name = 'myartjaub';
-		if($mod !== null) $mod_name = $mod->getName();
+		if($mod !== null) {
+			$mod_name = $mod->getName();
+		}
 		return $mod_name.'_'.$value;
 	}
 

src/Webtrees/GedcomRecord.php

Braces +13 added lines, -7 removed lines

@@ -104,9 +104,12 @@ 
 	public function canDisplayIsSourced($access_level = null){
 		global $global_facts;
 
-		if(!$this->gedcomrecord->canShow($access_level)) return false;
-		if($access_level === null )
-		    $access_level = \Fisharebest\Webtrees\Auth::accessLevel($this->gedcomrecord->getTree());
+		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'])) {
 			return $global_facts['SOUR'] >= $access_level;
@@ -125,7 +128,9 @@ 
 	 * @return int Level of sources
 	 */
 	public function isSourced(){
-		if($this->_issourced !== null) return $this->_issourced;
+		if($this->_issourced !== null) {
+			return $this->_issourced;
+		}
 		$this->_issourced=-1;
 		$sourcesfacts = $this->gedcomrecord->getFacts('SOUR');
 		foreach($sourcesfacts as $sourcefact){
@@ -144,7 +149,9 @@ 
 	 * @return int Level of sources
 	 */
 	public function isFactSourced($eventslist){
-	    if(empty($eventslist)) return 0;
+	    if(empty($eventslist)) {
+	    	return 0;
+	    }
 		$isSourced=0;
 		$facts = $this->gedcomrecord->getFacts($eventslist);
 		foreach($facts as $fact){
@@ -154,8 +161,7 @@ 
 				if($tmpIsSourced != 0) {
 					if($isSourced==0) {
 						$isSourced =  $tmpIsSourced;
-					}
-					else{
+					} else{
 						$isSourced = max($isSourced, $tmpIsSourced);
 					}
 				}

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

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 			$index = str_replace('%', '', $match2);
 			if(is_numeric($index) && $index >0 && $index <= $nbLevels){
 				$displayPlace = str_replace($match2, $levels[$index-1] , $displayPlace);
-			}
-			else{
+			} else{
 				$displayPlace = str_replace($match2, '' , $displayPlace);
 			}
 		}

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

Braces +24 added lines, -18 removed lines

@@ -54,7 +54,9 @@ 
 	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();
 		
@@ -72,12 +74,13 @@ 
 						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;
+						}
 					}
 				}
 			}
@@ -116,23 +119,19 @@ 
 					//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;
-					}
-					else{
+					} else{
 						$is_first=true;
 					}
-				}
-				else{
+				} else{
 					$is_first=true;
 				}
-			}
-			else{
+			} else{
 				$is_first=true;
 			}
 		}
 		if(isset($this->used_indis[$resIndi->getXref()])){
 			return null;
-		}
-		else{
+		} else{
 			return $resIndi;
 		}
 	}
@@ -145,7 +144,9 @@ 
 	 * @return LineageNode Computed lineage
 	 */
 	protected function buildLineage(LineageNode $node) {
-		if($node === null) return;
+		if($node === null) {
+			return;
+		}
 		
 		$indi_surname = null;
 		
@@ -198,7 +199,9 @@ 
 								$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);
+								}
 							}
 						}
 					}
@@ -212,12 +215,15 @@ 
 							$nbNatural++;
 							$node_child = new LineageNode($child, $node->getRootNode());							
 							$node_child = $this->buildLineage($node_child);
-							if($node_child) $node->addChild($family, $node_child);
-						}
-						else {
+							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);
+							}
 						}
 					}
 				}

src/Webtrees/Module/MiscExtensions/AdminConfigController.php

Braces +3 added lines, -1 removed lines

@@ -88,7 +88,9 @@
         global $WT_TREE;
         
         $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();

src/Webtrees/Functions/FunctionsPrint.php

Braces +11 added lines, -7 removed lines

@@ -160,7 +160,9 @@ 
 	public static function htmlIndividualForList(\Fisharebest\Webtrees\Individual $individual, $isStrong = true){
 		$html = '';
 		$tag = 'em';
-		if($isStrong) $tag = 'strong';
+		if($isStrong) {
+			$tag = 'strong';
+		}
 		if($individual && $individual->canShow()){
 			$dindi = new Individual($individual);
 			$html = $individual->getSexImage();
@@ -174,8 +176,7 @@ 
 			$html .= '&nbsp;<span><small><em>'.$dindi->format_first_major_fact(WT_EVENTS_BIRT, 10).'</em></small></span>';
 			$html .= '&nbsp;<span><small><em>'.$dindi->format_first_major_fact(WT_EVENTS_DEAT, 10).'</em></small></span>';
 			$html .= '</a>';
-		}
-		else {
+		} else {
 			$html .= '<span class=\"list_item\"><'.$tag.'>' . I18N::translate('Private') . '</'.$tag.'></span>';
 		}
 		return $html;
@@ -195,8 +196,7 @@ 
 		$date = $fact->getDate();
 		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
@@ -220,7 +220,9 @@ 
 	public static function formatFactPlaceShort(\Fisharebest\Webtrees\Fact $fact, $format, $anchor=false){
 		$html='';
 		
-		if ($fact === null) return $html;
+		if ($fact === null) {
+			return $html;
+		}
 		$place = $fact->getPlace();
 		if($place){
 			$dplace = new Place($place);
@@ -339,7 +341,9 @@ 
 					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;

src/Webtrees/Module/Certificates/CertificateController.php

Braces +3 added lines, -1 removed lines

@@ -124,7 +124,9 @@
         
         $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);
         

src/Webtrees/Family.php

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
 	* @return int Level of sources
 	* */
 	function isMarriageSourced(){
-		if($this->is_marriage_sourced !== null) return $this->is_marriage_sourced;
+		if($this->is_marriage_sourced !== null) {
+			return $this->is_marriage_sourced;
+		}
 		$this->is_marriage_sourced = $this->isFactSourced(WT_EVENTS_MARR.'|MARC');
 		return $this->is_marriage_sourced;
 	}

src/Webtrees/Individual.php

Braces +8 added lines, -6 removed lines

@@ -65,8 +65,7 @@ 
 				$ct2 = preg_match_all($pattern, $titlefact->getValue(), $match2);
 				if($ct2>0){
 					$this->titles[$match2[1][0]][]= trim($match2[2][0]);
-				}
-				else{
+				} else{
 					$this->titles[$titlefact->getValue()][]='';
 				}
 			}
@@ -98,8 +97,7 @@ 
 		if($bplace = $this->gedcomrecord->getBirthPlace()){
 			if($perc){
 				return array ($bplace, 1);
-			}
-			else{
+			} else{
 				return $bplace;
 			}
 		}
@@ -168,7 +166,9 @@ 
 	 * @return int Level of sources
 	 * */
 	public function isBirthSourced(){
-		if($this->is_birth_sourced !== null) return $this->is_birth_sourced;
+		if($this->is_birth_sourced !== null) {
+			return $this->is_birth_sourced;
+		}
 		$this->is_birth_sourced = $this->isFactSourced(WT_EVENTS_BIRT);
 		return $this->is_birth_sourced;
 	}
@@ -179,7 +179,9 @@ 
 	* @return int Level of sources
 	* */
 	public function isDeathSourced(){
-		if($this->is_death_sourced !== null) return $this->is_death_sourced;
+		if($this->is_death_sourced !== null) {
+			return $this->is_death_sourced;
+		}
 		$this->is_death_sourced = $this->isFactSourced(WT_EVENTS_DEAT);
 		return $this->is_death_sourced;
 	}