pradosoft / prado

framework/Security/TSecurityManager.php

Doc Comments +3 added lines, -1 removed lines

@@ -152,7 +152,7 @@ 
 	}
 
 	/**
-	 * @return mixed the algorithm used to encrypt/decrypt data. Defaults to the string 'aes-256-cbc'.
+	 * @return string the algorithm used to encrypt/decrypt data. Defaults to the string 'aes-256-cbc'.
 	 */
 	public function getCryptAlgorithm()
 	{
@@ -173,6 +173,7 @@ 
 	/**
 	 * Encrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be encrypted.
+	 * @param string $data
 	 * @return string the encrypted data
 	 * @throws TNotSupportedException if PHP OpenSSL extension is not loaded
 	 */
@@ -191,6 +192,7 @@ 
 	/**
 	 * Decrypts data with {@link getEncryptionKey EncryptionKey}.
 	 * @param string data to be decrypted.
+	 * @param string $data
 	 * @return string the decrypted data
 	 * @throws TNotSupportedException if PHP OpenSSL extension is not loaded
 	 */

Spacing +29 added lines, -29 removed lines

@@ -49,13 +49,13 @@ 
  */
 class TSecurityManager extends \Prado\TModule
 {
-	const STATE_VALIDATION_KEY = 'prado:securitymanager:validationkey';
-	const STATE_ENCRYPTION_KEY = 'prado:securitymanager:encryptionkey';
+	const STATE_VALIDATION_KEY='prado:securitymanager:validationkey';
+	const STATE_ENCRYPTION_KEY='prado:securitymanager:encryptionkey';
 
-	private $_validationKey = null;
-	private $_encryptionKey = null;
-	private $_hashAlgorithm = 'sha256';
-	private $_cryptAlgorithm = 'aes-256-cbc';
+	private $_validationKey=null;
+	private $_encryptionKey=null;
+	private $_hashAlgorithm='sha256';
+	private $_cryptAlgorithm='aes-256-cbc';
 	private $_mbstring;
 
 	/**
@@ -74,7 +74,7 @@ 
 	 */
 	protected function generateRandomKey()
 	{
-		return sprintf('%08x%08x%08x%08x',mt_rand(),mt_rand(),mt_rand(),mt_rand());
+		return sprintf('%08x%08x%08x%08x', mt_rand(), mt_rand(), mt_rand(), mt_rand());
 	}
 
 	/**
@@ -83,9 +83,9 @@ 
 	 */
 	public function getValidationKey()
 	{
-		if(null === $this->_validationKey) {
-			if(null === ($this->_validationKey = $this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
-				$this->_validationKey = $this->generateRandomKey();
+		if(null===$this->_validationKey) {
+			if(null===($this->_validationKey=$this->getApplication()->getGlobalState(self::STATE_VALIDATION_KEY))) {
+				$this->_validationKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_VALIDATION_KEY, $this->_validationKey, null, true);
 			}
 		}
@@ -98,10 +98,10 @@ 
 	 */
 	public function setValidationKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_validationkey_invalid');
 
-		$this->_validationKey = $value;
+		$this->_validationKey=$value;
 	}
 
 	/**
@@ -110,9 +110,9 @@ 
 	 */
 	public function getEncryptionKey()
 	{
-		if(null === $this->_encryptionKey) {
-			if(null === ($this->_encryptionKey = $this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
-				$this->_encryptionKey = $this->generateRandomKey();
+		if(null===$this->_encryptionKey) {
+			if(null===($this->_encryptionKey=$this->getApplication()->getGlobalState(self::STATE_ENCRYPTION_KEY))) {
+				$this->_encryptionKey=$this->generateRandomKey();
 				$this->getApplication()->setGlobalState(self::STATE_ENCRYPTION_KEY, $this->_encryptionKey, null, true);
 			}
 		}
@@ -125,10 +125,10 @@ 
 	 */
 	public function setEncryptionKey($value)
 	{
-		if('' === $value)
+		if(''===$value)
 			throw new TInvalidDataValueException('securitymanager_encryptionkey_invalid');
 
-		$this->_encryptionKey = $value;
+		$this->_encryptionKey=$value;
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 */
 	public function setHashAlgorithm($value)
 	{
-		$this->_hashAlgorithm = TPropertyValue::ensureString($value);
+		$this->_hashAlgorithm=TPropertyValue::ensureString($value);
 		if(!in_array($this->_hashAlgorithm, hash_algos()))
 			throw new TInvalidDataValueException('securitymanager_hash_algorithm_invalid');
 	}
@@ -165,7 +165,7 @@ 
 	 */
 	public function setCryptAlgorithm($value)
 	{
-		$this->_cryptAlgorithm = TPropertyValue::ensureString($value);
+		$this->_cryptAlgorithm=TPropertyValue::ensureString($value);
 		if(!in_array($this->_hashAlgorithm, openssl_get_cipher_methods()))
 			throw new TInvalidDataValueException('securitymanager_crypt_algorithm_invalid');
 	}
@@ -180,8 +180,8 @@ 
 	{
 		if(extension_loaded('openssl'))
 		{
-			$key = md5($this->getEncryptionKey());
-			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
+			$key=md5($this->getEncryptionKey());
+			$iv=openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return $iv.openssl_encrypt($data, $this->_cryptAlgorithm, $key, null, $iv);
 		}
 		else
@@ -198,8 +198,8 @@ 
 	{
 		if(extension_loaded('openssl'))
 		{
-			$key = md5($this->getEncryptionKey());
-			$iv = $this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
+			$key=md5($this->getEncryptionKey());
+			$iv=$this->substr($data, 0, openssl_cipher_iv_length($this->_cryptAlgorithm));
 			return openssl_decrypt($this->substr($data, $this->strlen($iv), $this->strlen($data)), $this->_cryptAlgorithm, $key, null, $iv);
 		}
 		else
@@ -213,7 +213,7 @@ 
 	 */
 	public function hashData($data)
 	{
-		$hmac = $this->computeHMAC($data);
+		$hmac=$this->computeHMAC($data);
 		return $hmac.$data;
 	}
 
@@ -231,9 +231,9 @@ 
 		if($this->strlen($data) < $len)
 			return false;
 
-		$hmac = $this->substr($data, 0, $len);
+		$hmac=$this->substr($data, 0, $len);
 		$data2=$this->substr($data, $len, $this->strlen($data));
-		return $hmac === $this->computeHMAC($data2) ? $data2 : false;
+		return $hmac===$this->computeHMAC($data2) ? $data2 : false;
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	private function strlen($string)
 	{
-		return $this->_mbstring ? mb_strlen($string,'8bit') : strlen($string);
+		return $this->_mbstring ? mb_strlen($string, '8bit') : strlen($string);
 	}
 
 	/**
@@ -265,8 +265,8 @@ 
 	 * @param int $length the desired portion length
 	 * @return string the extracted part of string, or FALSE on failure or an empty string.
 	 */
-	private function substr($string,$start,$length)
+	private function substr($string, $start, $length)
 	{
-		return $this->_mbstring ? mb_substr($string,$start,$length,'8bit') : substr($string,$start,$length);
+		return $this->_mbstring ? mb_substr($string, $start, $length, '8bit') : substr($string, $start, $length);
 	}
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -189,8 +189,7 @@ 
 				return file_put_contents($fileName,file_get_contents($this->_localName))!==false;
 			else
 				return false;
-		}
-		else
+		} else
 			return false;
 	}
 
@@ -211,8 +210,7 @@ 
 			$this->_errorCode=$_FILES[$key]['error'];
 			$this->_localName=$_FILES[$key]['tmp_name'];
 			return $this->_dataChanged=true;
-		}
-		else
+		} else
 			return false;
 	}