nilsteampassnet / TeamPass

includes/libraries/Encryption/PwGen/pwgen.php

Spacing +12 added lines, -12 removed lines

@@ -87,10 +87,10 @@ 
             if ($this->pw_length < 5) {
                 $this->pwgen = 'pwRand';
             }
-            if ($this->pw_length <=  2) {
+            if ($this->pw_length <= 2) {
                 $this->setCapitalize(false);
             }
-            if ($this->pw_length <=  1) {
+            if ($this->pw_length <= 1) {
                 $this->setNumerals(false);
             }
         } else {
@@ -196,7 +196,7 @@ 
 
     public function generate()
     {
-        if ($this->pwgen ==  'pwPhonemes') {
+        if ($this->pwgen == 'pwPhonemes') {
             $this->pwPhonemes();
         } else { // $this->pwgen == 'pwRand'
             $this->pwRand();
@@ -217,13 +217,13 @@ 
             $first = 1;
 
             while ($c < $this->pw_length) {
-                $i = self::myRand(0, count(self::$elements)-1);
+                $i = self::myRand(0, count(self::$elements) - 1);
                 $str = self::$elements[$i]->str;
                 $len = strlen($str);
                 $flags = self::$elements[$i]->flags;
 
                 // Filter on the basic type of the next element
-                if (($flags & $should_be) ==  0) {
+                if (($flags & $should_be) == 0) {
                     continue;
                 }
                 // Handle the NOT_FIRST flag
@@ -239,7 +239,7 @@ 
                     continue;
                 }
                 // Don't allow us to overflow the buffer
-                if ($len > $this->pw_length-$c) {
+                if ($len > $this->pw_length - $c) {
                     continue;
                 }
 
@@ -255,7 +255,7 @@ 
                  * let's do it!
                  */
                 for ($j = 0; $j < $len; $j++) {
-                    $this->password[$c+$j] = $str[$j];
+                    $this->password[$c + $j] = $str[$j];
                 }
 
                 // Handle PW_UPPERS
@@ -266,10 +266,10 @@ 
                     }
                 }
 
-                $c +=  $len;
+                $c += $len;
 
                 // Time to stop?
-                if ($c >=  $this->pw_length) {
+                if ($c >= $this->pw_length) {
                     break;
                 }
 
@@ -294,7 +294,7 @@ 
                 if ($this->pwgen_flags & self::PW_SYMBOLS) {
                     if (!$first && (self::myRand(0, 9) < 2)) {
                         do {
-                            $ch = self::$pw_symbols[self::myRand(0, strlen(self::$pw_symbols)-1)];
+                            $ch = self::$pw_symbols[self::myRand(0, strlen(self::$pw_symbols) - 1)];
                         } while (($this->pwgen_flags & self::PW_AMBIGUOUS) &&
                             strpos(self::$pw_ambiguous, $ch) !== false);
                         $this->password[$c++] = $ch;
@@ -303,7 +303,7 @@ 
                 }
 
                 // OK, figure out what the next element should be
-                if ($should_be ==  self::CONSONANT) {
+                if ($should_be == self::CONSONANT) {
                     $should_be = self::VOWEL;
                 } else { // should_be = =  VOWEL
                     if (($prev & self::VOWEL) || ($flags & self::DIPHTHONG) || (self::myRand(0, 9) > 3)
@@ -343,7 +343,7 @@ 
             $i = 0;
 
             while ($i < $this->pw_length) {
-                $ch = $chars[self::myRand(0, $len-1)];
+                $ch = $chars[self::myRand(0, $len - 1)];
                 if (($this->pwgen_flags & self::PW_AMBIGUOUS) &&
                     strpos(self::$pw_ambiguous, $ch) !== false) {
                     continue;

includes/libraries/Encryption/Encryption/Core.php

Indentation +5 added lines, -5 removed lines

@@ -50,25 +50,25 @@ 
     {
         if (Core::ourStrlen($ctr) !== Core::BLOCK_BYTE_SIZE) {
             throw new Ex\EnvironmentIsBrokenException(
-              'Trying to increment a nonce of the wrong size.'
+                'Trying to increment a nonce of the wrong size.'
             );
         }
 
         if (! \is_int($inc)) {
             throw new Ex\EnvironmentIsBrokenException(
-              'Trying to increment nonce by a non-integer.'
+                'Trying to increment nonce by a non-integer.'
             );
         }
 
         if ($inc < 0) {
             throw new Ex\EnvironmentIsBrokenException(
-              'Trying to increment nonce by a negative amount.'
+                'Trying to increment nonce by a negative amount.'
             );
         }
 
         if ($inc > PHP_INT_MAX - 255) {
             throw new Ex\EnvironmentIsBrokenException(
-              'Integer overflow may occur.'
+                'Integer overflow may occur.'
             );
         }
 
@@ -82,7 +82,7 @@ 
             /* Detect integer overflow and fail. */
             if (! \is_int($sum)) {
                 throw new Ex\EnvironmentIsBrokenException(
-                  'Integer overflow in CTR mode nonce increment.'
+                    'Integer overflow in CTR mode nonce increment.'
                 );
             }
 

Spacing +15 added lines, -15 removed lines

@@ -54,7 +54,7 @@ 
             );
         }
 
-        if (! \is_int($inc)) {
+        if (!\is_int($inc)) {
             throw new Ex\EnvironmentIsBrokenException(
               'Trying to increment nonce by a non-integer.'
             );
@@ -80,7 +80,7 @@ 
             $sum = \ord($ctr[$i]) + $inc;
 
             /* Detect integer overflow and fail. */
-            if (! \is_int($sum)) {
+            if (!\is_int($sum)) {
                 throw new Ex\EnvironmentIsBrokenException(
                   'Integer overflow in CTR mode nonce increment.'
                 );
@@ -132,7 +132,7 @@ 
         $digest_length = Core::ourStrlen(\hash_hmac($hash, '', '', true));
 
         // Sanity-check the desired output length.
-        if (empty($length) || ! \is_int($length) ||
+        if (empty($length) || !\is_int($length) ||
             $length < 0 || $length > 255 * $digest_length) {
             throw new Ex\EnvironmentIsBrokenException(
                 'Bad output length requested of HKDF.'
@@ -163,7 +163,7 @@ 
             // T(i) = HMAC-Hash(PRK, T(i-1) | info | 0x??)
             $last_block = \hash_hmac(
                 $hash,
-                $last_block . $info . \chr($block_index),
+                $last_block.$info.\chr($block_index),
                 $prk,
                 true
             );
@@ -227,7 +227,7 @@ 
      */
     public static function ensureConstantExists($name)
     {
-        if (! \defined($name)) {
+        if (!\defined($name)) {
             throw new Ex\EnvironmentIsBrokenException();
         }
     }
@@ -244,9 +244,9 @@ 
         // manage specific case of random_bytes
         if ($name === "random_bytes") {
             // random_bytes is a PHP7 new function required
-            require_once(substr(realpath(dirname(__FILE__)),0, strpos(realpath(dirname(__FILE__)), "Encryption")).'/misc/random_compat/random.php');
+            require_once(substr(realpath(dirname(__FILE__)), 0, strpos(realpath(dirname(__FILE__)), "Encryption")).'/misc/random_compat/random.php');
         }
-        if (! \function_exists($name)) {
+        if (!\function_exists($name)) {
             throw new Ex\EnvironmentIsBrokenException();
         }
     }
@@ -304,7 +304,7 @@ 
         if ($exists) {
             // mb_substr($str, 0, NULL, '8bit') returns an empty string on PHP
             // 5.3, so we have to find the length ourselves.
-            if (! isset($length)) {
+            if (!isset($length)) {
                 if ($start >= 0) {
                     $length = Core::ourStrlen($str) - $start;
                 } else {
@@ -363,17 +363,17 @@ 
     public static function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false)
     {
         // Type checks:
-        if (! \is_string($algorithm)) {
+        if (!\is_string($algorithm)) {
             throw new \InvalidArgumentException(
                 'pbkdf2(): algorithm must be a string'
             );
         }
-        if (! \is_string($password)) {
+        if (!\is_string($password)) {
             throw new \InvalidArgumentException(
                 'pbkdf2(): password must be a string'
             );
         }
-        if (! \is_string($salt)) {
+        if (!\is_string($salt)) {
             throw new \InvalidArgumentException(
                 'pbkdf2(): salt must be a string'
             );
@@ -383,7 +383,7 @@ 
         $key_length += 0;
 
         $algorithm = \strtolower($algorithm);
-        if (! \in_array($algorithm, \hash_algos(), true)) {
+        if (!\in_array($algorithm, \hash_algos(), true)) {
             throw new Ex\EnvironmentIsBrokenException(
                 'Invalid or unsupported hash algorithm.'
             );
@@ -394,7 +394,7 @@ 
             'sha1', 'sha224', 'sha256', 'sha384', 'sha512',
             'ripemd160', 'ripemd256', 'ripemd320', 'whirlpool',
         ];
-        if (! \in_array($algorithm, $ok_algorithms, true)) {
+        if (!\in_array($algorithm, $ok_algorithms, true)) {
             throw new Ex\EnvironmentIsBrokenException(
                 'Algorithm is not a secure cryptographic hash function.'
             );
@@ -408,7 +408,7 @@ 
 
         if (\function_exists('hash_pbkdf2')) {
             // The output length is in NIBBLES (4-bits) if $raw_output is false!
-            if (! $raw_output) {
+            if (!$raw_output) {
                 $key_length = $key_length * 2;
             }
             return \hash_pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output);
@@ -420,7 +420,7 @@ 
         $output = '';
         for ($i = 1; $i <= $block_count; $i++) {
             // $i encoded as 4 bytes, big endian.
-            $last = $salt . \pack('N', $i);
+            $last = $salt.\pack('N', $i);
             // first iteration
             $last = $xorsum = \hash_hmac($algorithm, $last, $password, true);
             // perform the other $count - 1 iterations

includes/libraries/Encryption/Encryption/Crypto.php

Spacing +5 added lines, -5 removed lines

@@ -186,11 +186,11 @@ 
         $keys = $secret->deriveKeys($salt);
         $ekey = $keys->getEncryptionKey();
         $akey = $keys->getAuthenticationKey();
-        $iv     = Core::secureRandom(Core::BLOCK_BYTE_SIZE);
+        $iv = Core::secureRandom(Core::BLOCK_BYTE_SIZE);
 
-        $ciphertext = Core::CURRENT_VERSION . $salt . $iv . self::plainEncrypt($plaintext, $ekey, $iv);
+        $ciphertext = Core::CURRENT_VERSION.$salt.$iv.self::plainEncrypt($plaintext, $ekey, $iv);
         $auth       = \hash_hmac(Core::HASH_FUNCTION_NAME, $ciphertext, $akey, true);
-        $ciphertext = $ciphertext . $auth;
+        $ciphertext = $ciphertext.$auth;
 
         if ($raw_binary) {
             return $ciphertext;
@@ -214,7 +214,7 @@ 
     {
         RuntimeTests::runtimeTest();
 
-        if (! $raw_binary) {
+        if (!$raw_binary) {
             try {
                 $ciphertext = Encoding::hexToBin($ciphertext);
             } catch (Ex\BadFormatException $ex) {
@@ -284,7 +284,7 @@ 
         // or password, whichever it is.
         $keys = $secret->deriveKeys($salt);
 
-        if (self::verifyHMAC($hmac, $header . $salt . $iv . $encrypted, $keys->getAuthenticationKey())) {
+        if (self::verifyHMAC($hmac, $header.$salt.$iv.$encrypted, $keys->getAuthenticationKey())) {
             $plaintext = self::plainDecrypt($encrypted, $keys->getEncryptionKey(), $iv, Core::CIPHER_METHOD);
             return $plaintext;
         } else {

includes/libraries/Encryption/Encryption/RuntimeTests.php

Spacing +16 added lines, -16 removed lines

@@ -46,10 +46,10 @@ 
             Core::ensureFunctionExists('openssl_get_cipher_methods');
             if (\in_array(Core::CIPHER_METHOD, \openssl_get_cipher_methods()) === false) {
                 throw new Ex\EnvironmentIsBrokenException(
-                    'Cipher method not supported. This is normally caused by an outdated ' .
-                    'version of OpenSSL (and/or OpenSSL compiled for FIPS compliance). ' .
-                    'Please upgrade to a newer version of OpenSSL that supports ' .
-                    Core::CIPHER_METHOD . ' to use this library.'
+                    'Cipher method not supported. This is normally caused by an outdated '.
+                    'version of OpenSSL (and/or OpenSSL compiled for FIPS compliance). '.
+                    'Please upgrade to a newer version of OpenSSL that supports '.
+                    Core::CIPHER_METHOD.' to use this library.'
                 );
             }
 
@@ -101,7 +101,7 @@ 
 
         // Modifying the ciphertext: Appending a string.
         try {
-            Crypto::decrypt($ciphertext . 'a', $key, true);
+            Crypto::decrypt($ciphertext.'a', $key, true);
             throw new Ex\EnvironmentIsBrokenException();
         } catch (Ex\WrongKeyOrModifiedCiphertextException $e) { /* expected */
         }
@@ -159,8 +159,8 @@ 
         $info   = Encoding::hexToBin('f0f1f2f3f4f5f6f7f8f9');
         $length = 42;
         $okm    = Encoding::hexToBin(
-            '3cb25f25faacd57a90434f64d0362f2a' .
-            '2d2d0a90cf1a5a4c5db02d56ecc4c5bf' .
+            '3cb25f25faacd57a90434f64d0362f2a'.
+            '2d2d0a90cf1a5a4c5db02d56ecc4c5bf'.
             '34007208d5b887185865'
         );
         $computed_okm = Core::HKDF('sha256', $ikm, $length, $info, $salt);
@@ -172,8 +172,8 @@ 
         $ikm    = \str_repeat("\x0c", 22);
         $length = 42;
         $okm    = Encoding::hexToBin(
-            '2c91117204d745f3500d636a62f64f0a' .
-            'b3bae548aa53d423b0d1f27ebba6f5e5' .
+            '2c91117204d745f3500d636a62f64f0a'.
+            'b3bae548aa53d423b0d1f27ebba6f5e5'.
             '673a081d70cce7acfc48'
         );
         $computed_okm = Core::HKDF('sha1', $ikm, $length, '', null);
@@ -207,20 +207,20 @@ 
     {
         // AES CTR mode test vector from NIST SP 800-38A
         $key = Encoding::hexToBin(
-            '603deb1015ca71be2b73aef0857d7781' .
+            '603deb1015ca71be2b73aef0857d7781'.
             '1f352c073b6108d72d9810a30914dff4'
         );
         $iv        = Encoding::hexToBin('f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff');
         $plaintext = Encoding::hexToBin(
-            '6bc1bee22e409f96e93d7e117393172a' .
-            'ae2d8a571e03ac9c9eb76fac45af8e51' .
-            '30c81c46a35ce411e5fbc1191a0a52ef' .
+            '6bc1bee22e409f96e93d7e117393172a'.
+            'ae2d8a571e03ac9c9eb76fac45af8e51'.
+            '30c81c46a35ce411e5fbc1191a0a52ef'.
             'f69f2445df4f9b17ad2b417be66c3710'
         );
         $ciphertext = Encoding::hexToBin(
-            '601ec313775789a5b7a7f504bbf3d228' .
-            'f443e3ca4d62b59aca84e990cacaf5c5' .
-            '2b0930daa23de94ce87017ba2d84988d' .
+            '601ec313775789a5b7a7f504bbf3d228'.
+            'f443e3ca4d62b59aca84e990cacaf5c5'.
+            '2b0930daa23de94ce87017ba2d84988d'.
             'dfc9c58db67aada613c2dd08457941a6'
         );
 

includes/libraries/Encryption/Encryption/Encoding.php

Spacing +5 added lines, -5 removed lines

@@ -124,16 +124,16 @@ 
         // being a prefix of another type's header, leading to ambiguity.
         if (Core::ourStrlen($header) !== self::SERIALIZE_HEADER_BYTES) {
             throw new Ex\EnvironmentIsBrokenException(
-                'Header must be ' . self::SERIALIZE_HEADER_BYTES . ' bytes.'
+                'Header must be '.self::SERIALIZE_HEADER_BYTES.' bytes.'
             );
         }
 
         return Encoding::binToHex(
-            $header .
-            $bytes .
+            $header.
+            $bytes.
             \hash(
                 self::CHECKSUM_HASH_ALGO,
-                $header . $bytes,
+                $header.$bytes,
                 true
             )
         );
@@ -197,7 +197,7 @@ 
         $checksum_b = \hash(self::CHECKSUM_HASH_ALGO, $checked_bytes, true);
 
         /* Check if the checksum matches. */
-        if (! Core::hashEquals($checksum_a, $checksum_b)) {
+        if (!Core::hashEquals($checksum_a, $checksum_b)) {
             throw new Ex\BadFormatException(
                 "Data is corrupted, the checksum doesn't match"
             );

includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
              * here in order to make the API simpler, avoiding the need to
              * document that this method might throw an Ex\BadFormatException. */
             throw new Ex\WrongKeyOrModifiedCiphertextException(
-                "The decrypted key was found to be in an invalid format. " .
+                "The decrypted key was found to be in an invalid format. ".
                 "This very likely indicates it was modified by an attacker."
             );
         }

includes/libraries/LDAP/adLDAP/collections/adLDAPCollection.php

Indentation +33 added lines, -33 removed lines

@@ -38,24 +38,24 @@ 
 abstract class adLDAPCollection
 {
     /**
-    * The current adLDAP connection via dependency injection
-    * 
-    * @var adLDAP
-    */
+     * The current adLDAP connection via dependency injection
+     * 
+     * @var adLDAP
+     */
     protected $adldap;
     
     /**
-    * The current object being modifed / called
-    * 
-    * @var mixed
-    */
+     * The current object being modifed / called
+     * 
+     * @var mixed
+     */
     protected $currentObject;
     
     /**
-    * The raw info array from Active Directory
-    * 
-    * @var array
-    */
+     * The raw info array from Active Directory
+     * 
+     * @var array
+     */
     protected $info;
     
     public function __construct($info, adLDAP $adldap) {
@@ -64,10 +64,10 @@ 
     }
     
     /**
-    * Set the raw info array from Active Directory
-    * 
-    * @param array $info
-    */
+     * Set the raw info array from Active Directory
+     * 
+     * @param array $info
+     */
     public function setInfo(array $info) {
         if ($this->info && sizeof($info) >= 1) {
             unset($this->info);
@@ -76,11 +76,11 @@ 
     }
     
     /**
-    * Magic get method to retrieve data from the raw array in a formatted way
-    * 
-    * @param string $attribute
-    * @return mixed
-    */
+     * Magic get method to retrieve data from the raw array in a formatted way
+     * 
+     * @param string $attribute
+     * @return mixed
+     */
     public function __get($attribute) {
         if (isset($this->info[0]) && is_array($this->info[0])) {
             foreach ($this->info[0] as $keyAttr => $valueAttr) {
@@ -106,20 +106,20 @@ 
     }    
     
     /**
-    * Magic set method to update an attribute
-    * 
-    * @param string $attribute
-    * @param string $value
-    * @return bool
-    */
+     * Magic set method to update an attribute
+     * 
+     * @param string $attribute
+     * @param string $value
+     * @return bool
+     */
     abstract public function __set($attribute, $value);
     
     /** 
-    * Magic isset method to check for the existence of an attribute 
-    * 
-    * @param string $attribute 
-    * @return bool 
-    */ 
+     * Magic isset method to check for the existence of an attribute 
+     * 
+     * @param string $attribute 
+     * @return bool 
+     */ 
     public function __isset($attribute) {
         if (isset($this->info[0]) && is_array($this->info[0])) { 
             foreach ($this->info[0] as $keyAttr => $valueAttr) { 
@@ -129,6 +129,6 @@ 
             } 
         } 
         return false; 
-     } 
+        } 
 }
 ?>

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
                     else {
                         $array = array();
                         foreach ($this->info[0][strtolower($attribute)] as $key => $value) {
-                            if ((string)$key != 'count') {
+                            if ((string) $key != 'count') {
                                 $array[$key] = $value;
                             } 
                         }  

Braces +2 added lines, -4 removed lines

@@ -87,8 +87,7 @@ 
                 if (strtolower($keyAttr) == strtolower($attribute)) {
                     if ($this->info[0][strtolower($attribute)]['count'] == 1) {
                         return $this->info[0][strtolower($attribute)][0];   
-                    }
-                    else {
+                    } else {
                         $array = array();
                         foreach ($this->info[0][strtolower($attribute)] as $key => $value) {
                             if ((string)$key != 'count') {
@@ -99,8 +98,7 @@ 
                     }
                 }   
             }
-        }
-        else {
+        } else {
             return NULL;   
         }
     }    

items.export.php

Spacing +4 added lines, -4 removed lines

@@ -165,7 +165,7 @@ 
 
     function exportItemsToFile()
     {
-        $("#export_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?>&nbsp;...&nbsp;<span id="export_progress">0%</span>').attr("class","").show();
+        $("#export_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?>&nbsp;...&nbsp;<span id="export_progress">0%</span>').attr("class","").show();
 
         //Get list of selected folders
         var ids = "";
@@ -175,20 +175,20 @@ 
         });
 
         if (ids == "") {
-            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_no_selected_folder'];?>").attr("class","ui-state-error");
+            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_no_selected_folder']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#export_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         if ($("input[name='export_format']:checked").length == 0) {
-            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_export_format_not_selected'];?>").attr("class","ui-state-error");
+            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['error_export_format_not_selected']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#export_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         // Get PDF encryption password and make sure it is set
         if (($("#export_pdf_password").val() == "") && ($("input[name='export_format']:checked").val() == "pdf")) {
-            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['pdf_password_warning'];?>").attr("class","ui-state-error");
+            $("#export_information").show().html("<i class='fa fa-exclamation-circle'></i>&nbsp;<?php echo $LANG['pdf_password_warning']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#export_information").effect( "fade", "slow" );}, 1000);
             return;
         }

suggestion.load.php

Spacing +43 added lines, -43 removed lines

@@ -31,7 +31,7 @@ 
             {
                 type    : "open_kb",
                 id      : id,
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 data = $.parseJSON(data);
@@ -71,7 +71,7 @@ 
             {
                 type    : "duplicate_suggestion",
                 id      : $("#suggestion_id").val(),
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].status == "no") {
@@ -101,12 +101,12 @@ 
             {
                 type        : "get_complexity_level",
                 folder_id   : $("#suggestion_folder").val(),
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].status == "ok") {
                     $("#complexity_required").val(data[0].complexity);
-                    $("#complexity_required_text").html("[<?php echo $LANG['complex_asked'];?>&nbsp;&nbsp;<span style=\"color:#D04806; font-weight:bold;\">"+data[0].complexity_text+"</span>]");
+                    $("#complexity_required_text").html("[<?php echo $LANG['complex_asked']; ?>&nbsp;&nbsp;<span style=\"color:#D04806; font-weight:bold;\">"+data[0].complexity_text+"</span>]");
                 }
                 $("#pw_wait").hide();
             },
@@ -138,7 +138,7 @@ 
                     "sAjaxSource": "sources/datatable/datatable.suggestion.php",
                     "bJQueryUI": true,
                     "oLanguage": {
-                        "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                        "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
                     },
                     "columns": [
                         {"width": "7%", className: "dt-body-left"},
@@ -164,7 +164,7 @@ 
                         "sAjaxSource": "sources/datatable/datatable.suggestion.php",
                         "bJQueryUI": true,
                         "oLanguage": {
-                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
                         },
                         "columns": [
                             {"width": "7%", className: "dt-body-left"},
@@ -186,7 +186,7 @@ 
                         "sAjaxSource": "sources/datatable/datatable.items_change.php",
                         "bJQueryUI": true,
                         "oLanguage": {
-                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+                            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
                         },
                         "columns": [
                             {"width": "5%", className: "dt-body-left"},
@@ -211,15 +211,15 @@ 
             autoOpen: false,
             width: 300,
             height: 150,
-            title: "<?php echo $LANG['suggestion_delete_confirm'];?>",
+            title: "<?php echo $LANG['suggestion_delete_confirm']; ?>",
             buttons: {
-                "<?php echo $LANG['del_button'];?>": function() {
+                "<?php echo $LANG['del_button']; ?>": function() {
                     $.post(
                         "sources/suggestion.queries.php",
                         {
                             type    : "delete_suggestion",
                             id      : $("#suggestion_id").val(),
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             $("#div_suggestion_delete").dialog("close");
@@ -228,7 +228,7 @@ 
                         }
                     )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             }
@@ -241,19 +241,19 @@ 
             autoOpen: false,
             width: 400,
             height: 240,
-            title: "<?php echo $LANG['suggestion_validate_confirm'];?>",
+            title: "<?php echo $LANG['suggestion_validate_confirm']; ?>",
             open: function( event, ui ) {
                 $("#suggestion_edit_wait").hide();
             },
             buttons: {
-                "<?php echo $LANG['confirm'];?>": function() {
+                "<?php echo $LANG['confirm']; ?>": function() {
                     $("#suggestion_edit_wait").show();
                     $.post(
                         "sources/suggestion.queries.php",
                         {
                             type    : "validate_suggestion",
                             id      : $("#suggestion_id").val(),
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             if (data[0].status == "done") {
@@ -261,13 +261,13 @@ 
                                 oTable.fnDraw();
                                 $("#div_suggestion_validate").dialog("close");
                             } else if (data[0].status = "error_when_creating") {
-                                $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_cannot_add'];?>").addClass("ui-state-error");
+                                $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_cannot_add']; ?>").addClass("ui-state-error");
                             }
                         },
                         "json"
                     )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             }
@@ -280,9 +280,9 @@ 
             autoOpen: false,
             width: 450,
             height: 550,
-            title: "<?php echo $LANG['suggestion_add'];?>",
+            title: "<?php echo $LANG['suggestion_add']; ?>",
             buttons: {
-                "<?php echo $LANG['save_button'];?>": function() {
+                "<?php echo $LANG['save_button']; ?>": function() {
                     $("#suggestion_error").hide();
                     if ($("#suggestion_label").val() == "") {
                         $("#suggestion_label").addClass("ui-state-error");
@@ -291,7 +291,7 @@ 
                     } else if ($("#suggestion_folder").val() == "") {
                         $("#suggestion_folder").addClass("ui-state-error");
                     } else if (parseInt($("#password_complexity").val()) < parseInt($("#complexity_required").val())) {
-                        $("#suggestion_error").show().html("<?php echo $LANG['error_complex_not_enought'];?>").addClass("ui-state-error");
+                        $("#suggestion_error").show().html("<?php echo $LANG['error_complex_not_enought']; ?>").addClass("ui-state-error");
                     } else {
                         $("#add_suggestion_wait").show();
                         var data = '{"label":"'+sanitizeString($("#suggestion_label").val())+
@@ -303,8 +303,8 @@ 
                         $.post("sources/suggestion.queries.php",
                             {
                                 type     : "add_new",
-                                data     : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key'];?>"),
-                                key      : "<?php echo $_SESSION['key'];?>"
+                                data     : prepareExchangedData(data, "encode", "<?php echo $_SESSION['key']; ?>"),
+                                key      : "<?php echo $_SESSION['key']; ?>"
                             },
                             function(data) {
                                 if (data[0].status == "done") {
@@ -312,7 +312,7 @@ 
                                     oTable.fnDraw();
                                     $("#suggestion_form").dialog("close");
                                 } else if (data[0].status = "duplicate_suggestion") {
-                                    $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_duplicate'];?>").addClass("ui-state-error");
+                                    $("#suggestion_error").show().html("<?php echo $LANG['suggestion_error_duplicate']; ?>").addClass("ui-state-error");
                                 }
                                 $("#add_suggestion_wait").hide();
                             },
@@ -320,7 +320,7 @@ 
                         );
                     }
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             },
@@ -343,10 +343,10 @@ 
             autoOpen: false,
             width: 700,
             height: 400,
-            title: "<?php echo $LANG['suggestion_delete_confirm'];?>",
+            title: "<?php echo $LANG['suggestion_delete_confirm']; ?>",
             buttons: {
-                "<?php echo $LANG['approve'];?>": function() {
-                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."...";?>").show();
+                "<?php echo $LANG['approve']; ?>": function() {
+                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>").show();
 
                     // select fields to update
                     var fields_to_update = "";
@@ -362,7 +362,7 @@ 
                             type    : "approve_item_change",
                             id      : $("#suggestion_id").val(),
                             data    : fields_to_update,
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             if (data[0].error === "") {
@@ -382,18 +382,18 @@ 
                         "json"
                     )
                 },
-                "<?php echo $LANG['reject'];?>": function() {
-                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."...";?>").show();
+                "<?php echo $LANG['reject']; ?>": function() {
+                    $("#suggestion_view_wait").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>").show();
                     $.post(
                         "sources/suggestion.queries.php",
                         {
                             type    : "reject_item_change",
                             id      : $("#suggestion_id").val(),
-                            key     : "<?php echo $_SESSION['key'];?>"
+                            key     : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
 
-                            $("#suggestion_view_wait").html("<?php echo $LANG['alert_message_done'];?>");
+                            $("#suggestion_view_wait").html("<?php echo $LANG['alert_message_done']; ?>");
                             oTable = $("#t_change").dataTable();
                             oTable.fnDraw();
                             setTimeout(
@@ -405,24 +405,24 @@ 
                         }
                     )
                 },
-                "<?php echo $LANG['cancel_button'];?>": function() {
+                "<?php echo $LANG['cancel_button']; ?>": function() {
                     $(this).dialog("close");
                 }
             },
             open: function (event, ui) {
-                $("#div_suggestion_html").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."...";?>");
+                $("#div_suggestion_html").html("<?php echo "<i class='fa fa-cog fa-spin fa-lg'></i>&nbsp;".addslashes($LANG['please_wait'])."..."; ?>");
 
                 // load change
                 $.post("sources/suggestion.queries.php",
                     {
                         type     : "get_item_change_detail",
                         id       : $("#suggestion_id").val(),
-                        key      : "<?php echo $_SESSION['key'];?>"
+                        key      : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data) {
                         //decrypt data
                         try {
-                            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
                         } catch (e) {
                             // error
                             return;
@@ -451,35 +451,35 @@ 
         $("#suggestion_pwd").simplePassMeter({
             "requirements": {},
             "container": "#pw_strength",
-            "defaultText" : "<?php echo $LANG['index_pw_level_txt'];?>",
+            "defaultText" : "<?php echo $LANG['index_pw_level_txt']; ?>",
             "ratings": [
                 {"minScore": 0,
                     "className": "meterFail",
-                    "text": "<?php echo $LANG['complex_level0'];?>"
+                    "text": "<?php echo $LANG['complex_level0']; ?>"
                 },
                 {"minScore": 25,
                     "className": "meterWarn",
-                    "text": "<?php echo $LANG['complex_level1'];?>"
+                    "text": "<?php echo $LANG['complex_level1']; ?>"
                 },
                 {"minScore": 50,
                     "className": "meterWarn",
-                    "text": "<?php echo $LANG['complex_level2'];?>"
+                    "text": "<?php echo $LANG['complex_level2']; ?>"
                 },
                 {"minScore": 60,
                     "className": "meterGood",
-                    "text": "<?php echo $LANG['complex_level3'];?>"
+                    "text": "<?php echo $LANG['complex_level3']; ?>"
                 },
                 {"minScore": 70,
                     "className": "meterGood",
-                    "text": "<?php echo $LANG['complex_level4'];?>"
+                    "text": "<?php echo $LANG['complex_level4']; ?>"
                 },
                 {"minScore": 80,
                     "className": "meterExcel",
-                    "text": "<?php echo $LANG['complex_level5'];?>"
+                    "text": "<?php echo $LANG['complex_level5']; ?>"
                 },
                 {"minScore": 90,
                     "className": "meterExcel",
-                    "text": "<?php echo $LANG['complex_level6'];?>"
+                    "text": "<?php echo $LANG['complex_level6']; ?>"
                 }
             ]
         });