nilsteampassnet / TeamPass

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS.php

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
 use ParagonIE\ConstantTime\Hex;
 use phpseclib\Crypt\Common\BlockCipher;
 use phpseclib\Crypt\AES;
-use phpseclib\Crypt\Base;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\TripleDES;
 use phpseclib\Math\BigInteger;

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         $symkey = '';
         $iv = substr($iv, 0, 8);
         while (strlen($symkey) < $length) {
-            $symkey.= md5($symkey . $password . $iv, true);
+            $symkey .= md5($symkey.$password.$iv, true);
         }
         return substr($symkey, 0, $length);
     }

includes/libraries/Authentication/phpseclib/Crypt/RSA/PKCS1.php

Unused Use Statements -2 removed lines

@@ -26,10 +26,8 @@
 
 use ParagonIE\ConstantTime\Base64;
 use ParagonIE\ConstantTime\Hex;
-use phpseclib\Crypt\AES;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\Random;
-use phpseclib\Crypt\TripleDES;
 use phpseclib\Math\BigInteger;
 use phpseclib\Common\Functions\ASN1;
 

Spacing +13 added lines, -13 removed lines

@@ -107,11 +107,11 @@ 
                 //     coefficient       INTEGER   -- ti
                 // }
                 $OtherPrimeInfo = pack('Ca*a*', self::ASN1_INTEGER, ASN1::encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
-                $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, ASN1::encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
-                $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, ASN1::encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
-                $OtherPrimeInfos.= pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
+                $OtherPrimeInfo .= pack('Ca*a*', self::ASN1_INTEGER, ASN1::encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
+                $OtherPrimeInfo .= pack('Ca*a*', self::ASN1_INTEGER, ASN1::encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
+                $OtherPrimeInfos .= pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
             }
-            $RSAPrivateKey.= pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
+            $RSAPrivateKey .= pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
         }
 
         $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, ASN1::encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
@@ -122,15 +122,15 @@ 
             $cipher->setKey(self::generateSymmetricKey($password, $iv, $cipher->getKeyLength() >> 3));
             $cipher->setIV($iv);
             $iv = strtoupper(Hex::encode($iv));
-            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                     "Proc-Type: 4,ENCRYPTED\r\n" .
-                     "DEK-Info: " . self::$defaultEncryptionAlgorithm . ",$iv\r\n" .
-                     "\r\n" .
-                     chunk_split(Base64::encode($cipher->encrypt($RSAPrivateKey)), 64) .
+            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n".
+                     "Proc-Type: 4,ENCRYPTED\r\n".
+                     "DEK-Info: ".self::$defaultEncryptionAlgorithm.",$iv\r\n".
+                     "\r\n".
+                     chunk_split(Base64::encode($cipher->encrypt($RSAPrivateKey)), 64).
                      '-----END RSA PRIVATE KEY-----';
         } else {
-            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
-                     chunk_split(Base64::encode($RSAPrivateKey), 64) .
+            $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n".
+                     chunk_split(Base64::encode($RSAPrivateKey), 64).
                      '-----END RSA PRIVATE KEY-----';
         }
 
@@ -168,8 +168,8 @@ 
             $components['publicExponent']
         );
 
-        $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n" .
-                        chunk_split(Base64::encode($RSAPublicKey), 64) .
+        $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n".
+                        chunk_split(Base64::encode($RSAPublicKey), 64).
                         '-----END RSA PUBLIC KEY-----';
 
         return $RSAPublicKey;

includes/libraries/Authentication/phpseclib/Net/SSH1.php

Unused Use Statements -1 removed lines

@@ -48,7 +48,6 @@
 
 namespace phpseclib\Net;
 
-use ParagonIE\ConstantTime\Hex;
 use phpseclib\Crypt\DES;
 use phpseclib\Crypt\Random;
 use phpseclib\Crypt\TripleDES;

Spacing +27 added lines, -27 removed lines

@@ -554,7 +554,7 @@ 
 
         if (defined('NET_SSH1_LOGGING')) {
             $this->_append_log('<-', $this->server_identification);
-            $this->_append_log('->', $this->identifier . "\r\n");
+            $this->_append_log('->', $this->identifier."\r\n");
         }
 
         if (!preg_match('#SSH-([0-9\.]+)-(.+)#', $init_line, $parts)) {
@@ -611,7 +611,7 @@ 
             }
         }
 
-        $session_id = md5($host_key_public_modulus->toBytes() . $server_key_public_modulus->toBytes() . $anti_spoofing_cookie, true);
+        $session_id = md5($host_key_public_modulus->toBytes().$server_key_public_modulus->toBytes().$anti_spoofing_cookie, true);
 
         $session_key = Random::string(32);
         $double_encrypted_session_key = $session_key ^ str_pad($session_id, 32, chr(0));
@@ -663,7 +663,7 @@ 
                 $this->crypto = new DES(DES::MODE_CBC);
                 $this->crypto->disablePadding();
                 $this->crypto->enableContinuousBuffer();
-                $this->crypto->setKey(substr($session_key, 0,  8));
+                $this->crypto->setKey(substr($session_key, 0, 8));
                 // "The iv (initialization vector) is initialized to all zeroes."
                 $this->crypto->setIV(str_repeat("\0", 8));
                 break;
@@ -816,7 +816,7 @@ 
 
         if ($response !== false) {
             do {
-                $output.= substr($response[self::RESPONSE_DATA], 4);
+                $output .= substr($response[self::RESPONSE_DATA], 4);
                 $response = $this->_get_binary_packet();
             } while (is_array($response) && $response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_EXITSTATUS);
         }
@@ -928,7 +928,7 @@ 
             if ($response === true) {
                 return Strings::shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
             }
-            $this->interactiveBuffer.= substr($response[self::RESPONSE_DATA], 4);
+            $this->interactiveBuffer .= substr($response[self::RESPONSE_DATA], 4);
         }
     }
 
@@ -1081,7 +1081,7 @@ 
                 return true;
             }
             $elapsed = strtok(microtime(), ' ') + strtok('') - $start;
-            $this->curTimeout-= $elapsed;
+            $this->curTimeout -= $elapsed;
         }
 
         $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
@@ -1093,8 +1093,8 @@ 
 
         while ($length > 0) {
             $temp = fread($this->fsock, $length);
-            $raw.= $temp;
-            $length-= strlen($temp);
+            $raw .= $temp;
+            $length -= strlen($temp);
         }
         $stop = strtok(microtime(), ' ') + strtok('');
 
@@ -1117,8 +1117,8 @@ 
 
         if (defined('NET_SSH1_LOGGING')) {
             $temp = isset($this->protocol_flags[$type]) ? $this->protocol_flags[$type] : 'UNKNOWN';
-            $temp = '<- ' . $temp .
-                    ' (' . round($stop - $start, 4) . 's)';
+            $temp = '<- '.$temp.
+                    ' ('.round($stop - $start, 4).'s)';
             $this->_append_log($temp, $data);
         }
 
@@ -1150,8 +1150,8 @@ 
         $padding = Random::string(8 - ($length & 7));
 
         $orig = $data;
-        $data = $padding . $data;
-        $data.= pack('N', $this->_crc($data));
+        $data = $padding.$data;
+        $data .= pack('N', $this->_crc($data));
 
         if ($this->crypto !== false) {
             $data = $this->crypto->encrypt($data);
@@ -1165,8 +1165,8 @@ 
 
         if (defined('NET_SSH1_LOGGING')) {
             $temp = isset($this->protocol_flags[ord($orig[0])]) ? $this->protocol_flags[ord($orig[0])] : 'UNKNOWN';
-            $temp = '-> ' . $temp .
-                    ' (' . round($stop - $start, 4) . 's)';
+            $temp = '-> '.$temp.
+                    ' ('.round($stop - $start, 4).'s)';
             $this->_append_log($temp, $orig);
         }
 
@@ -1260,7 +1260,7 @@ 
         $crc = 0x00000000;
         $length = strlen($data);
 
-        for ($i=0; $i<$length; $i++) {
+        for ($i = 0; $i < $length; $i++) {
             // We AND $crc >> 8 with 0x00FFFFFF because we want the eight newly added bits to all
             // be zero.  PHP, unfortunately, doesn't always do this.  0x80000000 >> 8, as an example,
             // yields 0xFF800000 - not 0x00800000.  The following link elaborates:
@@ -1314,9 +1314,9 @@ 
         while (strlen($random) != $length) {
             $block = Random::string($length - strlen($random));
             $block = str_replace("\x00", '', $block);
-            $random.= $block;
+            $random .= $block;
         }
-        $temp = chr(0) . chr(2) . $random . chr(0) . $m;
+        $temp = chr(0).chr(2).$random.chr(0).$m;
 
         $m = new BigInteger($temp, 256);
         $m = $m->modPow($key[0], $key[1]);
@@ -1386,12 +1386,12 @@ 
     {
         $output = '';
         for ($i = 0; $i < count($message_log); $i++) {
-            $output.= $message_number_log[$i] . "\r\n";
+            $output .= $message_number_log[$i]."\r\n";
             $current_log = $message_log[$i];
             $j = 0;
             do {
                 if (strlen($current_log)) {
-                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
+                    $output .= str_pad(dechex($j), 7, '0', STR_PAD_LEFT).'0  ';
                 }
                 $fragment = Strings::shift($current_log, $this->log_short_width);
                 $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
@@ -1399,10 +1399,10 @@ 
                 // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
                 // also replace < with a . since < messes up the output on web browsers
                 $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
+                $output .= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ').$raw."\r\n";
                 $j++;
             } while (strlen($current_log));
-            $output.= "\r\n";
+            $output .= "\r\n";
         }
 
         return $output;
@@ -1419,7 +1419,7 @@ 
      */
     function _format_log_helper($matches)
     {
-        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
+        return $this->log_boundary.str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
     }
 
     /**
@@ -1544,10 +1544,10 @@ 
             case self::LOG_COMPLEX:
                 $this->protocol_flags_log[] = $protocol_flags;
                 Strings::shift($message);
-                $this->log_size+= strlen($message);
+                $this->log_size += strlen($message);
                 $this->message_log[] = $message;
                 while ($this->log_size > self::LOG_MAX_SIZE) {
-                    $this->log_size-= strlen(array_shift($this->message_log));
+                    $this->log_size -= strlen(array_shift($this->message_log));
                     array_shift($this->protocol_flags_log);
                 }
                 break;
@@ -1555,7 +1555,7 @@ 
             // passwords won't be filtered out and select other packets may not be correctly
             // identified
             case self::LOG_REALTIME:
-                echo "<pre>\r\n" . $this->_format_log(array($message), array($protocol_flags)) . "\r\n</pre>\r\n";
+                echo "<pre>\r\n".$this->_format_log(array($message), array($protocol_flags))."\r\n</pre>\r\n";
                 @flush();
                 @ob_flush();
                 break;
@@ -1576,10 +1576,10 @@ 
                 $entry = $this->_format_log(array($message), array($protocol_flags));
                 if ($this->realtime_log_wrap) {
                     $temp = "<<< START >>>\r\n";
-                    $entry.= $temp;
+                    $entry .= $temp;
                     fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
                 }
-                $this->realtime_log_size+= strlen($entry);
+                $this->realtime_log_size += strlen($entry);
                 if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
                     fseek($this->realtime_log_file, 0);
                     $this->realtime_log_size = strlen($entry);

sources/items.queries.php

Unused Use Statements -1 removed lines

@@ -79,7 +79,6 @@
 // phpcrypt
 require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/phpcrypt/phpCrypt.php';
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
-use PHP_Crypt\Cipher as Cipher;
 
 // prepare Encryption class calls
 use \Defuse\Crypto\Crypto;

Spacing +31 added lines, -31 removed lines

@@ -77,7 +77,7 @@ 
 $aes->register();
 
 // phpcrypt
-require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/phpcrypt/phpCrypt.php';
+require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/phpcrypt/phpCrypt.php';
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
 use PHP_Crypt\Cipher as Cipher;
 
@@ -216,7 +216,7 @@ 
                 if (isset($_SESSION['settings']['item_extra_fields']) && $_SESSION['settings']['item_extra_fields'] == 1) {
                     foreach (explode("_|_", $dataReceived['fields']) as $field) {
                         $field_data = explode("~~", $field);
-                        if (count($field_data)>1 && !empty($field_data[1])) {
+                        if (count($field_data) > 1 && !empty($field_data[1])) {
                             // should we encrypt the data
                             $dataTmp = DB::queryFirstRow("SELECT encrypted_data
                                     FROM ".prefix_table("categories")."
@@ -344,8 +344,8 @@ 
                 $html = '<li class="item_draggable'
                 .'" id="'.$newID.'" style="margin-left:-30px;">'
                 .'<span style="cursor:hand;" class="grippy"><i class="fa fa-sm fa-arrows mi-grey-1"></i>&nbsp;</span>'
-                .$expirationFlag.'<i class="fa fa-sm fa-warning mi-yellow"></i>&nbsp;' .
-                '&nbsp;<a id="fileclass'.$newID.'" class="file" onclick="AfficherDetailsItem(\''.$newID.'\', \'0\', \'\', \'\', \'\', \'\', \'\')" ondblclick="AfficherDetailsItem(\''.$newID.'\', \'0\', \'\', \'\', \'\', true, \'\')">' .
+                .$expirationFlag.'<i class="fa fa-sm fa-warning mi-yellow"></i>&nbsp;'.
+                '&nbsp;<a id="fileclass'.$newID.'" class="file" onclick="AfficherDetailsItem(\''.$newID.'\', \'0\', \'\', \'\', \'\', \'\', \'\')" ondblclick="AfficherDetailsItem(\''.$newID.'\', \'0\', \'\', \'\', \'\', true, \'\')">'.
                 stripslashes($dataReceived['label']);
                 if (!empty($dataReceived['description']) && isset($_SESSION['settings']['show_description']) && $_SESSION['settings']['show_description'] == 1) {
                     $html .= '&nbsp;<font size=2px>['.strip_tags(stripslashes(substr(cleanString($dataReceived['description']), 0, 30))).']</font>';
@@ -571,7 +571,7 @@ 
                     if (isset($_SESSION['settings']['item_extra_fields']) && $_SESSION['settings']['item_extra_fields'] == 1) {
                         foreach (explode("_|_", $dataReceived['fields']) as $field) {
                             $field_data = explode("~~", $field);
-                            if (count($field_data)>1 && !empty($field_data[1])) {
+                            if (count($field_data) > 1 && !empty($field_data[1])) {
                                 $dataTmpCat = DB::queryFirstRow(
                                     "SELECT c.title AS title, i.data AS data, i.data_iv AS data_iv, i.encryption_type AS encryption_type, c.encrypted_data AS encrypted_data
                                     FROM ".prefix_table("categories_items")." AS i
@@ -856,12 +856,12 @@ 
                     foreach ($rows as $record) {
                         $reason = explode(':', $record['raison']);
                         if (empty($history)) {
-                            $history = date($_SESSION['settings']['date_format']." ".$_SESSION['settings']['time_format'], $record['date'])." - ".$record['login']." - ".$LANG[$record['action']] .
-                            " - ".(!empty($record['raison']) ? (count($reason) > 1 ? $LANG[trim($reason[0])].' : '.$reason[1] : $LANG[trim($reason[0])]):'');
+                            $history = date($_SESSION['settings']['date_format']." ".$_SESSION['settings']['time_format'], $record['date'])." - ".$record['login']." - ".$LANG[$record['action']].
+                            " - ".(!empty($record['raison']) ? (count($reason) > 1 ? $LANG[trim($reason[0])].' : '.$reason[1] : $LANG[trim($reason[0])]) : '');
                         } else {
-                            $history .= "<br />".date($_SESSION['settings']['date_format']." ".$_SESSION['settings']['time_format'], $record['date'])." - " .
-                            $record['login']." - ".$LANG[$record['action']]." - " .
-                            (!empty($record['raison']) ? (count($reason) > 1 ? $LANG[trim($reason[0])].' => '.$reason[1] : ($record['action'] != "at_manual" ? $LANG[trim($reason[0])] : trim($reason[0]))):'');
+                            $history .= "<br />".date($_SESSION['settings']['date_format']." ".$_SESSION['settings']['time_format'], $record['date'])." - ".
+                            $record['login']." - ".$LANG[$record['action']]." - ".
+                            (!empty($record['raison']) ? (count($reason) > 1 ? $LANG[trim($reason[0])].' => '.$reason[1] : ($record['action'] != "at_manual" ? $LANG[trim($reason[0])] : trim($reason[0]))) : '');
                         }
                     }
                     // decrypt PW
@@ -960,9 +960,9 @@ 
 
                     // Prepare some stuff to return
                     $arrData = array(
-                        "files" => $files,//str_replace('"', '&quot;', $files),
+                        "files" => $files, //str_replace('"', '&quot;', $files),
                         "history" => str_replace('"', '&quot;', $history),
-                        "files_edit" => $filesEdit,//str_replace('"', '&quot;', $filesEdit),
+                        "files_edit" => $filesEdit, //str_replace('"', '&quot;', $filesEdit),
                         "id_tree" => $dataItem['id_tree'],
                         "id" => $dataItem['id'],
                         "reload_page" => $reloadPage,
@@ -1041,7 +1041,7 @@ 
                 // previous is public folder and personal one
                 else if ($originalRecord['perso'] === "0" && $dataDestination['personal_folder'] === "1") {
                     // check if PSK is set
-                    if (!isset($_SESSION['user_settings']['session_psk']) || empty($_SESSION['user_settings']['session_psk'])){
+                    if (!isset($_SESSION['user_settings']['session_psk']) || empty($_SESSION['user_settings']['session_psk'])) {
                         $returnValues = '[{"error" : "no_psk"}, {"error_text" : "'.addslashes($LANG['alert_message_personal_sk_missing']).'"}]';
                         echo $returnValues;
                         break;
@@ -1067,7 +1067,7 @@ 
                 } else if ($originalRecord['perso'] === "1" && $dataDestination['personal_folder'] === "1") {
                 // previous is public folder and personal one
                     // check if PSK is set
-                    if (!isset($_SESSION['user_settings']['session_psk']) || empty($_SESSION['user_settings']['session_psk'])){
+                    if (!isset($_SESSION['user_settings']['session_psk']) || empty($_SESSION['user_settings']['session_psk'])) {
                         $returnValues = '[{"error" : "no_psk"}, {"error_text" : "'.addslashes($LANG['alert_message_personal_sk_missing']).'"}]';
                         echo $returnValues;
                         break;
@@ -1471,12 +1471,12 @@ 
                 DB::update(
                     prefix_table("items"),
                     array(
-                        'viewed_no' => $dataItem['viewed_no']+1,
+                        'viewed_no' => $dataItem['viewed_no'] + 1,
                     ),
                     "id = %i",
                     $_POST['id']
                 );
-                $arrData['viewed_no'] = $dataItem['viewed_no']+1;
+                $arrData['viewed_no'] = $dataItem['viewed_no'] + 1;
 
                 // get fields
                 $fieldsTmp = $arrCatList = "";
@@ -1821,7 +1821,7 @@ 
             }
             // check that title is not numeric
             if (is_numeric($title) === true) {
-                echo '[{"error" : "ERR_TITLE_ONLY_WITH_NUMBERS"}]';;
+                echo '[{"error" : "ERR_TITLE_ONLY_WITH_NUMBERS"}]'; ;
                 break;
             }
 
@@ -1864,7 +1864,7 @@ 
                 "SELECT title, parent_id, personal_folder FROM ".prefix_table("nested_tree")." WHERE id = %i",
                 $dataReceived['folder']
             );
-            if ( $tmp['parent_id'] != 0 || $tmp['title'] != $_SESSION['user_id'] || $tmp['personal_folder'] != 1 ) {
+            if ($tmp['parent_id'] != 0 || $tmp['title'] != $_SESSION['user_id'] || $tmp['personal_folder'] != 1) {
                 DB::update(
                     prefix_table("nested_tree"),
                     array(
@@ -1942,7 +1942,7 @@ 
                 break;
             }*/
 
-            if ( $tmp_source['parent_id'] != 0 || $tmp_source['title'] != $_SESSION['user_id'] || $tmp_source['personal_folder'] != 1 || $tmp_target['title'] != $_SESSION['user_id'] || $tmp_target['personal_folder'] != 1) {
+            if ($tmp_source['parent_id'] != 0 || $tmp_source['title'] != $_SESSION['user_id'] || $tmp_source['personal_folder'] != 1 || $tmp_target['title'] != $_SESSION['user_id'] || $tmp_target['personal_folder'] != 1) {
 
                 // moving SOURCE folder
                 DB::update(
@@ -2010,7 +2010,7 @@ 
                 if (in_array($elem->id, $_SESSION['groupes_visibles'])) {
                     $arboHtml_tmp .= ' style="cursor:pointer;" onclick="ListerItems('.$elem->id.', \'\', 0)"';
                 }
-                $arboHtml_tmp .= '>'. htmlspecialchars(stripslashes($elem->title), ENT_QUOTES). '</a>';
+                $arboHtml_tmp .= '>'.htmlspecialchars(stripslashes($elem->title), ENT_QUOTES).'</a>';
                 if (empty($arboHtml)) {
                     $arboHtml = $arboHtml_tmp;
                 } else {
@@ -2109,12 +2109,12 @@ 
                         INNER JOIN ".prefix_table("log_items")." AS l ON (i.id = l.id_item)
                         WHERE %l
                         GROUP BY i.id, l.date, l.id_user, l.action
-                        ORDER BY i.label ASC, l.date DESC".$query_limit,//
+                        ORDER BY i.label ASC, l.date DESC".$query_limit, //
                         $where
                     );
                 } else {
                     $items_to_display_once = "max";
-                    $where->add('i.inactif=%i',0);
+                    $where->add('i.inactif=%i', 0);
 
                     $rows = DB::query(
                         "SELECT i.id AS id, MIN(i.restricted_to) AS restricted_to, MIN(i.perso) AS perso,
@@ -2396,7 +2396,7 @@ 
                         // Build array with items
                         array_push($itemsIDList, array($record['id'], $pw, $record['login'], $displayItem));
 
-                        $i ++;
+                        $i++;
                     }
                     $idManaged = $record['id'];
                 }
@@ -2524,12 +2524,12 @@ 
 
             if (isset($_POST['item_id']) && !empty($_POST['item_id'])) {
                 // Lock Item (if already locked), go back and warn
-                $dataTmp = DB::queryFirstRow("SELECT timestamp, user_id FROM ".prefix_table("items_edition")." WHERE item_id = %i", $_POST['item_id']);//echo ">".$dataTmp[0];
+                $dataTmp = DB::queryFirstRow("SELECT timestamp, user_id FROM ".prefix_table("items_edition")." WHERE item_id = %i", $_POST['item_id']); //echo ">".$dataTmp[0];
 
                 // If token is taken for this Item and delay is passed then delete it.
                 if (isset($_SESSION['settings']['delay_item_edition']) &&
                     $_SESSION['settings']['delay_item_edition'] > 0 && !empty($dataTmp['timestamp']) &&
-                    round(abs(time()-$dataTmp['timestamp']) / 60, 2) > $_SESSION['settings']['delay_item_edition']
+                    round(abs(time() - $dataTmp['timestamp']) / 60, 2) > $_SESSION['settings']['delay_item_edition']
                 ) {
                     DB::delete(prefix_table("items_edition"), "item_id = %i", $_POST['item_id']);
                     //reload the previous data
@@ -2705,7 +2705,7 @@ 
                 // Delete from FILES table
                 DB::delete(prefix_table("files"), "id = %i", $_POST['file_id']);
                 // Update the log
-                logItems($data['id_item'], $dataItem['label'], $_SESSION['user_id'], 'at_modification', $_SESSION['login'],'at_del_file : '.$data['name']);
+                logItems($data['id_item'], $dataItem['label'], $_SESSION['user_id'], 'at_modification', $_SESSION['login'], 'at_del_file : '.$data['name']);
                 // Delete file from server
                 @unlink($_SESSION['settings']['path_to_upload_folder']."/".$data['file']);
             }
@@ -2745,7 +2745,7 @@ 
                 "SELECT description FROM ".prefix_table("items")." WHERE id=%i", $_POST['id_item']
             );
             // Clean up the string
-            echo json_encode(array("description" => strip_tags($dataItem['description'])), JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP);
+            echo json_encode(array("description" => strip_tags($dataItem['description'])), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP);
             break;
 
         /*
@@ -3293,7 +3293,7 @@ 
                 $_SESSION['settings']['otv_expiration_period'] = 7;
             }
             $url = $_SESSION['settings']['cpassman_url']."/index.php?otv=true&".http_build_query($otv_session);
-            $exp_date = date($_SESSION['settings']['date_format']." ".$_SESSION['settings']['time_format'], time() + (intval($_SESSION['settings']['otv_expiration_period'])*86400));
+            $exp_date = date($_SESSION['settings']['date_format']." ".$_SESSION['settings']['time_format'], time() + (intval($_SESSION['settings']['otv_expiration_period']) * 86400));
 
             echo json_encode(
                 array(
@@ -3323,7 +3323,7 @@ 
 
             // prepare image info
             $image_code = $file_info['file'];
-            $extension = substr($_POST['title'], strrpos($_POST['title'], '.')+1);
+            $extension = substr($_POST['title'], strrpos($_POST['title'], '.') + 1);
             $file_to_display = $_SESSION['settings']['url_to_upload_folder'].'/'.$image_code;
             $file_suffix = "";
 
@@ -3610,7 +3610,7 @@ 
                         $fldTitle = str_replace("&", "&amp;", $folder->title);
 
                         // rename personal folder with user login
-                        if ($folder->title == $_SESSION['user_id'] && $folder->nlevel == 1 ) {
+                        if ($folder->title == $_SESSION['user_id'] && $folder->nlevel == 1) {
                             $fldTitle = $_SESSION['login'];
                         }
 
@@ -3738,7 +3738,7 @@ 
                         '<td rowspan="2" style="width:40px;"><img src="'.$avatar.'" style="border-radius:20px; height:35px;"></td>'.
                         '<td colspan="2" style="font-size:11px;"><i>'.$LANG['by'].' '.$record['login'].' '.$LANG['at'].' '.date($_SESSION['settings']['date_format'].' '.$_SESSION['settings']['time_format'], $record['date']).'</i></td></tr>'.
                         '<tr style="border-bottom:3px solid #C9C9C9;"><td style="width:100px;"><b>'.$LANG[$record['action']].'</b></td>'.
-                        '<td style="">' . (!empty($record['raison']) && $record['action'] !== "at_creation" ? (count($reason) > 1 ? $LANG[trim($reason[0])].' : '.handleBackslash($reason[1]) : ($record['action'] == "at_manual" ? $reason[0] : $LANG[trim($reason[0])])) : '') . '</td>'.
+                        '<td style="">'.(!empty($record['raison']) && $record['action'] !== "at_creation" ? (count($reason) > 1 ? $LANG[trim($reason[0])].' : '.handleBackslash($reason[1]) : ($record['action'] == "at_manual" ? $reason[0] : $LANG[trim($reason[0])])) : '').'</td>'.
                         '</tr>'.
                         '<tr></tr>';
                 }

sources/main.functions.php

Unused Use Statements -1 removed lines

@@ -25,7 +25,6 @@
     require_once $_SESSION['settings']['cpassman_dir'] . '/includes/config/settings.php';
 }
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
-use PHP_Crypt\Cipher as Cipher;
 
 
 // prepare Encryption class calls

Spacing +60 added lines, -60 removed lines

@@ -21,8 +21,8 @@ 
     require_once '../includes/libraries/phpcrypt/phpCrypt.php';
     require_once '../includes/config/settings.php';
 } else {
-    require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/phpcrypt/phpCrypt.php';
-    require_once $_SESSION['settings']['cpassman_dir'] . '/includes/config/settings.php';
+    require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/phpcrypt/phpCrypt.php';
+    require_once $_SESSION['settings']['cpassman_dir'].'/includes/config/settings.php';
 }
 use PHP_Crypt\PHP_Crypt as PHP_Crypt;
 use PHP_Crypt\Cipher as Cipher;
@@ -37,7 +37,7 @@ 
 {
     $str = '';
     $x = $n + 10;
-    for ($i=0; $i<$x; $i++) {
+    for ($i = 0; $i < $x; $i++) {
         $str .= base_convert(mt_rand(1, 36), 10, 36);
     }
     return substr($str, 0, $n);
@@ -46,13 +46,13 @@ 
 //generate pbkdf2 compliant hash
 function strHashPbkdf2($p, $s, $c, $kl, $a = 'sha256', $st = 0)
 {
-    $kb = $st+$kl;  // Key blocks to compute
-    $dk = '';    // Derived key
+    $kb = $st + $kl; // Key blocks to compute
+    $dk = ''; // Derived key
 
-    for ($block=1; $block<=$kb; $block++) { // Create key
-        $ib = $h = hash_hmac($a, $s . pack('N', $block), $p, true); // Initial hash for this block
-        for ($i=1; $i<$c; $i++) { // Perform block iterations
-            $ib ^= ($h = hash_hmac($a, $h, $p, true));  // XOR each iterate
+    for ($block = 1; $block <= $kb; $block++) { // Create key
+        $ib = $h = hash_hmac($a, $s.pack('N', $block), $p, true); // Initial hash for this block
+        for ($i = 1; $i < $c; $i++) { // Perform block iterations
+            $ib ^= ($h = hash_hmac($a, $h, $p, true)); // XOR each iterate
         }
         $dk .= $ib; // Append iterated block
     }
@@ -155,7 +155,7 @@ 
     if (!isset($_SESSION['settings']['cpassman_dir']) || empty($_SESSION['settings']['cpassman_dir'])) {
         require_once '../includes/libraries/Encryption/PBKDF2/PasswordHash.php';
     } else {
-        require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/Encryption/PBKDF2/PasswordHash.php';
+        require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Encryption/PBKDF2/PasswordHash.php';
     }
 
     if (!empty($personalSalt)) {
@@ -169,7 +169,7 @@ 
     $pbkdf2Salt = getBits(64);
     // generate a pbkdf2 key to use for the encryption.
     //$key = strHashPbkdf2($staticSalt, $pbkdf2Salt, ITCOUNT, 16, 'sha256', 32);
-    $key = substr(pbkdf2('sha256', $staticSalt, $pbkdf2Salt, ITCOUNT, 16+32, true), 32, 16);
+    $key = substr(pbkdf2('sha256', $staticSalt, $pbkdf2Salt, ITCOUNT, 16 + 32, true), 32, 16);
     // Build $iv and $ivBase64.  We use a block size of 256 bits (AES compliant)
     // and CTR mode.  (Note: ECB mode is inadequate as IV is not used.)
     $iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, 'ctr'), MCRYPT_RAND);
@@ -183,7 +183,7 @@ 
     // MAC the encrypted text
     $mac = hash_hmac('sha256', $encrypted, $staticSalt);
     // We're done!
-    return base64_encode($ivBase64 . $encrypted . $mac . $pbkdf2Salt);
+    return base64_encode($ivBase64.$encrypted.$mac.$pbkdf2Salt);
 }
 
 /**
@@ -196,7 +196,7 @@ 
     if (!isset($_SESSION['settings']['cpassman_dir']) || empty($_SESSION['settings']['cpassman_dir'])) {
         require_once '../includes/libraries/Encryption/PBKDF2/PasswordHash.php';
     } else {
-        require_once $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/Encryption/PBKDF2/PasswordHash.php';
+        require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Encryption/PBKDF2/PasswordHash.php';
     }
 
     if (!empty($personalSalt)) {
@@ -211,9 +211,9 @@ 
     //remove the salt from the string
     $encrypted = substr($encrypted, 0, -64);
     //$key = strHashPbkdf2($staticSalt, $pbkdf2Salt, ITCOUNT, 16, 'sha256', 32);
-    $key = substr(pbkdf2('sha256', $staticSalt, $pbkdf2Salt, ITCOUNT, 16+32, true), 32, 16);
+    $key = substr(pbkdf2('sha256', $staticSalt, $pbkdf2Salt, ITCOUNT, 16 + 32, true), 32, 16);
     // Retrieve $iv which is the first 22 characters plus ==, base64_decoded.
-    $iv = base64_decode(substr($encrypted, 0, 43) . '==');
+    $iv = base64_decode(substr($encrypted, 0, 43).'==');
     // Remove $iv from $encrypted.
     $encrypted = substr($encrypted, 43);
     // Retrieve $mac which is the last 64 characters of $encrypted.
@@ -242,9 +242,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);
@@ -341,7 +341,7 @@ 
     }
 }
 
-function testHex2Bin ($val)
+function testHex2Bin($val)
 {
     if (!@hex2bin($val)) {
         throw new Exception("ERROR");
@@ -355,7 +355,7 @@ 
     if (!isset($_SESSION['settings']['cpassman_dir']) || empty($_SESSION['settings']['cpassman_dir'])) {
         $path = '../includes/libraries/Encryption/Encryption/';
     } else {
-        $path = $_SESSION['settings']['cpassman_dir'] . '/includes/libraries/Encryption/Encryption/';
+        $path = $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Encryption/Encryption/';
     }
 
     require_once $path.'Crypto.php';
@@ -436,7 +436,7 @@ 
     $protected_key = \Defuse\Crypto\KeyProtectedByPassword::createRandomPasswordProtectedKey($psk);
     $protected_key_encoded = $protected_key->saveToAsciiSafeString();
 
-    return $protected_key_encoded;  // save this in user table
+    return $protected_key_encoded; // save this in user table
 }
 
 function defuse_validate_personal_key($psk, $protected_key_encoded) {
@@ -462,7 +462,7 @@ 
         return "Error - The saltkey is not the correct one.";
     }
 
-    return $user_key_encoded;   // store it in session once user has entered his psk
+    return $user_key_encoded; // store it in session once user has entered his psk
 }
 
 /**
@@ -505,8 +505,8 @@ 
 }
 
 function db_error_handler($params) {
-    echo "Error: " . $params['error'] . "<br>\n";
-    echo "Query: " . $params['query'] . "<br>\n";
+    echo "Error: ".$params['error']."<br>\n";
+    echo "Query: ".$params['query']."<br>\n";
     die; // don't want to keep going if a query broke
 }
 
@@ -635,7 +635,7 @@ 
                     $tmp = DB::queryfirstrow("SELECT allow_pw_change FROM ".prefix_table("roles_title")." WHERE id = %i", $roleId);
                     foreach ($rows as $record) {
                         if (isset($record['folder_id']) && !in_array($record['folder_id'], $listAllowedFolders)) {
-                            array_push($listAllowedFolders, $record['folder_id']);//echo $record['folder_id'].";";
+                            array_push($listAllowedFolders, $record['folder_id']); //echo $record['folder_id'].";";
                         }
                         // Check if this group is allowed to modify any pw in allowed folders
                         if ($tmp['allow_pw_change'] == 1 && !in_array($record['folder_id'], $listFoldersEditableByRole)) {
@@ -736,14 +736,14 @@ 
             // get list of readonly folders when pf is disabled.
             // rule - if one folder is set as W or N in one of the Role, then User has access as W
             foreach ($listAllowedFolders as $folderId) {
-                if (!in_array($folderId, array_unique (array_merge ($listReadOnlyFolders, $_SESSION['personal_folders'])))) {   //
+                if (!in_array($folderId, array_unique(array_merge($listReadOnlyFolders, $_SESSION['personal_folders'])))) {   //
                     DB::query(
                         "SELECT *
                         FROM ".prefix_table("roles_values")."
                         WHERE folder_id = %i AND role_id IN %li AND type IN %ls",
                         $folderId,
                         $fonctionsAssociees,
-                        array("W","ND","NE","NDNE")
+                        array("W", "ND", "NE", "NDNE")
 
                     );
                     if (DB::count() == 0 && !in_array($folderId, $groupesVisiblesUser)) {
@@ -762,7 +762,7 @@ 
                         WHERE folder_id = %i AND role_id IN %li AND type IN %ls",
                         $folderId,
                         $fonctionsAssociees,
-                        array("W","ND","NE","NDNE")
+                        array("W", "ND", "NE", "NDNE")
                     );
                     if (DB::count() == 0 && !in_array($folderId, $groupesVisiblesUser)) {
                         array_push($listReadOnlyFolders, $folderId);
@@ -1121,7 +1121,7 @@ 
     global $LANG;
     include $_SESSION['settings']['cpassman_dir'].'/includes/config/settings.php';
     //load library
-    $user_language = isset($_SESSION['user_language']) ?$_SESSION['user_language'] : "english";
+    $user_language = isset($_SESSION['user_language']) ? $_SESSION['user_language'] : "english";
     require_once $_SESSION['settings']['cpassman_dir'].'/includes/language/'.$user_language.'.php';
     require_once $_SESSION['settings']['cpassman_dir'].'/includes/libraries/Email/Phpmailer/PHPMailerAutoload.php';
 
@@ -1230,19 +1230,19 @@ 
         ) {
             return json_encode(
                 $data,
-                JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP
+                JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
             );
         } else {
             return Encryption\Crypt\aesctr::encrypt(
                 json_encode(
                     $data,
-                    JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP
+                    JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
                 ),
                 $_SESSION['key'],
                 256
             );
         }
-    } elseif  ($type == "decode") {
+    } elseif ($type == "decode") {
         if (
             isset($_SESSION['settings']['encryptClientServer'])
             && $_SESSION['settings']['encryptClientServer'] == 0
@@ -1303,7 +1303,7 @@ 
 /*
  * Creates a KEY using PasswordLib
  */
-function GenerateCryptKey($size="", $secure="", $numerals="", $capitalize="", $ambiguous="", $symbols="")
+function GenerateCryptKey($size = "", $secure = "", $numerals = "", $capitalize = "", $ambiguous = "", $symbols = "")
 {
     // load library
     $pwgen = new SplClassLoader('Encryption\PwGen', '../includes/libraries');
@@ -1311,12 +1311,12 @@ 
     $pwgen = new Encryption\PwGen\pwgen();
 
     // init
-    if(!empty($size)) $pwgen->setLength($size);
-    if(!empty($secure)) $pwgen->setSecure($secure);
-    if(!empty($numerals)) $pwgen->setNumerals($numerals);
-    if(!empty($capitalize)) $pwgen->setCapitalize($capitalize);
-    if(!empty($ambiguous)) $pwgen->setAmbiguous($ambiguous);
-    if(!empty($symbols)) $pwgen->setSymbols($symbols);
+    if (!empty($size)) $pwgen->setLength($size);
+    if (!empty($secure)) $pwgen->setSecure($secure);
+    if (!empty($numerals)) $pwgen->setNumerals($numerals);
+    if (!empty($capitalize)) $pwgen->setCapitalize($capitalize);
+    if (!empty($ambiguous)) $pwgen->setAmbiguous($ambiguous);
+    if (!empty($symbols)) $pwgen->setSymbols($symbols);
 
     // generate and send back
     return $pwgen->generate();
@@ -1325,11 +1325,11 @@ 
 /*
 * Send sysLOG message
 */
-function send_syslog($message, $component = "teampass", $program = "php", $host , $port)
+function send_syslog($message, $component = "teampass", $program = "php", $host, $port)
 {
     $sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
         //$syslog_message = "<123>" . date('M d H:i:s ') . " " .$host . " " . $component . ": " . $message;
-    $syslog_message = "<123>" . date('M d H:i:s ') . $component . ": " . $message;
+    $syslog_message = "<123>".date('M d H:i:s ').$component.": ".$message;
         socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $host, $port);
     socket_close($sock);
 }
@@ -1341,7 +1341,7 @@ 
  *
  * permits to log events into DB
  */
-function logEvents($type, $label, $who, $login="", $field_1 = NULL)
+function logEvents($type, $label, $who, $login = "", $field_1 = NULL)
 {
     global $server, $user, $pass, $database, $pre, $port, $encoding;
 
@@ -1370,10 +1370,10 @@ 
         )
     );
     if (isset($_SESSION['settings']['syslog_enable']) && $_SESSION['settings']['syslog_enable'] == 1) {
-        if ($type == "user_mngt"){
-            send_syslog("The User " .$login. " perform the acction off " .$label. " to the user " .$field_1. " - " .$type,"teampass","php",$_SESSION['settings']['syslog_host'],$_SESSION['settings']['syslog_port']);
+        if ($type == "user_mngt") {
+            send_syslog("The User ".$login." perform the acction off ".$label." to the user ".$field_1." - ".$type, "teampass", "php", $_SESSION['settings']['syslog_host'], $_SESSION['settings']['syslog_port']);
         } else {
-            send_syslog("The User " .$login. " perform the acction off " .$label. " - " .$type,"teampass","php",$_SESSION['settings']['syslog_host'],$_SESSION['settings']['syslog_port']);
+            send_syslog("The User ".$login." perform the acction off ".$label." - ".$type, "teampass", "php", $_SESSION['settings']['syslog_host'], $_SESSION['settings']['syslog_port']);
         }
     }
 }
@@ -1406,7 +1406,7 @@ 
             )
         );
         if (isset($_SESSION['settings']['syslog_enable']) && $_SESSION['settings']['syslog_enable'] == 1) {
-                send_syslog("The Item ".$item." was ".$action." by ".$login." ".$raison,"teampass","php",$_SESSION['settings']['syslog_host'],$_SESSION['settings']['syslog_port']);
+                send_syslog("The Item ".$item." was ".$action." by ".$login." ".$raison, "teampass", "php", $_SESSION['settings']['syslog_host'], $_SESSION['settings']['syslog_port']);
         }
 }
 
@@ -1417,15 +1417,15 @@ 
     $ipaddress = '';
     if (getenv('HTTP_CLIENT_IP'))
         $ipaddress = getenv('HTTP_CLIENT_IP');
-    else if(getenv('HTTP_X_FORWARDED_FOR'))
+    else if (getenv('HTTP_X_FORWARDED_FOR'))
         $ipaddress = getenv('HTTP_X_FORWARDED_FOR');
-    else if(getenv('HTTP_X_FORWARDED'))
+    else if (getenv('HTTP_X_FORWARDED'))
         $ipaddress = getenv('HTTP_X_FORWARDED');
-    else if(getenv('HTTP_FORWARDED_FOR'))
+    else if (getenv('HTTP_FORWARDED_FOR'))
         $ipaddress = getenv('HTTP_FORWARDED_FOR');
-    else if(getenv('HTTP_FORWARDED'))
+    else if (getenv('HTTP_FORWARDED'))
         $ipaddress = getenv('HTTP_FORWARDED');
-    else if(getenv('REMOTE_ADDR'))
+    else if (getenv('REMOTE_ADDR'))
         $ipaddress = getenv('REMOTE_ADDR');
     else
         $ipaddress = 'UNKNOWN';
@@ -1472,7 +1472,7 @@ 
         // perform a copy
         if (file_exists($tp_config_file)) {
             if (!copy($tp_config_file, $tp_config_file.'.'.date("Y_m_d_His", time()))) {
-                return "ERROR: Could not copy file '" . $tp_config_file . "'";
+                return "ERROR: Could not copy file '".$tp_config_file."'";
             }
         }
 
@@ -1494,7 +1494,7 @@ 
         $data = file($tp_config_file);
         $x = 0;
         $bFound = false;
-        foreach($data as $line) {
+        foreach ($data as $line) {
             if (stristr($line, ");")) break;
             if (stristr($line, "'".$field."' => '")) {
                 $data[$x] = "    '".$field."' => '".$value."',\n";
@@ -1504,7 +1504,7 @@ 
             $x++;
         }
         if ($bFound === false) {
-            $data[($x-1)] = "    '".$field."' => '".$value."',\n";
+            $data[($x - 1)] = "    '".$field."' => '".$value."',\n";
         }
     } else {
         // ERROR
@@ -1519,7 +1519,7 @@ 
 /*
 ** Permits to replace &#92; to permit correct display
 */
-function handleBackslash ($input)
+function handleBackslash($input)
 {
     return str_replace("&amp;#92;", "&#92;", $input);
 }
@@ -1527,15 +1527,15 @@ 
 /*
 ** Permits to loas settings
 */
-function loadSettings ()
+function loadSettings()
 {
     /* LOAD CPASSMAN SETTINGS */
     if (!isset($_SESSION['settings']['loaded']) || $_SESSION['settings']['loaded'] != 1) {
-        $_SESSION['settings']['duplicate_folder'] = 0;  //by default, this is false;
-        $_SESSION['settings']['duplicate_item'] = 0;  //by default, this is false;
+        $_SESSION['settings']['duplicate_folder'] = 0; //by default, this is false;
+        $_SESSION['settings']['duplicate_item'] = 0; //by default, this is false;
         $_SESSION['settings']['number_of_used_pw'] = 5; //by default, this value is 5;
 
-        $rows = DB::query("SELECT * FROM " . prefix_table("misc") . " WHERE type=%s_type OR type=%s_type2",
+        $rows = DB::query("SELECT * FROM ".prefix_table("misc")." WHERE type=%s_type OR type=%s_type2",
             array(
                 'type' => "admin",
                 'type2' => "settings"
@@ -1716,7 +1716,7 @@ 
             unlink($file);
         } else {
             $lines = array();
-            exec("DEL /F/Q \"" . $file . "\"", $lines, $deleteError);
+            exec("DEL /F/Q \"".$file."\"", $lines, $deleteError);
         }
     }
 }
\ No newline at end of file

kb.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     "SELECT id, login FROM ".prefix_table("users")." ORDER BY login ASC"
 );
 $counter = DB::count();
-if ($counter>0) {
+if ($counter > 0) {
     foreach ($rows as $reccord) {
         $tab_users[$reccord['login']] = array(
             'id'=>$reccord['id'],

items.offline.php

Spacing +13 added lines, -13 removed lines

@@ -116,35 +116,35 @@ 
         $("#offline_password").simplePassMeter({
             "requirements": {},
             "container": "#offline_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']; ?>"
                 }
             ]
         });
@@ -162,7 +162,7 @@ 
      */
     function generateOfflineFile()
     {
-        $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?>').attr("class","").show();
+        $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?>').attr("class","").show();
 
         //Get list of selected folders
         var ids = "";
@@ -172,19 +172,19 @@ 
         });
 
         if (ids == "") {
-            $("#offline_information").show().html("<?php echo $LANG['error_no_selected_folder'];?>").attr("class","ui-state-error");
+            $("#offline_information").show().html("<?php echo $LANG['error_no_selected_folder']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#offline_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         if ($("#offline_password").val() == "") {
-            $("#offline_information").show().html("<?php echo $LANG['pdf_password_warning'];?>").attr("class","ui-state-error");
+            $("#offline_information").show().html("<?php echo $LANG['pdf_password_warning']; ?>").attr("class","ui-state-error");
             setTimeout(function(){$("#offline_information").effect( "fade", "slow" );}, 1000);
             return;
         }
 
         if ($("#offline_pw_strength_value").val() < $("#min_offline_pw_strength_value").val()) {
-            $("#offline_information").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['error_complex_not_enought'];?>");
+            $("#offline_information").addClass("ui-state-error ui-corner-all").show().html("<?php echo $LANG['error_complex_not_enought']; ?>");
             setTimeout(function(){$("#offline_information").effect( "fade", "slow" );}, 1000);
             return;
         }
@@ -216,7 +216,7 @@ 
     {
         // prpare list of ids to treat during this run
         if (idsList != "") {
-            $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait'];?> - ' + Math.round((parseInt(cpt)*100)/parseInt(number)) + "%");
+            $("#offline_information").html('<i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['please_wait']; ?> - ' + Math.round((parseInt(cpt)*100)/parseInt(number)) + "%");
 
             tab = idsList.split(';');
             idTree = tab[0];

admin.settings.load.php

Spacing +63 added lines, -63 removed lines

@@ -62,7 +62,7 @@ 
             $("#tbl_categories").append(
                 '<tr id="t_cat_'+data[0].id+'"><td colspan="2">'+
                 '<input type="text" id="catOrd_'+data[0].id+'" size="1" class="category_order" value="1" />&nbsp;&nbsp;'+
-                '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
+                '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category']; ?>" onclick="fieldAdd('+
                 data[0].id+')" style="cursor:pointer;">'+
                 '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-plus fa-stack-1x fa-inverse"></i>'+
                 '</span>&nbsp;'+
@@ -70,10 +70,10 @@ 
                 '<label for="item_'+data[0].id+'_cat" id="item_'+data[0].id+'">'+
                 $("#new_category_label").val()+'</label>'+
                 '</td><td>'+
-                '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+data[0].id+')" style="cursor:pointer;">'+
+                '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders']; ?>" onclick="catInFolders('+data[0].id+')" style="cursor:pointer;">'+
                 '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-edit fa-stack-1x fa-inverse"></i>'+
                 '</span>&nbsp;'+
-                '<?php echo $LANG['category_in_folders_title'];?>:'+
+                '<?php echo $LANG['category_in_folders_title']; ?>:'+
                 '<span style="font-family:italic; margin-left:10px;" id="catFolders_'+data[0].id+'"></span>'+
                 '<input type="hidden" id="catFoldersList_'+data[0].id+'" value="'+data[0].id+'" /></td><td></td>');
             // Add new cat
@@ -94,7 +94,7 @@ 
     var data = $("input[name=sel_item]:checked").attr("id").split('_');
     $("#post_id").val(data[1]);
     $("#post_type").val("renameItem");
-    $("#category_confirm_text").html("<?php echo $LANG['confirm_rename'];?>");
+    $("#category_confirm_text").html("<?php echo $LANG['confirm_rename']; ?>");
     $("#category_confirm").dialog("open");
 }
 
@@ -105,7 +105,7 @@ 
     var data = $("input[name=sel_item]:checked").attr("id").split('_');
     $("#post_id").val(data[1]);
     $("#post_type").val("deleteCategory");
-    $("#category_confirm_text").html("<?php echo $LANG['confirm_deletion'];?>");
+    $("#category_confirm_text").html("<?php echo $LANG['confirm_deletion']; ?>");
     $("#category_confirm").dialog("open");
 }
 
@@ -116,7 +116,7 @@ 
     var data = $("input[name=sel_item]:checked").attr("id").split('_');
     $("#post_id").val(data[1]);
     $("#post_type").val("moveItem");
-    $("#category_confirm_text").html("<?php echo $LANG['confirm_moveto'];?>");
+    $("#category_confirm_text").html("<?php echo $LANG['confirm_moveto']; ?>");
     $("#category_confirm").dialog("open");
 }
 
@@ -167,7 +167,7 @@ 
         "sources/categories.queries.php",
         {
             type    : "loadFieldsList",
-            title   : prepareExchangedData(sanitizeString($("#new_category_label").val()), "encode", "<?php echo $_SESSION['key'];?>")
+            title   : prepareExchangedData(sanitizeString($("#new_category_label").val()), "encode", "<?php echo $_SESSION['key']; ?>")
         },
         function(data) {
             var newList = '<table id="tbl_categories" style="">';
@@ -177,17 +177,17 @@ 
                 if (val[0] === "1") {
                     newList += '<tr id="t_cat_'+val[1]+'"><td colspan="2">'+
                     '<input type="text" id="catOrd_'+val[1]+'" size="1" class="category_order" value="'+val[3]+'" />&nbsp;'+
-                    '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category'];?>" onclick="fieldAdd('+
+                    '<span class="fa-stack tip" title="<?php echo $LANG['field_add_in_category']; ?>" onclick="fieldAdd('+
                     val[1]+')" style="cursor:pointer;">'+
                     '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-plus fa-stack-1x fa-inverse"></i>'+
                     '</span>&nbsp;'+
                     '<input type="radio" name="sel_item" id="item_'+val[1]+'_cat" />'+
                     '<label for="item_'+val[1]+'_cat" id="item_'+val[1]+'">'+val[2]+'</label>'+
                     '</td><td>'+
-                    '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders'];?>" onclick="catInFolders('+val[1]+')" style="cursor:pointer;">'+
+                    '<span class="fa-stack tip" title="<?php echo $LANG['category_in_folders']; ?>" onclick="catInFolders('+val[1]+')" style="cursor:pointer;">'+
                     '<i class="fa fa-square fa-stack-2x"></i><i class="fa fa-edit fa-stack-1x fa-inverse"></i>'+
                     '</span>&nbsp;'+
-                    '<?php echo $LANG['category_in_folders_title'];?>:'+
+                    '<?php echo $LANG['category_in_folders_title']; ?>:'+
                     '<span style="font-family:italic; margin-left:10px;" id="catFolders_'+val[1]+'">'+val[4]+'</span>'+
                     '<input type="hidden" id="catFoldersList_'+val[1]+'" value="'+val[5]+'" /></td></tr>';
                 } else {
@@ -199,9 +199,9 @@ 
                     if (val[4] !== "") {
                         newList += '<span id="encryt_data_'+val[1]+'" style="margin-left:4px; cursor:pointer;">';
                         if (val[4] === "1") {
-                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
+                            newList += '<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 1)"></i>';
                         } else if (val[4] === "0") {
-                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
+                            newList += '<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode('+val[1]+', 0)"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>';
                         }
                         newList += '</span>'
                     }
@@ -234,7 +234,7 @@ 
     else if (action === "admin_action_change_salt_key") {
         option = aes_encrypt(sanitizeString($("#new_salt_key").val()));
     } else if (action === "admin_email_send_backlog") {
-        $("#email_testing_results").show().html("<?php echo addslashes($LANG['please_wait']);?>").attr("class","ui-corner-all ui-state-focus");
+        $("#email_testing_results").show().html("<?php echo addslashes($LANG['please_wait']); ?>").attr("class","ui-corner-all ui-state-focus");
     } else if (action === "admin_action_attachments_cryption") {
         option = $("input[name=attachments_cryption]:checked").val();
         if (option === "" || option === undefined) {
@@ -261,7 +261,7 @@ 
         if (option === "" || option.length === 0) return;
 
         // convert to json string
-        option = prepareExchangedData(JSON.stringify(option) , "encode", "<?php echo $_SESSION['key'];?>");
+        option = prepareExchangedData(JSON.stringify(option) , "encode", "<?php echo $_SESSION['key']; ?>");
     }
     //Lauchn ajax query
     $.post(
@@ -274,7 +274,7 @@ 
             $("#div_loading").hide();
             if (data != null) {
                 if (data[0].result == "db_backup") {
-                    $("#result_admin_action_db_backup").html("<span class='fa fa-file-code-o'></span>&nbsp;<a href='"+data[0].href+"'><?php echo $LANG['pdf_download'];?></a>").show();
+                    $("#result_admin_action_db_backup").html("<span class='fa fa-file-code-o'></span>&nbsp;<a href='"+data[0].href+"'><?php echo $LANG['pdf_download']; ?></a>").show();
                 } else if (data[0].result == "pf_done") {
                     $("#result_admin_action_check_pf").html("<span class='fa fa-check mi-green'></span>").show();
                 } else if (data[0].result == "db_restore") {
@@ -289,9 +289,9 @@ 
                 } else if (data[0].result == "db_optimize") {
                     $("#result_admin_action_db_optimize").html("<span class='fa fa-check mi-green'></span>").show();
                 } else if (data[0].result == "purge_old_files") {
-                    $("#result_admin_action_purge_old_files").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_files_deleted+"&nbsp;<? echo $LANG['admin_action_purge_old_files_result'];?>").show();
+                    $("#result_admin_action_purge_old_files").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_files_deleted+"&nbsp;<? echo $LANG['admin_action_purge_old_files_result']; ?>").show();
                 } else if (data[0].result == "db_clean_items") {
-                    $("#result_admin_action_db_clean_items").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_items_deleted+"&nbsp;<?php echo $LANG['admin_action_db_clean_items_result'];?>").show();
+                    $("#result_admin_action_db_clean_items").html("<span class='fa fa-check mi-green'></span>&nbsp;"+data[0].nb_items_deleted+"&nbsp;<?php echo $LANG['admin_action_db_clean_items_result']; ?>").show();
                 } else if (data[0].result == "changed_salt_key") {
                     //deconnect user
                     $("#menu_action").val("deconnexion");
@@ -299,9 +299,9 @@ 
                     window.location.href = "logout.php"
                 } else if (data[0].result == "email_test_conf" || data[0].result == "admin_email_send_backlog") {
                     if (data[0].error != "") {
-                        $("#email_testing_results").html("<?php echo addslashes($LANG['admin_email_result_nok']);?>&nbsp;"+data[0].message).show().attr("class","ui-state-error ui-corner-all");
+                        $("#email_testing_results").html("<?php echo addslashes($LANG['admin_email_result_nok']); ?>&nbsp;"+data[0].message).show().attr("class","ui-state-error ui-corner-all");
                     } else {
-                        $("#email_testing_results").html("<?php echo addslashes(str_replace("#email#", $_SESSION['user_email'], $LANG['admin_email_result_ok']));?>").show().attr("class","ui-corner-all ui-state-focus");
+                        $("#email_testing_results").html("<?php echo addslashes(str_replace("#email#", $_SESSION['user_email'], $LANG['admin_email_result_ok'])); ?>").show().attr("class","ui-corner-all ui-state-focus");
                     }
                 } else if (data[0].result == "pw_prefix_correct") {
                     $("result_admin_action_pw_prefix_correct").html(data[0].ret).show();
@@ -326,7 +326,7 @@ 
                 } else if (data[0].result === "backup_decrypt_fails") {
                     $("#result_admin_script_backup").html(data[0].msg).show();
                 } else if (data[0].result === "backup_decrypt_success") {
-                    $("#result_admin_script_backup").html("<span class='fa fa-check mi-green'></span>&nbsp;<?php echo addslashes($LANG['file_is_now_ready']);?> - " + data[0].msg).show(1).delay(5000).fadeOut(500);
+                    $("#result_admin_script_backup").html("<span class='fa fa-check mi-green'></span>&nbsp;<?php echo addslashes($LANG['file_is_now_ready']); ?> - " + data[0].msg).show(1).delay(5000).fadeOut(500);
                 }
                 //--
             }
@@ -339,7 +339,7 @@ 
 *
 */
 function confirmChangingSk() {
-    if (confirm("<?php echo addslashes($LANG['confirm_database_reencryption']);?>")) {
+    if (confirm("<?php echo addslashes($LANG['confirm_database_reencryption']); ?>")) {
         changeMainSaltKey('starting', '');
     }
 }
@@ -360,14 +360,14 @@ 
     // start change
     if (start === "starting") {
         // inform
-        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['starting'];?>").show();
+        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['starting']; ?>").show();
 
         // launch query
         $.post(
             "sources/admin.queries.php",
             {
                 type     : "admin_action_change_salt_key___start",
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].error == "" && data[0].nextAction == "encrypt_items") {
@@ -379,7 +379,7 @@ 
                     //changeMainSaltKey(0, "files");
                 } else {
                     // error mngt
-                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back'];?> : "+data[0].error);
+                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back']; ?> : "+data[0].error);
                 }
             },
             "json"
@@ -388,7 +388,7 @@ 
     } else if (isFinite(start) && object !== "") {
         console.log("Step Encrypt - " +start+" ; "+nb+" ; "+$("#changeMainSaltKey_itemsCount").val());
 
-        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['treating_items'];?>...&nbsp;"+start+" > "+(parseInt(start)+parseInt(nb))+" (<?php echo $LANG['total_number_of_items'];?> : "+$("#changeMainSaltKey_itemsCount").val()+")");
+        $("#changeMainSaltKey_message").html("<i class=\"fa fa-cog fa-spin fa\"></i>&nbsp;<?php echo $LANG['treating_items']; ?>...&nbsp;"+start+" > "+(parseInt(start)+parseInt(nb))+" (<?php echo $LANG['total_number_of_items']; ?> : "+$("#changeMainSaltKey_itemsCount").val()+")");
 
         $.post(
             "sources/admin.queries.php",
@@ -398,7 +398,7 @@ 
                 start        : start,
                 length       : nb,
                 nbItems      : $("#changeMainSaltKey_itemsCount").val(),
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 console.log("Next action: "+data[0].nextAction);
@@ -412,11 +412,11 @@ 
                     }
                     changeMainSaltKey(data[0].nextStart, object);
                 } else if (data[0].nextAction === "finishing") {
-                    $("#changeMainSaltKey_message").html("<?php echo $LANG['finalizing'];?>...");
+                    $("#changeMainSaltKey_message").html("<?php echo $LANG['finalizing']; ?>...");
                     changeMainSaltKey("finishing");
                 } else {
                     // error mngt
-                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back'];?> : "+data[0].error);
+                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-alert fa-spin fa\"></i>&nbsp;<?php echo $LANG['error_sent_back']; ?> : "+data[0].error);
                 }
             },
             "json"
@@ -427,12 +427,12 @@ 
             "sources/admin.queries.php",
             {
                 type     : "admin_action_change_salt_key___end",
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 if (data[0].nextAction === "done") {
                     console.log("done");
-                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-info fa-lg\"></i>&nbsp;<?php echo $LANG['alert_message_done']." ".$LANG['number_of_items_treated'];?> : " + $("#changeMainSaltKey_itemsCountTotal").val() + '<p><?php echo $LANG['check_data_after_reencryption'];?><p><div style=\"margin-top:5px;\"><a href=\"#\" onclick=\"encryption_show_revert()\"><?php echo $LANG['revert'];?></a></div>');
+                    $("#changeMainSaltKey_message").html("<i class=\"fa fa-info fa-lg\"></i>&nbsp;<?php echo $LANG['alert_message_done']." ".$LANG['number_of_items_treated']; ?> : " + $("#changeMainSaltKey_itemsCountTotal").val() + '<p><?php echo $LANG['check_data_after_reencryption']; ?><p><div style=\"margin-top:5px;\"><a href=\"#\" onclick=\"encryption_show_revert()\"><?php echo $LANG['revert']; ?></a></div>');
                 } else {
                     // error mngt
                 }
@@ -444,13 +444,13 @@ 
 }
 
 function encryption_show_revert() {
-    if (confirm('<?php echo $LANG['revert_the_database'];?>')) {
-        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']);?>...</div>')
+    if (confirm('<?php echo $LANG['revert_the_database']; ?>')) {
+        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']); ?>...</div>')
         $.post(
             "sources/admin.queries.php",
             {
                 type    : "admin_action_change_salt_key___restore_backup",
-                key     : "<?php echo $_SESSION['key'];?>"
+                key     : "<?php echo $_SESSION['key']; ?>"
             },
             function(data) {
                 $("#changeMainSaltKey_message").html('').hide();
@@ -474,8 +474,8 @@ 
         "sources/admin.queries.php",
         {
             type    : "save_option_change",
-            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) {
             // force page reload in case of encryptClientServer
@@ -485,7 +485,7 @@ 
             }
             //decrypt data
             try {
-                data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
             } catch (e) {
                 // error
                 $("#message_box").html("An error appears. Answer from Server cannot be parsed!<br />Returned data:<br />"+data).show().fadeOut(4000);
@@ -524,8 +524,8 @@ 
         drag: true, // allow dragging the toggle between positions
         click: true, // allow clicking on the toggle
         text: {
-            on: '<?php echo $LANG['yes'];?>', // text for the ON position
-            off: '<?php echo $LANG['no'];?>' // and off
+            on: '<?php echo $LANG['yes']; ?>', // text for the ON position
+            off: '<?php echo $LANG['no']; ?>' // and off
         },
         on: true, // is the toggle ON on init
         animate: 250, // animation time (ms)
@@ -550,8 +550,8 @@ 
             "sources/admin.queries.php",
             {
                 type    : "save_option_change",
-                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) {
                 // force page reload in case of encryptClientServer
@@ -561,7 +561,7 @@ 
                 }
                 //decrypt data
                 try {
-                    data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+                    data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
                 } catch (e) {
                     // error
                     $("#message_box").html("An error appears. Answer from Server cannot be parsed!<br />Returned data:<br />"+data).show().fadeOut(4000);
@@ -605,7 +605,7 @@ 
             }
         },
         beforeLoad: function( event, ui ) {
-            ui.panel.html('<div id="loader_tab"><i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['loading'];?>...</div>')
+            ui.panel.html('<div id="loader_tab"><i class="fa fa-cog fa-spin"></i>&nbsp;<?php echo $LANG['loading']; ?>...</div>')
         },
         load: function( event, ui ) {
             $("#loader_tab").remove();
@@ -638,9 +638,9 @@ 
         autoOpen: false,
         width: 400,
         height: 120,
-        title: "<?php echo $LANG['confirm'];?>",
+        title: "<?php echo $LANG['confirm']; ?>",
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 $("#div_loading").show();
                 var $this = $(this);
                 // prepare data to send
@@ -675,7 +675,7 @@ 
                     "json"
                );
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $("#div_loading").hide();
                 $(this).dialog("close");
             }
@@ -688,9 +688,9 @@ 
         autoOpen: false,
         width: 500,
         height: 150,
-        title: "<?php echo $LANG['category_in_folders'];?>",
+        title: "<?php echo $LANG['category_in_folders']; ?>",
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 if ($("#new_field_title").val() != "" && $("#post_id").val() != "") {
                     $("#div_loading").show();
                     var $this = $(this);
@@ -712,7 +712,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $("#div_loading").hide();
                 $(this).dialog("close");
             }
@@ -722,8 +722,8 @@ 
     $("#cat_folders_selection").multiselect({
         selectedList: 7,
         multiple:true,
-        checkAllText: "<?php echo $LANG['check_all_text'];?>",
-        uncheckAllText: "<?php echo $LANG['uncheck_all_text'];?>"
+        checkAllText: "<?php echo $LANG['check_all_text']; ?>",
+        uncheckAllText: "<?php echo $LANG['uncheck_all_text']; ?>"
     });
 
     $("#category_in_folder").dialog({
@@ -732,12 +732,12 @@ 
         autoOpen: false,
         width: 400,
         height: 350,
-        title: "<?php echo $LANG['category_in_folders'];?>",
+        title: "<?php echo $LANG['category_in_folders']; ?>",
         open: function() {
             $("#cat_folders_selection").multiselect('refresh');
         },
         buttons: {
-            "<?php echo $LANG['confirm'];?>": function() {
+            "<?php echo $LANG['confirm']; ?>": function() {
                 // get list of selected folders
                 var ids = "";
                 $("#cat_folders_selection :selected").each(function(i, selected) {
@@ -767,7 +767,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $("#div_loading").hide();
                 $(this).dialog("close");
             }
@@ -780,12 +780,12 @@ 
         autoOpen: false,
         width:250,
         height:150,
-        title: "<?php echo $LANG['admin_action_db_restore_key'];?>",
+        title: "<?php echo $LANG['admin_action_db_restore_key']; ?>",
         buttons: {
-            "<?php echo $LANG['ok'];?>": function() {
+            "<?php echo $LANG['ok']; ?>": function() {
                 LaunchAdminActions("admin_action_db_restore", $("#restore_bck_fileObj").val()+"&"+$("#restore_bck_encryption_key").val());
             },
-            "<?php echo $LANG['cancel_button'];?>'": function() {
+            "<?php echo $LANG['cancel_button']; ?>'": function() {
                 $(this).dialog("close");
             }
         }
@@ -911,11 +911,11 @@ 
     $.post("sources/admin.queries.php",
         {
             type        : "is_backup_table_existing",
-            key         : "<?php echo $_SESSION['key'];?>"
+            key         : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
             if (data === "1") {
-                $("#changeMainSaltKey_message").show().html('<?php echo addslashes($LANG['previous_backup_exists']);?>&nbsp;&nbsp;<b><a href="#" id="but_bck_restore"><?php echo $LANG['yes'];?></a></b><br /><?php echo $LANG['previous_backup_exists_delete'];?>&nbsp;&nbsp;<b><a href="#" id="but_bck_delete"><?php echo $LANG['yes'];?></a></b>');
+                $("#changeMainSaltKey_message").show().html('<?php echo addslashes($LANG['previous_backup_exists']); ?>&nbsp;&nbsp;<b><a href="#" id="but_bck_restore"><?php echo $LANG['yes']; ?></a></b><br /><?php echo $LANG['previous_backup_exists_delete']; ?>&nbsp;&nbsp;<b><a href="#" id="but_bck_delete"><?php echo $LANG['yes']; ?></a></b>');
 
                 // Restore the backup
                 $("#but_bck_restore").click(function(e) {
@@ -924,13 +924,13 @@ 
 
                 // Delete the backup
                 $("#but_bck_delete").click(function(e) {
-                    if (confirm("<?php echo $LANG['wipe_backup_data'];?>")) {
-                        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']);?>...</div>')
+                    if (confirm("<?php echo $LANG['wipe_backup_data']; ?>")) {
+                        $("#changeMainSaltKey_message").append('<div style="margin-top:5px;"><i class="fa fa-cog fa-spin fa-lg"></i>&nbsp;<?php echo addslashes($LANG['please_wait']); ?>...</div>')
                         $.post(
                             "sources/admin.queries.php",
                             {
                                 type    : "admin_action_change_salt_key___delete_backup",
-                                key     : "<?php echo $_SESSION['key'];?>"
+                                key     : "<?php echo $_SESSION['key']; ?>"
                             },
                             function(data) {
                                 $("#changeMainSaltKey_message").html('').hide();
@@ -995,9 +995,9 @@ 
             // show to user
             if (data[0].error === ""){
                 if (encrypted_data === "1") {
-                    $("#encryt_data_"+id).html('<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data'];?>" onclick="changeEncrypMode(\''+id+'\', \'0\')"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>');
+                    $("#encryt_data_"+id).html('<span class="fa-stack" title="<?php echo $LANG['not_encrypted_data']; ?>" onclick="changeEncrypMode(\''+id+'\', \'0\')"><i class="fa fa-key fa-stack-1x"></i><i class="fa fa-ban fa-stack-1x fa-lg" style="color:red;"></i></span>');
                 } else {
-                    $("#encryt_data_"+id).html('<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data'];?>" onclick="changeEncrypMode(\''+id+'\', \'1\')"></i>');
+                    $("#encryt_data_"+id).html('<i class="fa fa-key tip" title="<?php echo $LANG['encrypted_data']; ?>" onclick="changeEncrypMode(\''+id+'\', \'1\')"></i>');
                 }
             }
             $("#div_loading").hide();

find.load.php

Spacing +35 added lines, -35 removed lines

@@ -21,7 +21,7 @@ 
 //<![CDATA[
 function aes_decrypt(text)
 {
-    return Aes.Ctr.decrypt(text, "<?php echo $_SESSION['key'];?>", 256);
+    return Aes.Ctr.decrypt(text, "<?php echo $_SESSION['key']; ?>", 256);
 }
 
 /*
@@ -38,10 +38,10 @@ 
         "sources/items.queries.php",
         {
             type    : "refresh_visible_folders",
-            key        : "<?php echo $_SESSION['key'];?>"
+            key        : "<?php echo $_SESSION['key']; ?>"
         },
         function(data) {
-            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key'];?>");
+            data = prepareExchangedData(data , "decode", "<?php echo $_SESSION['key']; ?>");
             $("#copy_in_folder").find('option').remove().end().append(data.selectFullVisibleFoldersOptions);
             $('#div_copy_item_to_folder').dialog('open');
         }
@@ -55,9 +55,9 @@ 
       autoOpen: false,
       width: 400,
       height: 200,
-      title: "<?php echo $LANG['item_menu_copy_elem'];?>",
+      title: "<?php echo $LANG['item_menu_copy_elem']; ?>",
       buttons: {
-          "<?php echo $LANG['ok'];?>": function() {
+          "<?php echo $LANG['ok']; ?>": function() {
               //Send query
                 $.post(
                     "sources/items.queries.php",
@@ -65,7 +65,7 @@ 
                         type    : "copy_item",
                         item_id : $('#id_selected_item').val(),
                         folder_id : $('#copy_in_folder').val(),
-                        key        : "<?php echo $_SESSION['key'];?>"
+                        key        : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data) {
                         //check if format error
@@ -74,7 +74,7 @@ 
                         }
                         //if OK
                         if (data[0].status == "ok") {
-                            $("#div_dialog_message_text").html("<?php echo $LANG['alert_message_done'];?>");
+                            $("#div_dialog_message_text").html("<?php echo $LANG['alert_message_done']; ?>");
                             $("#div_dialog_message").dialog('open');
                             $("#div_copy_item_to_folder").dialog('close');
                         }
@@ -82,7 +82,7 @@ 
                     "json"
                );
           },
-          "<?php echo $LANG['cancel_button'];?>": function() {
+          "<?php echo $LANG['cancel_button']; ?>": function() {
               $("#copy_item_to_folder_show_error").html("").hide();
               $(this).dialog('close');
           }
@@ -105,10 +105,10 @@ 
       autoOpen: false,
       width: 450,
       height: 220,
-      title: "<?php echo $LANG['see_item_title'];?>",
+      title: "<?php echo $LANG['see_item_title']; ?>",
       open:
         function(event, ui) {
-              $("#div_item_data_show_error").html("<?php echo $LANG['admin_info_loading'];?>").show();
+              $("#div_item_data_show_error").html("<?php echo $LANG['admin_info_loading']; ?>").show();
             $.post(
                 "sources/items.queries.php",
                 {
@@ -117,25 +117,25 @@ 
                     salt_key_required : $('#personalItem').val(),
                     salt_key_set : $('#personal_sk_set').val(),
                     page    : "find",
-                    key        : "<?php echo $_SESSION['key'];?>"
+                    key        : "<?php echo $_SESSION['key']; ?>"
                 },
                 function(data) {
                     //decrypt data
-                    data = prepareExchangedData(data, "decode", "<?php echo $_SESSION['key'];?>");
+                    data = prepareExchangedData(data, "decode", "<?php echo $_SESSION['key']; ?>");
                     var return_html = "";
                     if (data.show_detail_option != "0" || data.show_details == 0) {
                         //item expired
-                        return_html = "<?php echo $LANG['not_allowed_to_see_pw_is_expired'];?>";
+                        return_html = "<?php echo $LANG['not_allowed_to_see_pw_is_expired']; ?>";
                     } else if (data.show_details == "0") {
                         //Admin cannot see Item
-                        return_html = "<?php echo $LANG['not_allowed_to_see_pw'];?>";
+                        return_html = "<?php echo $LANG['not_allowed_to_see_pw']; ?>";
                     } else {
                         return_html = "<table>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['label'];?> :</td><td style='font-style:italic;display:inline;'>"+data.label+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['description'];?> :</td><td style='font-style:italic;display:inline;'>"+data.description+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['pw'];?> :</td><td style='font-style:italic;display:inline;'>"+unsanitizeString(data.pw)+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['index_login'];?> :</td><td style='font-style:italic;display:inline;'>"+data.login+"</td></tr>"+
-                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['url'];?> :</td><td style='font-style:italic;display:inline;'>"+data.url+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['label']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.label+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['description']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.description+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['pw']; ?> :</td><td style='font-style:italic;display:inline;'>"+unsanitizeString(data.pw)+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['index_login']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.login+"</td></tr>"+
+                            "<tr><td valign='top' class='td_title'><span class='ui-icon ui-icon-carat-1-e' style='float: left; margin-right: .3em;'>&nbsp;</span><?php echo $LANG['url']; ?> :</td><td style='font-style:italic;display:inline;'>"+data.url+"</td></tr>"+
                         "</table>";
                     }
                     $("#div_item_data_show_error").html("").hide();
@@ -150,7 +150,7 @@ 
         }
         ,
       buttons: {
-          "<?php echo $LANG['ok'];?>": function() {
+          "<?php echo $LANG['ok']; ?>": function() {
               $(this).dialog('close');
           }
       }
@@ -166,7 +166,7 @@ 
         "sAjaxSource": "sources/find.queries.php",
         "bJQueryUI": true,
         "oLanguage": {
-            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language'];?>.txt"
+            "sUrl": "includes/language/datatables.<?php echo $_SESSION['user_language']; ?>.txt"
         },
         "fnInitComplete": function() {
             $("#find_page input").focus();
@@ -194,7 +194,7 @@ 
         autoOpen: false,
         width: 500,
         height: 400,
-        title: "<?php echo $LANG['mass_operation'];?>",
+        title: "<?php echo $LANG['mass_operation']; ?>",
         open: function() {
             var html = sel_items = sel_items_txt = item_id = '';
 
@@ -213,7 +213,7 @@ 
 
             // prepare display
             if ($("#div_mass_op").data('action') === "move") {
-                html = '<?php echo $LANG['you_decided_to_move_items'];?>: ' +
+                html = '<?php echo $LANG['you_decided_to_move_items']; ?>: ' +
                 '<div><ul>' + sel_items_txt + '</ul></div>';
                 var folder_options = '';
 
@@ -222,7 +222,7 @@ 
                     "sources/folders.queries.php",
                     {
                         type    : "get_list_of_folders",
-                        key     : "<?php echo $_SESSION['key'];?>"
+                        key     : "<?php echo $_SESSION['key']; ?>"
                     },
                     function(data) {
                         $("#div_loading").hide();
@@ -235,7 +235,7 @@ 
                         }
 
                         // destination folder
-                         html += '<div style=""><?php echo $LANG['import_keepass_to_folder'];?>:&nbsp;&nbsp;' +
+                         html += '<div style=""><?php echo $LANG['import_keepass_to_folder']; ?>:&nbsp;&nbsp;' +
                          '<select id="mass_move_destination_folder_id">' + data[0].list_folders + '</select>' +
                          '</div>';
 
@@ -245,19 +245,19 @@ 
                     "json"
                 );
             } else if ($("#div_mass_op").data('action') === "delete") {
-                html = '<?php echo $LANG['you_decided_to_delete_items'];?>: ' +
+                html = '<?php echo $LANG['you_decided_to_delete_items']; ?>: ' +
                 '<div><ul>' + sel_items_txt + '</ul></div>' +
-                '<div style="padding:10px;" class="ui-corner-all ui-state-error"><span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['confirm_deletion'];?></div>';
+                '<div style="padding:10px;" class="ui-corner-all ui-state-error"><span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['confirm_deletion']; ?></div>';
                 
                 $("#div_mass_html").html(html);
             }
 
         },
         buttons: {
-            "<?php echo $LANG['ok'];?>": function() {
+            "<?php echo $LANG['ok']; ?>": function() {
                 $("#div_mass_op_msg")
                     .addClass("ui-state-highlight")
-                    .html('<span class="fa fa-cog fa-spin fa-lg"></span>&nbsp;<?php echo $LANG['please_wait'];?>')
+                    .html('<span class="fa fa-cog fa-spin fa-lg"></span>&nbsp;<?php echo $LANG['please_wait']; ?>')
                     .show();
 
                 var sel_items = '';
@@ -270,7 +270,7 @@ 
                 if (sel_items === "") {
                     $("#div_mass_op_msg")
                         .addClass("ui-state-error")
-                        .html('<span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['must_select_items'];?>')
+                        .html('<span class="fa fa-warning fa-lg"></span>&nbsp;<?php echo $LANG['must_select_items']; ?>')
                         .show().delay(2000).fadeOut(1000);
                     return false;
                 }
@@ -285,7 +285,7 @@ 
                             type        : "mass_move_items",
                             item_ids    : sel_items,
                             folder_id   : $("#mass_move_destination_folder_id").val(),
-                            key         : "<?php echo $_SESSION['key'];?>"
+                            key         : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             //check if format error
@@ -297,7 +297,7 @@ 
                                 //reload search 
                                 oTable.api().ajax.reload();
 
-                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done'];?>");
+                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done']; ?>");
                                     $("#main_info_box").show().position({
                                         my: "center",
                                         at: "center top+75",
@@ -320,7 +320,7 @@ 
                         {
                             type        : "mass_delete_items",
                             item_ids    : sel_items,
-                            key         : "<?php echo $_SESSION['key'];?>"
+                            key         : "<?php echo $_SESSION['key']; ?>"
                         },
                         function(data) {
                             //check if format error
@@ -332,7 +332,7 @@ 
                                 //reload search 
                                 oTable.api().ajax.reload();
 
-                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done'];?>");
+                                $("#main_info_box_text").html("<?php echo $LANG['alert_message_done']; ?>");
                                     $("#main_info_box").show().position({
                                         my: "center",
                                         at: "center top+75",
@@ -348,7 +348,7 @@ 
                     );
                 }
             },
-            "<?php echo $LANG['cancel_button'];?>": function() {
+            "<?php echo $LANG['cancel_button']; ?>": function() {
                 $(this).dialog('close');
             }
         }