nilsteampassnet / TeamPass

includes/libraries/phpcrypt/Padding.php

Doc Comments +4 added lines

@@ -173,6 +173,7 @@ 
 	 *
 	 * @param string $text The string to pad
 	 * @param integer The number of bytes to pad
+	 * @param integer $bytes
 	 * @return boolean Returns true
 	 */
 	private static function ansiX923Pad(&$text, $bytes)
@@ -217,6 +218,7 @@ 
 	 *
 	 * @param string $text The string to pad
 	 * @param integer The number of bytes to pad
+	 * @param integer $bytes
 	 * @return boolean Returns true
 	 */
 	private static function iso10126Pad(&$text, $bytes)
@@ -261,6 +263,7 @@ 
 	 *
 	 * @param string $text The string to pad
 	 * @param integer The number of bytes to pad
+	 * @param integer $bytes
 	 * @return boolean Returns true
 	 */
 	private static function pkcs7Pad(&$text, $bytes)
@@ -296,6 +299,7 @@ 
 	 *
 	 * @param string $text The string to pad
 	 * @param integer The number of bytes to pad
+	 * @param integer $bytes
 	 * @return boolean Returns true
 	 */
 	private static function iso7816Pad(&$text, $bytes)

Indentation +285 added lines, -285 removed lines

@@ -39,290 +39,290 @@
  */
 class Padding
 {
-	/**
-	 * Constructor
-	 *
-	 * @return void
-	 */
-	public function __construct() { }
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct() { }
-
-
-	/**
-	 * Returns a string padded using the specified padding scheme
-	 *
-	 * @param string $text The string to pad
-	 * @param integer $bytes The number of bytes to pad
-	 * @param integer $type One of the predefined padding types
-	 * @return boolean True on success, false on error
-	 */
-	public static function pad(&$text, $bytes, $type = PHP_Crypt::ZERO)
-	{
-		// if the size of padding is not greater than 1
-		// just return true, no padding will be done
-		if(!($bytes > 0))
-			return true;
-
-		switch($type)
-		{
-			case PHP_Crypt::PAD_ZERO:
-				return self::zeroPad($text, $bytes);
-				break;
-			case PHP_Crypt::PAD_ANSI_X923:
-				return self::ansiX923Pad($text, $bytes);
-				break;
-			case PHP_Crypt::PAD_ISO_10126:
-				return self::iso10126Pad($text, $bytes);
-				break;
-			case PHP_Crypt::PAD_PKCS7:
-				return self::pkcs7Pad($text, $bytes);
-				break;
-			case PHP_Crypt::PAD_ISO_7816_4:
-				return self::iso7816Pad($text, $bytes);
-				break;
-			default:
-				trigger_error("$type is not a valid padding type.", E_USER_NOTICE);
-				return self::zeroPad($text, $bytes);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Strips padding from a string
-	 *
-	 * @param string $text The string strip padding from
-	 * @param integer $type One of the predefined padding types
-	 * @return boolean True on success, false on error
-	 */
-	public static function strip(&$text, $type = PHP_Crypt::ZERO)
-	{
-		switch($type)
-		{
-			case PHP_Crypt::PAD_ZERO:
-				return self::zeroStrip($text);
-				break;
-			case PHP_Crypt::PAD_ANSI_X923:
-				return self::ansiX923Strip($text);
-				break;
-			case PHP_Crypt::PAD_ISO_10126:
-				return self::iso10126Strip($text);
-				break;
-			case PHP_Crypt::PAD_PKCS7:
-				return self::pkcs7Strip($text);
-				break;
-			case PHP_Crypt::PAD_ISO_7816_4:
-				return self::iso7816Strip($text);
-				break;
-			default:
-				trigger_error("$type is not a valid padding type.", E_USER_NOTICE);
-				return self::zeroStrip($text);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Pads a string with null bytes
-	 *
-	 * @param string $text The string to be padded
-	 * @param integer $bytes The number of bytes to pad
-	 * @return boolean Returns true
-	 */
-	private static function zeroPad(&$text, $bytes)
-	{
-		$len = $bytes + strlen($text);
-		$text = str_pad($text, $len, chr(0), STR_PAD_RIGHT);
-		return true;
-	}
-
-
-	/**
-	 * Strips null padding off a string
-	 * NOTE: This is generally a bad idea as there is no way
-	 * to distinguish a null byte that is not padding from
-	 * a null byte that is padding. Stripping null padding should
-	 *  be handled by the developer at the application level.
-	 *
-	 * @param string $text The string with null padding to strip
-	 * @return boolean Returns true
-	 */
-	private static function zeroStrip(&$text)
-	{
-		// with NULL byte padding, we should not strip off the
-		// null bytes, instead leave this to the developer at the
-		// application level
-		//$text = preg_replace('/\0+$/', '', $text);
-		return true;
-	}
-
-
-	/**
-	 * Pads a string using ANSI X.923
-	 * Adds null padding to the string, except for the last byte
-	 * which indicates the number of bytes padded
-	 *
-	 * @param string $text The string to pad
-	 * @param integer The number of bytes to pad
-	 * @return boolean Returns true
-	 */
-	private static function ansiX923Pad(&$text, $bytes)
-	{
-		$len = $bytes + strlen($text);
-		$text  = str_pad($text, ($len-1), "\0", STR_PAD_RIGHT);
-		$text .= chr($bytes);
-		return true;
-	}
-
-
-	/**
-	 * Strips ANSI X.923 padding from a string
-	 *
-	 * @param string $text The string to strip padding from
-	 * @return boolean Returns true
-	 */
-	private static function ansiX923Strip(&$text)
-	{
-		$pos = strlen($text) - 1;
-		$c = ord($text[$pos]);
-
-		if($c == 0)
-			return true;
-		else if($c == 1)
-			$text = substr($text, 0, -1);
-		else
-		{
-			// the total null bytes are 1 less than the value of the final byte
-			$nc = $c - 1;
-			$text = preg_replace('/\0{'.$nc.'}'.preg_quote(chr($c)).'$/', "", $text);
-		}
-
-		return true;
-	}
-
-
-	/**
-	 * Pads a string using ISO 10126
-	 * Adds random bytes to the end of the string, except for the last
-	 * byte which indicates the number of padded bytes
-	 *
-	 * @param string $text The string to pad
-	 * @param integer The number of bytes to pad
-	 * @return boolean Returns true
-	 */
-	private static function iso10126Pad(&$text, $bytes)
-	{
-		// create the random pad bytes, we do one less than
-		// needed because the last byte is reserved for the
-		// number of padded bytes
-		for($i = 0; $i < ($bytes - 1); ++$i)
-			$text .= chr(mt_rand(0, 255));
-
-		// add the byte to indicate the padding length
-		$text .= chr($bytes);
-		return true;
-	}
-
-
-	/**
-	 * Strips ISO 10126 padding from a string
-	 *
-	 * @param string $text The string to strip padding from
-	 * @return boolean Returns true
-	 */
-	private static function iso10126Strip(&$text)
-	{
-		$pos = strlen($text) - 1;
-		$c = ord($text[$pos]) * -1;
-
-		// if we got a null byte at the end of the string,
-		// just return
-		if($c == 0)
-			return true;
-
-		$text = substr($text, 0, $c);
-		return true;
-	}
-
-
-	/**
-	 * Pads a string using PKCS7
-	 * Adds padding using the bytes with the value of the
-	 * number of bytes need for padding
-	 *
-	 * @param string $text The string to pad
-	 * @param integer The number of bytes to pad
-	 * @return boolean Returns true
-	 */
-	private static function pkcs7Pad(&$text, $bytes)
-	{
-		$len = $bytes + strlen($text);
-		$text  = str_pad($text, $len, chr($bytes), STR_PAD_RIGHT);
-		return true;
-	}
-
-
-	/**
-	 * Strips PKCS7 padding from a string
-	 *
-	 * @param string $text The string to strip padding from
-	 * @return boolean Returns true
-	 */
-	private static function pkcs7Strip(&$text)
-	{
-		$pos = strlen($text) - 1;
-		$c = ord($text[$pos]);
-
-		if($c == 0)
-			return true;
-
-		$text = preg_replace('/'.preg_quote(chr($c)).'{'.$c.'}$/', "", $text);
-		return true;
-	}
-
-
-	/**
-	 * Pads a string using ISO/IEC 7816-4
-	 * Adds byte 0x80 followed by null bytes to pad a string
-	 *
-	 * @param string $text The string to pad
-	 * @param integer The number of bytes to pad
-	 * @return boolean Returns true
-	 */
-	private static function iso7816Pad(&$text, $bytes)
-	{
-		$text .= chr(0x80);
-		$len = $bytes + strlen($text);
-
-		// if we are only padding one byte, then 0x80 is all we need
-		// else we follow up with null bytes
-		if($bytes > 1)
-			$text  = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
-
-		return true;
-	}
-
-
-	/**
-	 * Strips ISO/IEC 7816-4 padding from a string
-	 *
-	 * @param string $text The string to strip padding from
-	 * @return boolean Returns true
-	 */
-	private static function iso7816Strip(&$text)
-	{
-		$c = chr(0x80);
-		$text = preg_replace('/'.preg_quote($c).'\0*$/', '', $text);
-		return true;
-	}
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct() { }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct() { }
+
+
+    /**
+     * Returns a string padded using the specified padding scheme
+     *
+     * @param string $text The string to pad
+     * @param integer $bytes The number of bytes to pad
+     * @param integer $type One of the predefined padding types
+     * @return boolean True on success, false on error
+     */
+    public static function pad(&$text, $bytes, $type = PHP_Crypt::ZERO)
+    {
+        // if the size of padding is not greater than 1
+        // just return true, no padding will be done
+        if(!($bytes > 0))
+            return true;
+
+        switch($type)
+        {
+            case PHP_Crypt::PAD_ZERO:
+                return self::zeroPad($text, $bytes);
+                break;
+            case PHP_Crypt::PAD_ANSI_X923:
+                return self::ansiX923Pad($text, $bytes);
+                break;
+            case PHP_Crypt::PAD_ISO_10126:
+                return self::iso10126Pad($text, $bytes);
+                break;
+            case PHP_Crypt::PAD_PKCS7:
+                return self::pkcs7Pad($text, $bytes);
+                break;
+            case PHP_Crypt::PAD_ISO_7816_4:
+                return self::iso7816Pad($text, $bytes);
+                break;
+            default:
+                trigger_error("$type is not a valid padding type.", E_USER_NOTICE);
+                return self::zeroPad($text, $bytes);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Strips padding from a string
+     *
+     * @param string $text The string strip padding from
+     * @param integer $type One of the predefined padding types
+     * @return boolean True on success, false on error
+     */
+    public static function strip(&$text, $type = PHP_Crypt::ZERO)
+    {
+        switch($type)
+        {
+            case PHP_Crypt::PAD_ZERO:
+                return self::zeroStrip($text);
+                break;
+            case PHP_Crypt::PAD_ANSI_X923:
+                return self::ansiX923Strip($text);
+                break;
+            case PHP_Crypt::PAD_ISO_10126:
+                return self::iso10126Strip($text);
+                break;
+            case PHP_Crypt::PAD_PKCS7:
+                return self::pkcs7Strip($text);
+                break;
+            case PHP_Crypt::PAD_ISO_7816_4:
+                return self::iso7816Strip($text);
+                break;
+            default:
+                trigger_error("$type is not a valid padding type.", E_USER_NOTICE);
+                return self::zeroStrip($text);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Pads a string with null bytes
+     *
+     * @param string $text The string to be padded
+     * @param integer $bytes The number of bytes to pad
+     * @return boolean Returns true
+     */
+    private static function zeroPad(&$text, $bytes)
+    {
+        $len = $bytes + strlen($text);
+        $text = str_pad($text, $len, chr(0), STR_PAD_RIGHT);
+        return true;
+    }
+
+
+    /**
+     * Strips null padding off a string
+     * NOTE: This is generally a bad idea as there is no way
+     * to distinguish a null byte that is not padding from
+     * a null byte that is padding. Stripping null padding should
+     *  be handled by the developer at the application level.
+     *
+     * @param string $text The string with null padding to strip
+     * @return boolean Returns true
+     */
+    private static function zeroStrip(&$text)
+    {
+        // with NULL byte padding, we should not strip off the
+        // null bytes, instead leave this to the developer at the
+        // application level
+        //$text = preg_replace('/\0+$/', '', $text);
+        return true;
+    }
+
+
+    /**
+     * Pads a string using ANSI X.923
+     * Adds null padding to the string, except for the last byte
+     * which indicates the number of bytes padded
+     *
+     * @param string $text The string to pad
+     * @param integer The number of bytes to pad
+     * @return boolean Returns true
+     */
+    private static function ansiX923Pad(&$text, $bytes)
+    {
+        $len = $bytes + strlen($text);
+        $text  = str_pad($text, ($len-1), "\0", STR_PAD_RIGHT);
+        $text .= chr($bytes);
+        return true;
+    }
+
+
+    /**
+     * Strips ANSI X.923 padding from a string
+     *
+     * @param string $text The string to strip padding from
+     * @return boolean Returns true
+     */
+    private static function ansiX923Strip(&$text)
+    {
+        $pos = strlen($text) - 1;
+        $c = ord($text[$pos]);
+
+        if($c == 0)
+            return true;
+        else if($c == 1)
+            $text = substr($text, 0, -1);
+        else
+        {
+            // the total null bytes are 1 less than the value of the final byte
+            $nc = $c - 1;
+            $text = preg_replace('/\0{'.$nc.'}'.preg_quote(chr($c)).'$/', "", $text);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Pads a string using ISO 10126
+     * Adds random bytes to the end of the string, except for the last
+     * byte which indicates the number of padded bytes
+     *
+     * @param string $text The string to pad
+     * @param integer The number of bytes to pad
+     * @return boolean Returns true
+     */
+    private static function iso10126Pad(&$text, $bytes)
+    {
+        // create the random pad bytes, we do one less than
+        // needed because the last byte is reserved for the
+        // number of padded bytes
+        for($i = 0; $i < ($bytes - 1); ++$i)
+            $text .= chr(mt_rand(0, 255));
+
+        // add the byte to indicate the padding length
+        $text .= chr($bytes);
+        return true;
+    }
+
+
+    /**
+     * Strips ISO 10126 padding from a string
+     *
+     * @param string $text The string to strip padding from
+     * @return boolean Returns true
+     */
+    private static function iso10126Strip(&$text)
+    {
+        $pos = strlen($text) - 1;
+        $c = ord($text[$pos]) * -1;
+
+        // if we got a null byte at the end of the string,
+        // just return
+        if($c == 0)
+            return true;
+
+        $text = substr($text, 0, $c);
+        return true;
+    }
+
+
+    /**
+     * Pads a string using PKCS7
+     * Adds padding using the bytes with the value of the
+     * number of bytes need for padding
+     *
+     * @param string $text The string to pad
+     * @param integer The number of bytes to pad
+     * @return boolean Returns true
+     */
+    private static function pkcs7Pad(&$text, $bytes)
+    {
+        $len = $bytes + strlen($text);
+        $text  = str_pad($text, $len, chr($bytes), STR_PAD_RIGHT);
+        return true;
+    }
+
+
+    /**
+     * Strips PKCS7 padding from a string
+     *
+     * @param string $text The string to strip padding from
+     * @return boolean Returns true
+     */
+    private static function pkcs7Strip(&$text)
+    {
+        $pos = strlen($text) - 1;
+        $c = ord($text[$pos]);
+
+        if($c == 0)
+            return true;
+
+        $text = preg_replace('/'.preg_quote(chr($c)).'{'.$c.'}$/', "", $text);
+        return true;
+    }
+
+
+    /**
+     * Pads a string using ISO/IEC 7816-4
+     * Adds byte 0x80 followed by null bytes to pad a string
+     *
+     * @param string $text The string to pad
+     * @param integer The number of bytes to pad
+     * @return boolean Returns true
+     */
+    private static function iso7816Pad(&$text, $bytes)
+    {
+        $text .= chr(0x80);
+        $len = $bytes + strlen($text);
+
+        // if we are only padding one byte, then 0x80 is all we need
+        // else we follow up with null bytes
+        if($bytes > 1)
+            $text  = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+
+        return true;
+    }
+
+
+    /**
+     * Strips ISO/IEC 7816-4 padding from a string
+     *
+     * @param string $text The string to strip padding from
+     * @return boolean Returns true
+     */
+    private static function iso7816Strip(&$text)
+    {
+        $c = chr(0x80);
+        $text = preg_replace('/'.preg_quote($c).'\0*$/', '', $text);
+        return true;
+    }
 }
 ?>

Spacing +12 added lines, -12 removed lines

@@ -67,10 +67,10 @@ 
 	{
 		// if the size of padding is not greater than 1
 		// just return true, no padding will be done
-		if(!($bytes > 0))
+		if (!($bytes > 0))
 			return true;
 
-		switch($type)
+		switch ($type)
 		{
 			case PHP_Crypt::PAD_ZERO:
 				return self::zeroPad($text, $bytes);
@@ -105,7 +105,7 @@ 
 	 */
 	public static function strip(&$text, $type = PHP_Crypt::ZERO)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case PHP_Crypt::PAD_ZERO:
 				return self::zeroStrip($text);
@@ -178,7 +178,7 @@ 
 	private static function ansiX923Pad(&$text, $bytes)
 	{
 		$len = $bytes + strlen($text);
-		$text  = str_pad($text, ($len-1), "\0", STR_PAD_RIGHT);
+		$text  = str_pad($text, ($len - 1), "\0", STR_PAD_RIGHT);
 		$text .= chr($bytes);
 		return true;
 	}
@@ -195,9 +195,9 @@ 
 		$pos = strlen($text) - 1;
 		$c = ord($text[$pos]);
 
-		if($c == 0)
+		if ($c == 0)
 			return true;
-		else if($c == 1)
+		else if ($c == 1)
 			$text = substr($text, 0, -1);
 		else
 		{
@@ -224,7 +224,7 @@ 
 		// create the random pad bytes, we do one less than
 		// needed because the last byte is reserved for the
 		// number of padded bytes
-		for($i = 0; $i < ($bytes - 1); ++$i)
+		for ($i = 0; $i < ($bytes - 1); ++$i)
 			$text .= chr(mt_rand(0, 255));
 
 		// add the byte to indicate the padding length
@@ -246,7 +246,7 @@ 
 
 		// if we got a null byte at the end of the string,
 		// just return
-		if($c == 0)
+		if ($c == 0)
 			return true;
 
 		$text = substr($text, 0, $c);
@@ -266,7 +266,7 @@ 
 	private static function pkcs7Pad(&$text, $bytes)
 	{
 		$len = $bytes + strlen($text);
-		$text  = str_pad($text, $len, chr($bytes), STR_PAD_RIGHT);
+		$text = str_pad($text, $len, chr($bytes), STR_PAD_RIGHT);
 		return true;
 	}
 
@@ -282,7 +282,7 @@ 
 		$pos = strlen($text) - 1;
 		$c = ord($text[$pos]);
 
-		if($c == 0)
+		if ($c == 0)
 			return true;
 
 		$text = preg_replace('/'.preg_quote(chr($c)).'{'.$c.'}$/', "", $text);
@@ -305,8 +305,8 @@ 
 
 		// if we are only padding one byte, then 0x80 is all we need
 		// else we follow up with null bytes
-		if($bytes > 1)
-			$text  = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+		if ($bytes > 1)
+			$text = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
 
 		return true;
 	}

Braces +20 added lines, -15 removed lines

@@ -67,8 +67,9 @@ 
 	{
 		// if the size of padding is not greater than 1
 		// just return true, no padding will be done
-		if(!($bytes > 0))
-			return true;
+		if(!($bytes > 0)) {
+					return true;
+		}
 
 		switch($type)
 		{
@@ -195,11 +196,11 @@ 
 		$pos = strlen($text) - 1;
 		$c = ord($text[$pos]);
 
-		if($c == 0)
-			return true;
-		else if($c == 1)
-			$text = substr($text, 0, -1);
-		else
+		if($c == 0) {
+					return true;
+		} else if($c == 1) {
+					$text = substr($text, 0, -1);
+		} else
 		{
 			// the total null bytes are 1 less than the value of the final byte
 			$nc = $c - 1;
@@ -224,8 +225,9 @@ 
 		// create the random pad bytes, we do one less than
 		// needed because the last byte is reserved for the
 		// number of padded bytes
-		for($i = 0; $i < ($bytes - 1); ++$i)
-			$text .= chr(mt_rand(0, 255));
+		for($i = 0; $i < ($bytes - 1); ++$i) {
+					$text .= chr(mt_rand(0, 255));
+		}
 
 		// add the byte to indicate the padding length
 		$text .= chr($bytes);
@@ -246,8 +248,9 @@ 
 
 		// if we got a null byte at the end of the string,
 		// just return
-		if($c == 0)
-			return true;
+		if($c == 0) {
+					return true;
+		}
 
 		$text = substr($text, 0, $c);
 		return true;
@@ -282,8 +285,9 @@ 
 		$pos = strlen($text) - 1;
 		$c = ord($text[$pos]);
 
-		if($c == 0)
-			return true;
+		if($c == 0) {
+					return true;
+		}
 
 		$text = preg_replace('/'.preg_quote(chr($c)).'{'.$c.'}$/', "", $text);
 		return true;
@@ -305,8 +309,9 @@ 
 
 		// if we are only padding one byte, then 0x80 is all we need
 		// else we follow up with null bytes
-		if($bytes > 1)
-			$text  = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+		if($bytes > 1) {
+					$text  = str_pad($text, ($len - 1), chr(0), STR_PAD_RIGHT);
+		}
 
 		return true;
 	}

includes/libraries/phpcrypt/phpCrypt.php

Doc Comments +2 added lines, -2 removed lines

@@ -97,8 +97,8 @@
 	 * @param string $key The key to use for the selected Cipher
 	 * @param string $cipher The type of cipher to use
 	 * @param string $mode The encrypt mode to use with the cipher
-	 * @param string $padding The padding type to use. Defaults to PAD_ZERO
-	 * @return void
+	 * @param integer $padding The padding type to use. Defaults to PAD_ZERO
+	 * @return string
 	 */
 	public function __construct($key, $cipher = self::CIPHER_AES_128, $mode = self::MODE_ECB, $padding = self::PAD_ZERO)
 	{

Indentation +393 added lines, -393 removed lines

@@ -35,423 +35,423 @@
  */
 class PHP_Crypt
 {
-	// Ciphers
-	const CIPHER_3DES			= "3DES";
-	const CIPHER_3WAY			= "3-Way";
-	const CIPHER_AES_128		= "AES-128";
-	const CIPHER_AES_192		= "AES-192";
-	const CIPHER_AES_256		= "AES-256";
-	const CIPHER_ARC4			= "ARC4"; // Alternative RC4
-	const CIPHER_BLOWFISH		= "Blowfish";
-	const CIPHER_CAST_128		= "CAST-128";
-	const CIPHER_CAST_256		= "CAST-256";
-	const CIPHER_DES			= "DES";
-	const CIPHER_ENIGMA			= "Enigma";
-	const CIPHER_GOST			= "GOST";
-	const CIPHER_RC2			= "RC2";
-	const CIPHER_RIJNDAEL_128	= "Rijndael-128";
-	const CIPHER_RIJNDAEL_192	= "Rijndael-192";
-	const CIPHER_RIJNDAEL_256	= "Rijndael-256";
-	const CIPHER_SKIPJACK		= "Skipjack";
-	const CIPHER_SIMPLEXOR		= "SimpleXOR";
-	const CIPHER_VIGENERE		= "Vigenere"; // historical
-
-	// Modes
-	const MODE_CBC	= "CBC";
-	const MODE_CFB	= "CFB";  // 8 bit cfb mode
-	const MODE_CTR	= "CTR";
-	const MODE_ECB	= "ECB";
-	const MODE_NCFB	= "NCFB"; // blocksize cfb mode
-	const MODE_NOFB	= "NOFB"; // blocksize ofb mode
-	const MODE_OFB	= "OFB";  // 8 bit ofb mode
-	const MODE_PCBC	= "PCBC";
-	const MODE_RAW	= "Raw";  // raw encryption, with no mode
-	const MODE_STREAM = "Stream"; // used only for stream ciphers
-
-	// The source of random data used to create keys and IV's
-	// Used for PHP_Crypt::createKey(), PHP_Crypt::createIV()
-	const RAND			= "rand"; // uses mt_rand(), windows & unix
-	const RAND_DEV_RAND	= "/dev/random"; // unix only
-	const RAND_DEV_URAND= "/dev/urandom";// unix only
-	const RAND_WIN_COM	= "wincom";		 // windows only, COM extension
-	const RAND_DEFAULT_SZ = 32;			 // the default number of bytes returned
-
-	// Padding types
-	const PAD_ZERO			= 0;
-	const PAD_ANSI_X923		= 1;
-	const PAD_ISO_10126		= 2;
-	const PAD_PKCS7			= 3;
-	const PAD_ISO_7816_4	= 4;
-
-
-	/** @type object $cipher An instance of the cipher object selected */
-	private $cipher = null;
-
-	/** @type object $mode An instance of the mode object selected */
-	private $mode = null;
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param string $key The key to use for the selected Cipher
-	 * @param string $cipher The type of cipher to use
-	 * @param string $mode The encrypt mode to use with the cipher
-	 * @param string $padding The padding type to use. Defaults to PAD_ZERO
-	 * @return void
-	 */
-	public function __construct($key, $cipher = self::CIPHER_AES_128, $mode = self::MODE_ECB, $padding = self::PAD_ZERO)
-	{
-		/*
+    // Ciphers
+    const CIPHER_3DES			= "3DES";
+    const CIPHER_3WAY			= "3-Way";
+    const CIPHER_AES_128		= "AES-128";
+    const CIPHER_AES_192		= "AES-192";
+    const CIPHER_AES_256		= "AES-256";
+    const CIPHER_ARC4			= "ARC4"; // Alternative RC4
+    const CIPHER_BLOWFISH		= "Blowfish";
+    const CIPHER_CAST_128		= "CAST-128";
+    const CIPHER_CAST_256		= "CAST-256";
+    const CIPHER_DES			= "DES";
+    const CIPHER_ENIGMA			= "Enigma";
+    const CIPHER_GOST			= "GOST";
+    const CIPHER_RC2			= "RC2";
+    const CIPHER_RIJNDAEL_128	= "Rijndael-128";
+    const CIPHER_RIJNDAEL_192	= "Rijndael-192";
+    const CIPHER_RIJNDAEL_256	= "Rijndael-256";
+    const CIPHER_SKIPJACK		= "Skipjack";
+    const CIPHER_SIMPLEXOR		= "SimpleXOR";
+    const CIPHER_VIGENERE		= "Vigenere"; // historical
+
+    // Modes
+    const MODE_CBC	= "CBC";
+    const MODE_CFB	= "CFB";  // 8 bit cfb mode
+    const MODE_CTR	= "CTR";
+    const MODE_ECB	= "ECB";
+    const MODE_NCFB	= "NCFB"; // blocksize cfb mode
+    const MODE_NOFB	= "NOFB"; // blocksize ofb mode
+    const MODE_OFB	= "OFB";  // 8 bit ofb mode
+    const MODE_PCBC	= "PCBC";
+    const MODE_RAW	= "Raw";  // raw encryption, with no mode
+    const MODE_STREAM = "Stream"; // used only for stream ciphers
+
+    // The source of random data used to create keys and IV's
+    // Used for PHP_Crypt::createKey(), PHP_Crypt::createIV()
+    const RAND			= "rand"; // uses mt_rand(), windows & unix
+    const RAND_DEV_RAND	= "/dev/random"; // unix only
+    const RAND_DEV_URAND= "/dev/urandom";// unix only
+    const RAND_WIN_COM	= "wincom";		 // windows only, COM extension
+    const RAND_DEFAULT_SZ = 32;			 // the default number of bytes returned
+
+    // Padding types
+    const PAD_ZERO			= 0;
+    const PAD_ANSI_X923		= 1;
+    const PAD_ISO_10126		= 2;
+    const PAD_PKCS7			= 3;
+    const PAD_ISO_7816_4	= 4;
+
+
+    /** @type object $cipher An instance of the cipher object selected */
+    private $cipher = null;
+
+    /** @type object $mode An instance of the mode object selected */
+    private $mode = null;
+
+
+    /**
+     * Constructor
+     *
+     * @param string $key The key to use for the selected Cipher
+     * @param string $cipher The type of cipher to use
+     * @param string $mode The encrypt mode to use with the cipher
+     * @param string $padding The padding type to use. Defaults to PAD_ZERO
+     * @return void
+     */
+    public function __construct($key, $cipher = self::CIPHER_AES_128, $mode = self::MODE_ECB, $padding = self::PAD_ZERO)
+    {
+        /*
 		 * CIPHERS
 		 */
-		switch($cipher)
-		{
-		case self::CIPHER_3DES:
-			$this->cipher = new Cipher_3DES($key);
-			break;
+        switch($cipher)
+        {
+        case self::CIPHER_3DES:
+            $this->cipher = new Cipher_3DES($key);
+            break;
 
-		case self::CIPHER_3WAY:
-			$this->cipher = new Cipher_3WAY($key);
-			break;
+        case self::CIPHER_3WAY:
+            $this->cipher = new Cipher_3WAY($key);
+            break;
 
-		case self::CIPHER_AES_128:
-			$this->cipher = new Cipher_AES_128($key);
-			break;
+        case self::CIPHER_AES_128:
+            $this->cipher = new Cipher_AES_128($key);
+            break;
 
-		case self::CIPHER_AES_192:
-			$this->cipher = new Cipher_AES_192($key);
-			break;
+        case self::CIPHER_AES_192:
+            $this->cipher = new Cipher_AES_192($key);
+            break;
 
-		case self::CIPHER_AES_256:
-			$this->cipher = new Cipher_AES_256($key);
-			break;
+        case self::CIPHER_AES_256:
+            $this->cipher = new Cipher_AES_256($key);
+            break;
 
-		case self::CIPHER_ARC4: // an alternative to RC4
-			$this->cipher = new Cipher_ARC4($key);
-			break;
+        case self::CIPHER_ARC4: // an alternative to RC4
+            $this->cipher = new Cipher_ARC4($key);
+            break;
 
-		case self::CIPHER_BLOWFISH:
-			$this->cipher = new Cipher_Blowfish($key);
-			break;
+        case self::CIPHER_BLOWFISH:
+            $this->cipher = new Cipher_Blowfish($key);
+            break;
 
-		case self::CIPHER_CAST_128:
-			$this->cipher = new Cipher_CAST_128($key);
-			break;
+        case self::CIPHER_CAST_128:
+            $this->cipher = new Cipher_CAST_128($key);
+            break;
 
-		case self::CIPHER_CAST_256:
-			$this->cipher = new Cipher_CAST_256($key);
-			break;
+        case self::CIPHER_CAST_256:
+            $this->cipher = new Cipher_CAST_256($key);
+            break;
 
-		case self::CIPHER_DES:
-			$this->cipher = new Cipher_DES($key);
-			break;
+        case self::CIPHER_DES:
+            $this->cipher = new Cipher_DES($key);
+            break;
 
-		case self::CIPHER_ENIGMA:
-			$this->cipher = new Cipher_Enigma($key);
-			break;
+        case self::CIPHER_ENIGMA:
+            $this->cipher = new Cipher_Enigma($key);
+            break;
 
-		case self::CIPHER_GOST:
-			$this->cipher = new Cipher_GOST($key);
-			break;
+        case self::CIPHER_GOST:
+            $this->cipher = new Cipher_GOST($key);
+            break;
 
-		case self::CIPHER_RC2:
-			$this->cipher = new Cipher_RC2($key);
-			break;
+        case self::CIPHER_RC2:
+            $this->cipher = new Cipher_RC2($key);
+            break;
 
-		case self::CIPHER_RIJNDAEL_128:
-			$this->cipher = new Cipher_Rijndael_128($key);
-			break;
+        case self::CIPHER_RIJNDAEL_128:
+            $this->cipher = new Cipher_Rijndael_128($key);
+            break;
 
-		case self::CIPHER_RIJNDAEL_192:
-			$this->cipher = new Cipher_Rijndael_192($key);
-			break;
+        case self::CIPHER_RIJNDAEL_192:
+            $this->cipher = new Cipher_Rijndael_192($key);
+            break;
 
-		case self::CIPHER_RIJNDAEL_256:
-			$this->cipher = new Cipher_Rijndael_256($key);
-			break;
+        case self::CIPHER_RIJNDAEL_256:
+            $this->cipher = new Cipher_Rijndael_256($key);
+            break;
 
-		case self::CIPHER_SIMPLEXOR:
-			$this->cipher = new Cipher_Simple_XOR($key);
-			break;
+        case self::CIPHER_SIMPLEXOR:
+            $this->cipher = new Cipher_Simple_XOR($key);
+            break;
 
-		case self::CIPHER_SKIPJACK:
-			$this->cipher = new Cipher_Skipjack($key);
-			break;
+        case self::CIPHER_SKIPJACK:
+            $this->cipher = new Cipher_Skipjack($key);
+            break;
 
-		case self::CIPHER_VIGENERE:
-			$this->cipher = new Cipher_Vigenere($key);
-			break;
+        case self::CIPHER_VIGENERE:
+            $this->cipher = new Cipher_Vigenere($key);
+            break;
 
-		default:
-			trigger_error("$cipher is not a valid cipher", E_USER_WARNING);
-		}
+        default:
+            trigger_error("$cipher is not a valid cipher", E_USER_WARNING);
+        }
 
 
-		/*
+        /*
 		 * MODES
 		 */
-		switch($mode)
-		{
-		case self::MODE_CBC:
-			$this->mode = new Mode_CBC($this->cipher);
-			break;
-
-		case self::MODE_CFB:
-			$this->mode = new Mode_CFB($this->cipher);
-			break;
-
-		case self::MODE_CTR:
-			$this->mode = new Mode_CTR($this->cipher);
-			break;
-
-		case self::MODE_ECB:
-			$this->mode = new Mode_ECB($this->cipher);
-			break;
-
-		case self::MODE_NCFB:
-			$this->mode = new Mode_NCFB($this->cipher);
-			break;
-
-		case self::MODE_NOFB:
-			$this->mode = new Mode_NOFB($this->cipher);
-			break;
-
-		case self::MODE_OFB:
-			$this->mode = new Mode_OFB($this->cipher);
-			break;
-
-		case self::MODE_PCBC:
-			$this->mode = new Mode_PCBC($this->cipher);
-			break;
-
-		case self::MODE_RAW:
-			$this->mode = new Mode_RAW($this->cipher);
-			break;
-
-		case self::MODE_STREAM:
-			$this->mode = new Mode_Stream($this->cipher);
-			break;
-
-		default:
-			trigger_error("$mode is not a valid mode", E_USER_WARNING);
-		}
-
-		// set the default padding
-		$this->padding($padding);
-	}
-
-
-	/**
-	 * Destructor
-	 *
-	 * @return void
-	 */
-	public function __destruct()
-	{
-
-	}
-
-
-	/**
-	 * Encrypt a plain text message using the Mode and Cipher selected.
-	 * Some stream modes require this function to be called in a loop
-	 * which requires the use of $result parameter to retrieve
-	 * the decrypted data.
-	 *
-	 * @param string $text The plain text string
-	 * @return string The encrypted string
-	 */
-	public function encrypt($text)
-	{
-		// check that an iv is set, if required by the mode
-		$this->mode->checkIV();
-
-		// the encryption is done inside the mode
-		$this->mode->encrypt($text);
-		return $text;
-	}
-
-
-	/**
-	 * Decrypt an encrypted message using the Mode and Cipher selected.
-	 * Some stream modes require this function to be called in a loop
-	 * which requires the use of $result parameter to retrieve
-	 * the decrypted data.
-	 *
-	 * @param string $text The encrypted string
-	 * @return string The decrypted string
-	 */
-	public function decrypt($text)
-	{
-		// check that an iv is set, if required by the mode
-		$this->mode->checkIV();
-
-		// the decryption is done inside the mode
-		$this->mode->decrypt($text);
-		return $text;
-	}
-
-
-	/**
-	 * Return the cipher object being used
-	 *
-	 * @return object The Cipher object
-	 */
-	public function cipher()
-	{
-		return $this->cipher;
-	}
-
-
-	/**
-	 * Return the mode object being used
-	 *
-	 * @return object The Mode object
-	 */
-	public function mode()
-	{
-		return $this->mode;
-	}
-
-
-	/**
-	 * Returns the name of the cipher being used
-	 *
-	 * @return string The name of the cipher currently in use,
-	 *	it will be one of the predefined phpCrypt cipher constants
-	 */
-	public function cipherName()
-	{
-		return $this->cipher->name();
-	}
-
-
-	/**
-	 * Return the name of the mode being used
-	 *
-	 * @return string The name of the mode in use, it will
-	 * be one of the predefined phpCrypt mode constants
-	 */
-	public function modeName()
-	{
-		return $this->mode->name();
-	}
-
-
-	/**
-	 * Returns Ciphers required block size in bytes
-	 *
-	 * @return integer The cipher data block size, in bytes
-	 */
-	public function cipherBlockSize()
-	{
-		return $this->cipher->blockSize();
-	}
-
-
-	/**
-	 * Returns the cipher's required key size, in bytes
-	 *
-	 * @return integer The cipher's key size requirement, in bytes
-	 */
-	public function cipherKeySize()
-	{
-		return $this->cipher->keySize();
-	}
-
-
-	/**
-	 * Sets and/or returns the key to be used. Normally you set
-	 * the key in the phpCrypt constructor. This can be usefully
-	 * if you need to change the key on the fly and don't want
-	 * to create a new instance of phpCrypt.
-	 *
-	 * If the $key parameter is not given, this function will simply
-	 * return the key currently in use.
-	 *
-	 * @param string $key Optional, The key to set
-	 * @return string The key being used
-	 */
-	public function cipherKey($key = "")
-	{
-		return $this->cipher->key($key);
-	}
-
-
-	/**
-	 * A helper function which will create a random key. Calls
-	 * Core::randBytes(). By default it will use PHP_Crypt::RAND for
-	 * the random source of bytes, and return a PHP_Crypt::RAND_DEFAULT_SZ
-	 * byte string. There are 4 ways to create a random byte string by
-	 * setting the $src parameter:
-	 * PHP_Crypt::RAND - Default, uses mt_rand()
-	 * PHP_Crypt::RAND_DEV_RAND - Unix only, uses /dev/random
-	 * PHP_Crypt::RAND_DEV_URAND - Unix only, uses /dev/urandom
-	 * PHP_Crypt::RAND_WIN_COM - Windows only, uses Microsoft's CAPICOM SDK
-	 *
-	 * @param string $src Optional, The source to use to create random bytes
-	 * @param integer $len Optional, The number of random bytes to return
-	 * @return string A random string of bytes
-	 */
-	public static function createKey($src = self::RAND, $len = self::RAND_DEFAULT_SZ)
-	{
-		return Core::randBytes($src, $len);
-	}
-
-
-	/**
-	 * Sets the IV to use. Note that you do not need to call
-	 * this function if creating an IV using createIV(). This
-	 * function is used when an IV has already been created
-	 * outside of phpCrypt and needs to be set. Alternatively
-	 * you can just pass the $iv parameter to the encrypt()
-	 * or decrypt() functions
-	 *
-	 * When the $iv parameter is not given, the function will
-	 * return the current IV being used. See createIV() if you
-	 * need to create an IV.
-	 *
-	 * @param string $iv Optional, The IV to use during Encryption/Decryption
-	 * @return void
-	 */
-	public function IV($iv = "")
-	{
-		return $this->mode->IV($iv);
-	}
-
-
-	/**
-	 * Creates an IV for the the Cipher selected, if one is required.
-	 * If you already have an IV to use, this function does not need
-	 * to be called, instead set it with setIV(). If you create an
-	 * IV with createIV(), you do not need to set it with setIV(),
-	 * as it is automatically set in this function
-	 *
-	 * $src values are:
-	 * PHP_Crypt::RAND - Default, uses mt_rand()
-	 * PHP_Crypt::RAND_DEV_RAND - Unix only, uses /dev/random
-	 * PHP_Crypt::RAND_DEV_URAND - Unix only, uses /dev/urandom
-	 * PHP_Crypt::RAND_WIN_COM - Windows only, uses Microsoft's CAPICOM SDK
-	 *
-	 * @param string $src Optional, how the IV is generated
-	 * @return string The IV that was created, and set for the mode
-	 */
-	public function createIV($src = self::RAND)
-	{
-		return $this->mode->createIV($src);
-	}
-
-
-	/**
-	 * Sets the type of padding to be used within the specified Mode
-	 *
-	 * @param string $type One of the predefined padding types
-	 * @return void
-	 */
-	public function padding($type = "")
-	{
-		return $this->mode->padding($type);
-	}
+        switch($mode)
+        {
+        case self::MODE_CBC:
+            $this->mode = new Mode_CBC($this->cipher);
+            break;
+
+        case self::MODE_CFB:
+            $this->mode = new Mode_CFB($this->cipher);
+            break;
+
+        case self::MODE_CTR:
+            $this->mode = new Mode_CTR($this->cipher);
+            break;
+
+        case self::MODE_ECB:
+            $this->mode = new Mode_ECB($this->cipher);
+            break;
+
+        case self::MODE_NCFB:
+            $this->mode = new Mode_NCFB($this->cipher);
+            break;
+
+        case self::MODE_NOFB:
+            $this->mode = new Mode_NOFB($this->cipher);
+            break;
+
+        case self::MODE_OFB:
+            $this->mode = new Mode_OFB($this->cipher);
+            break;
+
+        case self::MODE_PCBC:
+            $this->mode = new Mode_PCBC($this->cipher);
+            break;
+
+        case self::MODE_RAW:
+            $this->mode = new Mode_RAW($this->cipher);
+            break;
+
+        case self::MODE_STREAM:
+            $this->mode = new Mode_Stream($this->cipher);
+            break;
+
+        default:
+            trigger_error("$mode is not a valid mode", E_USER_WARNING);
+        }
+
+        // set the default padding
+        $this->padding($padding);
+    }
+
+
+    /**
+     * Destructor
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+
+    }
+
+
+    /**
+     * Encrypt a plain text message using the Mode and Cipher selected.
+     * Some stream modes require this function to be called in a loop
+     * which requires the use of $result parameter to retrieve
+     * the decrypted data.
+     *
+     * @param string $text The plain text string
+     * @return string The encrypted string
+     */
+    public function encrypt($text)
+    {
+        // check that an iv is set, if required by the mode
+        $this->mode->checkIV();
+
+        // the encryption is done inside the mode
+        $this->mode->encrypt($text);
+        return $text;
+    }
+
+
+    /**
+     * Decrypt an encrypted message using the Mode and Cipher selected.
+     * Some stream modes require this function to be called in a loop
+     * which requires the use of $result parameter to retrieve
+     * the decrypted data.
+     *
+     * @param string $text The encrypted string
+     * @return string The decrypted string
+     */
+    public function decrypt($text)
+    {
+        // check that an iv is set, if required by the mode
+        $this->mode->checkIV();
+
+        // the decryption is done inside the mode
+        $this->mode->decrypt($text);
+        return $text;
+    }
+
+
+    /**
+     * Return the cipher object being used
+     *
+     * @return object The Cipher object
+     */
+    public function cipher()
+    {
+        return $this->cipher;
+    }
+
+
+    /**
+     * Return the mode object being used
+     *
+     * @return object The Mode object
+     */
+    public function mode()
+    {
+        return $this->mode;
+    }
+
+
+    /**
+     * Returns the name of the cipher being used
+     *
+     * @return string The name of the cipher currently in use,
+     *	it will be one of the predefined phpCrypt cipher constants
+     */
+    public function cipherName()
+    {
+        return $this->cipher->name();
+    }
+
+
+    /**
+     * Return the name of the mode being used
+     *
+     * @return string The name of the mode in use, it will
+     * be one of the predefined phpCrypt mode constants
+     */
+    public function modeName()
+    {
+        return $this->mode->name();
+    }
+
+
+    /**
+     * Returns Ciphers required block size in bytes
+     *
+     * @return integer The cipher data block size, in bytes
+     */
+    public function cipherBlockSize()
+    {
+        return $this->cipher->blockSize();
+    }
+
+
+    /**
+     * Returns the cipher's required key size, in bytes
+     *
+     * @return integer The cipher's key size requirement, in bytes
+     */
+    public function cipherKeySize()
+    {
+        return $this->cipher->keySize();
+    }
+
+
+    /**
+     * Sets and/or returns the key to be used. Normally you set
+     * the key in the phpCrypt constructor. This can be usefully
+     * if you need to change the key on the fly and don't want
+     * to create a new instance of phpCrypt.
+     *
+     * If the $key parameter is not given, this function will simply
+     * return the key currently in use.
+     *
+     * @param string $key Optional, The key to set
+     * @return string The key being used
+     */
+    public function cipherKey($key = "")
+    {
+        return $this->cipher->key($key);
+    }
+
+
+    /**
+     * A helper function which will create a random key. Calls
+     * Core::randBytes(). By default it will use PHP_Crypt::RAND for
+     * the random source of bytes, and return a PHP_Crypt::RAND_DEFAULT_SZ
+     * byte string. There are 4 ways to create a random byte string by
+     * setting the $src parameter:
+     * PHP_Crypt::RAND - Default, uses mt_rand()
+     * PHP_Crypt::RAND_DEV_RAND - Unix only, uses /dev/random
+     * PHP_Crypt::RAND_DEV_URAND - Unix only, uses /dev/urandom
+     * PHP_Crypt::RAND_WIN_COM - Windows only, uses Microsoft's CAPICOM SDK
+     *
+     * @param string $src Optional, The source to use to create random bytes
+     * @param integer $len Optional, The number of random bytes to return
+     * @return string A random string of bytes
+     */
+    public static function createKey($src = self::RAND, $len = self::RAND_DEFAULT_SZ)
+    {
+        return Core::randBytes($src, $len);
+    }
+
+
+    /**
+     * Sets the IV to use. Note that you do not need to call
+     * this function if creating an IV using createIV(). This
+     * function is used when an IV has already been created
+     * outside of phpCrypt and needs to be set. Alternatively
+     * you can just pass the $iv parameter to the encrypt()
+     * or decrypt() functions
+     *
+     * When the $iv parameter is not given, the function will
+     * return the current IV being used. See createIV() if you
+     * need to create an IV.
+     *
+     * @param string $iv Optional, The IV to use during Encryption/Decryption
+     * @return void
+     */
+    public function IV($iv = "")
+    {
+        return $this->mode->IV($iv);
+    }
+
+
+    /**
+     * Creates an IV for the the Cipher selected, if one is required.
+     * If you already have an IV to use, this function does not need
+     * to be called, instead set it with setIV(). If you create an
+     * IV with createIV(), you do not need to set it with setIV(),
+     * as it is automatically set in this function
+     *
+     * $src values are:
+     * PHP_Crypt::RAND - Default, uses mt_rand()
+     * PHP_Crypt::RAND_DEV_RAND - Unix only, uses /dev/random
+     * PHP_Crypt::RAND_DEV_URAND - Unix only, uses /dev/urandom
+     * PHP_Crypt::RAND_WIN_COM - Windows only, uses Microsoft's CAPICOM SDK
+     *
+     * @param string $src Optional, how the IV is generated
+     * @return string The IV that was created, and set for the mode
+     */
+    public function createIV($src = self::RAND)
+    {
+        return $this->mode->createIV($src);
+    }
+
+
+    /**
+     * Sets the type of padding to be used within the specified Mode
+     *
+     * @param string $type One of the predefined padding types
+     * @return void
+     */
+    public function padding($type = "")
+    {
+        return $this->mode->padding($type);
+    }
 }
 ?>

Switch Indentation +91 added lines, -91 removed lines

@@ -107,84 +107,84 @@ 
 		 */
 		switch($cipher)
 		{
-		case self::CIPHER_3DES:
-			$this->cipher = new Cipher_3DES($key);
-			break;
+		    case self::CIPHER_3DES:
+			    $this->cipher = new Cipher_3DES($key);
+			    break;
 
-		case self::CIPHER_3WAY:
-			$this->cipher = new Cipher_3WAY($key);
-			break;
+		    case self::CIPHER_3WAY:
+			    $this->cipher = new Cipher_3WAY($key);
+			    break;
 
-		case self::CIPHER_AES_128:
-			$this->cipher = new Cipher_AES_128($key);
-			break;
+		    case self::CIPHER_AES_128:
+			    $this->cipher = new Cipher_AES_128($key);
+			    break;
 
-		case self::CIPHER_AES_192:
-			$this->cipher = new Cipher_AES_192($key);
-			break;
+		    case self::CIPHER_AES_192:
+			    $this->cipher = new Cipher_AES_192($key);
+			    break;
 
-		case self::CIPHER_AES_256:
-			$this->cipher = new Cipher_AES_256($key);
-			break;
+		    case self::CIPHER_AES_256:
+			    $this->cipher = new Cipher_AES_256($key);
+			    break;
 
-		case self::CIPHER_ARC4: // an alternative to RC4
-			$this->cipher = new Cipher_ARC4($key);
-			break;
+		    case self::CIPHER_ARC4: // an alternative to RC4
+			    $this->cipher = new Cipher_ARC4($key);
+			    break;
 
-		case self::CIPHER_BLOWFISH:
-			$this->cipher = new Cipher_Blowfish($key);
-			break;
+		    case self::CIPHER_BLOWFISH:
+			    $this->cipher = new Cipher_Blowfish($key);
+			    break;
 
-		case self::CIPHER_CAST_128:
-			$this->cipher = new Cipher_CAST_128($key);
-			break;
+		    case self::CIPHER_CAST_128:
+			    $this->cipher = new Cipher_CAST_128($key);
+			    break;
 
-		case self::CIPHER_CAST_256:
-			$this->cipher = new Cipher_CAST_256($key);
-			break;
+		    case self::CIPHER_CAST_256:
+			    $this->cipher = new Cipher_CAST_256($key);
+			    break;
 
-		case self::CIPHER_DES:
-			$this->cipher = new Cipher_DES($key);
-			break;
+		    case self::CIPHER_DES:
+			    $this->cipher = new Cipher_DES($key);
+			    break;
 
-		case self::CIPHER_ENIGMA:
-			$this->cipher = new Cipher_Enigma($key);
-			break;
+		    case self::CIPHER_ENIGMA:
+			    $this->cipher = new Cipher_Enigma($key);
+			    break;
 
-		case self::CIPHER_GOST:
-			$this->cipher = new Cipher_GOST($key);
-			break;
+		    case self::CIPHER_GOST:
+			    $this->cipher = new Cipher_GOST($key);
+			    break;
 
-		case self::CIPHER_RC2:
-			$this->cipher = new Cipher_RC2($key);
-			break;
+		    case self::CIPHER_RC2:
+			    $this->cipher = new Cipher_RC2($key);
+			    break;
 
-		case self::CIPHER_RIJNDAEL_128:
-			$this->cipher = new Cipher_Rijndael_128($key);
-			break;
+		    case self::CIPHER_RIJNDAEL_128:
+			    $this->cipher = new Cipher_Rijndael_128($key);
+			    break;
 
-		case self::CIPHER_RIJNDAEL_192:
-			$this->cipher = new Cipher_Rijndael_192($key);
-			break;
+		    case self::CIPHER_RIJNDAEL_192:
+			    $this->cipher = new Cipher_Rijndael_192($key);
+			    break;
 
-		case self::CIPHER_RIJNDAEL_256:
-			$this->cipher = new Cipher_Rijndael_256($key);
-			break;
+		    case self::CIPHER_RIJNDAEL_256:
+			    $this->cipher = new Cipher_Rijndael_256($key);
+			    break;
 
-		case self::CIPHER_SIMPLEXOR:
-			$this->cipher = new Cipher_Simple_XOR($key);
-			break;
+		    case self::CIPHER_SIMPLEXOR:
+			    $this->cipher = new Cipher_Simple_XOR($key);
+			    break;
 
-		case self::CIPHER_SKIPJACK:
-			$this->cipher = new Cipher_Skipjack($key);
-			break;
+		    case self::CIPHER_SKIPJACK:
+			    $this->cipher = new Cipher_Skipjack($key);
+			    break;
 
-		case self::CIPHER_VIGENERE:
-			$this->cipher = new Cipher_Vigenere($key);
-			break;
+		    case self::CIPHER_VIGENERE:
+			    $this->cipher = new Cipher_Vigenere($key);
+			    break;
 
-		default:
-			trigger_error("$cipher is not a valid cipher", E_USER_WARNING);
+		    default:
+			    trigger_error("$cipher is not a valid cipher", E_USER_WARNING);
 		}
 
 
@@ -193,48 +193,48 @@ 
 		 */
 		switch($mode)
 		{
-		case self::MODE_CBC:
-			$this->mode = new Mode_CBC($this->cipher);
-			break;
+		    case self::MODE_CBC:
+			    $this->mode = new Mode_CBC($this->cipher);
+			    break;
 
-		case self::MODE_CFB:
-			$this->mode = new Mode_CFB($this->cipher);
-			break;
+		    case self::MODE_CFB:
+			    $this->mode = new Mode_CFB($this->cipher);
+			    break;
 
-		case self::MODE_CTR:
-			$this->mode = new Mode_CTR($this->cipher);
-			break;
+		    case self::MODE_CTR:
+			    $this->mode = new Mode_CTR($this->cipher);
+			    break;
 
-		case self::MODE_ECB:
-			$this->mode = new Mode_ECB($this->cipher);
-			break;
+		    case self::MODE_ECB:
+			    $this->mode = new Mode_ECB($this->cipher);
+			    break;
 
-		case self::MODE_NCFB:
-			$this->mode = new Mode_NCFB($this->cipher);
-			break;
+		    case self::MODE_NCFB:
+			    $this->mode = new Mode_NCFB($this->cipher);
+			    break;
 
-		case self::MODE_NOFB:
-			$this->mode = new Mode_NOFB($this->cipher);
-			break;
+		    case self::MODE_NOFB:
+			    $this->mode = new Mode_NOFB($this->cipher);
+			    break;
 
-		case self::MODE_OFB:
-			$this->mode = new Mode_OFB($this->cipher);
-			break;
+		    case self::MODE_OFB:
+			    $this->mode = new Mode_OFB($this->cipher);
+			    break;
 
-		case self::MODE_PCBC:
-			$this->mode = new Mode_PCBC($this->cipher);
-			break;
+		    case self::MODE_PCBC:
+			    $this->mode = new Mode_PCBC($this->cipher);
+			    break;
 
-		case self::MODE_RAW:
-			$this->mode = new Mode_RAW($this->cipher);
-			break;
+		    case self::MODE_RAW:
+			    $this->mode = new Mode_RAW($this->cipher);
+			    break;
 
-		case self::MODE_STREAM:
-			$this->mode = new Mode_Stream($this->cipher);
-			break;
+		    case self::MODE_STREAM:
+			    $this->mode = new Mode_Stream($this->cipher);
+			    break;
 
-		default:
-			trigger_error("$mode is not a valid mode", E_USER_WARNING);
+		    default:
+			    trigger_error("$mode is not a valid mode", E_USER_WARNING);
 		}
 
 		// set the default padding

Spacing +15 added lines, -15 removed lines

@@ -41,46 +41,46 @@ 
 	const CIPHER_AES_128		= "AES-128";
 	const CIPHER_AES_192		= "AES-192";
 	const CIPHER_AES_256		= "AES-256";
-	const CIPHER_ARC4			= "ARC4"; // Alternative RC4
+	const CIPHER_ARC4 = "ARC4"; // Alternative RC4
 	const CIPHER_BLOWFISH		= "Blowfish";
 	const CIPHER_CAST_128		= "CAST-128";
 	const CIPHER_CAST_256		= "CAST-256";
 	const CIPHER_DES			= "DES";
-	const CIPHER_ENIGMA			= "Enigma";
-	const CIPHER_GOST			= "GOST";
+	const CIPHER_ENIGMA = "Enigma";
+	const CIPHER_GOST = "GOST";
 	const CIPHER_RC2			= "RC2";
 	const CIPHER_RIJNDAEL_128	= "Rijndael-128";
 	const CIPHER_RIJNDAEL_192	= "Rijndael-192";
 	const CIPHER_RIJNDAEL_256	= "Rijndael-256";
 	const CIPHER_SKIPJACK		= "Skipjack";
-	const CIPHER_SIMPLEXOR		= "SimpleXOR";
+	const CIPHER_SIMPLEXOR = "SimpleXOR";
 	const CIPHER_VIGENERE		= "Vigenere"; // historical
 
 	// Modes
 	const MODE_CBC	= "CBC";
-	const MODE_CFB	= "CFB";  // 8 bit cfb mode
+	const MODE_CFB	= "CFB"; // 8 bit cfb mode
 	const MODE_CTR	= "CTR";
 	const MODE_ECB	= "ECB";
 	const MODE_NCFB	= "NCFB"; // blocksize cfb mode
 	const MODE_NOFB	= "NOFB"; // blocksize ofb mode
-	const MODE_OFB	= "OFB";  // 8 bit ofb mode
+	const MODE_OFB	= "OFB"; // 8 bit ofb mode
 	const MODE_PCBC	= "PCBC";
-	const MODE_RAW	= "Raw";  // raw encryption, with no mode
+	const MODE_RAW	= "Raw"; // raw encryption, with no mode
 	const MODE_STREAM = "Stream"; // used only for stream ciphers
 
 	// The source of random data used to create keys and IV's
 	// Used for PHP_Crypt::createKey(), PHP_Crypt::createIV()
-	const RAND			= "rand"; // uses mt_rand(), windows & unix
+	const RAND = "rand"; // uses mt_rand(), windows & unix
 	const RAND_DEV_RAND	= "/dev/random"; // unix only
-	const RAND_DEV_URAND= "/dev/urandom";// unix only
-	const RAND_WIN_COM	= "wincom";		 // windows only, COM extension
-	const RAND_DEFAULT_SZ = 32;			 // the default number of bytes returned
+	const RAND_DEV_URAND = "/dev/urandom"; // unix only
+	const RAND_WIN_COM = "wincom"; // windows only, COM extension
+	const RAND_DEFAULT_SZ = 32; // the default number of bytes returned
 
 	// Padding types
-	const PAD_ZERO			= 0;
+	const PAD_ZERO = 0;
 	const PAD_ANSI_X923		= 1;
 	const PAD_ISO_10126		= 2;
-	const PAD_PKCS7			= 3;
+	const PAD_PKCS7 = 3;
 	const PAD_ISO_7816_4	= 4;
 
 
@@ -105,7 +105,7 @@ 
 		/*
 		 * CIPHERS
 		 */
-		switch($cipher)
+		switch ($cipher)
 		{
 		case self::CIPHER_3DES:
 			$this->cipher = new Cipher_3DES($key);
@@ -191,7 +191,7 @@ 
 		/*
 		 * MODES
 		 */
-		switch($mode)
+		switch ($mode)
 		{
 		case self::MODE_CBC:
 			$this->mode = new Mode_CBC($this->cipher);

includes/libraries/Tree/NestedTree/NestedTree.php

Doc Comments +1 added lines

@@ -443,6 +443,7 @@
      * @param int $id    The ID of the current node to process
      * @param int $level The nlevel to assign to the current node
      * @param   int     &$n     A reference to the running tally for the n-value
+     * @param integer $n
      */
     public function generateTreeData(&$arr, $id, $level, &$n)
     {

Indentation +9 added lines, -9 removed lines

@@ -35,8 +35,8 @@ 
         $this->table = $table;
 
         $this->fields = array('id'     => $idField,
-                              'parent' => $parentField,
-                              'sort'   => $sortField
+                                'parent' => $parentField,
+                                'sort'   => $sortField
         );
     }
 
@@ -49,7 +49,7 @@ 
     public function getFields()
     {
         return array($this->fields['id'], $this->fields['parent'], $this->fields['sort'],
-                     'nleft', 'nright', 'nlevel', 'personal_folder', 'renewal_period', 'bloquer_modification', 'bloquer_creation');
+                        'nleft', 'nright', 'nlevel', 'personal_folder', 'renewal_period', 'bloquer_modification', 'bloquer_creation');
     }
 
     /**
@@ -356,12 +356,12 @@ 
         $idField = $this->fields['id'];
         $parentField = $this->fields['parent'];
 
-		$query = sprintf(
-			'select %s from %s order by %s',
-			join(',', $this->getFields()),
-			$this->table,
-			$this->fields['sort']
-		);
+        $query = sprintf(
+            'select %s from %s order by %s',
+            join(',', $this->getFields()),
+            $this->table,
+            $this->fields['sort']
+        );
 
         $result = mysqli_query($link, $query);
 

install/install.queries.php

Doc Comments +1 added lines

@@ -50,6 +50,7 @@
  * genHash()
  *
  * Generate a hash for user login
+ * @param string $password
  */
 function bCrypt($password, $cost)
 {

Spacing +125 added lines, -125 removed lines

@@ -22,13 +22,13 @@ 
 function chmod_r($dir, $dirPermissions, $filePermissions) {
     $dp = opendir($dir);
     $res = true;
-    while($file = readdir($dp)) {
+    while ($file = readdir($dp)) {
         if (($file == ".") || ($file == ".."))
             continue;
 
         $fullPath = $dir."/".$file;
 
-        if(is_dir($fullPath)) {
+        if (is_dir($fullPath)) {
             if ($res = @chmod($fullPath, $dirPermissions))
                 $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
         } else {
@@ -57,9 +57,9 @@ 
     if (function_exists('openssl_random_pseudo_bytes')) {
         $salt .= bin2hex(openssl_random_pseudo_bytes(11));
     } else {
-        $chars='./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-        for ($i=0; $i<22; $i++) {
-            $salt.=$chars[mt_rand(0, 63)];
+        $chars = './ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+        for ($i = 0; $i < 22; $i++) {
+            $salt .= $chars[mt_rand(0, 63)];
         }
     }
     return crypt($password, $salt);
@@ -69,7 +69,7 @@ 
     switch ($_POST['type']) {
         case "step_2":
             //decrypt
-            require_once 'libs/aesctr.php';  // AES Counter Mode implementation
+            require_once 'libs/aesctr.php'; // AES Counter Mode implementation
             $json = Encryption\Crypt\aesctr::decrypt($_POST['data'], "cpm", 128);
             $data = json_decode($json, true);
             $json = Encryption\Crypt\aesctr::decrypt($_POST['activity'], "cpm", 128);
@@ -78,8 +78,8 @@ 
             $data = array_merge($data, array("task" => $json));
 
             $abspath = str_replace('\\', '/', $data['root_path']);
-            if (substr($abspath, strlen($abspath)-1) == "/") {
-                $abspath = substr($abspath, 0, strlen($abspath)-1);
+            if (substr($abspath, strlen($abspath) - 1) == "/") {
+                $abspath = substr($abspath, 0, strlen($abspath) - 1);
             }
             $_SESSION['abspath'] = $abspath;
             $_SESSION['url_path'] = $data['url_path'];
@@ -121,7 +121,7 @@ 
             }
 
             if (isset($data['activity']) && $data['activity'] == "ini") {
-                if (ini_get($data['task'])>=60) {
+                if (ini_get($data['task']) >= 60) {
                     echo '[{"error" : "", "index" : "'.$_POST['index'].'"}]';
                 } else {
                     echo '[{"error" : "PHP \"Maximum execution time\" is set to '.ini_get('max_execution_time').' seconds. Please try to set to 60s at least during installation.", "index" : "'.$_POST['index'].'", "multiple" : "'.$_POST['multiple'].'"}]';
@@ -132,7 +132,7 @@ 
 
         case "step_3":
             //decrypt
-            require_once 'libs/aesctr.php';  // AES Counter Mode implementation
+            require_once 'libs/aesctr.php'; // AES Counter Mode implementation
             $json = Encryption\Crypt\aesctr::decrypt($_POST['data'], "cpm", 128);
             $data = json_decode($json, true);
             $json = Encryption\Crypt\aesctr::decrypt($_POST['db'], "cpm", 128);
@@ -148,7 +148,7 @@ 
                     ) CHARSET=utf8;"
                 );
                 // store values
-                foreach($data as $key=>$value) {
+                foreach ($data as $key=>$value) {
                     $_SESSION[$key] = $value;
                     $tmp = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT COUNT(*) FROM `_install` WHERE `key` = '".$key."'"));
                     if ($tmp[0] == 0 || empty($tmp[0])) {
@@ -161,13 +161,13 @@ 
                 if ($tmp[0] == 0 || empty($tmp[0])) {
                     mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('url_path', '", empty($_SESSION['url_path']) ? $db['url_path'] : $_SESSION['url_path'], "');");
                 } else {
-                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '", empty($_SESSION['url_path']) ? $db['url_path'] : $_SESSION['url_path'],"' WHERE `key` = 'url_path';");
+                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '", empty($_SESSION['url_path']) ? $db['url_path'] : $_SESSION['url_path'], "' WHERE `key` = 'url_path';");
                 }
                 $tmp = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT COUNT(*) FROM `_install` WHERE `key` = 'abspath'"));
                 if ($tmp[0] == 0 || empty($tmp[0])) {
-                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('abspath', '", empty($_SESSION['abspath']) ? $db['abspath'] : $_SESSION['abspath'],"');");
+                    mysqli_query($dbTmp, "INSERT INTO `_install` (`key`, `value`) VALUES ('abspath', '", empty($_SESSION['abspath']) ? $db['abspath'] : $_SESSION['abspath'], "');");
                 } else {
-                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '", empty($_SESSION['abspath']) ? $db['abspath'] : $_SESSION['abspath'],"' WHERE `key` = 'abspath';");
+                    mysqli_query($dbTmp, "UPDATE `_install` SET `value` = '", empty($_SESSION['abspath']) ? $db['abspath'] : $_SESSION['abspath'], "' WHERE `key` = 'abspath';");
                 }
 
                 echo '[{"error" : "", "result" : "Connection is successful", "multiple" : ""}]';
@@ -179,7 +179,7 @@ 
 
         case "step_4":
             //decrypt
-            require_once 'libs/aesctr.php';  // AES Counter Mode implementation
+            require_once 'libs/aesctr.php'; // AES Counter Mode implementation
             $json = Encryption\Crypt\aesctr::decrypt($_POST['data'], "cpm", 128);
             $data = json_decode($json, true);
             $json = Encryption\Crypt\aesctr::decrypt($_POST['db'], "cpm", 128);
@@ -188,8 +188,8 @@ 
             $dbTmp = mysqli_connect($db['db_host'], $db['db_login'], $db['db_pw'], $db['db_bdd'], $db['db_port']);
 
             // prepare data
-            foreach($data as $key=>$value) {
-                $data[$key] = str_replace(array('&quot;', '&#92;'), array('""','\\\\'), $value);
+            foreach ($data as $key=>$value) {
+                $data[$key] = str_replace(array('&quot;', '&#92;'), array('""', '\\\\'), $value);
             }
 
             // check skpath
@@ -198,13 +198,13 @@ 
             } else {
                 $data['sk_path'] = str_replace("&#92;", "/", $data['sk_path']);
             }
-            if (substr($data['sk_path'], strlen($data['sk_path'])-1) == "/" || substr($data['sk_path'], strlen($data['sk_path'])-1) == "\"") {
-                $data['sk_path'] = substr($data['sk_path'], 0, strlen($data['sk_path'])-1);
+            if (substr($data['sk_path'], strlen($data['sk_path']) - 1) == "/" || substr($data['sk_path'], strlen($data['sk_path']) - 1) == "\"") {
+                $data['sk_path'] = substr($data['sk_path'], 0, strlen($data['sk_path']) - 1);
             }
             if (is_dir($data['sk_path'])) {
                 if (is_writable($data['sk_path'])) {
                     // store all variables in SESSION
-                    foreach($data as $key=>$value) {
+                    foreach ($data as $key=>$value) {
                         $_SESSION[$key] = $value;
                         $tmp = mysqli_fetch_row(mysqli_query($dbTmp, "SELECT COUNT(*) FROM `_install` WHERE `key` = '".$key."'"));
                         if ($tmp[0] == 0 || empty($tmp[0])) {
@@ -225,7 +225,7 @@ 
 
         case "step_5":
             //decrypt
-            require_once 'libs/aesctr.php';  // AES Counter Mode implementation
+            require_once 'libs/aesctr.php'; // AES Counter Mode implementation
             $activity = Encryption\Crypt\aesctr::decrypt($_POST['activity'], "cpm", 128);
             $task = Encryption\Crypt\aesctr::decrypt($_POST['task'], "cpm", 128);
             $json = Encryption\Crypt\aesctr::decrypt($_POST['db'], "cpm", 128);
@@ -341,97 +341,97 @@ 
                             array('admin', 'path_to_files_folder', $var['abspath'].'/files'),
                             array('admin', 'url_to_files_folder', $var['url_path'].'/files'),
                             array('admin', 'activate_expiration', '0'),
-                            array('admin','pw_life_duration','0'),
-                            array('admin','maintenance_mode','1'),
-                            array('admin','enable_sts','0'),
-                            array('admin','encryptClientServer','1'),
-                            array('admin','cpassman_version',$k['version']),
-                            array('admin','ldap_mode','0'),
-                            array('admin','ldap_type','0'),
-                            array('admin','ldap_suffix','0'),
-                            array('admin','ldap_domain_dn','0'),
-                            array('admin','ldap_domain_controler','0'),
-                            array('admin','ldap_user_attribute','0'),
-                            array('admin','ldap_ssl','0'),
-                            array('admin','ldap_tls','0'),
-                            array('admin','ldap_elusers','0'),
-                            array('admin','ldap_search_base','0'),
-                            array('admin','richtext','0'),
-                            array('admin','allow_print','0'),
-                            array('admin','roles_allowed_to_print','0'),
-                            array('admin','show_description','1'),
-                            array('admin','anyone_can_modify','0'),
-                            array('admin','anyone_can_modify_bydefault','0'),
-                            array('admin','nb_bad_authentication','0'),
-                            array('admin','utf8_enabled','1'),
-                            array('admin','restricted_to','0'),
-                            array('admin','restricted_to_roles','0'),
-                            array('admin','enable_send_email_on_user_login','0'),
-                            array('admin','enable_user_can_create_folders','0'),
-                            array('admin','insert_manual_entry_item_history','0'),
-                            array('admin','enable_kb','0'),
-                            array('admin','enable_email_notification_on_item_shown','0'),
-                            array('admin','enable_email_notification_on_user_pw_change','0'),
-                            array('admin','custom_logo',''),
-                            array('admin','custom_login_text',''),
-                            array('admin','default_language','english'),
-                            array('admin','send_stats', '0'),
-                            array('admin','send_statistics_items', 'stat_country;stat_users;stat_items;stat_items_shared;stat_folders;stat_folders_shared;stat_admins;stat_managers;stat_ro;stat_mysqlversion;stat_phpversion;stat_teampassversion;stat_languages;stat_kb;stat_suggestion;stat_customfields;stat_api;stat_2fa;stat_agses;stat_duo;stat_ldap;stat_syslog;stat_stricthttps;stat_fav;stat_pf;'),
-                            array('admin','send_stats_time', time()-2592000),
-                            array('admin','get_tp_info', '1'),
-                            array('admin','send_mail_on_user_login', '0'),
+                            array('admin', 'pw_life_duration', '0'),
+                            array('admin', 'maintenance_mode', '1'),
+                            array('admin', 'enable_sts', '0'),
+                            array('admin', 'encryptClientServer', '1'),
+                            array('admin', 'cpassman_version', $k['version']),
+                            array('admin', 'ldap_mode', '0'),
+                            array('admin', 'ldap_type', '0'),
+                            array('admin', 'ldap_suffix', '0'),
+                            array('admin', 'ldap_domain_dn', '0'),
+                            array('admin', 'ldap_domain_controler', '0'),
+                            array('admin', 'ldap_user_attribute', '0'),
+                            array('admin', 'ldap_ssl', '0'),
+                            array('admin', 'ldap_tls', '0'),
+                            array('admin', 'ldap_elusers', '0'),
+                            array('admin', 'ldap_search_base', '0'),
+                            array('admin', 'richtext', '0'),
+                            array('admin', 'allow_print', '0'),
+                            array('admin', 'roles_allowed_to_print', '0'),
+                            array('admin', 'show_description', '1'),
+                            array('admin', 'anyone_can_modify', '0'),
+                            array('admin', 'anyone_can_modify_bydefault', '0'),
+                            array('admin', 'nb_bad_authentication', '0'),
+                            array('admin', 'utf8_enabled', '1'),
+                            array('admin', 'restricted_to', '0'),
+                            array('admin', 'restricted_to_roles', '0'),
+                            array('admin', 'enable_send_email_on_user_login', '0'),
+                            array('admin', 'enable_user_can_create_folders', '0'),
+                            array('admin', 'insert_manual_entry_item_history', '0'),
+                            array('admin', 'enable_kb', '0'),
+                            array('admin', 'enable_email_notification_on_item_shown', '0'),
+                            array('admin', 'enable_email_notification_on_user_pw_change', '0'),
+                            array('admin', 'custom_logo', ''),
+                            array('admin', 'custom_login_text', ''),
+                            array('admin', 'default_language', 'english'),
+                            array('admin', 'send_stats', '0'),
+                            array('admin', 'send_statistics_items', 'stat_country;stat_users;stat_items;stat_items_shared;stat_folders;stat_folders_shared;stat_admins;stat_managers;stat_ro;stat_mysqlversion;stat_phpversion;stat_teampassversion;stat_languages;stat_kb;stat_suggestion;stat_customfields;stat_api;stat_2fa;stat_agses;stat_duo;stat_ldap;stat_syslog;stat_stricthttps;stat_fav;stat_pf;'),
+                            array('admin', 'send_stats_time', time() - 2592000),
+                            array('admin', 'get_tp_info', '1'),
+                            array('admin', 'send_mail_on_user_login', '0'),
                             array('cron', 'sending_emails', '0'),
-                            array('admin','nb_items_by_query', 'auto'),
-                            array('admin','enable_delete_after_consultation', '0'),
-                            array('admin','enable_personal_saltkey_cookie', '0'),
-                            array('admin','personal_saltkey_cookie_duration', '31'),
-                            array('admin','email_smtp_server', ''),
-                            array('admin','email_smtp_auth', ''),
-                            array('admin','email_auth_username', ''),
-                            array('admin','email_auth_pwd', ''),
-                            array('admin','email_port', ''),
-                            array('admin','email_security',''),
-                            array('admin','email_server_url', ''),
-                            array('admin','email_from', ''),
-                            array('admin','email_from_name', ''),
-                            array('admin','pwd_maximum_length', '40'),
-                            array('admin','google_authentication', '0'),
-                            array('admin','delay_item_edition', '0'),
-                            array('admin','allow_import','0'),
-                            array('admin','proxy_ip',''),
-                            array('admin','proxy_port',''),
-                            array('admin','upload_maxfilesize','10mb'),
-                            array('admin','upload_docext','doc,docx,dotx,xls,xlsx,xltx,rtf,csv,txt,pdf,ppt,pptx,pot,dotx,xltx'),
-                            array('admin','upload_imagesext','jpg,jpeg,gif,png'),
-                            array('admin','upload_pkgext','7z,rar,tar,zip'),
-                            array('admin','upload_otherext','sql,xml'),
-                            array('admin','upload_imageresize_options','1'),
-                            array('admin','upload_imageresize_width','800'),
-                            array('admin','upload_imageresize_height','600'),
-                            array('admin','upload_imageresize_quality','90'),
-                            array('admin','use_md5_password_as_salt','0'),
-                            array('admin','ga_website_name','TeamPass for ChangeMe'),
-                            array('admin','api','0'),
-                            array('admin','subfolder_rights_as_parent','0'),
-                            array('admin','show_only_accessible_folders','0'),
-                            array('admin','enable_suggestion','0'),
-                            array('admin','otv_expiration_period','7'),
-                            array('admin','default_session_expiration_time','60'),
-                            array('admin','duo','0'),
-                            array('admin','enable_server_password_change','0'),
-                            array('admin','ldap_object_class','0'),
-                            array('admin','bck_script_path', $var['abspath']."/backups"),
-                            array('admin','bck_script_filename', 'bck_teampass'),
-                            array('admin','syslog_enable','0'),
-                            array('admin','syslog_host','localhost'),
-                            array('admin','syslog_port','514'),
-                            array('admin','manager_move_item','0'),
-                            array('admin','create_item_without_password','0'),
-                            array('admin','otv_is_enabled','0'),
-                            array('admin','agses_authentication_enabled','0'),
-                            array('admin','item_extra_fields','0'),
-                            array('admin','saltkey_ante_2127','none'),
-                            array('admin','migration_to_2127','done')
+                            array('admin', 'nb_items_by_query', 'auto'),
+                            array('admin', 'enable_delete_after_consultation', '0'),
+                            array('admin', 'enable_personal_saltkey_cookie', '0'),
+                            array('admin', 'personal_saltkey_cookie_duration', '31'),
+                            array('admin', 'email_smtp_server', ''),
+                            array('admin', 'email_smtp_auth', ''),
+                            array('admin', 'email_auth_username', ''),
+                            array('admin', 'email_auth_pwd', ''),
+                            array('admin', 'email_port', ''),
+                            array('admin', 'email_security', ''),
+                            array('admin', 'email_server_url', ''),
+                            array('admin', 'email_from', ''),
+                            array('admin', 'email_from_name', ''),
+                            array('admin', 'pwd_maximum_length', '40'),
+                            array('admin', 'google_authentication', '0'),
+                            array('admin', 'delay_item_edition', '0'),
+                            array('admin', 'allow_import', '0'),
+                            array('admin', 'proxy_ip', ''),
+                            array('admin', 'proxy_port', ''),
+                            array('admin', 'upload_maxfilesize', '10mb'),
+                            array('admin', 'upload_docext', 'doc,docx,dotx,xls,xlsx,xltx,rtf,csv,txt,pdf,ppt,pptx,pot,dotx,xltx'),
+                            array('admin', 'upload_imagesext', 'jpg,jpeg,gif,png'),
+                            array('admin', 'upload_pkgext', '7z,rar,tar,zip'),
+                            array('admin', 'upload_otherext', 'sql,xml'),
+                            array('admin', 'upload_imageresize_options', '1'),
+                            array('admin', 'upload_imageresize_width', '800'),
+                            array('admin', 'upload_imageresize_height', '600'),
+                            array('admin', 'upload_imageresize_quality', '90'),
+                            array('admin', 'use_md5_password_as_salt', '0'),
+                            array('admin', 'ga_website_name', 'TeamPass for ChangeMe'),
+                            array('admin', 'api', '0'),
+                            array('admin', 'subfolder_rights_as_parent', '0'),
+                            array('admin', 'show_only_accessible_folders', '0'),
+                            array('admin', 'enable_suggestion', '0'),
+                            array('admin', 'otv_expiration_period', '7'),
+                            array('admin', 'default_session_expiration_time', '60'),
+                            array('admin', 'duo', '0'),
+                            array('admin', 'enable_server_password_change', '0'),
+                            array('admin', 'ldap_object_class', '0'),
+                            array('admin', 'bck_script_path', $var['abspath']."/backups"),
+                            array('admin', 'bck_script_filename', 'bck_teampass'),
+                            array('admin', 'syslog_enable', '0'),
+                            array('admin', 'syslog_host', 'localhost'),
+                            array('admin', 'syslog_port', '514'),
+                            array('admin', 'manager_move_item', '0'),
+                            array('admin', 'create_item_without_password', '0'),
+                            array('admin', 'otv_is_enabled', '0'),
+                            array('admin', 'agses_authentication_enabled', '0'),
+                            array('admin', 'item_extra_fields', '0'),
+                            array('admin', 'saltkey_ante_2127', 'none'),
+                            array('admin', 'migration_to_2127', 'done')
                         );
                         foreach ($aMiscVal as $elem) {
                             //Check if exists before inserting
@@ -448,7 +448,7 @@ 
                                     (`type`, `intitule`, `valeur`) VALUES
                                     ('".$elem[0]."', '".$elem[1]."', '".
                                     str_replace("'", "", $elem[2])."');"
-                                );    // or die(mysqli_error($dbTmp))
+                                ); // or die(mysqli_error($dbTmp))
                             }
 
                             // append new setting in config file
@@ -843,10 +843,10 @@ 
                         $tmp = mysqli_num_rows(mysqli_query($dbTmp, "SELECT * FROM `".$var['tbl_prefix']."users` WHERE login = 'admin'"));
                         if ($tmp === "0") {
                             $mysqli_result = mysqli_query($dbTmp,
-                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `admin`, `gestionnaire`, `personal_folder`, `groupes_visibles`, `email`, `encrypted_psk`) VALUES ('1', 'admin', '".bCrypt($var['admin_pwd'],'13' )."', '1', '0', '0', '', '', '')"
+                                "INSERT INTO `".$var['tbl_prefix']."users` (`id`, `login`, `pw`, `admin`, `gestionnaire`, `personal_folder`, `groupes_visibles`, `email`, `encrypted_psk`) VALUES ('1', 'admin', '".bCrypt($var['admin_pwd'], '13')."', '1', '0', '0', '', '', '')"
                             );
                         } else {
-                            $mysqli_result = mysqli_query($dbTmp, "UPDATE `".$var['tbl_prefix']."users` SET `pw` = '".bCrypt($var['admin_pwd'],'13' )."' WHERE login = 'admin' AND id = '1'");
+                            $mysqli_result = mysqli_query($dbTmp, "UPDATE `".$var['tbl_prefix']."users` SET `pw` = '".bCrypt($var['admin_pwd'], '13')."' WHERE login = 'admin' AND id = '1'");
                         }
 
                         // check that API doesn't exist
@@ -878,13 +878,13 @@ 
 
             mysqli_close($dbTmp);
             // Destroy session without writing to disk
-            define('NODESTROY_SESSION','true');
+            define('NODESTROY_SESSION', 'true');
             session_destroy();
             break;
 
         case "step_6":
             //decrypt
-            require_once 'libs/aesctr.php';  // AES Counter Mode implementation
+            require_once 'libs/aesctr.php'; // AES Counter Mode implementation
             $activity = Encryption\Crypt\aesctr::decrypt($_POST['activity'], "cpm", 128);
             $data_sent = Encryption\Crypt\aesctr::decrypt($_POST['data'], "cpm", 128);
             $data_sent = json_decode($data_sent, true);
@@ -995,9 +995,9 @@ 
                     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
                         // Change directory permissions
                         $result = chmod_r($_SESSION['abspath'], 0770, 0740);
-                        if ($result )
+                        if ($result)
                             $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
-                        if  ($result)
+                        if ($result)
                             $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
                     }
 
@@ -1039,8 +1039,8 @@ 
                             $events .= "The file $csrfp_file already exist. A copy has been created.<br />";
                         }
                     }
-                    unlink($csrfp_file);    // delete existing csrfp.config file
-                    copy($csrfp_file_sample, $csrfp_file);  // make a copy of csrfp.config.sample file
+                    unlink($csrfp_file); // delete existing csrfp.config file
+                    copy($csrfp_file_sample, $csrfp_file); // make a copy of csrfp.config.sample file
                     $data = file_get_contents($csrfp_file);
                     $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "'.bin2hex(openssl_random_pseudo_bytes(25)).'"', $data);
                     $jsUrl = $data_sent['url_path'].'/includes/libraries/csrfp/js/csrfprotector.js';
@@ -1053,13 +1053,13 @@ 
 
             mysqli_close($dbTmp);
             // Destroy session without writing to disk
-            define('NODESTROY_SESSION','true');
+            define('NODESTROY_SESSION', 'true');
             session_destroy();
             break;
         case "step_7":
 
             //decrypt
-            require_once 'libs/aesctr.php';  // AES Counter Mode implementation
+            require_once 'libs/aesctr.php'; // AES Counter Mode implementation
             $activity = Encryption\Crypt\aesctr::decrypt($_POST['activity'], "cpm", 128);
             $task = Encryption\Crypt\aesctr::decrypt($_POST['task'], "cpm", 128);
             // launch
@@ -1068,7 +1068,7 @@ 
             if ($activity == "file") {
                 if ($task == "deleteInstall") {
                     function delTree($dir) {
-                        $files = array_diff(scandir($dir), array('.','..'));
+                        $files = array_diff(scandir($dir), array('.', '..'));
 
                         foreach ($files as $file) {
                             (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
@@ -1076,7 +1076,7 @@ 
                         return rmdir($dir);
                     }
 
-                    $result=true;
+                    $result = true;
                     $errorMsg = "Cannot delete installation directory";
                     if (file_exists($_SESSION['abspath'].'/install')) {
                         // set the permissions on the install directory and delete
@@ -1102,7 +1102,7 @@ 
             //
             mysqli_close($dbTmp);
             // Destroy session without writing to disk
-            define('NODESTROY_SESSION','true');
+            define('NODESTROY_SESSION', 'true');
             session_destroy();
             break;
     }

Braces +15 added lines, -10 removed lines

@@ -23,14 +23,16 @@ 
     $dp = opendir($dir);
     $res = true;
     while($file = readdir($dp)) {
-        if (($file == ".") || ($file == ".."))
-            continue;
+        if (($file == ".") || ($file == "..")) {
+                    continue;
+        }
 
         $fullPath = $dir."/".$file;
 
         if(is_dir($fullPath)) {
-            if ($res = @chmod($fullPath, $dirPermissions))
-                $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
+            if ($res = @chmod($fullPath, $dirPermissions)) {
+                            $res = @chmod_r($fullPath, $dirPermissions, $filePermissions);
+            }
         } else {
             $res = chmod($fullPath, $filePermissions);
         }
@@ -40,8 +42,9 @@ 
         }
     }
     closedir($dp);
-    if (is_dir($dir) && $res)
-        $res = @chmod($dir, $dirPermissions);
+    if (is_dir($dir) && $res) {
+            $res = @chmod($dir, $dirPermissions);
+    }
 
     return $res;
 }
@@ -995,10 +998,12 @@ 
                     if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
                         // Change directory permissions
                         $result = chmod_r($_SESSION['abspath'], 0770, 0740);
-                        if ($result )
-                            $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
-                        if  ($result)
-                            $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
+                        if ($result ) {
+                                                    $result = chmod_r($_SESSION['abspath'].'/files', 0770, 0770);
+                        }
+                        if  ($result) {
+                                                    $result = chmod_r($_SESSION['abspath'].'/upload', 0770, 0770);
+                        }
                     }
 
                     if ($result === false) {

install/js/crypt/aes.class.php

Doc Comments +13 added lines

@@ -40,6 +40,10 @@ 
     return $output;
   }
 
+  /**
+   * @param integer $rnd
+   * @param integer $Nb
+   */
   private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
     for ($r=0; $r<4; $r++) {
       for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
@@ -48,6 +52,9 @@ 
     return $state;
   }
 
+  /**
+   * @param integer $Nb
+   */
   private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
     for ($r=0; $r<4; $r++) {
       for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
@@ -56,6 +63,9 @@ 
     return $s;
   }
 
+  /**
+   * @param integer $Nb
+   */
   private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
     for ($r=1; $r<4; $r++) {
@@ -65,6 +75,9 @@ 
     return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
   }
 
+  /**
+   * @param integer $Nb
+   */
   private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
     for ($c=0; $c<4; $c++) {
       $a = array(4);  // 'a' is a copy of the current column from 's'

Indentation +61 added lines, -61 removed lines

@@ -6,15 +6,15 @@ 
 
 class Aes
 {
-  /**
-   * AES Cipher function: encrypt 'input' with Rijndael algorithm
-   *
-   * @param input message as byte-array (16 bytes)
-   * @param w     key schedule as 2D byte-array (Nr+1 x Nb bytes) -
-   *              generated from the cipher key by keyExpansion()
-   * @return      ciphertext as byte-array (16 bytes)
-   */
-  public static function cipher($input, $w) {    // main cipher function [é5.1]
+    /**
+     * AES Cipher function: encrypt 'input' with Rijndael algorithm
+     *
+     * @param input message as byte-array (16 bytes)
+     * @param w     key schedule as 2D byte-array (Nr+1 x Nb bytes) -
+     *              generated from the cipher key by keyExpansion()
+     * @return      ciphertext as byte-array (16 bytes)
+     */
+    public static function cipher($input, $w) {    // main cipher function [é5.1]
     $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
     $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
@@ -24,10 +24,10 @@ 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
     for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
-      $state = self::subBytes($state, $Nb);
-      $state = self::shiftRows($state, $Nb);
-      $state = self::mixColumns($state, $Nb);
-      $state = self::addRoundKey($state, $w, $round, $Nb);
+        $state = self::subBytes($state, $Nb);
+        $state = self::shiftRows($state, $Nb);
+        $state = self::mixColumns($state, $Nb);
+        $state = self::addRoundKey($state, $w, $round, $Nb);
     }
 
     $state = self::subBytes($state, $Nb);
@@ -38,59 +38,59 @@ 
     for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
 
     return $output;
-  }
+    }
 
-  private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
+    private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+        for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
     }
 
     return $state;
-  }
+    }
 
-  private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
+    private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+        for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
     }
 
     return $s;
-  }
+    }
 
-  private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
+    private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
     for ($r=1; $r<4; $r++) {
-      for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+        for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
+        for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
     }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
     return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
-  }
+    }
 
-  private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
+    private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
     for ($c=0; $c<4; $c++) {
-      $a = array(4);  // 'a' is a copy of the current column from 's'
-      $b = array(4);  // 'b' is aé{02} in GF(2^8)
-      for ($i=0; $i<4; $i++) {
+        $a = array(4);  // 'a' is a copy of the current column from 's'
+        $b = array(4);  // 'b' is aé{02} in GF(2^8)
+        for ($i=0; $i<4; $i++) {
         $a[$i] = $s[$i][$c];
         $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
-      }
-      // a[n] ^ b[n] is aé{03} in GF(2^8)
-      $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
-      $s[1][$c] = $a[0] ^ $b[1] ^ $a[2] ^ $b[2] ^ $a[3]; // a0 * 2*a1 + 3*a2 + a3
-      $s[2][$c] = $a[0] ^ $a[1] ^ $b[2] ^ $a[3] ^ $b[3]; // a0 + a1 + 2*a2 + 3*a3
-      $s[3][$c] = $a[0] ^ $b[0] ^ $a[1] ^ $a[2] ^ $b[3]; // 3*a0 + a1 + a2 + 2*a3
+        }
+        // a[n] ^ b[n] is aé{03} in GF(2^8)
+        $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
+        $s[1][$c] = $a[0] ^ $b[1] ^ $a[2] ^ $b[2] ^ $a[3]; // a0 * 2*a1 + 3*a2 + a3
+        $s[2][$c] = $a[0] ^ $a[1] ^ $b[2] ^ $a[3] ^ $b[3]; // a0 + a1 + 2*a2 + 3*a3
+        $s[3][$c] = $a[0] ^ $b[0] ^ $a[1] ^ $a[2] ^ $b[3]; // 3*a0 + a1 + a2 + 2*a3
     }
 
     return $s;
-  }
-
-  /**
-   * Key expansion for Rijndael cipher(): performs key expansion on cipher key
-   * to generate a key schedule
-   *
-   * @param key cipher key byte-array (16 bytes)
-   * @return    key schedule as 2D byte-array (Nr+1 x Nb bytes)
-   */
-  public static function keyExpansion($key) {  // generate Key Schedule from Cipher Key [é5.2]
+    }
+
+    /**
+     * Key expansion for Rijndael cipher(): performs key expansion on cipher key
+     * to generate a key schedule
+     *
+     * @param key cipher key byte-array (16 bytes)
+     * @return    key schedule as 2D byte-array (Nr+1 x Nb bytes)
+     */
+    public static function keyExpansion($key) {  // generate Key Schedule from Cipher Key [é5.2]
     $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
     $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
     $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
@@ -99,41 +99,41 @@ 
     $temp = array();
 
     for ($i=0; $i<$Nk; $i++) {
-      $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
-      $w[$i] = $r;
+        $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+        $w[$i] = $r;
     }
 
     for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
-      $w[$i] = array();
-      for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
-      if ($i % $Nk == 0) {
+        $w[$i] = array();
+        for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
+        if ($i % $Nk == 0) {
         $temp = self::subWord(self::rotWord($temp));
         for ($t=0; $t<4; $t++) $temp[$t] ^= self::$rCon[$i/$Nk][$t];
-      } elseif ($Nk > 6 && $i%$Nk == 4) {
+        } elseif ($Nk > 6 && $i%$Nk == 4) {
         $temp = self::subWord($temp);
-      }
-      for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+        }
+        for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
     }
 
     return $w;
-  }
+    }
 
-  private static function subWord($w) {    // apply SBox to 4-byte word w
+    private static function subWord($w) {    // apply SBox to 4-byte word w
     for ($i=0; $i<4; $i++) $w[$i] = self::$sBox[$w[$i]];
 
     return $w;
-  }
+    }
 
-  private static function rotWord($w) {    // rotate 4-byte word w left by one byte
+    private static function rotWord($w) {    // rotate 4-byte word w left by one byte
     $tmp = $w[0];
     for ($i=0; $i<3; $i++) $w[$i] = $w[$i+1];
     $w[3] = $tmp;
 
     return $w;
-  }
+    }
 
-  // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
-  private static $sBox = array(
+    // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
+    private static $sBox = array(
     0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
     0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
     0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
@@ -151,8 +151,8 @@ 
     0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
     0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16);
 
-  // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
-  private static $rCon = array(
+    // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
+    private static $rCon = array(
     array(0x00, 0x00, 0x00, 0x00),
     array(0x01, 0x00, 0x00, 0x00),
     array(0x02, 0x00, 0x00, 0x00),

Spacing +48 added lines, -48 removed lines

@@ -15,15 +15,15 @@ 
    * @return      ciphertext as byte-array (16 bytes)
    */
   public static function cipher($input, $w) {    // main cipher function [é5.1]
-    $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
-    $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+    $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+    $Nr = count($w) / $Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
-    $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $state[$i%4][floor($i/4)] = $input[$i];
+    $state = array(); // initialise 4xNb byte-array 'state' with input [é3.4]
+    for ($i = 0; $i < 4 * $Nb; $i++) $state[$i % 4][floor($i / 4)] = $input[$i];
 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
-    for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
+    for ($round = 1; $round < $Nr; $round++) {  // apply Nr rounds
       $state = self::subBytes($state, $Nb);
       $state = self::shiftRows($state, $Nb);
       $state = self::mixColumns($state, $Nb);
@@ -34,23 +34,23 @@ 
     $state = self::shiftRows($state, $Nb);
     $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
-    $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
+    $output = array(4 * $Nb); // convert state to 1-d array before returning [é3.4]
+    for ($i = 0; $i < 4 * $Nb; $i++) $output[$i] = $state[$i % 4][floor($i / 4)];
 
     return $output;
   }
 
   private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
-    for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+    for ($r = 0; $r < 4; $r++) {
+      for ($c = 0; $c < $Nb; $c++) $state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
     }
 
     return $state;
   }
 
   private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
-    for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+    for ($r = 0; $r < 4; $r++) {
+      for ($c = 0; $c < $Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
     }
 
     return $s;
@@ -58,20 +58,20 @@ 
 
   private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
-    for ($r=1; $r<4; $r++) {
-      for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+    for ($r = 1; $r < 4; $r++) {
+      for ($c = 0; $c < 4; $c++) $t[$c] = $s[$r][($c + $r) % $Nb]; // shift into temp copy
+      for ($c = 0; $c < 4; $c++) $s[$r][$c] = $t[$c]; // and copy back
     }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-    return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
+    return $s; // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
   }
 
   private static function mixColumns($s, $Nb) {   // combine bytes of each col of state S [é5.1.3]
-    for ($c=0; $c<4; $c++) {
-      $a = array(4);  // 'a' is a copy of the current column from 's'
-      $b = array(4);  // 'b' is aé{02} in GF(2^8)
-      for ($i=0; $i<4; $i++) {
+    for ($c = 0; $c < 4; $c++) {
+      $a = array(4); // 'a' is a copy of the current column from 's'
+      $b = array(4); // 'b' is aé{02} in GF(2^8)
+      for ($i = 0; $i < 4; $i++) {
         $a[$i] = $s[$i][$c];
-        $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
+        $b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
       }
       // a[n] ^ b[n] is aé{03} in GF(2^8)
       $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
@@ -91,42 +91,42 @@ 
    * @return    key schedule as 2D byte-array (Nr+1 x Nb bytes)
    */
   public static function keyExpansion($key) {  // generate Key Schedule from Cipher Key [é5.2]
-    $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
-    $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
-    $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
+    $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+    $Nk = count($key) / 4; // key length (in words): 4/6/8 for 128/192/256-bit keys
+    $Nr = $Nk + 6; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
     $w = array();
     $temp = array();
 
-    for ($i=0; $i<$Nk; $i++) {
-      $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+    for ($i = 0; $i < $Nk; $i++) {
+      $r = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
       $w[$i] = $r;
     }
 
-    for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
+    for ($i = $Nk; $i < ($Nb * ($Nr + 1)); $i++) {
       $w[$i] = array();
-      for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
+      for ($t = 0; $t < 4; $t++) $temp[$t] = $w[$i - 1][$t];
       if ($i % $Nk == 0) {
         $temp = self::subWord(self::rotWord($temp));
-        for ($t=0; $t<4; $t++) $temp[$t] ^= self::$rCon[$i/$Nk][$t];
-      } elseif ($Nk > 6 && $i%$Nk == 4) {
+        for ($t = 0; $t < 4; $t++) $temp[$t] ^= self::$rCon[$i / $Nk][$t];
+      } elseif ($Nk > 6 && $i % $Nk == 4) {
         $temp = self::subWord($temp);
       }
-      for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      for ($t = 0; $t < 4; $t++) $w[$i][$t] = $w[$i - $Nk][$t] ^ $temp[$t];
     }
 
     return $w;
   }
 
   private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) $w[$i] = self::$sBox[$w[$i]];
+    for ($i = 0; $i < 4; $i++) $w[$i] = self::$sBox[$w[$i]];
 
     return $w;
   }
 
   private static function rotWord($w) {    // rotate 4-byte word w left by one byte
     $tmp = $w[0];
-    for ($i=0; $i<3; $i++) $w[$i] = $w[$i+1];
+    for ($i = 0; $i < 3; $i++) $w[$i] = $w[$i + 1];
     $w[3] = $tmp;
 
     return $w;
@@ -134,22 +134,22 @@ 
 
   // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
   private static $sBox = array(
-    0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
-    0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
-    0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
-    0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
-    0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
-    0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
-    0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
-    0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
-    0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
-    0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
-    0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
-    0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
-    0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
-    0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
-    0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
-    0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16);
+    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+    0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+    0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+    0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+    0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+    0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+    0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+    0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+    0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+    0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+    0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16);
 
   // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
   private static $rCon = array(

Braces +35 added lines, -11 removed lines

@@ -19,7 +19,9 @@ 
     $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
     $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $state[$i%4][floor($i/4)] = $input[$i];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $state[$i%4][floor($i/4)] = $input[$i];
+    }
 
     $state = self::addRoundKey($state, $w, 0, $Nb);
 
@@ -35,14 +37,18 @@ 
     $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
     $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-    for ($i=0; $i<4*$Nb; $i++) $output[$i] = $state[$i%4][floor($i/4)];
+    for ($i=0; $i<4*$Nb; $i++) {
+        $output[$i] = $state[$i%4][floor($i/4)];
+    }
 
     return $output;
   }
 
   private static function addRoundKey($state, $w, $rnd, $Nb) {  // xor Round Key into state S [é5.1.4]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      for ($c=0; $c<$Nb; $c++) {
+          $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+      }
     }
 
     return $state;
@@ -50,7 +56,9 @@ 
 
   private static function subBytes($s, $Nb) {    // apply SBox to state S [é5.1.1]
     for ($r=0; $r<4; $r++) {
-      for ($c=0; $c<$Nb; $c++) $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      for ($c=0; $c<$Nb; $c++) {
+          $s[$r][$c] = self::$sBox[$s[$r][$c]];
+      }
     }
 
     return $s;
@@ -59,8 +67,14 @@ 
   private static function shiftRows($s, $Nb) {    // shift row r of state S left by r bytes [é5.1.2]
     $t = array(4);
     for ($r=1; $r<4; $r++) {
-      for ($c=0; $c<4; $c++) $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
-      for ($c=0; $c<4; $c++) $s[$r][$c] = $t[$c];           // and copy back
+      for ($c=0; $c<4; $c++) {
+          $t[$c] = $s[$r][($c+$r)%$Nb];
+      }
+      // shift into temp copy
+      for ($c=0; $c<4; $c++) {
+          $s[$r][$c] = $t[$c];
+      }
+      // and copy back
     }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
     return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
   }
@@ -105,28 +119,38 @@ 
 
     for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
       $w[$i] = array();
-      for ($t=0; $t<4; $t++) $temp[$t] = $w[$i-1][$t];
+      for ($t=0; $t<4; $t++) {
+          $temp[$t] = $w[$i-1][$t];
+      }
       if ($i % $Nk == 0) {
         $temp = self::subWord(self::rotWord($temp));
-        for ($t=0; $t<4; $t++) $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+        for ($t=0; $t<4; $t++) {
+            $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+        }
       } elseif ($Nk > 6 && $i%$Nk == 4) {
         $temp = self::subWord($temp);
       }
-      for ($t=0; $t<4; $t++) $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      for ($t=0; $t<4; $t++) {
+          $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+      }
     }
 
     return $w;
   }
 
   private static function subWord($w) {    // apply SBox to 4-byte word w
-    for ($i=0; $i<4; $i++) $w[$i] = self::$sBox[$w[$i]];
+    for ($i=0; $i<4; $i++) {
+        $w[$i] = self::$sBox[$w[$i]];
+    }
 
     return $w;
   }
 
   private static function rotWord($w) {    // rotate 4-byte word w left by one byte
     $tmp = $w[0];
-    for ($i=0; $i<3; $i++) $w[$i] = $w[$i+1];
+    for ($i=0; $i<3; $i++) {
+        $w[$i] = $w[$i+1];
+    }
     $w[3] = $tmp;
 
     return $w;

install/js/crypt/aesctr.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
    * @param plaintext source text to be encrypted
    * @param password  the password to use to generate a key
    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-   * @return          encrypted text
+   * @return          string text
    */
   public static function encrypt($plaintext, $password, $nBits)
   {
@@ -84,7 +84,7 @@ 
    * @param ciphertext source text to be decrypted
    * @param password   the password to use to generate a key
    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-   * @return           decrypted text
+   * @return           string text
    */
   public static function decrypt($ciphertext, $password, $nBits)
   {

Indentation +51 added lines, -51 removed lines

@@ -7,19 +7,19 @@ 
 
 class AesCtr extends Aes
 {
-  /**
-   * Encrypt a text using AES encryption in Counter mode of operation
-   *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-   *
-   * Unicode multi-byte character safe
-   *
-   * @param plaintext source text to be encrypted
-   * @param password  the password to use to generate a key
-   * @param nBits     number of bits to be used in the key (128, 192, or 256)
-   * @return          encrypted text
-   */
-  public static function encrypt($plaintext, $password, $nBits)
-  {
+    /**
+     * Encrypt a text using AES encryption in Counter mode of operation
+     *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+     *
+     * Unicode multi-byte character safe
+     *
+     * @param plaintext source text to be encrypted
+     * @param password  the password to use to generate a key
+     * @param nBits     number of bits to be used in the key (128, 192, or 256)
+     * @return          encrypted text
+     */
+    public static function encrypt($plaintext, $password, $nBits)
+    {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
     if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
@@ -53,22 +53,22 @@ 
     $ciphertxt = array();  // ciphertext as array of strings
 
     for ($b=0; $b<$blockCount; $b++) {
-      // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-      // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+        // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+        // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
+        for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+        for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
 
-      $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+        $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
 
-      // block size is reduced on final block
-      $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
-      $cipherByte = array();
+        // block size is reduced on final block
+        $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
+        $cipherByte = array();
 
-      for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
+        for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
         $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b*$blockSize+$i, 1));
         $cipherByte[$i] = chr($cipherByte[$i]);
-      }
-      $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+        }
+        $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
     }
 
     // implode is more efficient than repeated string concatenation
@@ -76,18 +76,18 @@ 
     $ciphertext = base64_encode($ciphertext);
 
     return $ciphertext;
-  }
+    }
 
-  /**
-   * Decrypt a text encrypted by AES in counter mode of operation
-   *
-   * @param ciphertext source text to be decrypted
-   * @param password   the password to use to generate a key
-   * @param nBits      number of bits to be used in the key (128, 192, or 256)
-   * @return           decrypted text
-   */
-  public static function decrypt($ciphertext, $password, $nBits)
-  {
+    /**
+     * Decrypt a text encrypted by AES in counter mode of operation
+     *
+     * @param ciphertext source text to be decrypted
+     * @param password   the password to use to generate a key
+     * @param nBits      number of bits to be used in the key (128, 192, or 256)
+     * @return           decrypted text
+     */
+    public static function decrypt($ciphertext, $password, $nBits)
+    {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
     if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
@@ -117,47 +117,47 @@ 
     $plaintxt = array();
 
     for ($b=0; $b<$nBlocks; $b++) {
-      // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+        // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
+        for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+        for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
 
-      $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+        $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
 
-      $plaintxtByte = array();
-      for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+        $plaintxtByte = array();
+        for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
         // -- xor plaintext with ciphered counter byte-by-byte --
         $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b],$i,1));
         $plaintxtByte[$i] = chr($plaintxtByte[$i]);
 
-      }
-      $plaintxt[$b] = implode('', $plaintxtByte);
+        }
+        $plaintxt[$b] = implode('', $plaintxtByte);
     }
 
     // join array of blocks into single plaintext string
     $plaintext = implode('',$plaintxt);
 
     return $plaintext;
-  }
+    }
 
-  /*
+    /*
    * Unsigned right shift function, since PHP has neither >>> operator nor unsigned ints
    *
    * @param a  number to be shifted (32-bit integer)
    * @param b  number of bits to shift a to the right (0..31)
    * @return   a right-shifted and zero-filled by b bits
    */
-  private static function urs($a, $b)
-  {
+    private static function urs($a, $b)
+    {
     $a &= 0xffffffff; $b &= 0x1f;  // (bounds check)
     if ($a&0x80000000 && $b>0) {   // if left-most bit set
-      $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
-      $a = $a >> ($b-1);           //   remaining right-shifts
+        $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
+        $a = $a >> ($b-1);           //   remaining right-shifts
     } else {                       // otherwise
-      $a = ($a>>$b);               //   use normal right-shift
+        $a = ($a>>$b);               //   use normal right-shift
     }
 
     return $a;
-  }
+    }
 
 }
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  */

Spacing +42 added lines, -42 removed lines

@@ -20,55 +20,55 @@ 
    */
   public static function encrypt($plaintext, $password, $nBits)
   {
-    $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+    if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) return ''; // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
     // use AES itself to encrypt password to get cipher key (using plain password as source for
     // key expansion) - gives us well encrypted key
-    $nBytes = $nBits/8;  // no bytes in key
+    $nBytes = $nBits / 8; // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i = 0; $i < $nBytes; $i++) $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-    $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+    $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
     // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in
     // 1st 8 bytes, block counter in 2nd 8 bytes
     $counterBlock = array();
-    $nonce = floor(microtime(true)*1000);   // timestamp: milliseconds since 1-Jan-1970
-    $nonceSec = floor($nonce/1000);
-    $nonceMs = $nonce%1000;
+    $nonce = floor(microtime(true) * 1000); // timestamp: milliseconds since 1-Jan-1970
+    $nonceSec = floor($nonce / 1000);
+    $nonceMs = $nonce % 1000;
     // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-    for ($i=0; $i<4; $i++) $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
-    for ($i=0; $i<4; $i++) $counterBlock[$i+4] = $nonceMs & 0xff;
+    for ($i = 0; $i < 4; $i++) $counterBlock[$i] = self::urs($nonceSec, $i * 8) & 0xff;
+    for ($i = 0; $i < 4; $i++) $counterBlock[$i + 4] = $nonceMs & 0xff;
     // and convert it to a string to go on the front of the ciphertext
     $ctrTxt = '';
-    for ($i=0; $i<8; $i++) $ctrTxt .= chr($counterBlock[$i]);
+    for ($i = 0; $i < 8; $i++) $ctrTxt .= chr($counterBlock[$i]);
 
     // generate key schedule - an expansion of the key into distinct Key Rounds for each round
     $keySchedule = Aes::keyExpansion($key);
     //print_r($keySchedule);
 
-    $blockCount = ceil(strlen($plaintext)/$blockSize);
-    $ciphertxt = array();  // ciphertext as array of strings
+    $blockCount = ceil(strlen($plaintext) / $blockSize);
+    $ciphertxt = array(); // ciphertext as array of strings
 
-    for ($b=0; $b<$blockCount; $b++) {
+    for ($b = 0; $b < $blockCount; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
       // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
+      for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c - 4] = self::urs($b / 0x100000000, $c * 8);
 
-      $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+      $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // -- encrypt counter block --
 
       // block size is reduced on final block
-      $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
+      $blockLength = $b < $blockCount - 1 ? $blockSize : (strlen($plaintext) - 1) % $blockSize + 1;
       $cipherByte = array();
 
-      for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
-        $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b*$blockSize+$i, 1));
+      for ($i = 0; $i < $blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
+        $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b * $blockSize + $i, 1));
         $cipherByte[$i] = chr($cipherByte[$i]);
       }
-      $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+      $ciphertxt[$b] = implode('', $cipherByte); // escape troublesome characters in ciphertext
     }
 
     // implode is more efficient than repeated string concatenation
@@ -88,45 +88,45 @@ 
    */
   public static function decrypt($ciphertext, $password, $nBits)
   {
-    $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+    if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) return ''; // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
 
     // use AES to encrypt password (mirroring encrypt routine)
-    $nBytes = $nBits/8;  // no bytes in key
+    $nBytes = $nBits / 8; // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i = 0; $i < $nBytes; $i++) $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-    $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+    $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
     // recover nonce from 1st element of ciphertext
     $counterBlock = array();
     $ctrTxt = substr($ciphertext, 0, 8);
-    for ($i=0; $i<8; $i++) $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    for ($i = 0; $i < 8; $i++) $counterBlock[$i] = ord(substr($ctrTxt, $i, 1));
 
     // generate key schedule
     $keySchedule = Aes::keyExpansion($key);
 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
-    $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
+    $nBlocks = ceil((strlen($ciphertext) - 8) / $blockSize);
     $ct = array();
-    for ($b=0; $b<$nBlocks; $b++) $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
-    $ciphertext = $ct;  // ciphertext is now array of block-length strings
+    for ($b = 0; $b < $nBlocks; $b++) $ct[$b] = substr($ciphertext, 8 + $b * $blockSize, 16);
+    $ciphertext = $ct; // ciphertext is now array of block-length strings
 
     // plaintext will get generated block-by-block into array of block-length strings
     $plaintxt = array();
 
-    for ($b=0; $b<$nBlocks; $b++) {
+    for ($b = 0; $b < $nBlocks; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
+      for ($c = 0; $c < 4; $c++) $counterBlock[15 - $c - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
 
-      $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+      $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // encrypt counter block
 
       $plaintxtByte = array();
-      for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+      for ($i = 0; $i < strlen($ciphertext[$b]); $i++) {
         // -- xor plaintext with ciphered counter byte-by-byte --
-        $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b],$i,1));
+        $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
         $plaintxtByte[$i] = chr($plaintxtByte[$i]);
 
       }
@@ -134,7 +134,7 @@ 
     }
 
     // join array of blocks into single plaintext string
-    $plaintext = implode('',$plaintxt);
+    $plaintext = implode('', $plaintxt);
 
     return $plaintext;
   }
@@ -148,12 +148,12 @@ 
    */
   private static function urs($a, $b)
   {
-    $a &= 0xffffffff; $b &= 0x1f;  // (bounds check)
-    if ($a&0x80000000 && $b>0) {   // if left-most bit set
-      $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
-      $a = $a >> ($b-1);           //   remaining right-shifts
+    $a &= 0xffffffff; $b &= 0x1f; // (bounds check)
+    if ($a & 0x80000000 && $b > 0) {   // if left-most bit set
+      $a = ($a >> 1) & 0x7fffffff; //   right-shift one bit & clear left-most bit
+      $a = $a >> ($b - 1); //   remaining right-shifts
     } else {                       // otherwise
-      $a = ($a>>$b);               //   use normal right-shift
+      $a = ($a >> $b); //   use normal right-shift
     }
 
     return $a;

Braces +41 added lines, -13 removed lines

@@ -21,14 +21,19 @@ 
   public static function encrypt($plaintext, $password, $nBits)
   {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
     // use AES itself to encrypt password to get cipher key (using plain password as source for
     // key expansion) - gives us well encrypted key
     $nBytes = $nBits/8;  // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i=0; $i<$nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
     $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
@@ -39,11 +44,17 @@ 
     $nonceSec = floor($nonce/1000);
     $nonceMs = $nonce%1000;
     // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-    for ($i=0; $i<4; $i++) $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
-    for ($i=0; $i<4; $i++) $counterBlock[$i+4] = $nonceMs & 0xff;
+    for ($i=0; $i<4; $i++) {
+        $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+    }
+    for ($i=0; $i<4; $i++) {
+        $counterBlock[$i+4] = $nonceMs & 0xff;
+    }
     // and convert it to a string to go on the front of the ciphertext
     $ctrTxt = '';
-    for ($i=0; $i<8; $i++) $ctrTxt .= chr($counterBlock[$i]);
+    for ($i=0; $i<8; $i++) {
+        $ctrTxt .= chr($counterBlock[$i]);
+    }
 
     // generate key schedule - an expansion of the key into distinct Key Rounds for each round
     $keySchedule = Aes::keyExpansion($key);
@@ -55,8 +66,12 @@ 
     for ($b=0; $b<$blockCount; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
       // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+      }
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+      }
 
       $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
 
@@ -89,20 +104,27 @@ 
   public static function decrypt($ciphertext, $password, $nBits)
   {
     $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-    if (!($nBits==128 || $nBits==192 || $nBits==256)) return '';  // standard allows 128/192/256 bit keys
+    if (!($nBits==128 || $nBits==192 || $nBits==256)) {
+        return '';
+    }
+    // standard allows 128/192/256 bit keys
     $ciphertext = base64_decode($ciphertext);
 
     // use AES to encrypt password (mirroring encrypt routine)
     $nBytes = $nBits/8;  // no bytes in key
     $pwBytes = array();
-    for ($i=0; $i<$nBytes; $i++) $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    for ($i=0; $i<$nBytes; $i++) {
+        $pwBytes[$i] = ord(substr($password,$i,1)) & 0xff;
+    }
     $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
     $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
 
     // recover nonce from 1st element of ciphertext
     $counterBlock = array();
     $ctrTxt = substr($ciphertext, 0, 8);
-    for ($i=0; $i<8; $i++) $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    for ($i=0; $i<8; $i++) {
+        $counterBlock[$i] = ord(substr($ctrTxt,$i,1));
+    }
 
     // generate key schedule
     $keySchedule = Aes::keyExpansion($key);
@@ -110,7 +132,9 @@ 
     // separate ciphertext into blocks (skipping past initial 8 bytes)
     $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
     $ct = array();
-    for ($b=0; $b<$nBlocks; $b++) $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    for ($b=0; $b<$nBlocks; $b++) {
+        $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+    }
     $ciphertext = $ct;  // ciphertext is now array of block-length strings
 
     // plaintext will get generated block-by-block into array of block-length strings
@@ -118,8 +142,12 @@ 
 
     for ($b=0; $b<$nBlocks; $b++) {
       // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
-      for ($c=0; $c<4; $c++) $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+      }
+      for ($c=0; $c<4; $c++) {
+          $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+      }
 
       $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
 

install/libs/aesctr.php

Doc Comments +18 added lines, -5 removed lines

@@ -49,6 +49,10 @@ 
         return $output;
     }
 
+    /**
+     * @param integer $rnd
+     * @param integer $Nb
+     */
     private static function addRoundKey($state, $w, $rnd, $Nb)
     {
         // xor Round Key into state S [é5.1.4]
@@ -61,6 +65,9 @@ 
         return $state;
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function subBytes($s, $Nb)
     {
         // apply SBox to state S [é5.1.1]
@@ -73,6 +80,9 @@ 
         return $s;
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function shiftRows($s, $Nb)
     {
         // shift row r of state S left by r bytes [é5.1.2]
@@ -88,6 +98,9 @@ 
         return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
+    /**
+     * @param integer $Nb
+     */
     private static function mixColumns($s, $Nb)
     {
         // combine bytes of each col of state S [é5.1.3]
@@ -219,10 +232,10 @@ 
     *
     * Unicode multi-byte character safe
     *
-    * @param plaintext source text to be encrypted
+    * @param plaintext string text to be encrypted
     * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
+    * @param nBits     integer of bits to be used in the key (128, 192, or 256)
+    * @return          string text
     */
     public static function encrypt($plaintext, $password, $nBits)
     {
@@ -302,8 +315,8 @@ 
     *
     * @param ciphertext source text to be decrypted
     * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
+    * @param nBits      integer of bits to be used in the key (128, 192, or 256)
+    * @return           string text
     */
     public static function decrypt($ciphertext, $password, $nBits)
     {

Indentation +17 added lines, -17 removed lines

@@ -214,16 +214,16 @@ 
 {
 
     /**
-    * Encrypt a text using AES encryption in Counter mode of operation
-    *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-    *
-    * Unicode multi-byte character safe
-    *
-    * @param plaintext source text to be encrypted
-    * @param password  the password to use to generate a key
-    * @param nBits     number of bits to be used in the key (128, 192, or 256)
-    * @return          encrypted text
-    */
+     * Encrypt a text using AES encryption in Counter mode of operation
+     *  - see http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
+     *
+     * Unicode multi-byte character safe
+     *
+     * @param plaintext source text to be encrypted
+     * @param password  the password to use to generate a key
+     * @param nBits     number of bits to be used in the key (128, 192, or 256)
+     * @return          encrypted text
+     */
     public static function encrypt($plaintext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
@@ -298,13 +298,13 @@ 
     }
 
     /**
-    * Decrypt a text encrypted by AES in counter mode of operation
-    *
-    * @param ciphertext source text to be decrypted
-    * @param password   the password to use to generate a key
-    * @param nBits      number of bits to be used in the key (128, 192, or 256)
-    * @return           decrypted text
-    */
+     * Decrypt a text encrypted by AES in counter mode of operation
+     *
+     * @param ciphertext source text to be decrypted
+     * @param password   the password to use to generate a key
+     * @param nBits      number of bits to be used in the key (128, 192, or 256)
+     * @return           decrypted text
+     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
         $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES

Spacing +107 added lines, -107 removed lines

@@ -20,17 +20,17 @@ 
     public static function cipher($input, $w)
     {
         // main cipher function [é5.1]
-        $Nb = 4;                 // block size (in words): no of columns in state (fixed at 4 for AES)
-        $Nr = count($w)/$Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
+        $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+        $Nr = count($w) / $Nb - 1; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
-        $state = array();  // initialise 4xNb byte-array 'state' with input [é3.4]
-        for ($i=0; $i<4*$Nb; $i++) {
-            $state[$i%4][floor($i/4)] = $input[$i];
+        $state = array(); // initialise 4xNb byte-array 'state' with input [é3.4]
+        for ($i = 0; $i < 4 * $Nb; $i++) {
+            $state[$i % 4][floor($i / 4)] = $input[$i];
         }
 
         $state = self::addRoundKey($state, $w, 0, $Nb);
 
-        for ($round=1; $round<$Nr; $round++) {  // apply Nr rounds
+        for ($round = 1; $round < $Nr; $round++) {  // apply Nr rounds
             $state = self::subBytes($state, $Nb);
             $state = self::shiftRows($state, $Nb);
             $state = self::mixColumns($state, $Nb);
@@ -41,9 +41,9 @@ 
         $state = self::shiftRows($state, $Nb);
         $state = self::addRoundKey($state, $w, $Nr, $Nb);
 
-        $output = array(4*$Nb);  // convert state to 1-d array before returning [é3.4]
-        for ($i=0; $i<4*$Nb; $i++) {
-            $output[$i] = $state[$i%4][floor($i/4)];
+        $output = array(4 * $Nb); // convert state to 1-d array before returning [é3.4]
+        for ($i = 0; $i < 4 * $Nb; $i++) {
+            $output[$i] = $state[$i % 4][floor($i / 4)];
         }
 
         return $output;
@@ -52,9 +52,9 @@ 
     private static function addRoundKey($state, $w, $rnd, $Nb)
     {
         // xor Round Key into state S [é5.1.4]
-        for ($r=0; $r<4; $r++) {
-            for ($c=0; $c<$Nb; $c++) {
-                $state[$r][$c] ^= $w[$rnd*4+$c][$r];
+        for ($r = 0; $r < 4; $r++) {
+            for ($c = 0; $c < $Nb; $c++) {
+                $state[$r][$c] ^= $w[$rnd * 4 + $c][$r];
             }
         }
 
@@ -64,8 +64,8 @@ 
     private static function subBytes($s, $Nb)
     {
         // apply SBox to state S [é5.1.1]
-        for ($r=0; $r<4; $r++) {
-            for ($c=0; $c<$Nb; $c++) {
+        for ($r = 0; $r < 4; $r++) {
+            for ($c = 0; $c < $Nb; $c++) {
                 $s[$r][$c] = self::$sBox[$s[$r][$c]];
             }
         }
@@ -77,26 +77,26 @@ 
     {
         // shift row r of state S left by r bytes [é5.1.2]
         $t = array(4);
-        for ($r=1; $r<4; $r++) {
-            for ($c=0; $c<4; $c++) {
-                $t[$c] = $s[$r][($c+$r)%$Nb];  // shift into temp copy
+        for ($r = 1; $r < 4; $r++) {
+            for ($c = 0; $c < 4; $c++) {
+                $t[$c] = $s[$r][($c + $r) % $Nb]; // shift into temp copy
             }
-            for ($c=0; $c<4; $c++) {
-                $s[$r][$c] = $t[$c];           // and copy back
+            for ($c = 0; $c < 4; $c++) {
+                $s[$r][$c] = $t[$c]; // and copy back
             }
         }          // note that this will work for Nb=4,5,6, but not 7,8 (always 4 for AES):
-        return $s;  // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
+        return $s; // see fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.311.pdf
     }
 
     private static function mixColumns($s, $Nb)
     {
         // combine bytes of each col of state S [é5.1.3]
-        for ($c=0; $c<4; $c++) {
-            $a = array(4);  // 'a' is a copy of the current column from 's'
-            $b = array(4);  // 'b' is aé{02} in GF(2^8)
-            for ($i=0; $i<4; $i++) {
+        for ($c = 0; $c < 4; $c++) {
+            $a = array(4); // 'a' is a copy of the current column from 's'
+            $b = array(4); // 'b' is aé{02} in GF(2^8)
+            for ($i = 0; $i < 4; $i++) {
                 $a[$i] = $s[$i][$c];
-                $b[$i] = $s[$i][$c]&0x80 ? $s[$i][$c]<<1 ^ 0x011b : $s[$i][$c]<<1;
+                $b[$i] = $s[$i][$c] & 0x80 ? $s[$i][$c] << 1 ^ 0x011b : $s[$i][$c] << 1;
             }
             // a[n] ^ b[n] is aé{03} in GF(2^8)
             $s[0][$c] = $b[0] ^ $a[1] ^ $b[1] ^ $a[2] ^ $a[3]; // 2*a0 + 3*a1 + a2 + a3
@@ -118,33 +118,33 @@ 
     public static function keyExpansion($key)
     {
         // generate Key Schedule from Cipher Key [é5.2]
-        $Nb = 4;              // block size (in words): no of columns in state (fixed at 4 for AES)
-        $Nk = count($key)/4;  // key length (in words): 4/6/8 for 128/192/256-bit keys
-        $Nr = $Nk + 6;        // no of rounds: 10/12/14 for 128/192/256-bit keys
+        $Nb = 4; // block size (in words): no of columns in state (fixed at 4 for AES)
+        $Nk = count($key) / 4; // key length (in words): 4/6/8 for 128/192/256-bit keys
+        $Nr = $Nk + 6; // no of rounds: 10/12/14 for 128/192/256-bit keys
 
         $w = array();
         $temp = array();
 
-        for ($i=0; $i<$Nk; $i++) {
-            $r = array($key[4*$i], $key[4*$i+1], $key[4*$i+2], $key[4*$i+3]);
+        for ($i = 0; $i < $Nk; $i++) {
+            $r = array($key[4 * $i], $key[4 * $i + 1], $key[4 * $i + 2], $key[4 * $i + 3]);
             $w[$i] = $r;
         }
 
-        for ($i=$Nk; $i<($Nb*($Nr+1)); $i++) {
+        for ($i = $Nk; $i < ($Nb * ($Nr + 1)); $i++) {
             $w[$i] = array();
-            for ($t=0; $t<4; $t++) {
-                $temp[$t] = $w[$i-1][$t];
+            for ($t = 0; $t < 4; $t++) {
+                $temp[$t] = $w[$i - 1][$t];
             }
             if ($i % $Nk == 0) {
                 $temp = self::subWord(self::rotWord($temp));
-                for ($t=0; $t<4; $t++) {
-                    $temp[$t] ^= self::$rCon[$i/$Nk][$t];
+                for ($t = 0; $t < 4; $t++) {
+                    $temp[$t] ^= self::$rCon[$i / $Nk][$t];
                 }
-            } elseif ($Nk > 6 && $i%$Nk == 4) {
+            } elseif ($Nk > 6 && $i % $Nk == 4) {
                 $temp = self::subWord($temp);
             }
-            for ($t=0; $t<4; $t++) {
-                $w[$i][$t] = $w[$i-$Nk][$t] ^ $temp[$t];
+            for ($t = 0; $t < 4; $t++) {
+                $w[$i][$t] = $w[$i - $Nk][$t] ^ $temp[$t];
             }
         }
 
@@ -154,7 +154,7 @@ 
     private static function subWord($w)
     {
         // apply SBox to 4-byte word w
-        for ($i=0; $i<4; $i++) {
+        for ($i = 0; $i < 4; $i++) {
             $w[$i] = self::$sBox[$w[$i]];
         }
 
@@ -165,8 +165,8 @@ 
     {
         // rotate 4-byte word w left by one byte
         $tmp = $w[0];
-        for ($i=0; $i<3; $i++) {
-            $w[$i] = $w[$i+1];
+        for ($i = 0; $i < 3; $i++) {
+            $w[$i] = $w[$i + 1];
         }
         $w[3] = $tmp;
 
@@ -175,22 +175,22 @@ 
 
     // sBox is pre-computed multiplicative inverse in GF(2^8) used in subBytes and keyExpansion [é5.1.1]
     private static $sBox = array(
-            0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5,0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76,
-            0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0,0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0,
-            0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc,0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15,
-            0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a,0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75,
-            0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0,0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84,
-            0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b,0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf,
-            0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85,0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8,
-            0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5,0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2,
-            0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17,0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73,
-            0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88,0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb,
-            0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c,0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79,
-            0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9,0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08,
-            0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6,0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a,
-            0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e,0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e,
-            0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94,0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf,
-            0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68,0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
+            0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+            0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+            0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+            0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+            0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+            0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+            0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+            0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+            0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+            0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+            0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+            0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+            0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+            0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+            0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+            0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
     );
 
     // rCon is Round Constant used for the Key Expansion [1st col is 2^(r-1) in GF(2^8)] [é5.2]
@@ -226,72 +226,72 @@ 
     */
     public static function encrypt($plaintext, $password, $nBits)
     {
-        $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-        if (!($nBits==128 || $nBits==192 || $nBits==256)) {
-            return '';  // standard allows 128/192/256 bit keys
+        $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+        if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
+            return ''; // standard allows 128/192/256 bit keys
         }
         // note PHP (5) gives us plaintext and password in UTF8 encoding!
 
         // use AES itself to encrypt password to get cipher key (using plain password as source for
         // key expansion) - gives us well encrypted key
-        $nBytes = $nBits/8;  // no bytes in key
+        $nBytes = $nBits / 8; // no bytes in key
         $pwBytes = array();
-        for ($i=0; $i<$nBytes; $i++) {
+        for ($i = 0; $i < $nBytes; $i++) {
             $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
         }
         $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-        $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+        $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
         // initialise counter block (NIST SP800-38A §B.2): millisecond time-stamp for nonce in
         // 1st 8 bytes, block counter in 2nd 8 bytes
         $counterBlock = array();
-        $nonce = floor(microtime(true)*1000);   // timestamp: milliseconds since 1-Jan-1970
-        $nonceSec = floor($nonce/1000);
-        $nonceMs = $nonce%1000;
+        $nonce = floor(microtime(true) * 1000); // timestamp: milliseconds since 1-Jan-1970
+        $nonceSec = floor($nonce / 1000);
+        $nonceMs = $nonce % 1000;
         // encode nonce with seconds in 1st 4 bytes, and (repeated) ms part filling 2nd 4 bytes
-        for ($i=0; $i<4; $i++) {
-            $counterBlock[$i] = self::urs($nonceSec, $i*8) & 0xff;
+        for ($i = 0; $i < 4; $i++) {
+            $counterBlock[$i] = self::urs($nonceSec, $i * 8) & 0xff;
         }
-        for ($i=0; $i<4; $i++) {
-            $counterBlock[$i+4] = $nonceMs & 0xff;
+        for ($i = 0; $i < 4; $i++) {
+            $counterBlock[$i + 4] = $nonceMs & 0xff;
         }
         // and convert it to a string to go on the front of the ciphertext
         $ctrTxt = '';
-        for ($i=0; $i<8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
             $ctrTxt .= chr($counterBlock[$i]);
         }
 
         // generate key schedule - an expansion of the key into distinct Key Rounds for each round
         $keySchedule = Aes::keyExpansion($key);
 
-        $blockCount = ceil(strlen($plaintext)/$blockSize);
-        $ciphertxt = array();  // ciphertext as array of strings
+        $blockCount = ceil(strlen($plaintext) / $blockSize);
+        $ciphertxt = array(); // ciphertext as array of strings
 
-        for ($b=0; $b<$blockCount; $b++) {
+        for ($b = 0; $b < $blockCount; $b++) {
             // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
             // done in two stages for 32-bit ops: using two words allows us to go past 2^32 blocks (68GB)
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
             }
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c-4] = self::urs($b/0x100000000, $c*8);
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c - 4] = self::urs($b / 0x100000000, $c * 8);
             }
 
-            $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // -- encrypt counter block --
+            $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // -- encrypt counter block --
 
             // block size is reduced on final block
-            $blockLength = $b<$blockCount-1 ? $blockSize : (strlen($plaintext)-1)%$blockSize+1;
+            $blockLength = $b < $blockCount - 1 ? $blockSize : (strlen($plaintext) - 1) % $blockSize + 1;
             $cipherByte = array();
 
-            for ($i=0; $i<$blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
-                $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b*$blockSize+$i, 1));
+            for ($i = 0; $i < $blockLength; $i++) {  // -- xor plaintext with ciphered counter byte-by-byte --
+                $cipherByte[$i] = $cipherCntr[$i] ^ ord(substr($plaintext, $b * $blockSize + $i, 1));
                 $cipherByte[$i] = chr($cipherByte[$i]);
             }
-            $ciphertxt[$b] = implode('', $cipherByte);  // escape troublesome characters in ciphertext
+            $ciphertxt[$b] = implode('', $cipherByte); // escape troublesome characters in ciphertext
         }
 
         // implode is more efficient than repeated string concatenation
-        $ciphertext = $ctrTxt . implode('', $ciphertxt);
+        $ciphertext = $ctrTxt.implode('', $ciphertxt);
         $ciphertext = base64_encode($ciphertext);
 
         return $ciphertext;
@@ -307,25 +307,25 @@ 
     */
     public static function decrypt($ciphertext, $password, $nBits)
     {
-        $blockSize = 16;  // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
-        if (!($nBits==128 || $nBits==192 || $nBits==256)) {
-            return '';  // standard allows 128/192/256 bit keys
+        $blockSize = 16; // block size fixed at 16 bytes / 128 bits (Nb=4) for AES
+        if (!($nBits == 128 || $nBits == 192 || $nBits == 256)) {
+            return ''; // standard allows 128/192/256 bit keys
         }
         $ciphertext = base64_decode($ciphertext);
 
         // use AES to encrypt password (mirroring encrypt routine)
-        $nBytes = $nBits/8;  // no bytes in key
+        $nBytes = $nBits / 8; // no bytes in key
         $pwBytes = array();
-        for ($i=0; $i<$nBytes; $i++) {
+        for ($i = 0; $i < $nBytes; $i++) {
             $pwBytes[$i] = ord(substr($password, $i, 1)) & 0xff;
         }
         $key = Aes::cipher($pwBytes, Aes::keyExpansion($pwBytes));
-        $key = array_merge($key, array_slice($key, 0, $nBytes-16));  // expand key to 16/24/32 bytes long
+        $key = array_merge($key, array_slice($key, 0, $nBytes - 16)); // expand key to 16/24/32 bytes long
 
         // recover nonce from 1st element of ciphertext
         $counterBlock = array();
         $ctrTxt = substr($ciphertext, 0, 8);
-        for ($i=0; $i<8; $i++) {
+        for ($i = 0; $i < 8; $i++) {
             $counterBlock[$i] = ord(substr($ctrTxt, $i, 1));
         }
 
@@ -333,29 +333,29 @@ 
         $keySchedule = Aes::keyExpansion($key);
 
         // separate ciphertext into blocks (skipping past initial 8 bytes)
-        $nBlocks = ceil((strlen($ciphertext)-8) / $blockSize);
+        $nBlocks = ceil((strlen($ciphertext) - 8) / $blockSize);
         $ct = array();
-        for ($b=0; $b<$nBlocks; $b++) {
-            $ct[$b] = substr($ciphertext, 8+$b*$blockSize, 16);
+        for ($b = 0; $b < $nBlocks; $b++) {
+            $ct[$b] = substr($ciphertext, 8 + $b * $blockSize, 16);
         }
-        $ciphertext = $ct;  // ciphertext is now array of block-length strings
+        $ciphertext = $ct; // ciphertext is now array of block-length strings
 
         // plaintext will get generated block-by-block into array of block-length strings
         $plaintxt = array();
 
-        for ($b=0; $b<$nBlocks; $b++) {
+        for ($b = 0; $b < $nBlocks; $b++) {
             // set counter (block #) in last 8 bytes of counter block (leaving nonce in 1st 8 bytes)
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c] = self::urs($b, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c] = self::urs($b, $c * 8) & 0xff;
             }
-            for ($c=0; $c<4; $c++) {
-                $counterBlock[15-$c-4] = self::urs(($b+1)/0x100000000-1, $c*8) & 0xff;
+            for ($c = 0; $c < 4; $c++) {
+                $counterBlock[15 - $c - 4] = self::urs(($b + 1) / 0x100000000 - 1, $c * 8) & 0xff;
             }
 
-            $cipherCntr = Aes::cipher($counterBlock, $keySchedule);  // encrypt counter block
+            $cipherCntr = Aes::cipher($counterBlock, $keySchedule); // encrypt counter block
 
             $plaintxtByte = array();
-            for ($i=0; $i<strlen($ciphertext[$b]); $i++) {
+            for ($i = 0; $i < strlen($ciphertext[$b]); $i++) {
                 // -- xor plaintext with ciphered counter byte-by-byte --
                 $plaintxtByte[$i] = $cipherCntr[$i] ^ ord(substr($ciphertext[$b], $i, 1));
                 $plaintxtByte[$i] = chr($plaintxtByte[$i]);
@@ -379,12 +379,12 @@ 
     private static function urs($a, $b)
     {
         $a &= 0xffffffff;
-        $b &= 0x1f;  // (bounds check)
-        if ($a&0x80000000 && $b>0) {   // if left-most bit set
-            $a = ($a>>1) & 0x7fffffff;   //   right-shift one bit & clear left-most bit
-            $a = $a >> ($b-1);           //   remaining right-shifts
+        $b &= 0x1f; // (bounds check)
+        if ($a & 0x80000000 && $b > 0) {   // if left-most bit set
+            $a = ($a >> 1) & 0x7fffffff; //   right-shift one bit & clear left-most bit
+            $a = $a >> ($b - 1); //   remaining right-shifts
         } else {                       // otherwise
-            $a = ($a>>$b);               //   use normal right-shift
+            $a = ($a >> $b); //   use normal right-shift
         }
 
         return $a;

install/upgrade.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 ################
 ## Function permits to get the value from a line
 ################
+/**
+ * @param string $val
+ */
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));

Indentation +6 added lines, -6 removed lines

@@ -423,8 +423,8 @@ 
                      <h3>Step 2</h3>
                      <fieldset><legend>DataBase Informations</legend>';
 
-                     // check if all database  info are available
-                     if (
+                        // check if all database  info are available
+                        if (
                         isset($_SESSION['server']) && !empty($_SESSION['server'])
                         && isset($_SESSION['database']) && !empty($_SESSION['database'])
                         && isset($_SESSION['user']) && !empty($_SESSION['user'])
@@ -437,15 +437,15 @@ 
                         The database information has been retreived from the settings file.<br>
                         If you need to change them, please edit file `/includes/config/settings.php` and relaunch the upgrade process.
                         </div>';
-                     } else {
+                        } else {
                         echo '
                         <div style="">
                         The database information has not been retreived from the settings file.<br>
                         You need to adapt the file `/includes/config/settings.php` and relaunch the upgrade process.
                         </div>';
-                     }
+                        }
 
-                     echo '
+                        echo '
                      <a href="'.$protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8).'/install/upgrade.php">Restart upgrade process</a>
                      </fieldset>
 
@@ -475,7 +475,7 @@ 
                      </div>';
 
                     // teampass_version = 2.1.27 and no encrypt_key in db
-                     echo '
+                        echo '
                      <div id="no_encrypt_key" style="display:none;">
                      <fieldset>
                         <legend>Database Origine</legend>

Spacing +37 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));
-    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";")-1)));
+    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";") - 1)));
 }
 
 //get infos from SETTINGS.PHP file
@@ -19,41 +19,41 @@ 
 if (file_exists($filename)) {
     //copy some constants from this existing file
     $settings_file = file($filename);
-    while (list($key,$val) = each($settings_file)) {
-        if (substr_count($val,'charset')>0) {
+    while (list($key, $val) = each($settings_file)) {
+        if (substr_count($val, 'charset') > 0) {
             $_SESSION['charset'] = getSettingValue($val);
-        } elseif (substr_count($val,'@define(')>0 && substr_count($val, 'SALT')>0) {
-            $_SESSION['encrypt_key'] = substr($val,17,strpos($val,"')")-17);
-        } elseif (substr_count($val,'$smtp_server = ')>0) {
+        } elseif (substr_count($val, '@define(') > 0 && substr_count($val, 'SALT') > 0) {
+            $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')") - 17);
+        } elseif (substr_count($val, '$smtp_server = ') > 0) {
             $_SESSION['smtp_server'] = getSettingValue($val);
-        } elseif (substr_count($val,'$smtp_auth = ')>0) {
+        } elseif (substr_count($val, '$smtp_auth = ') > 0) {
             $_SESSION['smtp_auth'] = getSettingValue($val);
-        } elseif (substr_count($val,'$smtp_port = ')>0) {
+        } elseif (substr_count($val, '$smtp_port = ') > 0) {
             $_SESSION['smtp_port'] = getSettingValue($val);
-        } elseif (substr_count($val,'$smtp_security = ')>0) {
+        } elseif (substr_count($val, '$smtp_security = ') > 0) {
             $_SESSION['smtp_security'] = getSettingValue($val);
-        } elseif (substr_count($val,'$smtp_auth_username = ')>0) {
+        } elseif (substr_count($val, '$smtp_auth_username = ') > 0) {
             $_SESSION['smtp_auth_username'] = getSettingValue($val);
-        } elseif (substr_count($val,'$smtp_auth_password = ')>0) {
+        } elseif (substr_count($val, '$smtp_auth_password = ') > 0) {
             $_SESSION['smtp_auth_password'] = getSettingValue($val);
-        } elseif (substr_count($val,'$email_from = ')>0) {
+        } elseif (substr_count($val, '$email_from = ') > 0) {
             $_SESSION['email_from'] = getSettingValue($val);
-        } elseif (substr_count($val,'$email_from_name = ')>0) {
+        } elseif (substr_count($val, '$email_from_name = ') > 0) {
             $_SESSION['email_from_name'] = getSettingValue($val);
-        } elseif (substr_count($val,'$server = ')>0) {
+        } elseif (substr_count($val, '$server = ') > 0) {
             $_SESSION['server'] = getSettingValue($val);
-        } elseif (substr_count($val,'$user = ')>0) {
+        } elseif (substr_count($val, '$user = ') > 0) {
             $_SESSION['user'] = getSettingValue($val);
-        } elseif (substr_count($val,'$pass = ')>0) {
+        } elseif (substr_count($val, '$pass = ') > 0) {
             $_SESSION['pass'] = getSettingValue($val);
-        } elseif (substr_count($val,'$port = ')>0) {
+        } elseif (substr_count($val, '$port = ') > 0) {
             $_SESSION['port'] = getSettingValue($val);
-        } elseif (substr_count($val,'$database = ')>0) {
+        } elseif (substr_count($val, '$database = ') > 0) {
             $_SESSION['database'] = getSettingValue($val);
-        } elseif (substr_count($val,'$pre = ')>0) {
+        } elseif (substr_count($val, '$pre = ') > 0) {
             $_SESSION['pre'] = getSettingValue($val);
-        } elseif (substr_count($val,'require_once "')>0 && substr_count($val, 'sk.php')>0) {
-            $_SESSION['sk_path'] = substr($val,14,strpos($val,'";')-14);
+        } elseif (substr_count($val, 'require_once "') > 0 && substr_count($val, 'sk.php') > 0) {
+            $_SESSION['sk_path'] = substr($val, 14, strpos($val, '";') - 14);
         }
     }
 }
@@ -63,9 +63,9 @@ 
 ) {
     //copy some constants from this existing file
     $skFile = file($_SESSION['sk_file']);
-    while (list($key,$val) = each($skFile)) {
-        if (substr_count($val, '@define(')>0) {
-            $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')")-17);
+    while (list($key, $val) = each($skFile)) {
+        if (substr_count($val, '@define(') > 0) {
+            $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')") - 17);
         }
     }
 }
@@ -310,8 +310,8 @@ 
 
 
 //define root path
-$abs_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/') . substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF'])-20);
-if( isset($_SERVER['HTTPS'] ) ) {
+$abs_path = rtrim($_SERVER['DOCUMENT_ROOT'], '/').substr($_SERVER['PHP_SELF'], 0, strlen($_SERVER['PHP_SELF']) - 20);
+if (isset($_SERVER['HTTPS'])) {
     $protocol = 'https://';
 } else {
     $protocol = 'http://';
@@ -334,12 +334,12 @@ 
 
 //HIDDEN THINGS
 echo '
-                    <input type="hidden" id="step" name="step" value="', isset($_POST['step']) ? $_POST['step']:'', '" />
-                    <input type="hidden" id="actual_cpm_version" name="actual_cpm_version" value="', isset($_POST['actual_cpm_version']) ? $_POST['actual_cpm_version']:'', '" />
-                    <input type="hidden" id="cpm_isUTF8" name="cpm_isUTF8" value="', isset($_POST['cpm_isUTF8']) ? $_POST['cpm_isUTF8']:'', '" />
+                    <input type="hidden" id="step" name="step" value="', isset($_POST['step']) ? $_POST['step'] : '', '" />
+                    <input type="hidden" id="actual_cpm_version" name="actual_cpm_version" value="', isset($_POST['actual_cpm_version']) ? $_POST['actual_cpm_version'] : '', '" />
+                    <input type="hidden" id="cpm_isUTF8" name="cpm_isUTF8" value="', isset($_POST['cpm_isUTF8']) ? $_POST['cpm_isUTF8'] : '', '" />
                     <input type="hidden" name="menu_action" id="menu_action" value="" />
                     <input type="hidden" name="user_granted" id="user_granted" value="" />
-                    <input type="hidden" name="session_salt" id="session_salt" value="', (isset($_POST['session_salt']) && !empty($_POST['session_salt'])) ? $_POST['session_salt']:@$_SESSION['encrypt_key'], '" />';
+                    <input type="hidden" name="session_salt" id="session_salt" value="', (isset($_POST['session_salt']) && !empty($_POST['session_salt'])) ? $_POST['session_salt'] : @$_SESSION['encrypt_key'], '" />';
 
 if (!isset($_GET['step']) && !isset($_POST['step'])) {
     //ETAPE O
@@ -571,7 +571,7 @@ 
         echo '<br /><br />
         <label for="sk_path" style="width:300px;">Absolute path to SaltKey :
             <img src="images/information-white.png" alt="" title="The SaltKey is stored in a file called sk.php. But for security reasons, this file should be stored in a folder outside the www folder of your server. So please, indicate here the path to this folder.">
-        </label><input type="text" id="sk_path" name="sk_path" value="'.substr($_SESSION['sk_path'], 0, strlen($_SESSION['sk_path'])-7).'" size="75" /><br />
+        </label><input type="text" id="sk_path" name="sk_path" value="'.substr($_SESSION['sk_path'], 0, strlen($_SESSION['sk_path']) - 7).'" size="75" /><br />
         ';
     }
     echo '
@@ -602,7 +602,7 @@ 
                     <div style="width:900px;margin:auto;margin-top:30px;">
                         <div id="progressbar" style="float:left;margin-top:9px;"></div>
                         <div id="buttons_bottom">
-                            <input type="button" id="but_next" target_id="'. (intval($_POST['step'])+1).'" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="NEXT" />
+                            <input type="button" id="but_next" target_id="'. (intval($_POST['step']) + 1).'" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="NEXT" />
                         </div>
                     </div>';
 } elseif ($_POST['step'] == 3 && $conversion_utf8 == true && $_SESSION['user_granted'] === "1") {
@@ -610,22 +610,22 @@ 
                     <div style="width:900px;margin:auto;margin-top:30px;">
                         <div id="progressbar" style="float:left;margin-top:9px;"></div>
                         <div id="buttons_bottom">
-                            <input type="button" id="but_launch" onclick="Check(\'step'.$_POST['step'] .'\')" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="LAUNCH" />
-                            <input type="button" id="but_next" target_id="'. (intval($_POST['step'])+1).'" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="NEXT" disabled="disabled" />
+                            <input type="button" id="but_launch" onclick="Check(\'step'.$_POST['step'].'\')" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="LAUNCH" />
+                            <input type="button" id="but_next" target_id="'. (intval($_POST['step']) + 1).'" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="NEXT" disabled="disabled" />
                         </div>
                     </div>';
 } elseif ($_POST['step'] == 6 && $_SESSION['user_granted'] === "1") {
     echo '
                  <div style="margin-top:30px; text-align:center; width:100%; font-size:24px;">
-                     <a href="#" onclick="javascript:window.location.href=\'', (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ? 'https' : 'http', '://'.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'],0,strrpos($_SERVER['PHP_SELF'],'/')-8).'\';"><b>Open TeamPass</b></a>
+                     <a href="#" onclick="javascript:window.location.href=\'', (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) || isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ? 'https' : 'http', '://'.$_SERVER['HTTP_HOST'].substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/') - 8).'\';"><b>Open TeamPass</b></a>
                  </div>';
 } else {
     echo '
                      <div style="width:900px;margin:auto;margin-top:30px;">
                          <div id="progressbar" style="float:left;margin-top:9px;"></div>
                          <div id="buttons_bottom">
-                             <input type="button" id="but_launch" onclick="Check(\'step'.$_POST['step'] .'\')" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="LAUNCH" />
-                             <input type="button" id="but_next" target_id="'. (intval($_POST['step'])+1).'" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="NEXT" disabled="disabled" />
+                             <input type="button" id="but_launch" onclick="Check(\'step'.$_POST['step'].'\')" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="LAUNCH" />
+                             <input type="button" id="but_next" target_id="'. (intval($_POST['step']) + 1).'" style="padding:3px;cursor:pointer;font-size:20px;" class="ui-state-default ui-corner-all" value="NEXT" disabled="disabled" />
                          </div>
                      </div>';
 }

install/upgrade_ajax.php

Doc Comments +3 added lines

@@ -50,6 +50,9 @@
 ################
 ## Function permits to get the value from a line
 ################
+/**
+ * @param string $val
+ */
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));

Indentation +1 added lines, -1 removed lines

@@ -469,7 +469,7 @@
                 } else {
                     // user said that database has not being used for an older version
                     // no old sk is available
-                     $tmp = mysqli_num_rows(mysqli_query(
+                        $tmp = mysqli_num_rows(mysqli_query(
                             $dbTmp,
                             "SELECT * FROM `".$var['tbl_prefix']."misc` WHERE type = 'admin' AND intitule = 'saltkey_ante_2127'"
                         ));

Spacing +68 added lines, -68 removed lines

@@ -53,7 +53,7 @@ 
 function getSettingValue($val)
 {
     $val = trim(strstr($val, "="));
-    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";")-1)));
+    return trim(str_replace('"', '', substr($val, 1, strpos($val, ";") - 1)));
 }
 
 ################
@@ -64,7 +64,7 @@ 
     global $dbTmp;
     $exists = false;
     $columns = mysqli_query($dbTmp, "show columns from $db");
-    while ($c = mysqli_fetch_assoc( $columns)) {
+    while ($c = mysqli_fetch_assoc($columns)) {
         if ($c['Field'] == $column) {
             $exists = true;
             break;
@@ -75,7 +75,7 @@ 
     }
 }
 
-function addIndexIfNotExist($table, $index, $sql ) {
+function addIndexIfNotExist($table, $index, $sql) {
     global $dbTmp;
 
     $mysqli_result = mysqli_query($dbTmp, "SHOW INDEX FROM $table WHERE key_name LIKE \"$index\"");
@@ -83,7 +83,7 @@ 
 
     // if index does not exist, then add it
     if (!$res) {
-        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` " . $sql);
+        $res = mysqli_query($dbTmp, "ALTER TABLE `$table` ".$sql);
     }
 
     return $res;
@@ -187,13 +187,13 @@ 
             $_SESSION['fullurl'] = $_POST['fullurl'];
             $abspath = str_replace('\\', '/', $_POST['abspath']);
             $_SESSION['abspath'] = $abspath;
-            if (substr($abspath, strlen($abspath)-1) == "/") {
-                $abspath = substr($abspath, 0, strlen($abspath)-1);
+            if (substr($abspath, strlen($abspath) - 1) == "/") {
+                $abspath = substr($abspath, 0, strlen($abspath) - 1);
             }
             $okWritable = true;
             $okExtensions = true;
             $txt = "";
-            $x=1;
+            $x = 1;
             $tab = array(
                 $abspath."/includes/config/settings.php",
                 $abspath."/includes/libraries/csrfp/libs/",
@@ -206,7 +206,7 @@ 
             );
             foreach ($tab as $elem) {
                 // try to create it if not existing
-                if(substr($elem, -1) === '/' && !is_dir($elem)) {
+                if (substr($elem, -1) === '/' && !is_dir($elem)) {
                     mkdir($elem);
                 }
                 // check if writable
@@ -284,7 +284,7 @@ 
                 $txt .= '<span style=\"padding-left:30px;font-size:13pt;\">PHP extension \"curl\"'.
                     '&nbsp;&nbsp;<img src=\"images/tick-circle.png\"></span><br />';
             }
-            if (ini_get('max_execution_time')<60) {
+            if (ini_get('max_execution_time') < 60) {
                 $txt .= '<span style=\"padding-left:30px;font-size:13pt;\">PHP \"Maximum '.
                     'execution time\" is set to '.ini_get('max_execution_time').' seconds.'.
                     ' Please try to set to 60s at least until Upgrade is finished.&nbsp;'.
@@ -311,41 +311,41 @@ 
             if (file_exists($filename)) {
                 //copy some constants from this existing file
                 $settingsFile = file($filename);
-                while (list($key,$val) = each($settingsFile)) {
-                    if (substr_count($val, 'charset')>0) {
+                while (list($key, $val) = each($settingsFile)) {
+                    if (substr_count($val, 'charset') > 0) {
                         $_SESSION['charset'] = getSettingValue($val);
-                    } elseif (substr_count($val, '@define(')>0 && substr_count($val, 'SALT')>0) {
-                        $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')")-17);
-                    } elseif (substr_count($val, '$smtp_server')>0) {
+                    } elseif (substr_count($val, '@define(') > 0 && substr_count($val, 'SALT') > 0) {
+                        $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')") - 17);
+                    } elseif (substr_count($val, '$smtp_server') > 0) {
                         $_SESSION['smtp_server'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$smtp_auth')>0) {
+                    } elseif (substr_count($val, '$smtp_auth') > 0) {
                         $_SESSION['smtp_auth'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$smtp_auth_username')>0) {
+                    } elseif (substr_count($val, '$smtp_auth_username') > 0) {
                         $_SESSION['smtp_auth_username'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$smtp_auth_password')>0) {
+                    } elseif (substr_count($val, '$smtp_auth_password') > 0) {
                         $_SESSION['smtp_auth_password'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$smtp_port')>0) {
+                    } elseif (substr_count($val, '$smtp_port') > 0) {
                         $_SESSION['smtp_port'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$smtp_security')>0) {
+                    } elseif (substr_count($val, '$smtp_security') > 0) {
                         $_SESSION['smtp_security'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$email_from')>0) {
+                    } elseif (substr_count($val, '$email_from') > 0) {
                         $_SESSION['email_from'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$email_from_name')>0) {
+                    } elseif (substr_count($val, '$email_from_name') > 0) {
                         $_SESSION['email_from_name'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$server')>0) {
+                    } elseif (substr_count($val, '$server') > 0) {
                         $_SESSION['server'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$user')>0) {
+                    } elseif (substr_count($val, '$user') > 0) {
                         $_SESSION['user'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$pass')>0) {
+                    } elseif (substr_count($val, '$pass') > 0) {
                         $_SESSION['pass'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$port')>0) {
+                    } elseif (substr_count($val, '$port') > 0) {
                         $_SESSION['port'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$database')>0) {
+                    } elseif (substr_count($val, '$database') > 0) {
                         $_SESSION['database'] = getSettingValue($val);
-                    } elseif (substr_count($val, '$pre')>0) {
+                    } elseif (substr_count($val, '$pre') > 0) {
                         $_SESSION['pre'] = getSettingValue($val);
-                    } elseif (substr_count($val, 'require_once "')>0 && substr_count($val, 'sk.php')>0) {
-                        $_SESSION['sk_file'] = substr($val, 14, strpos($val, '";')-14);
+                    } elseif (substr_count($val, 'require_once "') > 0 && substr_count($val, 'sk.php') > 0) {
+                        $_SESSION['sk_file'] = substr($val, 14, strpos($val, '";') - 14);
                     }
                 }
             }
@@ -358,9 +358,9 @@ 
                     '</span><br />';
                 //copy some constants from this existing file
                 $skFile = file($_SESSION['sk_file']);
-                while (list($key,$val) = each($skFile)) {
-                    if (substr_count($val, "@define('SALT'")>0) {
-                        $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')")-17);
+                while (list($key, $val) = each($skFile)) {
+                    if (substr_count($val, "@define('SALT'") > 0) {
+                        $_SESSION['encrypt_key'] = substr($val, 17, strpos($val, "')") - 17);
                         echo '$("#session_salt").val("'.$_SESSION['encrypt_key'].'");';
                     }
                 }
@@ -568,11 +568,11 @@ 
             if (
                 isset($_POST['prefix_before_convert']) && $_POST['prefix_before_convert'] == "true"
             ) {
-                $tables =mysqli_query($dbTmp,'SHOW TABLES');
+                $tables = mysqli_query($dbTmp, 'SHOW TABLES');
                 while ($table = mysqli_fetch_row($tables)) {
                     if (tableExists("old_".$table[0]) != 1 && substr($table[0], 0, 4) != "old_") {
-                        mysqli_query($dbTmp,"CREATE TABLE old_".$table[0]." LIKE ".$table[0]);
-                        mysqli_query($dbTmp,"INSERT INTO old_".$table[0]." SELECT * FROM ".$table[0]);
+                        mysqli_query($dbTmp, "CREATE TABLE old_".$table[0]." LIKE ".$table[0]);
+                        mysqli_query($dbTmp, "INSERT INTO old_".$table[0]." SELECT * FROM ".$table[0]);
                     }
                 }
             }
@@ -584,7 +584,7 @@ 
             );
 
             //convert tables
-            $res = mysqli_query($dbTmp,"SHOW TABLES FROM `".$_SESSION['database']."`");
+            $res = mysqli_query($dbTmp, "SHOW TABLES FROM `".$_SESSION['database']."`");
             while ($table = mysqli_fetch_row($res)) {
                 if (substr($table[0], 0, 4) != "old_") {
                     mysqli_query($dbTmp,
@@ -692,16 +692,16 @@ 
 global \$server, \$user, \$pass, \$database, \$pre, \$db, \$port, \$encoding;
 
 ### DATABASE connexion parameters ###
-\$server = \"". $_SESSION['server'] ."\";
-\$user = \"". $_SESSION['user'] ."\";
-\$pass = \"". str_replace("$", "\\$", $_SESSION['pass']) ."\";
-\$database = \"". $_SESSION['database'] ."\";
-\$port = ". $_SESSION['port'] .";
-\$pre = \"". $_SESSION['pre'] ."\";
+\$server = \"". $_SESSION['server']."\";
+\$user = \"". $_SESSION['user']."\";
+\$pass = \"". str_replace("$", "\\$", $_SESSION['pass'])."\";
+\$database = \"". $_SESSION['database']."\";
+\$port = ". $_SESSION['port'].";
+\$pre = \"". $_SESSION['pre']."\";
 \$encoding = \"".$_SESSION['db_encoding']."\";
 
 @date_default_timezone_set(\$_SESSION['settings']['timezone']);
-@define('SECUREPATH', '".substr($skFile, 0, strlen($skFile)-7)."');
+@define('SECUREPATH', '".substr($skFile, 0, strlen($skFile) - 7)."');
 require_once \"".$skFile."\";
 @define('COST', '13'); // Don't change this."
                     )
@@ -747,8 +747,8 @@ 
                         $events .= "The file $csrfp_file already exist. A copy has been created.<br />";
                     }
                 }
-                unlink($csrfp_file);    // delete existing csrfp.config file
-                copy($csrfp_file_sample, $csrfp_file);  // make a copy of csrfp.config.sample file
+                unlink($csrfp_file); // delete existing csrfp.config file
+                copy($csrfp_file_sample, $csrfp_file); // make a copy of csrfp.config.sample file
                 $data = file_get_contents("../includes/libraries/csrfp/libs/csrfp.config.php");
                 $newdata = str_replace('"CSRFP_TOKEN" => ""', '"CSRFP_TOKEN" => "'.bin2hex(openssl_random_pseudo_bytes(25)).'"', $data);
                 $newdata = str_replace('"tokenLength" => "25"', '"tokenLength" => "50"', $newdata);
@@ -797,20 +797,20 @@ 
 
             $mysqli = new mysqli($_SESSION['server'], $_SESSION['user'], $_SESSION['pass'], $_SESSION['database'], $_SESSION['port']);
             if ($mysqli->connect_error) {
-                die('Error : ('. $mysqli->connect_errno .') '. $mysqli->connect_error);
+                die('Error : ('.$mysqli->connect_errno.') '.$mysqli->connect_error);
             }
 
             $results = $mysqli->query("SHOW TABLES");
 
-            while($row = $results->fetch_array()){
+            while ($row = $results->fetch_array()) {
                 $mtables[] = $row[0];
             }
 
-            foreach($mtables as $table){
+            foreach ($mtables as $table) {
                 $contents .= "-- Table `".$table."` --\n";
 
                 $results = $mysqli->query("SHOW CREATE TABLE ".$table);
-                while($row = $results->fetch_array()){
+                while ($row = $results->fetch_array()) {
                     $contents .= $row[1].";\n\n";
                 }
 
@@ -820,39 +820,39 @@ 
                 $fields_count = count($fields);
 
                 $insert_head = "INSERT INTO `".$table."` (";
-                for($i=0; $i < $fields_count; $i++){
-                    $insert_head  .= "`".$fields[$i]->name."`";
-                        if($i < $fields_count-1){
-                                $insert_head  .= ', ';
+                for ($i = 0; $i < $fields_count; $i++) {
+                    $insert_head .= "`".$fields[$i]->name."`";
+                        if ($i < $fields_count - 1) {
+                                $insert_head .= ', ';
                             }
                 }
-                $insert_head .=  ")";
+                $insert_head .= ")";
                 $insert_head .= " VALUES\n";
 
-                if($row_count>0){
+                if ($row_count > 0) {
                     $r = 0;
-                    while($row = $results->fetch_array()){
-                        if(($r % 400)  == 0){
+                    while ($row = $results->fetch_array()) {
+                        if (($r % 400) == 0) {
                             $contents .= $insert_head;
                         }
                         $contents .= "(";
-                        for($i=0; $i < $fields_count; $i++){
-                            $row_content =  str_replace("\n","\\n",$mysqli->real_escape_string($row[$i]));
+                        for ($i = 0; $i < $fields_count; $i++) {
+                            $row_content = str_replace("\n", "\\n", $mysqli->real_escape_string($row[$i]));
 
-                            switch($fields[$i]->type){
+                            switch ($fields[$i]->type) {
                                 case 8: case 3:
-                                    $contents .=  $row_content;
+                                    $contents .= $row_content;
                                     break;
                                 default:
-                                    $contents .= "'". $row_content ."'";
+                                    $contents .= "'".$row_content."'";
                             }
-                            if($i < $fields_count-1){
-                                    $contents  .= ', ';
+                            if ($i < $fields_count - 1) {
+                                    $contents .= ', ';
                                 }
                         }
-                        if(($r+1) == $row_count || ($r % 400) == 399){
+                        if (($r + 1) == $row_count || ($r % 400) == 399) {
                             $contents .= ");\n\n";
-                        }else{
+                        } else {
                             $contents .= "),\n";
                         }
                         $r++;
@@ -860,9 +860,9 @@ 
                 }
             }
 
-            $backup_file_name = "sql-backup-".date( "d-m-Y--h-i-s").".sql";
+            $backup_file_name = "sql-backup-".date("d-m-Y--h-i-s").".sql";
 
-            $fp = fopen("../files/".$backup_file_name ,'w+');
+            $fp = fopen("../files/".$backup_file_name, 'w+');
             if (($result = fwrite($fp, $contents))) {
                 echo '[{ "error" : "" , "file" : "files/'.$backup_file_name.'"}]';
             } else {

Braces +7 added lines, -4 removed lines

@@ -100,9 +100,12 @@ 
         AND table_name = '$tablename'"
     );
 
-    if ($res > 0) return true;
-    else return false;
-}
+    if ($res > 0) {
+        return true;
+    } else {
+        return false;
+    }
+    }
 
 //define pbkdf2 iteration count
 @define('ITCOUNT', '2072');
@@ -852,7 +855,7 @@ 
                         }
                         if(($r+1) == $row_count || ($r % 400) == 399){
                             $contents .= ");\n\n";
-                        }else{
+                        } else{
                             $contents .= "),\n";
                         }
                         $r++;