nilsteampassnet / TeamPass

includes/libraries/phpcrypt/modes/NOFB.php

Indentation +123 added lines, -123 removed lines

@@ -37,128 +37,128 @@
  */
 class Mode_NOFB extends Mode
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	public function __construct($cipher)
-	{
-		parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
-
-		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be encrypted
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$len = strlen($text);
-		$blocksz = $this->cipher->blockSize();
-
-		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// current position in the text
-			$pos = $i * $blocksz;
-
-			// make sure we don't extend past the length of $text
-			$byte_len = $blocksz;
-			if(($pos + $blocksz) > $len)
-				$byte_len -= ($pos + $blocksz) - $len;
-
-			// encrypt the register
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// now grab a block of text and a block of from the register, and XOR them
-			$block = substr($text, $pos, $byte_len);
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
-
-			// replace the plain text block with encrypted text
-			$text = substr_replace($text, $block, $pos, $byte_len);
-
-			// shift the register left n-bytes, append n-bytes of encrypted register
-			$this->register = substr($this->register, $byte_len);
-			$this->register .= substr($this->enc_register, 0, $byte_len);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be decrypted
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$len = strlen($text);
-		$blocksz = $this->cipher->blockSize();
-
-		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// current position within $text
-			$pos = $i * $blocksz;
-
-			// make sure we don't extend past the length of $text
-			$byte_len = $blocksz;
-			if(($pos + $byte_len) > $len)
-				$byte_len -= ($pos + $byte_len) - $len;
-
-			// encrypt the register
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// shift the register left n-bytes, append n-bytes of encrypted register
-			$this->register = substr($this->register, $byte_len);
-			$this->register .= substr($this->enc_register, 0, $byte_len);
-
-			// now grab a block of text and xor with the register
-			$block = substr($text, $pos, $byte_len);
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
-
-			// replace the encrypted block with plain text
-			$text = substr_replace($text, $block, $pos, $byte_len);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * This mode requires an IV
-	 *
-	 * @return boolean true
-	 */
-	public function requiresIV()
-	{
-		return true;
-	}
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    public function __construct($cipher)
+    {
+        parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
+
+        // this works with only block Ciphers
+        if($cipher->type() != Cipher::BLOCK)
+            trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be encrypted
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $len = strlen($text);
+        $blocksz = $this->cipher->blockSize();
+
+        $max = $len / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // current position in the text
+            $pos = $i * $blocksz;
+
+            // make sure we don't extend past the length of $text
+            $byte_len = $blocksz;
+            if(($pos + $blocksz) > $len)
+                $byte_len -= ($pos + $blocksz) - $len;
+
+            // encrypt the register
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // now grab a block of text and a block of from the register, and XOR them
+            $block = substr($text, $pos, $byte_len);
+            for($j = 0; $j < $byte_len; ++$j)
+                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+
+            // replace the plain text block with encrypted text
+            $text = substr_replace($text, $block, $pos, $byte_len);
+
+            // shift the register left n-bytes, append n-bytes of encrypted register
+            $this->register = substr($this->register, $byte_len);
+            $this->register .= substr($this->enc_register, 0, $byte_len);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be decrypted
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $len = strlen($text);
+        $blocksz = $this->cipher->blockSize();
+
+        $max = $len / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // current position within $text
+            $pos = $i * $blocksz;
+
+            // make sure we don't extend past the length of $text
+            $byte_len = $blocksz;
+            if(($pos + $byte_len) > $len)
+                $byte_len -= ($pos + $byte_len) - $len;
+
+            // encrypt the register
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // shift the register left n-bytes, append n-bytes of encrypted register
+            $this->register = substr($this->register, $byte_len);
+            $this->register .= substr($this->enc_register, 0, $byte_len);
+
+            // now grab a block of text and xor with the register
+            $block = substr($text, $pos, $byte_len);
+            for($j = 0; $j < $byte_len; ++$j)
+                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+
+            // replace the encrypted block with plain text
+            $text = substr_replace($text, $block, $pos, $byte_len);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * This mode requires an IV
+     *
+     * @return boolean true
+     */
+    public function requiresIV()
+    {
+        return true;
+    }
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
 		parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
+		if ($cipher->type() != Cipher::BLOCK)
 			trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
 	}
 
@@ -77,14 +77,14 @@ 
 		$blocksz = $this->cipher->blockSize();
 
 		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// current position in the text
 			$pos = $i * $blocksz;
 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
-			if(($pos + $blocksz) > $len)
+			if (($pos + $blocksz) > $len)
 				$byte_len -= ($pos + $blocksz) - $len;
 
 			// encrypt the register
@@ -93,7 +93,7 @@ 
 
 			// now grab a block of text and a block of from the register, and XOR them
 			$block = substr($text, $pos, $byte_len);
-			for($j = 0; $j < $byte_len; ++$j)
+			for ($j = 0; $j < $byte_len; ++$j)
 				$block[$j] = $block[$j] ^ $this->enc_register[$j];
 
 			// replace the plain text block with encrypted text
@@ -120,14 +120,14 @@ 
 		$blocksz = $this->cipher->blockSize();
 
 		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// current position within $text
 			$pos = $i * $blocksz;
 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
-			if(($pos + $byte_len) > $len)
+			if (($pos + $byte_len) > $len)
 				$byte_len -= ($pos + $byte_len) - $len;
 
 			// encrypt the register
@@ -140,7 +140,7 @@ 
 
 			// now grab a block of text and xor with the register
 			$block = substr($text, $pos, $byte_len);
-			for($j = 0; $j < $byte_len; ++$j)
+			for ($j = 0; $j < $byte_len; ++$j)
 				$block[$j] = $block[$j] ^ $this->enc_register[$j];
 
 			// replace the encrypted block with plain text

Braces +15 added lines, -10 removed lines

@@ -49,8 +49,9 @@ 
 		parent::__construct(PHP_Crypt::MODE_NOFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::BLOCK) {
+					trigger_error("NOFB mode requires a block cipher", E_USER_WARNING);
+		}
 	}
 
 
@@ -84,8 +85,9 @@ 
 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
-			if(($pos + $blocksz) > $len)
-				$byte_len -= ($pos + $blocksz) - $len;
+			if(($pos + $blocksz) > $len) {
+							$byte_len -= ($pos + $blocksz) - $len;
+			}
 
 			// encrypt the register
 			$this->enc_register = $this->register;
@@ -93,8 +95,9 @@ 
 
 			// now grab a block of text and a block of from the register, and XOR them
 			$block = substr($text, $pos, $byte_len);
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			for($j = 0; $j < $byte_len; ++$j) {
+							$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			}
 
 			// replace the plain text block with encrypted text
 			$text = substr_replace($text, $block, $pos, $byte_len);
@@ -127,8 +130,9 @@ 
 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
-			if(($pos + $byte_len) > $len)
-				$byte_len -= ($pos + $byte_len) - $len;
+			if(($pos + $byte_len) > $len) {
+							$byte_len -= ($pos + $byte_len) - $len;
+			}
 
 			// encrypt the register
 			$this->enc_register = $this->register;
@@ -140,8 +144,9 @@ 
 
 			// now grab a block of text and xor with the register
 			$block = substr($text, $pos, $byte_len);
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			for($j = 0; $j < $byte_len; ++$j) {
+							$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			}
 
 			// replace the encrypted block with plain text
 			$text = substr_replace($text, $block, $pos, $byte_len);

includes/libraries/phpcrypt/modes/CBC.php

Indentation +127 added lines, -127 removed lines

@@ -36,132 +36,132 @@
  */
 class Mode_CBC extends Mode
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	function __construct($cipher)
-	{
-		parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
-
-		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher passed
-	 * to the constructor in CBC mode
-	 * The steps to encrypt using CBC are as follows
-	 * 1) Get a block of plain text data to use in the Cipher
-	 * 2) XOR the block with IV (if it's the first round) or the previous
-	 *	round's encrypted result
-	 * 3) Encrypt the block using the cipher
-	 * 4) Save the encrypted block to use in the next round
-	 *
-	 * @param string $text the string to be encrypted in CBC mode
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$this->pad($text);
-		$blocksz = $this->cipher->blockSize();
-
-		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// get the current position in $text
-			$pos = $i * $blocksz;
-
-			// grab a block of plain text
-			$block = substr($text, $pos, $blocksz);
-
-			// xor the block with the register
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $block[$j] ^ $this->register[$j];
-
-			// encrypt the block, and save it back to the register
-			$this->cipher->encrypt($block);
-			$this->register = $block;
-
-			// replace the plain text block with the cipher text
-			$text = substr_replace($text, $this->register, $pos, $blocksz);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher passed
-	 * to the constructor in CBC mode
-	 * The decryption algorithm requires the following steps
-	 * 1) Get the first block of encrypted text, save it
-	 * 2) Decrypt the block
-	 * 3) XOR the decrypted block (if it's the first pass use the IV,
-	 *	else use the encrypted block from step 1
-	 * 4) the result from the XOR will be a plain text block, save it
-	 * 5) assign the encrypted block from step 1 to use in the next round
-	 *
-	 * @param string $text the string to be decrypted in CBC mode
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$blocksz = $this->cipher->blockSize();
-
-		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// get the current position in $text
-			$pos = $i * $blocksz;
-
-			// grab a block of cipher text, and save it for use later
-			$block = substr($text, $pos, $blocksz);
-			$tmp_block = $block;
-
-			// decrypt the block of cipher text
-			$this->cipher->decrypt($block);
-
-			// xor the block with the register
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $block[$j] ^ $this->register[$j];
-
-			// replace the block of cipher text with plain text
-			$text = substr_replace($text, $block, $pos, $blocksz);
-
-			// save the cipher text block to the register
-			$this->register = $tmp_block;
-		}
-
-		$this->strip($text);
-		return true;
-	}
-
-
-	/**
-	 * This mode requires an IV
-	 *
-	 * @return boolean Returns True
-	 */
-	public function requiresIV()
-	{
-		return true;
-	}
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    function __construct($cipher)
+    {
+        parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
+
+        // this works with only block Ciphers
+        if($cipher->type() != Cipher::BLOCK)
+            trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher passed
+     * to the constructor in CBC mode
+     * The steps to encrypt using CBC are as follows
+     * 1) Get a block of plain text data to use in the Cipher
+     * 2) XOR the block with IV (if it's the first round) or the previous
+     *	round's encrypted result
+     * 3) Encrypt the block using the cipher
+     * 4) Save the encrypted block to use in the next round
+     *
+     * @param string $text the string to be encrypted in CBC mode
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $this->pad($text);
+        $blocksz = $this->cipher->blockSize();
+
+        $max = strlen($text) / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // get the current position in $text
+            $pos = $i * $blocksz;
+
+            // grab a block of plain text
+            $block = substr($text, $pos, $blocksz);
+
+            // xor the block with the register
+            for($j = 0; $j < $blocksz; ++$j)
+                $block[$j] = $block[$j] ^ $this->register[$j];
+
+            // encrypt the block, and save it back to the register
+            $this->cipher->encrypt($block);
+            $this->register = $block;
+
+            // replace the plain text block with the cipher text
+            $text = substr_replace($text, $this->register, $pos, $blocksz);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher passed
+     * to the constructor in CBC mode
+     * The decryption algorithm requires the following steps
+     * 1) Get the first block of encrypted text, save it
+     * 2) Decrypt the block
+     * 3) XOR the decrypted block (if it's the first pass use the IV,
+     *	else use the encrypted block from step 1
+     * 4) the result from the XOR will be a plain text block, save it
+     * 5) assign the encrypted block from step 1 to use in the next round
+     *
+     * @param string $text the string to be decrypted in CBC mode
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $blocksz = $this->cipher->blockSize();
+
+        $max = strlen($text) / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // get the current position in $text
+            $pos = $i * $blocksz;
+
+            // grab a block of cipher text, and save it for use later
+            $block = substr($text, $pos, $blocksz);
+            $tmp_block = $block;
+
+            // decrypt the block of cipher text
+            $this->cipher->decrypt($block);
+
+            // xor the block with the register
+            for($j = 0; $j < $blocksz; ++$j)
+                $block[$j] = $block[$j] ^ $this->register[$j];
+
+            // replace the block of cipher text with plain text
+            $text = substr_replace($text, $block, $pos, $blocksz);
+
+            // save the cipher text block to the register
+            $this->register = $tmp_block;
+        }
+
+        $this->strip($text);
+        return true;
+    }
+
+
+    /**
+     * This mode requires an IV
+     *
+     * @return boolean Returns True
+     */
+    public function requiresIV()
+    {
+        return true;
+    }
 }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -48,7 +48,7 @@ 
 		parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
+		if ($cipher->type() != Cipher::BLOCK)
 			trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
 	}
 
@@ -83,7 +83,7 @@ 
 		$blocksz = $this->cipher->blockSize();
 
 		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// get the current position in $text
 			$pos = $i * $blocksz;
@@ -92,7 +92,7 @@ 
 			$block = substr($text, $pos, $blocksz);
 
 			// xor the block with the register
-			for($j = 0; $j < $blocksz; ++$j)
+			for ($j = 0; $j < $blocksz; ++$j)
 				$block[$j] = $block[$j] ^ $this->register[$j];
 
 			// encrypt the block, and save it back to the register
@@ -126,7 +126,7 @@ 
 		$blocksz = $this->cipher->blockSize();
 
 		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// get the current position in $text
 			$pos = $i * $blocksz;
@@ -139,7 +139,7 @@ 
 			$this->cipher->decrypt($block);
 
 			// xor the block with the register
-			for($j = 0; $j < $blocksz; ++$j)
+			for ($j = 0; $j < $blocksz; ++$j)
 				$block[$j] = $block[$j] ^ $this->register[$j];
 
 			// replace the block of cipher text with plain text

Braces +9 added lines, -6 removed lines

@@ -48,8 +48,9 @@ 
 		parent::__construct(PHP_Crypt::MODE_CBC, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::BLOCK) {
+					trigger_error("CBC mode requires a block cipher", E_USER_WARNING);
+		}
 	}
 
 
@@ -92,8 +93,9 @@ 
 			$block = substr($text, $pos, $blocksz);
 
 			// xor the block with the register
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $block[$j] ^ $this->register[$j];
+			for($j = 0; $j < $blocksz; ++$j) {
+							$block[$j] = $block[$j] ^ $this->register[$j];
+			}
 
 			// encrypt the block, and save it back to the register
 			$this->cipher->encrypt($block);
@@ -139,8 +141,9 @@ 
 			$this->cipher->decrypt($block);
 
 			// xor the block with the register
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $block[$j] ^ $this->register[$j];
+			for($j = 0; $j < $blocksz; ++$j) {
+							$block[$j] = $block[$j] ^ $this->register[$j];
+			}
 
 			// replace the block of cipher text with plain text
 			$text = substr_replace($text, $block, $pos, $blocksz);

includes/libraries/phpcrypt/modes/Stream.php

Indentation +24 added lines, -24 removed lines

@@ -38,32 +38,32 @@
  */
 class Mode_Stream extends Mode_Raw
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	public function __construct($cipher)
-	{
-		// call the secondary 'constructor' from the parent
-		parent::__construct1(PHP_Crypt::MODE_STREAM, $cipher);
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    public function __construct($cipher)
+    {
+        // call the secondary 'constructor' from the parent
+        parent::__construct1(PHP_Crypt::MODE_STREAM, $cipher);
 
-		// this works with only stream Ciphers
-		if($cipher->type() != Cipher::STREAM)
-			trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
-	}
+        // this works with only stream Ciphers
+        if($cipher->type() != Cipher::STREAM)
+            trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
+    }
 
 
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
 }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
 		parent::__construct1(PHP_Crypt::MODE_STREAM, $cipher);
 
 		// this works with only stream Ciphers
-		if($cipher->type() != Cipher::STREAM)
+		if ($cipher->type() != Cipher::STREAM)
 			trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
 	}
 

Braces +3 added lines, -2 removed lines

@@ -51,8 +51,9 @@
 		parent::__construct1(PHP_Crypt::MODE_STREAM, $cipher);
 
 		// this works with only stream Ciphers
-		if($cipher->type() != Cipher::STREAM)
-			trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::STREAM) {
+					trigger_error("Stream mode requires a stream cipher", E_USER_WARNING);
+		}
 	}
 
 

includes/libraries/phpcrypt/modes/OFB.php

Indentation +86 added lines, -86 removed lines

@@ -36,91 +36,91 @@
  */
 class Mode_OFB extends Mode
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	public function __construct($cipher)
-	{
-		parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
-
-		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be encrypted
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
-		{
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-			$text[$i] = $text[$i] ^ $this->enc_register[0];
-
-			// shift the register left
-			$this->register = substr($this->register, 1);
-			$this->register .= $this->enc_register[0];
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be decrypted
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
-		{
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// shift the register left
-			$this->register = substr($this->register, 1);
-			$this->register .= $this->enc_register[0];
-
-			$text[$i] = $text[$i] ^ $this->enc_register[0];
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * This mode requires an IV
-	 *
-	 * @return boolean true
-	 */
-	public function requiresIV()
-	{
-		return true;
-	}
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    public function __construct($cipher)
+    {
+        parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
+
+        // this works with only block Ciphers
+        if($cipher->type() != Cipher::BLOCK)
+            trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be encrypted
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $max = strlen($text);
+        for($i = 0; $i < $max; ++$i)
+        {
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+            $text[$i] = $text[$i] ^ $this->enc_register[0];
+
+            // shift the register left
+            $this->register = substr($this->register, 1);
+            $this->register .= $this->enc_register[0];
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be decrypted
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $max = strlen($text);
+        for($i = 0; $i < $max; ++$i)
+        {
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // shift the register left
+            $this->register = substr($this->register, 1);
+            $this->register .= $this->enc_register[0];
+
+            $text[$i] = $text[$i] ^ $this->enc_register[0];
+        }
+
+        return true;
+    }
+
+
+    /**
+     * This mode requires an IV
+     *
+     * @return boolean true
+     */
+    public function requiresIV()
+    {
+        return true;
+    }
 }
 ?>

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 		parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
+		if ($cipher->type() != Cipher::BLOCK)
 			trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
 	}
 
@@ -73,7 +73,7 @@ 
 	public function encrypt(&$text)
 	{
 		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			$this->enc_register = $this->register;
 			$this->cipher->encrypt($this->enc_register);
@@ -97,7 +97,7 @@ 
 	public function decrypt(&$text)
 	{
 		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			$this->enc_register = $this->register;
 			$this->cipher->encrypt($this->enc_register);

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 		parent::__construct(PHP_Crypt::MODE_OFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::BLOCK) {
+					trigger_error("OFB mode requires a block cipher", E_USER_WARNING);
+		}
 	}
 
 

includes/libraries/phpcrypt/modes/NCFB.php

Indentation +130 added lines, -130 removed lines

@@ -37,135 +37,135 @@
  */
 class Mode_NCFB extends Mode
 {
-	/**
-	 * The constructor, Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	public function __construct($cipher)
-	{
-		parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
-
-		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be encrypted
-	 * @return boolean True
-	 */
-	public function encrypt(&$text)
-	{
-		$blocksz = $this->cipher->blockSize();
-
-		// first we need to pad the string so its the correct length for the cipher
-		$len = strlen($text);
-
-		// if $len is less than blockSize() this will still work, as even
-		// a fraction is greater than 0
-		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// current position in the text
-			$pos = $i * $blocksz;
-
-			// make sure we don't extend past the length of $text
-			$byte_len = $blocksz;
-
-			if(($pos + $byte_len) > $len)
-				$byte_len -= ($pos + $byte_len) - $len;
-
-			// encrypt the register
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// encrypt the block by xoring it with the encrypted register
-			$block = substr($text, $pos, $byte_len);
-
-			// xor the block
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
-
-			// replace the plain text block with the encrypted block
-			$text = substr_replace($text, $block, $pos, $byte_len);
-
-			// shift the register left n-bytes, append n-bytes of encrypted register
-			$this->register = substr($this->register, $blocksz);
-			$this->register .= $block;
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be decrypted
-	 * @return bool Returns True
-	 */
-	public function decrypt(&$text)
-	{
-		$blocksz = $this->cipher->blockSize();
-		$len = strlen($text);
-
-		// if $len is less than blockSize() this will still work, as even
-		// a fraction is greater than 0
-		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// get the current position in text
-			$pos = $i * $blocksz;
-
-			// make sure we don't extend past the length of $text
-			$byte_len = $blocksz;
-			if(($pos + $byte_len) > $len)
-				$byte_len -= ($pos + $byte_len) - $len;
-
-			// encrypt the register
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// shift the register left, push the encrypted byte onto the end
-			$block = substr($text, $pos, $byte_len);
-			$this->register = $block;
-
-			// xor the block
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
-
-			// replace the encrypted block with the plain text block
-			$text = substr_replace($text, $block, $pos, $byte_len);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * This mode requires an IV
-	 *
-	 * @return boolean true
-	 */
-	public function requiresIV()
-	{
-		return true;
-	}
+    /**
+     * The constructor, Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    public function __construct($cipher)
+    {
+        parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
+
+        // this works with only block Ciphers
+        if($cipher->type() != Cipher::BLOCK)
+            trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be encrypted
+     * @return boolean True
+     */
+    public function encrypt(&$text)
+    {
+        $blocksz = $this->cipher->blockSize();
+
+        // first we need to pad the string so its the correct length for the cipher
+        $len = strlen($text);
+
+        // if $len is less than blockSize() this will still work, as even
+        // a fraction is greater than 0
+        $max = $len / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // current position in the text
+            $pos = $i * $blocksz;
+
+            // make sure we don't extend past the length of $text
+            $byte_len = $blocksz;
+
+            if(($pos + $byte_len) > $len)
+                $byte_len -= ($pos + $byte_len) - $len;
+
+            // encrypt the register
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // encrypt the block by xoring it with the encrypted register
+            $block = substr($text, $pos, $byte_len);
+
+            // xor the block
+            for($j = 0; $j < $byte_len; ++$j)
+                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+
+            // replace the plain text block with the encrypted block
+            $text = substr_replace($text, $block, $pos, $byte_len);
+
+            // shift the register left n-bytes, append n-bytes of encrypted register
+            $this->register = substr($this->register, $blocksz);
+            $this->register .= $block;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be decrypted
+     * @return bool Returns True
+     */
+    public function decrypt(&$text)
+    {
+        $blocksz = $this->cipher->blockSize();
+        $len = strlen($text);
+
+        // if $len is less than blockSize() this will still work, as even
+        // a fraction is greater than 0
+        $max = $len / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // get the current position in text
+            $pos = $i * $blocksz;
+
+            // make sure we don't extend past the length of $text
+            $byte_len = $blocksz;
+            if(($pos + $byte_len) > $len)
+                $byte_len -= ($pos + $byte_len) - $len;
+
+            // encrypt the register
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // shift the register left, push the encrypted byte onto the end
+            $block = substr($text, $pos, $byte_len);
+            $this->register = $block;
+
+            // xor the block
+            for($j = 0; $j < $byte_len; ++$j)
+                $block[$j] = $block[$j] ^ $this->enc_register[$j];
+
+            // replace the encrypted block with the plain text block
+            $text = substr_replace($text, $block, $pos, $byte_len);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * This mode requires an IV
+     *
+     * @return boolean true
+     */
+    public function requiresIV()
+    {
+        return true;
+    }
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 		parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
+		if ($cipher->type() != Cipher::BLOCK)
 			trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
 	}
 
@@ -80,7 +80,7 @@ 
 		// if $len is less than blockSize() this will still work, as even
 		// a fraction is greater than 0
 		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// current position in the text
 			$pos = $i * $blocksz;
@@ -88,7 +88,7 @@ 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
 
-			if(($pos + $byte_len) > $len)
+			if (($pos + $byte_len) > $len)
 				$byte_len -= ($pos + $byte_len) - $len;
 
 			// encrypt the register
@@ -99,7 +99,7 @@ 
 			$block = substr($text, $pos, $byte_len);
 
 			// xor the block
-			for($j = 0; $j < $byte_len; ++$j)
+			for ($j = 0; $j < $byte_len; ++$j)
 				$block[$j] = $block[$j] ^ $this->enc_register[$j];
 
 			// replace the plain text block with the encrypted block
@@ -128,14 +128,14 @@ 
 		// if $len is less than blockSize() this will still work, as even
 		// a fraction is greater than 0
 		$max = $len / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// get the current position in text
 			$pos = $i * $blocksz;
 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
-			if(($pos + $byte_len) > $len)
+			if (($pos + $byte_len) > $len)
 				$byte_len -= ($pos + $byte_len) - $len;
 
 			// encrypt the register
@@ -147,7 +147,7 @@ 
 			$this->register = $block;
 
 			// xor the block
-			for($j = 0; $j < $byte_len; ++$j)
+			for ($j = 0; $j < $byte_len; ++$j)
 				$block[$j] = $block[$j] ^ $this->enc_register[$j];
 
 			// replace the encrypted block with the plain text block

Braces +15 added lines, -10 removed lines

@@ -48,8 +48,9 @@ 
 		parent::__construct(PHP_Crypt::MODE_NCFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::BLOCK) {
+					trigger_error("NCFB mode requires a block cipher", E_USER_WARNING);
+		}
 	}
 
 
@@ -88,8 +89,9 @@ 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
 
-			if(($pos + $byte_len) > $len)
-				$byte_len -= ($pos + $byte_len) - $len;
+			if(($pos + $byte_len) > $len) {
+							$byte_len -= ($pos + $byte_len) - $len;
+			}
 
 			// encrypt the register
 			$this->enc_register = $this->register;
@@ -99,8 +101,9 @@ 
 			$block = substr($text, $pos, $byte_len);
 
 			// xor the block
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			for($j = 0; $j < $byte_len; ++$j) {
+							$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			}
 
 			// replace the plain text block with the encrypted block
 			$text = substr_replace($text, $block, $pos, $byte_len);
@@ -135,8 +138,9 @@ 
 
 			// make sure we don't extend past the length of $text
 			$byte_len = $blocksz;
-			if(($pos + $byte_len) > $len)
-				$byte_len -= ($pos + $byte_len) - $len;
+			if(($pos + $byte_len) > $len) {
+							$byte_len -= ($pos + $byte_len) - $len;
+			}
 
 			// encrypt the register
 			$this->enc_register = $this->register;
@@ -147,8 +151,9 @@ 
 			$this->register = $block;
 
 			// xor the block
-			for($j = 0; $j < $byte_len; ++$j)
-				$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			for($j = 0; $j < $byte_len; ++$j) {
+							$block[$j] = $block[$j] ^ $this->enc_register[$j];
+			}
 
 			// replace the encrypted block with the plain text block
 			$text = substr_replace($text, $block, $pos, $byte_len);

includes/libraries/phpcrypt/modes/PCBC.php

Indentation +119 added lines, -119 removed lines

@@ -36,124 +36,124 @@
  */
 class Mode_PCBC extends Mode
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	function __construct($cipher)
-	{
-		parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
-
-		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher
-	 *
-	 * @param string $text the string to be encrypted
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$this->pad($text);
-		$blocksz = $this->cipher->blockSize();
-
-		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// current position in the text
-			$pos = $i * $blocksz;
-
-			// get a block of plain text, and make a copy
-			$block = substr($text, $pos, $blocksz);
-			$plain_block = $block;
-
-			// xor the register with plain text
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $this->register[$j] ^ $block[$j];
-
-			// encrypt the block creating the cipher text
-			$this->cipher->encrypt($block);
-
-			// xor the encrypted block with the plain text block to create
-			// the register in the next round
-			for($j = 0; $j < $blocksz; ++$j)
-				$this->register[$j] = $block[$j] ^ $plain_block[$j];
-
-			// copy the encrypted block back to $text
-			$text = substr_replace($text, $block, $pos, $blocksz);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher
-	 *
-	 * @param string $text the string to be decrypted
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$blocksz = $this->cipher->blockSize();
-
-		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
-		{
-			// current position in the text
-			$pos = $i * $blocksz;
-
-			// get a block of encrypted text, and make a copy
-			$block = substr($text, $pos, $blocksz);
-			$enc_block = $block;
-
-			// decrypt the block
-			$this->cipher->decrypt($block);
-
-			// xor the decrypted block with the register, to create
-			// the plain text block
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $this->register[$j] ^ $block[$j];
-
-			// now xor the $enc_block with the unencrypted $block
-			for($j = 0; $j < $blocksz; ++$j)
-				$this->register[$j] = $block[$j] ^ $enc_block[$j];
-
-			// copy the plain text block back to $text
-			$text = substr_replace($text, $block, $pos, $blocksz);
-		}
-
-		$this->strip($text);
-		return true;
-	}
-
-
-	/**
-	 * This mode requires an IV
-	 *
-	 * @return boolean Returns true
-	 */
-	public function requiresIV()
-	{
-		return true;
-	}
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    function __construct($cipher)
+    {
+        parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
+
+        // this works with only block Ciphers
+        if($cipher->type() != Cipher::BLOCK)
+            trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher
+     *
+     * @param string $text the string to be encrypted
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $this->pad($text);
+        $blocksz = $this->cipher->blockSize();
+
+        $max = strlen($text) / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // current position in the text
+            $pos = $i * $blocksz;
+
+            // get a block of plain text, and make a copy
+            $block = substr($text, $pos, $blocksz);
+            $plain_block = $block;
+
+            // xor the register with plain text
+            for($j = 0; $j < $blocksz; ++$j)
+                $block[$j] = $this->register[$j] ^ $block[$j];
+
+            // encrypt the block creating the cipher text
+            $this->cipher->encrypt($block);
+
+            // xor the encrypted block with the plain text block to create
+            // the register in the next round
+            for($j = 0; $j < $blocksz; ++$j)
+                $this->register[$j] = $block[$j] ^ $plain_block[$j];
+
+            // copy the encrypted block back to $text
+            $text = substr_replace($text, $block, $pos, $blocksz);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher
+     *
+     * @param string $text the string to be decrypted
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $blocksz = $this->cipher->blockSize();
+
+        $max = strlen($text) / $blocksz;
+        for($i = 0; $i < $max; ++$i)
+        {
+            // current position in the text
+            $pos = $i * $blocksz;
+
+            // get a block of encrypted text, and make a copy
+            $block = substr($text, $pos, $blocksz);
+            $enc_block = $block;
+
+            // decrypt the block
+            $this->cipher->decrypt($block);
+
+            // xor the decrypted block with the register, to create
+            // the plain text block
+            for($j = 0; $j < $blocksz; ++$j)
+                $block[$j] = $this->register[$j] ^ $block[$j];
+
+            // now xor the $enc_block with the unencrypted $block
+            for($j = 0; $j < $blocksz; ++$j)
+                $this->register[$j] = $block[$j] ^ $enc_block[$j];
+
+            // copy the plain text block back to $text
+            $text = substr_replace($text, $block, $pos, $blocksz);
+        }
+
+        $this->strip($text);
+        return true;
+    }
+
+
+    /**
+     * This mode requires an IV
+     *
+     * @return boolean Returns true
+     */
+    public function requiresIV()
+    {
+        return true;
+    }
 }
 ?>

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 		parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
+		if ($cipher->type() != Cipher::BLOCK)
 			trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
 	}
 
@@ -76,7 +76,7 @@ 
 		$blocksz = $this->cipher->blockSize();
 
 		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// current position in the text
 			$pos = $i * $blocksz;
@@ -86,7 +86,7 @@ 
 			$plain_block = $block;
 
 			// xor the register with plain text
-			for($j = 0; $j < $blocksz; ++$j)
+			for ($j = 0; $j < $blocksz; ++$j)
 				$block[$j] = $this->register[$j] ^ $block[$j];
 
 			// encrypt the block creating the cipher text
@@ -94,7 +94,7 @@ 
 
 			// xor the encrypted block with the plain text block to create
 			// the register in the next round
-			for($j = 0; $j < $blocksz; ++$j)
+			for ($j = 0; $j < $blocksz; ++$j)
 				$this->register[$j] = $block[$j] ^ $plain_block[$j];
 
 			// copy the encrypted block back to $text
@@ -116,7 +116,7 @@ 
 		$blocksz = $this->cipher->blockSize();
 
 		$max = strlen($text) / $blocksz;
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// current position in the text
 			$pos = $i * $blocksz;
@@ -130,11 +130,11 @@ 
 
 			// xor the decrypted block with the register, to create
 			// the plain text block
-			for($j = 0; $j < $blocksz; ++$j)
+			for ($j = 0; $j < $blocksz; ++$j)
 				$block[$j] = $this->register[$j] ^ $block[$j];
 
 			// now xor the $enc_block with the unencrypted $block
-			for($j = 0; $j < $blocksz; ++$j)
+			for ($j = 0; $j < $blocksz; ++$j)
 				$this->register[$j] = $block[$j] ^ $enc_block[$j];
 
 			// copy the plain text block back to $text

Braces +15 added lines, -10 removed lines

@@ -48,8 +48,9 @@ 
 		parent::__construct(PHP_Crypt::MODE_PCBC, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::BLOCK) {
+					trigger_error("PCBC mode requires a block cipher", E_USER_WARNING);
+		}
 	}
 
 
@@ -86,16 +87,18 @@ 
 			$plain_block = $block;
 
 			// xor the register with plain text
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $this->register[$j] ^ $block[$j];
+			for($j = 0; $j < $blocksz; ++$j) {
+							$block[$j] = $this->register[$j] ^ $block[$j];
+			}
 
 			// encrypt the block creating the cipher text
 			$this->cipher->encrypt($block);
 
 			// xor the encrypted block with the plain text block to create
 			// the register in the next round
-			for($j = 0; $j < $blocksz; ++$j)
-				$this->register[$j] = $block[$j] ^ $plain_block[$j];
+			for($j = 0; $j < $blocksz; ++$j) {
+							$this->register[$j] = $block[$j] ^ $plain_block[$j];
+			}
 
 			// copy the encrypted block back to $text
 			$text = substr_replace($text, $block, $pos, $blocksz);
@@ -130,12 +133,14 @@ 
 
 			// xor the decrypted block with the register, to create
 			// the plain text block
-			for($j = 0; $j < $blocksz; ++$j)
-				$block[$j] = $this->register[$j] ^ $block[$j];
+			for($j = 0; $j < $blocksz; ++$j) {
+							$block[$j] = $this->register[$j] ^ $block[$j];
+			}
 
 			// now xor the $enc_block with the unencrypted $block
-			for($j = 0; $j < $blocksz; ++$j)
-				$this->register[$j] = $block[$j] ^ $enc_block[$j];
+			for($j = 0; $j < $blocksz; ++$j) {
+							$this->register[$j] = $block[$j] ^ $enc_block[$j];
+			}
 
 			// copy the plain text block back to $text
 			$text = substr_replace($text, $block, $pos, $blocksz);

includes/libraries/phpcrypt/modes/CFB.php

Indentation +90 added lines, -90 removed lines

@@ -36,95 +36,95 @@
  */
 class Mode_CFB extends Mode
 {
-	/**
-	 * Constructor
-	 * Sets the cipher object that will be used for encryption
-	 *
-	 * @param object $cipher one of the phpCrypt encryption cipher objects
-	 * @return void
-	 */
-	public function __construct($cipher)
-	{
-		parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
-
-		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-		parent::__destruct();
-	}
-
-
-	/**
-	 * Encrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text The string to be encrypted in CFB mode
-	 * @return boolean Returns true
-	 */
-	public function encrypt(&$text)
-	{
-		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
-		{
-			// copy the register, and then encrypt it
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// encrypt the byte
-			$text[$i] = $text[$i] ^ $this->enc_register[0];
-
-			// left shift the register and push the encrypted byte onto register
-			$this->register = substr($this->register, 1);
-			$this->register .= $text[$i];
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Decrypts an the entire string $plain_text using the cipher passed
-	 *
-	 * @param string $text the string to be decrypted in CFB mode
-	 * @return boolean Returns true
-	 */
-	public function decrypt(&$text)
-	{
-		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
-		{
-			$this->enc_register = $this->register;
-			$this->cipher->encrypt($this->enc_register);
-
-			// left shift the register and push the encrypted byte onto register
-			$this->register = substr($this->register, 1);
-			$this->register .= $text[$i];
-
-			// decrypt the byte
-			$text[$i] = $text[$i] ^ $this->enc_register[0];
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * This mode requires an IV
-	 *
-	 * @return boolean True
-	 */
-	public function requiresIV()
-	{
-		return true;
-	}
+    /**
+     * Constructor
+     * Sets the cipher object that will be used for encryption
+     *
+     * @param object $cipher one of the phpCrypt encryption cipher objects
+     * @return void
+     */
+    public function __construct($cipher)
+    {
+        parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
+
+        // this works with only block Ciphers
+        if($cipher->type() != Cipher::BLOCK)
+            trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        parent::__destruct();
+    }
+
+
+    /**
+     * Encrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text The string to be encrypted in CFB mode
+     * @return boolean Returns true
+     */
+    public function encrypt(&$text)
+    {
+        $max = strlen($text);
+        for($i = 0; $i < $max; ++$i)
+        {
+            // copy the register, and then encrypt it
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // encrypt the byte
+            $text[$i] = $text[$i] ^ $this->enc_register[0];
+
+            // left shift the register and push the encrypted byte onto register
+            $this->register = substr($this->register, 1);
+            $this->register .= $text[$i];
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Decrypts an the entire string $plain_text using the cipher passed
+     *
+     * @param string $text the string to be decrypted in CFB mode
+     * @return boolean Returns true
+     */
+    public function decrypt(&$text)
+    {
+        $max = strlen($text);
+        for($i = 0; $i < $max; ++$i)
+        {
+            $this->enc_register = $this->register;
+            $this->cipher->encrypt($this->enc_register);
+
+            // left shift the register and push the encrypted byte onto register
+            $this->register = substr($this->register, 1);
+            $this->register .= $text[$i];
+
+            // decrypt the byte
+            $text[$i] = $text[$i] ^ $this->enc_register[0];
+        }
+
+        return true;
+    }
+
+
+    /**
+     * This mode requires an IV
+     *
+     * @return boolean True
+     */
+    public function requiresIV()
+    {
+        return true;
+    }
 }
 ?>

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 		parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
+		if ($cipher->type() != Cipher::BLOCK)
 			trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
 	}
 
@@ -73,7 +73,7 @@ 
 	public function encrypt(&$text)
 	{
 		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			// copy the register, and then encrypt it
 			$this->enc_register = $this->register;
@@ -100,7 +100,7 @@ 
 	public function decrypt(&$text)
 	{
 		$max = strlen($text);
-		for($i = 0; $i < $max; ++$i)
+		for ($i = 0; $i < $max; ++$i)
 		{
 			$this->enc_register = $this->register;
 			$this->cipher->encrypt($this->enc_register);

Braces +3 added lines, -2 removed lines

@@ -48,8 +48,9 @@
 		parent::__construct(PHP_Crypt::MODE_CFB, $cipher);
 
 		// this works with only block Ciphers
-		if($cipher->type() != Cipher::BLOCK)
-			trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
+		if($cipher->type() != Cipher::BLOCK) {
+					trigger_error("CFB mode requires a block cipher", E_USER_WARNING);
+		}
 	}
 
 

includes/libraries/Pdf/Tfpdf/font/zapfdingbats.php

Indentation +12 added lines, -12 removed lines

@@ -4,16 +4,16 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
-	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
-	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
-	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
-	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
-	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
-	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
-	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
-	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
-	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
-	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+    chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
+    chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
+    ','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
+    'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
+    'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
+    'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
+    chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+    chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
+    chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
+    chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
+    chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
+    chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
 ?>

Spacing +12 added lines, -12 removed lines

@@ -4,16 +4,16 @@
 $up = -100;
 $ut = 50;
 $cw = array(
-	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
-	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
-	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
-	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
-	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
-	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
-	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
-	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
-	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
-	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
-	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+	chr(0)=>0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0,
+	chr(22)=>0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939,
+	','=>549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692,
+	'B'=>786, 'C'=>788, 'D'=>788, 'E'=>790, 'F'=>793, 'G'=>794, 'H'=>816, 'I'=>823, 'J'=>789, 'K'=>841, 'L'=>823, 'M'=>833, 'N'=>816, 'O'=>831, 'P'=>923, 'Q'=>744, 'R'=>723, 'S'=>749, 'T'=>790, 'U'=>792, 'V'=>695, 'W'=>776,
+	'X'=>768, 'Y'=>792, 'Z'=>759, '['=>707, '\\'=>708, ']'=>682, '^'=>701, '_'=>826, '`'=>815, 'a'=>789, 'b'=>789, 'c'=>707, 'd'=>687, 'e'=>696, 'f'=>689, 'g'=>786, 'h'=>787, 'i'=>713, 'j'=>791, 'k'=>785, 'l'=>791, 'm'=>873,
+	'n'=>761, 'o'=>762, 'p'=>762, 'q'=>759, 'r'=>759, 's'=>892, 't'=>892, 'u'=>788, 'v'=>784, 'w'=>438, 'x'=>138, 'y'=>277, 'z'=>415, '{'=>392, '|'=>392, '}'=>668, '~'=>668, chr(127)=>0, chr(128)=>390, chr(129)=>390, chr(130)=>317, chr(131)=>317,
+	chr(132)=>276, chr(133)=>276, chr(134)=>509, chr(135)=>509, chr(136)=>410, chr(137)=>410, chr(138)=>234, chr(139)=>234, chr(140)=>334, chr(141)=>334, chr(142)=>0, chr(143)=>0, chr(144)=>0, chr(145)=>0, chr(146)=>0, chr(147)=>0, chr(148)=>0, chr(149)=>0, chr(150)=>0, chr(151)=>0, chr(152)=>0, chr(153)=>0,
+	chr(154)=>0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>0, chr(161)=>732, chr(162)=>544, chr(163)=>544, chr(164)=>910, chr(165)=>667, chr(166)=>760, chr(167)=>760, chr(168)=>776, chr(169)=>595, chr(170)=>694, chr(171)=>626, chr(172)=>788, chr(173)=>788, chr(174)=>788, chr(175)=>788,
+	chr(176)=>788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788,
+	chr(198)=>788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918,
+	chr(220)=>927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874,
+	chr(242)=>760, chr(243)=>946, chr(244)=>771, chr(245)=>865, chr(246)=>771, chr(247)=>888, chr(248)=>967, chr(249)=>888, chr(250)=>831, chr(251)=>873, chr(252)=>927, chr(253)=>970, chr(254)=>918, chr(255)=>0);
 ?>

includes/libraries/Pdf/Tfpdf/font/courier.php

Indentation +1 added lines, -1 removed lines

@@ -4,5 +4,5 @@
 $up = -100;
 $ut = 50;
 for($i=0;$i<=255;$i++)
-	$cw[chr($i)] = 600;
+    $cw[chr($i)] = 600;
 ?>

Spacing +1 added lines, -1 removed lines

@@ -3,6 +3,6 @@
 $name = 'Courier';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for ($i = 0; $i <= 255; $i++)
 	$cw[chr($i)] = 600;
 ?>

Braces +2 added lines, -1 removed lines

@@ -3,6 +3,7 @@
 $name = 'Courier';
 $up = -100;
 $ut = 50;
-for($i=0;$i<=255;$i++)
+for($i=0;$i<=255;$i++) {
 	$cw[chr($i)] = 600;
+}
 ?>