jon48 / webtrees-lib

src/Webtrees/Mvc/View/ViewBag.php

Braces +6 added lines, -2 removed lines

@@ -73,8 +73,12 @@
      * @param bool $override
      */
     public function set($key, $value, $override = true) {
-        if(is_null($key)) return;
-        if(!$override && array_key_exists($key, $this->data)) return;
+        if(is_null($key)) {
+        	return;
+        }
+        if(!$override && array_key_exists($key, $this->data)) {
+        	return;
+        }
         $this->data[$key] = $value;        
     }
     

src/Webtrees/ImageBuilder.php

Braces +13 added lines, -6 removed lines

@@ -87,7 +87,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setExpireOffset($expireOffset) {
-	    if($expireOffset) $this->expire_offset = $expireOffset;
+	    if($expireOffset) {
+	    	$this->expire_offset = $expireOffset;
+	    }
 	    return $this;
 	}
 	
@@ -107,7 +109,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setShowWatermark($show_watermark) {
-	    if(!is_null($show_watermark)) $this->show_watermark = $show_watermark;
+	    if(!is_null($show_watermark)) {
+	    	$this->show_watermark = $show_watermark;
+	    }
 	    return $this;
 	}
 	
@@ -118,7 +122,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontMaxSize($font_max_size) {
-	    if($font_max_size) $this->font_max_size = $font_max_size;
+	    if($font_max_size) {
+	    	$this->font_max_size = $font_max_size;
+	    }
 	    return $this;
 	}
 	
@@ -129,7 +135,9 @@ 
 	 * @return ImageBuilder
 	 */
 	public function setFontColor($font_color) {
-	    if($font_color) $this->font_color = $font_color;
+	    if($font_color) {
+	    	$this->font_color = $font_color;
+	    }
 	    return $this;
 	}
 	
@@ -280,8 +288,7 @@ 
 	    // text to watermark with	    
 	    if(method_exists($this->media, 'getWatermarkText')) {
 	       $word1_text = $this->media->getWatermarkText();
-	    }
-	    else {
+	    } else {
 	        $word1_text = $this->media->getTitle();
 	    }
 	

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/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/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;
 	}

src/Webtrees/Functions/Functions.php

Braces +27 added lines, -17 removed lines

@@ -114,16 +114,18 @@ 
 		$len_chars = count($chars);
 		$token = '';
 		
-		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		for ($i = 0; $i < $length; $i++) {
+					$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+		}
 		
 		# Number of 32 char chunks
 		$chunks = ceil( strlen($token) / 32 );
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ( $i=1; $i<=$chunks; $i++ ) {
+					$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		}
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -146,12 +148,14 @@ 
 	 * @return string Encrypted and encoded text
 	 */
 	public static function encryptToSafeBase64($data){
-	    if(!self::isEncryptionCompatible())
-	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
+	    if(!self::isEncryptionCompatible()) {
+	    	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
+	    }
 	    
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE'))) {
+					$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		}
 		$iv = mcrypt_create_iv(self::ENCRYPTION_IV_SIZE, MCRYPT_RAND);
 		$id = mcrypt_encrypt(MCRYPT_RIJNDAEL_128, $key, $data, MCRYPT_MODE_CBC,$iv);
 		$encrypted = base64_encode($iv.$id);
@@ -169,20 +173,24 @@ 
 	 * @return string Decrypted text
 	 */
 	public static function decryptFromSafeBase64($encrypted){
-	    if(!self::isEncryptionCompatible())
-	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
+	    if(!self::isEncryptionCompatible()) {
+	    	        throw new \Exception('MCrypt PHP extension is required to use encryption.');
+	    }
 	    
 		$key = 'STANDARDKEYIFNOSERVER';
-		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
-			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE'))) {
+					$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		}
 		$encrypted = str_replace('-', '+', $encrypted);
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if(!$encrypted)
-			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
-		if(strlen($encrypted) < self::ENCRYPTION_IV_SIZE) 
-			throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		if(!$encrypted) {
+					throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
+		}
+		if(strlen($encrypted) < self::ENCRYPTION_IV_SIZE) {
+					throw new \InvalidArgumentException('The encrypted value does not contain enough characters for the key.');
+		}
 		$iv_dec = substr($encrypted, 0, self::ENCRYPTION_IV_SIZE);
 		$encrypted = substr($encrypted, self::ENCRYPTION_IV_SIZE);
 		$decrypted = mcrypt_decrypt(MCRYPT_RIJNDAEL_128, $key, $encrypted, MCRYPT_MODE_CBC, $iv_dec);
@@ -223,7 +231,9 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) {
+			return true;
+		}
 		return false;
 	}
 	

src/Webtrees/Mvc/Dispatcher.php

Braces +3 added lines, -6 removed lines

@@ -71,19 +71,16 @@
 			if(method_exists($ctrl, $method)) {
 			    try {
 			        call_user_func_array(array($ctrl, $method), array());
-			    }
-			    catch (MvcException $ex) {
+			    } catch (MvcException $ex) {
 			        if(!headers_sent()) {
 			            http_response_code($ex->getHttpCode());
 			        }
 			        echo $ex->getMessage();			        
 			    }
-			}
-			 else {
+			} else {
 				 throw new \Exception('The page requested does not exist');
 			 }
-		 }
-		 else {
+		 } else {
 			 throw new \Exception('The page requested does not exist');
 		 }
     }

src/Webtrees/Mvc/MvcException.php

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
      * @throws InvalidArgumentException Thrown if not valid Http code
      */
     public function setHttpCode($http_code) {
-        if(!in_array($http_code, self::$VALID_HTTP))
-            throw new \InvalidArgumentException('Invalid HTTP code');
+        if(!in_array($http_code, self::$VALID_HTTP)) {
+                    throw new \InvalidArgumentException('Invalid HTTP code');
+        }
         $this->http_code= $http_code;
     }