nilsteampassnet / TeamPass

sources/main.queries.php

Spacing +110 added lines, -110 removed lines

@@ -42,8 +42,8 @@ 
 }
 
 // DO CHECKS
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 $post_type = filter_input(INPUT_POST, 'type', FILTER_SANITIZE_STRING);
 if (
     isset($post_type) === true
@@ -59,7 +59,7 @@ 
     && checkUser($_SESSION['user_id'], $_SESSION['key'], 'home', $SETTINGS) === false
 ) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 } elseif ((isset($_SESSION['user_id']) === true
         && isset($_SESSION['key'])) === true
@@ -71,7 +71,7 @@ 
     mainQuery($SETTINGS);
 } else {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -102,15 +102,15 @@ 
         date_default_timezone_set('UTC');
     }
 
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 
     // Includes
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
 
     // Connect to mysql server
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
     if (defined('DB_PASSWD_CLEAR') === false) {
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
     }
@@ -122,7 +122,7 @@ 
     DB::$encoding = DB_ENCODING;
 
     // User's language loading
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
 
     // Prepare post variables
     $post_key = filter_input(INPUT_POST, 'key', FILTER_SANITIZE_STRING);
@@ -214,7 +214,7 @@ 
                     $_SESSION['user_id']
                 );
                 // Return data
-                echo '[{"new_value":"' . $_SESSION['sessionDuration'] . '"}]';
+                echo '[{"new_value":"'.$_SESSION['sessionDuration'].'"}]';
 
                 break;
             }
@@ -281,7 +281,7 @@ 
             $pwdlib = new PasswordLib\PasswordLib();
             // generate key
             $key = $pwdlib->getRandomToken(filter_input(INPUT_POST, 'size', FILTER_SANITIZE_NUMBER_INT));
-            echo '[{"key" : "' . htmlentities($key, ENT_QUOTES) . '"}]';
+            echo '[{"key" : "'.htmlentities($key, ENT_QUOTES).'"}]';
             break;
 
         /*
@@ -310,7 +310,7 @@ 
                 )
             );
 
-            echo '[{"token" : "' . $token . '"}]';
+            echo '[{"token" : "'.$token.'"}]';
             break;
 
 
@@ -623,7 +623,7 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('error_not_allowed_to') . '</div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('error_not_allowed_to').'</div>',
                 ),
                 'encode'
             );
@@ -632,7 +632,7 @@ 
         // check if expected security level is reached
         $dataUser = DB::queryfirstrow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -654,8 +654,8 @@ 
         if (empty($dataUser['fonction_id']) === false) {
             $data = DB::queryFirstRow(
                 'SELECT complexity
-                FROM ' . prefixTable('roles_title') . '
-                WHERE id IN (' . $dataUser['fonction_id'] . ')
+                FROM ' . prefixTable('roles_title').'
+                WHERE id IN (' . $dataUser['fonction_id'].')
                 ORDER BY complexity DESC'
             );
         } else {
@@ -668,8 +668,8 @@ 
             return prepareExchangedData(
                 array(
                     'error' => true,
-                    'message' => '<div style="margin:10px 0 10px 15px;">' . langHdl('complexity_level_not_reached') . '.<br>' .
-                        langHdl('expected_complexity_level') . ': <b>' . TP_PW_COMPLEXITY[$data['complexity']][1] . '</b></div>',
+                    'message' => '<div style="margin:10px 0 10px 15px;">'.langHdl('complexity_level_not_reached').'.<br>'.
+                        langHdl('expected_complexity_level').': <b>'.TP_PW_COMPLEXITY[$data['complexity']][1].'</b></div>',
                 ),
                 'encode'
             );
@@ -763,14 +763,14 @@ 
         // Get data about user
         $data = DB::queryfirstrow(
             'SELECT id, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE login = %s',
             $post_login
         );
     } else {
         $data = DB::queryfirstrow(
             'SELECT id, login, email, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_id
         );
@@ -780,7 +780,7 @@ 
     $counter = DB::count();
 
     // load passwordLib library
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
     $pwdlib->register();
     $pwdlib = new PasswordLib\PasswordLib();
 
@@ -827,7 +827,7 @@ 
     }
     
     // generate new GA user code
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
     $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
     $gaSecretKey = $tfa->createSecret();
     $gaTemporaryCode = GenerateCryptKey(12, false, true, true, false, true, $SETTINGS);
@@ -869,7 +869,7 @@ 
                 'email' => $data['email'],
                 'email_result' => str_replace(
                     '#email#',
-                    '<b>' . obfuscateEmail($data['email']) . '</b>',
+                    '<b>'.obfuscateEmail($data['email']).'</b>',
                     addslashes(langHdl('admin_email_result_ok'))
                 ),
             ),
@@ -885,7 +885,7 @@ 
             'email' => $data['email'],
             'email_result' => str_replace(
                 '#email#',
-                '<b>' . obfuscateEmail($data['email']) . '</b>',
+                '<b>'.obfuscateEmail($data['email']).'</b>',
                 addslashes(langHdl('admin_email_result_ok'))
             ),
         ),
@@ -901,7 +901,7 @@ 
         && (int) $SETTINGS['enable_send_email_on_user_login'] === 1
     ) {
         $row = DB::queryFirstRow(
-            'SELECT valeur FROM ' . prefixTable('misc') . ' WHERE type = %s AND intitule = %s',
+            'SELECT valeur FROM '.prefixTable('misc').' WHERE type = %s AND intitule = %s',
             'cron',
             'sending_emails'
         );
@@ -909,12 +909,12 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );
             foreach ($rows as $record) {
-                echo $record['increment_id'] . " >> ";
+                echo $record['increment_id']." >> ";
                 // Send email
                 $ret = json_decode(
                     sendEmail(
@@ -1013,8 +1013,8 @@ 
     $arr_html = array();
     $rows = DB::query(
         'SELECT i.id AS id, i.label AS label, i.id_tree AS id_tree, l.date, i.perso AS perso, i.restricted_to AS restricted
-        FROM ' . prefixTable('log_items') . ' AS l
-        RIGHT JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
+        FROM ' . prefixTable('log_items').' AS l
+        RIGHT JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
         WHERE l.action = %s AND l.id_user = %i
         ORDER BY l.date DESC
         LIMIT 0, 100',
@@ -1047,7 +1047,7 @@ 
         isset($SETTINGS['enable_suggestion']) === true && (int) $SETTINGS['enable_suggestion'] === 1
         && ((int) $_SESSION['user_admin'] === 1 || (int) $_SESSION['user_manager'] === 1)
     ) {
-        DB::query('SELECT * FROM ' . prefixTable('suggestion'));
+        DB::query('SELECT * FROM '.prefixTable('suggestion'));
         $nb_suggestions_waiting = DB::count();
     }
 
@@ -1083,13 +1083,13 @@ 
             if ($data === 'stat_languages') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } elseif ($data === 'stat_country') {
                 $tmp = '';
                 foreach ($stats_data[$data] as $key => $value) {
-                    $tmp .= $tmp === '' ? $key . '-' . $value : ',' . $key . '-' . $value;
+                    $tmp .= $tmp === '' ? $key.'-'.$value : ','.$key.'-'.$value;
                 }
                 $statsToSend[$data] = $tmp;
             } else {
@@ -1163,8 +1163,8 @@ 
             if (strpos($line, 'cpassman_url') > 0 && empty($url_found) === true) {
                 $url_found = substr($line, 19, strlen($line) - 22);
                 $tmp = parse_url($url_found);
-                $anonym_url = $tmp['scheme'] . '://<anonym_url>' . $tmp['path'];
-                $line = "'cpassman_url' => '" . $anonym_url . "\n";
+                $anonym_url = $tmp['scheme'].'://<anonym_url>'.$tmp['path'];
+                $line = "'cpassman_url' => '".$anonym_url."\n";
             }
 
             // Anonymize all urls
@@ -1191,7 +1191,7 @@ 
     $teampass_errors = '';
     $rows = DB::query(
         'SELECT label, date AS error_date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE `type` LIKE 'error'
         ORDER BY `date` DESC
         LIMIT 0, 10"
@@ -1199,9 +1199,9 @@ 
     if (DB::count() > 0) {
         foreach ($rows as $record) {
             if (empty($teampass_errors) === true) {
-                $teampass_errors = ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors = ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             } else {
-                $teampass_errors .= ' * ' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['error_date']) . ' - ' . $record['label'];
+                $teampass_errors .= ' * '.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['error_date']).' - '.$record['label'];
             }
         }
     }
@@ -1210,7 +1210,7 @@ 
 
     // Now prepare text
     $txt = '### Page on which it happened
-' . $post_data['current_page'] . '
+' . $post_data['current_page'].'
 
 ### Steps to reproduce
 1.
@@ -1225,39 +1225,39 @@ 
 Tell us what happens instead
 
 ### Server configuration
-**Operating system**: ' . php_uname() . '
+**Operating system**: ' . php_uname().'
 
-**Web server:** ' . $_SERVER['SERVER_SOFTWARE'] . '
+**Web server:** ' . $_SERVER['SERVER_SOFTWARE'].'
 
-**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)) . '
+**Database:** ' . ($link === false ? langHdl('undefined') : mysqli_get_server_info($link)).'
 
-**PHP version:** ' . PHP_VERSION . '
+**PHP version:** ' . PHP_VERSION.'
 
-**Teampass version:** ' . TP_VERSION_FULL . '
+**Teampass version:** ' . TP_VERSION_FULL.'
 
 **Teampass configuration file:**
 ```
-' . $list_of_options . '
+' . $list_of_options.'
 ```
 
 **Updated from an older Teampass or fresh install:**
 
 ### Client configuration
 
-**Browser:** ' . $post_data['browser_name'] . ' - ' . $post_data['browser_version'] . '
+**Browser:** ' . $post_data['browser_name'].' - '.$post_data['browser_version'].'
 
-**Operating system:** ' . $post_data['os'] . ' - ' . $post_data['os_archi'] . 'bits
+**Operating system:** ' . $post_data['os'].' - '.$post_data['os_archi'].'bits
 
 ### Logs
 
 #### Web server error log
 ```
-' . $err['message'] . ' - ' . $err['file'] . ' (' . $err['line'] . ')
+' . $err['message'].' - '.$err['file'].' ('.$err['line'].')
 ```
 
 #### Teampass 10 last system errors
 ```
-' . $teampass_errors . '
+' . $teampass_errors.'
 ```
 
 #### Log from the web-browser developer console (CTRL + SHIFT + i)
@@ -1285,7 +1285,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key, pw
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1293,14 +1293,14 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT id, pw
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $post_user_id
@@ -1328,7 +1328,7 @@ 
             
             // Use the password check
             // load passwordLib library
-            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
+            $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
             $pwdlib->register();
             $pwdlib = new PasswordLib\PasswordLib();
             
@@ -1372,7 +1372,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1399,7 +1399,7 @@ 
             );
 
             // Load superGlobals
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
             $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
@@ -1437,7 +1437,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1571,7 +1571,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT email, auth_type, login
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -1626,13 +1626,13 @@ 
         // Check if user exists
         DB::queryFirstRow(
             'SELECT *
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
         if (DB::count() > 0) {
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // CLear old sharekeys
             if ($post_self_change === false) {
@@ -1684,13 +1684,13 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
         if (DB::count() > 0) {
             // Include libraries
-            include_once $SETTINGS['cpassman_dir'] . '/sources/aes.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/aes.functions.php';
 
             // WHAT STEP TO PERFORM?
             if ($post_action === 'step0') {
@@ -1848,15 +1848,15 @@ 
     // Loop on items
     $rows = DB::query(
         'SELECT id, pw
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key, increment_id
-            FROM ' . prefixTable('sharekeys_items') . '
+            FROM ' . prefixTable('sharekeys_items').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -1884,7 +1884,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1917,7 +1917,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -1941,15 +1941,15 @@ 
     // Loop on logs
     $rows = DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_logs') . '
+            FROM ' . prefixTable('sharekeys_logs').'
             WHERE object_id = %i AND user_id = %i',
             $record['increment_id'],
             $_SESSION['user_id']
@@ -1976,7 +1976,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -1998,7 +1998,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT increment_id
-        FROM ' . prefixTable('log_items') . '
+        FROM ' . prefixTable('log_items').'
         WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
     );
 
@@ -2022,15 +2022,15 @@ 
     // Loop on fields
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"
-        LIMIT ' . $post_start . ', ' . $post_length
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_fields') . '
+            FROM ' . prefixTable('sharekeys_fields').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2057,7 +2057,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2079,7 +2079,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('categories_items') . '
+        FROM ' . prefixTable('categories_items').'
         WHERE encryption_type = "teampass_aes"'
     );
 
@@ -2103,14 +2103,14 @@ 
     // Loop on suggestions
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('suggestion') . '
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('suggestion').'
+        LIMIT ' . $post_start.', '.$post_length
     );
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_suggestions') . '
+            FROM ' . prefixTable('sharekeys_suggestions').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2137,7 +2137,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2182,15 +2182,15 @@ 
     // Loop on files
     $rows = DB::query(
         'SELECT id
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"
-        LIMIT ' . $post_start . ', ' . $post_length
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"
+        LIMIT ' . $post_start.', '.$post_length
     ); //aes_encryption
     foreach ($rows as $record) {
         // Get itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT share_key
-            FROM ' . prefixTable('sharekeys_files') . '
+            FROM ' . prefixTable('sharekeys_files').'
             WHERE object_id = %i AND user_id = %i',
             $record['id'],
             $_SESSION['user_id']
@@ -2217,7 +2217,7 @@ 
             if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                 $currentUserKey = DB::queryFirstRow(
                     'SELECT increment_id
-                    FROM ' . prefixTable('sharekeys_items') . '
+                    FROM ' . prefixTable('sharekeys_items').'
                     WHERE object_id = %i AND user_id = %i',
                     $record['id'],
                     $post_user_id
@@ -2239,8 +2239,8 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('files') . '
-        WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+        FROM ' . prefixTable('files').'
+        WHERE status = "' . TP_ENCRYPTION_NAME.'"'
     );
 
     $next_start = (int) $post_start + (int) $post_length;
@@ -2272,16 +2272,16 @@ 
     if (count($_SESSION['personal_folders']) > 0) {
         $rows = DB::query(
             'SELECT id, pw
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso = 1 AND id_tree IN %ls
-            LIMIT ' . $post_start . ', ' . $post_length,
+            LIMIT ' . $post_start.', '.$post_length,
             $_SESSION['personal_folders']
         );
         foreach ($rows as $record) {
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $_SESSION['user_id']
@@ -2308,7 +2308,7 @@ 
                 if ((int) $post_user_id !== (int) $_SESSION['user_id']) {
                     $currentUserKey = DB::queryFirstRow(
                         'SELECT increment_id
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['id'],
                         $post_user_id
@@ -2331,7 +2331,7 @@ 
     // SHould we change step?
     DB::query(
         'SELECT *
-        FROM ' . prefixTable('items') . '
+        FROM ' . prefixTable('items').'
         WHERE perso = 0'
     );
 
@@ -2355,7 +2355,7 @@ 
         // Check if user exists
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, encrypted_psk
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2380,9 +2380,9 @@ 
                 // Loop on persoanl items
                 $rows = DB::query(
                     'SELECT id, pw
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE perso = 1 AND id_tree IN %ls
-                    LIMIT ' . $post_start . ', ' . $post_length,
+                    LIMIT ' . $post_start.', '.$post_length,
                     $_SESSION['personal_folders']
                 );
                 $countUserPersonalItems = DB::count();
@@ -2425,7 +2425,7 @@ 
                         // Loop on files
                         $rows = DB::query(
                             'SELECT id, file
-                            FROM ' . prefixTable('files') . '
+                            FROM ' . prefixTable('files').'
                             WHERE status != %s
                             AND id_item = %i',
                             TP_ENCRYPTION_NAME,
@@ -2436,13 +2436,13 @@ 
                             // Now decrypt the file
                             prepareFileWithDefuse(
                                 'decrypt',
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'],
-                                $SETTINGS['path_to_upload_folder'] . '/' . $record2['file'] . '.delete',
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'],
+                                $SETTINGS['path_to_upload_folder'].'/'.$record2['file'].'.delete',
                                 $post_user_psk
                             );
 
                             // Encrypt the file
-                            $encryptedFile = encryptFile($record2['file'] . '.delete', $SETTINGS['path_to_upload_folder']);
+                            $encryptedFile = encryptFile($record2['file'].'.delete', $SETTINGS['path_to_upload_folder']);
 
                             DB::update(
                                 prefixTable('files'),
@@ -2465,7 +2465,7 @@ 
                             );
 
                             // Unlink original file
-                            unlink($SETTINGS['path_to_upload_folder'] . '/' . $record2['file']);
+                            unlink($SETTINGS['path_to_upload_folder'].'/'.$record2['file']);
                         }
                     }
                 }
@@ -2534,7 +2534,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT '.$post_fields.'
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2569,7 +2569,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2580,7 +2580,7 @@ 
             $privateKey = decryptPrivateKey($post_current_pwd, $userData['private_key']);
 
             // Load superGlobals
-            include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+            include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
             $superGlobal = new protect\SuperGlobal\SuperGlobal();
 
             if ($superGlobal->get('private_key', 'SESSION', 'user') === $privateKey) {
@@ -2613,7 +2613,7 @@ 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2650,7 +2650,7 @@ 
         // Get user info
         $userData = DB::queryFirstRow(
             'SELECT auth_type, login, private_key, special
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $post_user_id
         );
@@ -2680,14 +2680,14 @@ 
                 );
 
                 // Load superGlobals
-                include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                 $superGlobal = new protect\SuperGlobal\SuperGlobal();
                 $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 
                 return prepareExchangedData(
                     array(
                         'error' => false,
-                        'message' => langHdl('done'),'',
+                        'message' => langHdl('done'), '',
                     ),
                     'encode'
                 );
@@ -2711,14 +2711,14 @@ 
             // Get one item
             $record = DB::queryFirstRow(
                 'SELECT id, pw
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $post_user_id
@@ -2746,7 +2746,7 @@ 
                     );
                     
                     // Load superGlobals
-                    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
+                    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
                     $superGlobal = new protect\SuperGlobal\SuperGlobal();
                     $superGlobal->put('private_key', $privateKey, 'SESSION', 'user');
 

Braces +3 added lines, -1 removed lines

@@ -1861,7 +1861,9 @@
             $record['id'],
             $_SESSION['user_id']
         );
-        if (count($currentUserKey) === 0) continue;
+        if (count($currentUserKey) === 0) {
+            continue;
+        }
 
         // Decrypt itemkey with admin key
         $itemKey = decryptUserObjectKey($currentUserKey['share_key'], $_SESSION['user']['private_key']);