jon48 / webtrees-lib

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(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
-			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		if(Filter::server('SERVER_NAME') && 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(Filter::server('SERVER_NAME') && Filter::server('SERVER_SOFTWARE'))
-			$key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
+		if(Filter::server('SERVER_NAME') && 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;
 	}