nilsteampassnet / TeamPass

self-unlock.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
 // Load functions
-require_once __DIR__. '/includes/config/include.php';
+require_once __DIR__.'/includes/config/include.php';
 require_once __DIR__.'/sources/main.functions.php';
 
 // init
@@ -53,10 +53,10 @@ 
 // Check for existing lock
 $result = DB::queryFirstField(
     'SELECT 1
-     FROM ' . prefixTable('auth_failures') . '
+     FROM ' . prefixTable('auth_failures').'
      WHERE unlock_at = (
         SELECT MAX(unlock_at)
-        FROM ' . prefixTable('auth_failures') . '
+        FROM ' . prefixTable('auth_failures').'
         WHERE unlock_at > %s
         AND source = %s AND value = %s)
      AND unlock_code = %s',

sources/identify.php

Indentation +1 added lines, -1 removed lines

@@ -2663,7 +2663,7 @@
             'SELECT email, name
              FROM '.prefixTable('users').'
              WHERE login = %s',
-             $value
+                $value
         );
 
         // No valid email address for user

Braces +9 added lines, -4 removed lines

@@ -2401,7 +2401,9 @@ 
         // Complete $userInfo
         $userInfo['has_been_created'] = 1;
 
-        if (WIP === true) error_log("--- USER CREATED ---");
+        if (WIP === true) {
+            error_log("--- USER CREATED ---");
+        }
 
         return [
             'error' => false,
@@ -2437,7 +2439,9 @@ 
         }
 
         // Oauth2 user already exists and authenticated
-        if (WIP === true) error_log("--- USER AUTHENTICATED ---");
+        if (WIP === true) {
+            error_log("--- USER AUTHENTICATED ---");
+        }
         $userInfo['has_been_created'] = 0;
 
         $passwordManager = new PasswordManager();
@@ -2667,8 +2671,9 @@ 
         );
 
         // No valid email address for user
-        if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL))
-            return;
+        if (!$userInfos || !filter_var($userInfos['email'], FILTER_VALIDATE_EMAIL)) {
+                    return;
+        }
 
         $unlock_url = $SETTINGS['cpassman_url'].'/self-unlock.php?login='.$value.'&otp='.$unlock_code;
 

Spacing +41 added lines, -42 removed lines

@@ -487,7 +487,7 @@ 
         return $dataReceived;
     }
 
-    private function handleDuoAuthentication(array $dataReceived): array|false
+    private function handleDuoAuthentication(array $dataReceived): array | false
     {
         if (!$this->isDuoAuthInProgress($dataReceived)) {
             return $dataReceived;
@@ -659,8 +659,7 @@ 
         }
 
         // Setup API key
-        $apiKey = empty($userInfo['api_key']) ? '' : 
-            base64_decode(decryptUserObjectKey($userInfo['api_key'], $returnKeys['private_key_clear']));
+        $apiKey = empty($userInfo['api_key']) ? '' : base64_decode(decryptUserObjectKey($userInfo['api_key'], $returnKeys['private_key_clear']));
         $this->session->set('user-api_key', $apiKey);
     }
 
@@ -681,7 +680,7 @@ 
         if (!is_null($userInfo['roles_from_ad_groups'])) {
             $userInfo['fonction_id'] = empty($userInfo['fonction_id']) 
                 ? $userInfo['roles_from_ad_groups'] 
-                : $userInfo['fonction_id'] . ';' . $userInfo['roles_from_ad_groups'];
+                : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
         }
 
         $this->session->set('user-roles', $userInfo['fonction_id']);
@@ -701,7 +700,7 @@ 
         }
 
         $rolesList = DB::query(
-            'SELECT id, title, complexity FROM ' . prefixTable('roles_title') . ' WHERE id IN %li',
+            'SELECT id, title, complexity FROM '.prefixTable('roles_title').' WHERE id IN %li',
             $this->session->get('user-roles_array')
         );
 
@@ -855,7 +854,7 @@ 
     private function setupUserCache(array $userInfo): void
     {
         $cacheTreeData = DB::queryFirstRow(
-            'SELECT visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id=%i',
+            'SELECT visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id=%i',
             (int) $this->session->get('user-id')
         );
 
@@ -886,7 +885,7 @@ 
         foreach ($this->session->get('user-latest_items') as $item) {
             if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
-                    'SELECT id,label,id_tree FROM ' . prefixTable('items') . ' WHERE id=%i',
+                    'SELECT id,label,id_tree FROM '.prefixTable('items').' WHERE id=%i',
                     $item
                 );
                 
@@ -895,7 +894,7 @@ 
                     [
                         'id' => $item,
                         'label' => $dataLastItems['label'],
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
                     ],
                     'add'
                 );
@@ -911,7 +910,7 @@ 
         }
 
         $adminUser = DB::queryFirstRow(
-            'SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 
+            'SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 
             1
         );
         
@@ -924,7 +923,7 @@ 
             str_replace(
                 ['#tp_user#', '#tp_date#', '#tp_time#'],
                 [
-                    ' ' . $this->session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
+                    ' '.$this->session->get('user-login').' (IP: '.getClientIpServer().')',
                     date($this->settings['date_format'], (int) $this->session->get('user-last_connection')),
                     date($this->settings['time_format'], (int) $this->session->get('user-last_connection')),
                 ],
@@ -1072,7 +1071,7 @@ 
 {
     $rows = DB::query(
         'SELECT date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE field_1 = %s
         AND type = 'failed_auth'
         AND label = 'user_not_exists'
@@ -1086,7 +1085,7 @@ 
         foreach ($rows as $record) {
             array_push(
                 $arrAttempts,
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
             );
         }
     }
@@ -1121,7 +1120,7 @@ 
     $ldapConnection
 ) : bool
 {
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
     if ((int) $userInfoDisabled === 1) {
         return false;
@@ -1316,7 +1315,7 @@ 
     } catch (Exception $e) {
         return [
             'error' => true,
-            'message' => "Error: " . $e->getMessage(),
+            'message' => "Error: ".$e->getMessage(),
         ];
     }
 }
@@ -1347,7 +1346,7 @@ 
                 'type' => 'OpenLDAP'
             ];
         default:
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
     }
 }
 
@@ -1484,7 +1483,7 @@ 
         );
     }
     
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
 }
 
 /**
@@ -1501,12 +1500,12 @@ 
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
         // Get user groups from AD
         $user_ad_groups = [];
-        foreach($groups as $group) {
+        foreach ($groups as $group) {
             //print_r($group);
             // get relation role id for AD group
             $role = DB::queryFirstRow(
                 'SELECT lgr.role_id
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
                 WHERE lgr.ldap_group_id = %s',
                 $group
             );
@@ -1637,7 +1636,7 @@ 
             // Check if exists in DB
             $groupData = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE title = %s',
                 $group["displayName"]
             );
@@ -1778,7 +1777,7 @@ 
             
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1791,7 +1790,7 @@ 
                 $userInfo['id']
             );
             $firstTime = [
-                'value' => '<img src="' . $new_2fa_qr . '">',
+                'value' => '<img src="'.$new_2fa_qr.'">',
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1947,7 +1946,7 @@ 
         }*/
         return [
             'error' => true,
-            'message' => $duo_error . $lang->get('duo_error_check_config'),
+            'message' => $duo_error.$lang->get('duo_error_check_config'),
             'pwd_attempts' => (int) $sessionPwdAttempts,
             'debug_message' => $e->getMessage(),
             'proceedIdentification' => false,
@@ -1963,7 +1962,7 @@ 
         } catch (DuoException $e) {
             return [
                 'error' => true,
-                'message' => $duo_error . $lang->get('duo_error_url'),
+                'message' => $duo_error.$lang->get('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'debug_message' => $e->getMessage(),
                 'proceedIdentification' => false,
@@ -1971,7 +1970,7 @@ 
         }
         
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
-        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
+        if (!empty($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
             $key = hash('sha256', $duo_state);
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -1999,7 +1998,7 @@ 
         } else {
             return [
                 'error' => true,
-                'message' => $duo_error . $lang->get('duo_error_url'),
+                'message' => $duo_error.$lang->get('duo_error_url'),
                 'pwd_attempts' => (int) $sessionPwdAttempts,
                 'proceedIdentification' => false,
             ];
@@ -2020,8 +2019,8 @@ 
         // return the response (which should be the user name)
         if ($decoded_token['preferred_username'] === $username) {
             $session->set('user-duo_status', 'COMPLET');
-            $session->set('user-duo_state','');
-            $session->set('user-duo_data','');
+            $session->set('user-duo_state', '');
+            $session->set('user-duo_data', '');
             $session->set('user-login', $username);
 
             return [
@@ -2032,9 +2031,9 @@ 
             ];
         } else {
             // Something wrong, username from the original Duo request is different than the one received now
-            $session->set('user-duo_status','');
-            $session->set('user-duo_state','');
-            $session->set('user-duo_data','');
+            $session->set('user-duo_status', '');
+            $session->set('user-duo_state', '');
+            $session->set('user-duo_data', '');
 
             return [
                 'error' => true,
@@ -2045,9 +2044,9 @@ 
         }
     }
     // If we are here something wrong
-    $session->set('user-duo_status','');
-    $session->set('user-duo_state','');
-    $session->set('user-duo_data','');
+    $session->set('user-duo_status', '');
+    $session->set('user-duo_state', '');
+    $session->set('user-duo_data', '');
     return [
         'error' => true,
         'message' => $lang->get('duo_login_mismatch'),
@@ -2159,7 +2158,7 @@ 
         // Check for existing lock
         $unlock_at = DB::queryFirstField(
             'SELECT MAX(unlock_at)
-             FROM ' . prefixTable('auth_failures') . '
+             FROM ' . prefixTable('auth_failures').'
              WHERE unlock_at > %s
              AND ((source = %s AND value = %s) OR (source = %s AND value = %s))',
             date('Y-m-d H:i:s', time()),
@@ -2181,8 +2180,8 @@ 
         // Get user info from DB
         $data = DB::queryFirstRow(
             'SELECT u.*, a.value AS api_key
-            FROM ' . prefixTable('users') . ' AS u
-            LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
+            FROM ' . prefixTable('users').' AS u
+            LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
             WHERE login = %s AND deleted_at IS NULL',
             $login
         );
@@ -2300,7 +2299,7 @@ 
             'array' => [
                 'value' => 'bruteforce_wait',
                 'error' => true,
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
             ]
         ];
     }
@@ -2837,15 +2836,15 @@ 
 
             if ($ret['error'] !== false) {
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
-                $session->set('user-duo_status','');
-                $session->set('user-duo_state','');
-                $session->set('user-duo_data','');
+                $session->set('user-duo_status', '');
+                $session->set('user-duo_state', '');
+                $session->set('user-duo_data', '');
                 return [
                     'error' => true,
                     'mfaData' => $ret,
                     'mfaQRCodeInfos' => false,
                 ];
-            } else if ($ret['duo_url_ready'] === true){
+            } else if ($ret['duo_url_ready'] === true) {
                 return [
                     'error' => false,
                     'mfaData' => $ret,
@@ -2909,7 +2908,7 @@ 
     // Count failed attempts from this source
     $count = DB::queryFirstField(
         'SELECT COUNT(*)
-        FROM ' . prefixTable('auth_failures') . '
+        FROM ' . prefixTable('auth_failures').'
         WHERE source = %s AND value = %s',
         $source,
         $value

pages/profile.js.php

Spacing +15 added lines, -15 removed lines

@@ -73,7 +73,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -97,7 +97,7 @@ 
     })
 
     // Select user properties
-    $('#profile-user-language option[value=<?php echo $session->get('user-language');?>').attr('selected','selected');
+    $('#profile-user-language option[value=<?php echo $session->get('user-language'); ?>').attr('selected','selected');
 
 
     // AVATAR IMPORT
@@ -295,7 +295,7 @@ 
 
                     // reload page in case of language change
                     if ($('#profile-user-language').val()
-                        && $('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language');?>') {
+                        && $('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language'); ?>') {
                         // prepare reload
                         $(this).delay(3000).queue(function() {
                             document.location.href = "index.php?page=profile";
@@ -306,7 +306,7 @@ 
                         // Inform user
                         toastr.remove();
                         toastr.info(
-                            '<?php echo $lang->get('alert_page_will_reload') . ' ... ' . $lang->get('please_wait'); ?>',
+                            '<?php echo $lang->get('alert_page_will_reload').' ... '.$lang->get('please_wait'); ?>',
                             '', {
                                 timeOut: 3000,
                                 progressBar: true
@@ -410,27 +410,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -523,27 +523,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -559,7 +559,7 @@ 
         }
     });
 
-    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
+    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
 
     $("#open-dialog-keys-download").on('click', function(event) {
         event.preventDefault();

pages/items.php

Spacing +34 added lines, -34 removed lines

@@ -69,7 +69,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('items') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 // Define Timezone
@@ -90,7 +90,7 @@ 
 
 // Get list of users
 $usersList = [];
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
 foreach ($rows as $record) {
     $usersList[$record['login']] = [
         'id' => $record['id'],
@@ -101,16 +101,16 @@ 
 // Get list of roles
 $arrRoles = [];
 $listRoles = '';
-$rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+$rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
 foreach ($rows as $reccord) {
     $arrRoles[$reccord['title']] = [
         'id' => $reccord['id'],
         'title' => $reccord['title'],
     ];
     if (empty($listRoles)) {
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
     } else {
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
     }
 }
 
@@ -185,7 +185,7 @@ 
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fa-solid fa-archive mr-2"></i><?php echo $lang->get('attachments'); ?></a></li>
                         <?php
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields').'</a></li>' : '';
                         ?>
                     </ul>
                 </div><!-- /.card-header -->
@@ -254,7 +254,7 @@ 
                                                 <?php
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
                                                     echo '
-                                                <option>' . $i . '</option>';
+                                                <option>' . $i.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -284,7 +284,7 @@ 
                                     <span class="ml-2 col-md-1 clear-me-html" id="form-item-icon-show"></span>
                                 </div>
                                 <small class='form-text text-muted'>
-                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                                 </small>
                             </div>
 
@@ -472,39 +472,39 @@ 
                             <div class="tab-pane" id="tab_4">
                                 <div id="form-item-field" class="hidden">
                                     <?php
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
                                         if (isset($session_item_fields) === true) {
                                             foreach ($session_item_fields as $category) {
                                                 //print_r($category);
                                                 echo '
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
-                                                <h5>' . $category['title'] . '</h5>
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
+                                                <h5>' . $category['title'].'</h5>
                                                 <p>';
                                                 foreach ($category['fields'] as $field) {
                                                     if ($field['type'] === 'textarea') {
                                                         echo '
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <label>' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</label>
-                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0"></textarea>
+                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0"></textarea>
                                                     </div>';
                                                     } else {
                                                         echo '
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</span>
                                                         </div>
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0">
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0">
                                                     </div>';
                                                     }
                                                     if (!empty($field['regex'])) {
                                                         echo '
-                                                    <div>Regex: '. $field['regex'] .'</div>
+                                                    <div>Regex: '. $field['regex'].'</div>
                                                         ';
                                                     }
                                                 }
@@ -515,8 +515,8 @@ 
                                                 ) {
                                                     echo '
                                                     <div class="form-check icheck-blue">
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
                                                     </div>';
                                                 }
                                                 echo '
@@ -526,8 +526,8 @@ 
                                         } else {
                                             echo
                                             '<div class="alert alert-info">
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
-                                                ' . $lang->get('no_fields') . '
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
+                                                ' . $lang->get('no_fields').'
                                             </div>';
                                         } ?>
                                 </div>
@@ -668,7 +668,7 @@ 
                         <p><?php
                             echo str_replace(
         ['##otv_expiration_period##', '. '],
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
         $lang->get('otv_message')
     );
                             ?></p>
@@ -686,9 +686,9 @@ 
 
                     <div class="row">
                         <div class="form-group col-4">
-                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period'];?>)</label>
+                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period']; ?>)</label>
                             <div class="input-group mb-3">
-                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period'];?>" value="<?php echo $SETTINGS['otv_expiration_period'];?>">
+                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period']; ?>" value="<?php echo $SETTINGS['otv_expiration_period']; ?>">
                             </div>
                         </div>
 
@@ -776,7 +776,7 @@ 
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -794,14 +794,14 @@ 
                             <label><?php echo $lang->get('icon'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                         <div class="form-group">
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                     </div>
@@ -1212,18 +1212,18 @@ 
                                 <?php
                                     foreach ($session_item_fields as $elem) {
                                         echo '
-                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
-                                    <h5>' . $elem['title'] . '</h5>
+                                <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
+                                    <h5>' . $elem['title'].'</h5>
                                     <p>
                                         <ul class="list-group list-group-unbordered mb-3">';
                                         foreach ($elem['fields'] as $field) {
                                             echo '
-                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
-                                                <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
-                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'] . '">
+                                            <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
+                                                <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
+                                                <button type="button" class="float-right btn btn-secondary btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="card-item-field-value-' . $field['id'].'">
                                                     <i class="fa-solid fa-copy"></i>
                                                 </button>
-                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
+                                                <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
                                             </li>';
                                         }
                                         echo '

sources/tools.queries.php

Switch Indentation +171 added lines, -171 removed lines

@@ -91,215 +91,215 @@
 switch ($post_type) {
 //##########################################################
 //CASE for creating a DB backup
-case 'perform_fix_pf_items-step1':
-    // Check KEY
-    if (!hash_equals((string) $session->get('key'), (string) $post_key)) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => $lang->get('key_is_not_correct'),
-            ),
-            'encode'
-        );
-        break;
-    }
-    // Is admin?
-    if ((int) $session->get('user-admin') !== 1) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => $lang->get('error_not_allowed_to'),
-            ),
-            'encode'
-        );
-        break;
-    }
+    case 'perform_fix_pf_items-step1':
+        // Check KEY
+        if (!hash_equals((string) $session->get('key'), (string) $post_key)) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $lang->get('key_is_not_correct'),
+                ),
+                'encode'
+            );
+            break;
+        }
+        // Is admin?
+        if ((int) $session->get('user-admin') !== 1) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $lang->get('error_not_allowed_to'),
+                ),
+                'encode'
+            );
+            break;
+        }
 
-    // decrypt and retrieve data in JSON format
-    $dataReceived = prepareExchangedData(
-        $post_data,
-        'decode'
-    );
+        // decrypt and retrieve data in JSON format
+        $dataReceived = prepareExchangedData(
+            $post_data,
+            'decode'
+        );
 
-    $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
+        $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
 
-    // Get user info
-    $userInfo = DB::queryFirstRow(
-        'SELECT private_key, public_key, psk, encrypted_psk
+        // Get user info
+        $userInfo = DB::queryFirstRow(
+            'SELECT private_key, public_key, psk, encrypted_psk
         FROM teampass_users
         WHERE id = %i',
-        $userId
-    );
+            $userId
+        );
 
-    // Get user's private folders
-    $userPFRoot = DB::queryFirstRow(
-        'SELECT id
+        // Get user's private folders
+        $userPFRoot = DB::queryFirstRow(
+            'SELECT id
         FROM teampass_nested_tree
         WHERE title = %i',
-        $userId
-    );
-    if (DB::count() === 0) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => 'User has no personal folders',
-            ),
-            'encode'
-        );
-        break;
-    }
-    $personalFolders = [];
-    $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
-    $tree->rebuild();
-    $folders = $tree->getDescendants($userPFRoot['id'], true);
-    foreach ($folders as $folder) {
-        array_push($personalFolders, $folder->id);
-    }
-
-    //Show done
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'message' => 'Personal Folders found: ',
-            'personalFolders' => json_encode($personalFolders),
-        ),
-        'encode'
-    );
-    break;
-
-case 'perform_fix_pf_items-step2':
-    // Check KEY
-    if (!hash_equals((string) $session->get('key'), (string) $post_key)) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => $lang->get('key_is_not_correct'),
-            ),
-            'encode'
+            $userId
         );
-        break;
-    }
-    // Is admin?
-    if ((int) $session->get('user-admin') !== 1) {
+        if (DB::count() === 0) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => 'User has no personal folders',
+                ),
+                'encode'
+            );
+            break;
+        }
+        $personalFolders = [];
+        $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
+        $tree->rebuild();
+        $folders = $tree->getDescendants($userPFRoot['id'], true);
+        foreach ($folders as $folder) {
+            array_push($personalFolders, $folder->id);
+        }
+
+        //Show done
         echo prepareExchangedData(
             array(
-                'error' => true,
-                'message' => $lang->get('error_not_allowed_to'),
+                'error' => false,
+                'message' => 'Personal Folders found: ',
+                'personalFolders' => json_encode($personalFolders),
             ),
             'encode'
         );
         break;
-    }
 
-    // decrypt and retrieve data in JSON format
-    $dataReceived = prepareExchangedData(
-        $post_data,
-        'decode'
-    );
+    case 'perform_fix_pf_items-step2':
+        // Check KEY
+        if (!hash_equals((string) $session->get('key'), (string) $post_key)) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $lang->get('key_is_not_correct'),
+                ),
+                'encode'
+            );
+            break;
+        }
+        // Is admin?
+        if ((int) $session->get('user-admin') !== 1) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $lang->get('error_not_allowed_to'),
+                ),
+                'encode'
+            );
+            break;
+        }
 
-    $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
-    $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        // decrypt and retrieve data in JSON format
+        $dataReceived = prepareExchangedData(
+            $post_data,
+            'decode'
+        );
+
+        $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
+        $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-    // Delete all private items with sharekeys
-    $pfiSharekeys = DB::queryFirstColumn(
-        'select s.increment_id
+        // Delete all private items with sharekeys
+        $pfiSharekeys = DB::queryFirstColumn(
+            'select s.increment_id
         from teampass_sharekeys_items as s
         INNER JOIN teampass_items AS i ON (i.id = s.object_id)
         WHERE s.user_id = %i AND i.perso = 1 AND i.id_tree IN %ls',
-        $userId,
-        $personalFolders
-    );
-    $pfiSharekeysCount = DB::count();
-    if ($pfiSharekeysCount > 0) {
-        DB::delete(
-            "teampass_sharekeys_items",
-            "increment_id IN %ls",
-            $pfiSharekeys
+            $userId,
+            $personalFolders
         );
-    }
+        $pfiSharekeysCount = DB::count();
+        if ($pfiSharekeysCount > 0) {
+            DB::delete(
+                "teampass_sharekeys_items",
+                "increment_id IN %ls",
+                $pfiSharekeys
+            );
+        }
 
     
-    //Show done
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'message' => '<br>Number of Sharekeys for private items DELETED: ',
-            'nbDeleted' => $pfiSharekeysCount,
-            'personalFolders' => json_encode($personalFolders),
-        ),
-        'encode'
-    );
-    break;
-
-case 'perform_fix_pf_items-step3':
-    // Check KEY
-    if (!hash_equals((string) $session->get('key'), (string) $post_key)) {
-        echo prepareExchangedData(
-            array(
-                'error' => true,
-                'message' => $lang->get('key_is_not_correct'),
-            ),
-            'encode'
-        );
-        break;
-    }
-    // Is admin?
-    if ((int) $session->get('user-admin') !== 1) {
+        //Show done
         echo prepareExchangedData(
             array(
-                'error' => true,
-                'message' => $lang->get('error_not_allowed_to'),
+                'error' => false,
+                'message' => '<br>Number of Sharekeys for private items DELETED: ',
+                'nbDeleted' => $pfiSharekeysCount,
+                'personalFolders' => json_encode($personalFolders),
             ),
             'encode'
         );
         break;
-    }
 
-    // decrypt and retrieve data in JSON format
-    $dataReceived = prepareExchangedData(
-        $post_data,
-        'decode'
-    );
+    case 'perform_fix_pf_items-step3':
+        // Check KEY
+        if (!hash_equals((string) $session->get('key'), (string) $post_key)) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $lang->get('key_is_not_correct'),
+                ),
+                'encode'
+            );
+            break;
+        }
+        // Is admin?
+        if ((int) $session->get('user-admin') !== 1) {
+            echo prepareExchangedData(
+                array(
+                    'error' => true,
+                    'message' => $lang->get('error_not_allowed_to'),
+                ),
+                'encode'
+            );
+            break;
+        }
+
+        // decrypt and retrieve data in JSON format
+        $dataReceived = prepareExchangedData(
+            $post_data,
+            'decode'
+        );
 
-    $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
-    $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $userId = filter_var($dataReceived['userId'], FILTER_SANITIZE_NUMBER_INT);
+        $personalFolders = filter_var($dataReceived['personalFolders'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-    // Update from items_old to items all the private itemsitems that have been converted to teampass_aes
-    // Get all key back
-    $items = DB::query(
-        "SELECT id
+        // Update from items_old to items all the private itemsitems that have been converted to teampass_aes
+        // Get all key back
+        $items = DB::query(
+            "SELECT id
         FROM teampass_items
         WHERE id_tree IN %ls AND encryption_type = %s",
-        $personalFolders,
-        "teampass_aes"
-    );
-    //DB::debugMode(false);
-    $nbItems = DB::count();
-    foreach ($items as $item) {
-        $defusePwd = DB::queryFirstField("SELECT pw FROM teampass_items_old WHERE id = %i", $item['id']);
-        DB::update(
-            "teampass_items",
-            ['pw' => $defusePwd, "encryption_type" => "defuse"],
-            "id = %i",
-            $item['id']
+            $personalFolders,
+            "teampass_aes"
         );
-    }
+        //DB::debugMode(false);
+        $nbItems = DB::count();
+        foreach ($items as $item) {
+            $defusePwd = DB::queryFirstField("SELECT pw FROM teampass_items_old WHERE id = %i", $item['id']);
+            DB::update(
+                "teampass_items",
+                ['pw' => $defusePwd, "encryption_type" => "defuse"],
+                "id = %i",
+                $item['id']
+            );
+        }
 
     
-    //Show done
-    echo prepareExchangedData(
-        array(
-            'error' => false,
-            'message' => '<br>Number of items reseted to Defuse: ',
-            'nbItems' => $nbItems,
-            'personalFolders' => json_encode($personalFolders),
-        ),
-        'encode'
-    );
-    break;
-
-    /* TOOL #2 - Fixing items master keys */
-    /*
+        //Show done
+        echo prepareExchangedData(
+            array(
+                'error' => false,
+                'message' => '<br>Number of items reseted to Defuse: ',
+                'nbItems' => $nbItems,
+                'personalFolders' => json_encode($personalFolders),
+            ),
+            'encode'
+        );
+        break;
+
+        /* TOOL #2 - Fixing items master keys */
+        /*
     * STEP 1 - Check if we have the correct pwd for TP_USER
     */
     case 'perform_fix_items_master_keys-step1':

Spacing +20 added lines, -20 removed lines

@@ -70,7 +70,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -335,7 +335,7 @@ 
         // Get PT_USER info
         $userInfo = DB::queryFirstRow(
             'SELECT pw, public_key, private_key, login, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             TP_USER_ID
         );
@@ -372,8 +372,8 @@ 
         // Get one itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT ski.share_key, ski.increment_id AS increment_id, l.id_user
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
+            FROM ' . prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
             WHERE ski.user_id = %i
             ORDER BY RAND()
             LIMIT 1',
@@ -392,7 +392,7 @@ 
                 echo  prepareExchangedData(
                     array(
                         'error' => true,
-                        'message' => 'No issue found, normal process should work. This process is now finished. (item id : ' . $currentUserKey['increment_id'] . ')',
+                        'message' => 'No issue found, normal process should work. This process is now finished. (item id : '.$currentUserKey['increment_id'].')',
                     ),
                     'encode'
                 );
@@ -452,7 +452,7 @@ 
         // Get user info
         $userInfo = DB::queryFirstRow(
             'SELECT public_key, private_key
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $userId
         );
@@ -475,8 +475,8 @@ 
         // Get one itemKey from current user
         $currentUserKey = DB::queryFirstRow(
             'SELECT ski.share_key, ski.increment_id AS increment_id, l.id_user
-            FROM ' . prefixTable('sharekeys_items') . ' AS ski
-            INNER JOIN ' . prefixTable('log_items') . ' AS l ON ski.object_id = l.id_item
+            FROM ' . prefixTable('sharekeys_items').' AS ski
+            INNER JOIN ' . prefixTable('log_items').' AS l ON ski.object_id = l.id_item
             WHERE ski.user_id = %i
             ORDER BY RAND()
             LIMIT 1',
@@ -514,8 +514,8 @@ 
                 // Get number of users to treat
                 DB::query(
                     'SELECT i.id 
-                    FROM ' . prefixTable('items') . ' AS i
-                    INNER JOIN ' . prefixTable('sharekeys_items') . ' AS si ON i.id = si.object_id
+                    FROM ' . prefixTable('items').' AS i
+                    INNER JOIN ' . prefixTable('sharekeys_items').' AS si ON i.id = si.object_id
                     WHERE i.perso = %i AND si.user_id = %i;',
                     0,
                     $userId
@@ -597,11 +597,11 @@ 
             // Loop on items
             $rows = DB::query(
                 'SELECT si.object_id AS object_id, si.share_key AS share_key, i.pw AS pw, si.increment_id as increment_id
-                FROM ' . prefixTable('sharekeys_items') . ' AS si
-                INNER JOIN ' . prefixTable('items') . ' AS i ON (i.id = si.object_id)
+                FROM ' . prefixTable('sharekeys_items').' AS si
+                INNER JOIN ' . prefixTable('items').' AS i ON (i.id = si.object_id)
                 WHERE si.user_id = %i
                 ORDER BY si.increment_id ASC
-                LIMIT ' . $startIndex . ', ' . $limit,
+                LIMIT ' . $startIndex.', '.$limit,
                 $userId
             );        
             
@@ -625,7 +625,7 @@ 
                     // It will be updated if already exists
                     $currentTPUserKey = DB::queryFirstRow(
                         'SELECT increment_id, user_id, share_key
-                        FROM ' . prefixTable('sharekeys_items') . '
+                        FROM ' . prefixTable('sharekeys_items').'
                         WHERE object_id = %i AND user_id = %i',
                         $record['object_id'],
                         TP_USER_ID
@@ -661,7 +661,7 @@ 
             DB::commit();
         } catch (Exception $e) {
             DB::rollback();
-            error_log("Teampass - Error: Keys treatment: " . $e->getMessage());
+            error_log("Teampass - Error: Keys treatment: ".$e->getMessage());
         }
 
         $nextIndex = (int) $startIndex + (int) $limit;
@@ -717,7 +717,7 @@ 
             // Get PT_USER info
             DB::queryFirstRow(
                 'SELECT operation_code
-                FROM ' . prefixTable('sharekeys_backup') . '
+                FROM ' . prefixTable('sharekeys_backup').'
                 WHERE operation_code = %s',
                 $operationCode
             );
@@ -727,7 +727,7 @@ 
                 // using increment_id_value in order to update the correct record
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('sharekeys_backup') . '
+                    FROM ' . prefixTable('sharekeys_backup').'
                     WHERE operation_code = %s',
                     $operationCode
                 );
@@ -746,7 +746,7 @@ 
 
                 // Delete all sharekeys for this operation
                 DB::query(
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
                     WHERE operation_code = %i',
                     $operationCode
                 );
@@ -809,7 +809,7 @@ 
             // Get operation info
             DB::query(
                 'SELECT operation_code
-                FROM ' . prefixTable('sharekeys_backup') . '
+                FROM ' . prefixTable('sharekeys_backup').'
                 WHERE operation_code = %s',
                 $operationCode
             );
@@ -818,7 +818,7 @@ 
             if ($nbKeys > 0) {
                 // Delete all sharekeys for this operation
                 DB::query(
-                    'DELETE FROM ' . prefixTable('sharekeys_backup') . '
+                    'DELETE FROM '.prefixTable('sharekeys_backup').'
                     WHERE operation_code = %s',
                     $operationCode
                 );

sources/users.logs.datatable.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -145,7 +145,7 @@ 
     if (isset($order['column']) && preg_match('#^(asc|desc)$#i', $order['dir'])) {
         $columnIndex = $order['column'];
         $dir = $inputData['dir'];
-        $sOrder .= $aColumns[$columnIndex] . ' ' . $dir . ', ';
+        $sOrder .= $aColumns[$columnIndex].' '.$dir.', ';
     }
 
     $sOrder = substr_replace($sOrder, '', -2);

sources/folders.class.php

Indentation +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
     private function isParentFolderAllowed($parent_id, $user_accessible_folders, $user_is_admin, $user_can_create_root_folder)
     {
         if ($parent_id == 0 && $user_can_create_root_folder == true)
-	    return true;
+        return true;
 
         if (in_array($parent_id, $user_accessible_folders) === false
             && (int) $user_is_admin !== 1

Braces +6 added lines, -4 removed lines

@@ -112,8 +112,9 @@ 
      */
     private function isParentFolderAllowed($parent_id, $user_accessible_folders, $user_is_admin, $user_can_create_root_folder)
     {
-        if ($parent_id == 0 && $user_can_create_root_folder == true)
-	    return true;
+        if ($parent_id == 0 && $user_can_create_root_folder == true) {
+        	    return true;
+        }
 
         if (in_array($parent_id, $user_accessible_folders) === false
             && (int) $user_is_admin !== 1
@@ -438,8 +439,9 @@ 
             )['count'];
 
             // Don't insert duplicates
-            if ($count > 0)
-                continue;
+            if ($count > 0) {
+                            continue;
+            }
 
             // Insert new background task
             DB::insert(

Spacing +15 added lines, -15 removed lines

@@ -91,7 +91,7 @@ 
 
         $parentComplexity = $this->checkComplexityLevel($parentFolderData, $complexity, $parent_id);
         if (isset($parentComplexity['error']) && $parentComplexity['error'] === true) {
-            return $this->errorResponse($this->lang->get('error_folder_complexity_lower_than_top_folder') . " [<b>{$this->settings['TP_PW_COMPLEXITY'][$parentComplexity['valeur']][1]}</b>]");
+            return $this->errorResponse($this->lang->get('error_folder_complexity_lower_than_top_folder')." [<b>{$this->settings['TP_PW_COMPLEXITY'][$parentComplexity['valeur']][1]}</b>]");
         }
 
         return $this->createFolder($params, array_merge($parentFolderData, $parentComplexity), $options);
@@ -144,7 +144,7 @@ 
         ) {
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s AND personal_folder = 0',
                 $title
             );
@@ -168,7 +168,7 @@ 
         //check if parent folder is personal
         $data = DB::queryFirstRow(
             'SELECT personal_folder, bloquer_creation, bloquer_modification
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE id = %i',
             $parent_id
         );
@@ -207,7 +207,7 @@ 
             // get complexity level for this folder
             $data = DB::queryFirstRow(
                 'SELECT valeur
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE intitule = %i AND type = %s',
                 $parent_id,
                 'complex'
@@ -278,11 +278,11 @@ 
      */
     private function canCreateFolder($isPersonal, $user_is_admin, $user_is_manager, $user_can_manage_all_users, $user_can_create_root_folder)
     {
-        return (int)$isPersonal === 1 ||
-            (int)$user_is_admin === 1 ||
-            ((int)$user_is_manager === 1 || (int)$user_can_manage_all_users === 1) ||
+        return (int) $isPersonal === 1 ||
+            (int) $user_is_admin === 1 ||
+            ((int) $user_is_manager === 1 || (int) $user_can_manage_all_users === 1) ||
             ($this->settings['enable_user_can_create_folders'] ?? false) ||
-            ((int)$user_can_create_root_folder === 1);
+            ((int) $user_can_create_root_folder === 1);
     }
 
     /**
@@ -362,7 +362,7 @@ 
         $path = '';
         $tree_path = $tree->getPath(0, false);
         foreach ($tree_path as $fld) {
-            $path .= empty($path) ? $fld->title : '/' . $fld->title;
+            $path .= empty($path) ? $fld->title : '/'.$fld->title;
         }
 
         $new_json = [
@@ -378,7 +378,7 @@ 
 
         $cache_tree = DB::queryFirstRow(
             'SELECT increment_id, folders, visible_folders 
-            FROM ' . prefixTable('cache_tree') . ' 
+            FROM ' . prefixTable('cache_tree').' 
             WHERE user_id = %i', 
             (int) $user_id
         );
@@ -419,7 +419,7 @@ 
     private function manageFolderPermissions($parent_id, $newId, $user_roles, $access_rights, $user_is_admin)
     {
         if ($parent_id !== 0 && $this->settings['subfolder_rights_as_parent'] ?? false) {
-            $rows = DB::query('SELECT role_id, type FROM ' . prefixTable('roles_values') . ' WHERE folder_id = %i', $parent_id);
+            $rows = DB::query('SELECT role_id, type FROM '.prefixTable('roles_values').' WHERE folder_id = %i', $parent_id);
             foreach ($rows as $record) {
                 DB::insert(prefixTable('roles_values'), [
                     'role_id' => $record['role_id'],
@@ -427,7 +427,7 @@ 
                     'type' => $record['type'],
                 ]);
             }
-        } elseif ((int)$user_is_admin !== 1) {
+        } elseif ((int) $user_is_admin !== 1) {
             foreach (array_unique(explode(';', $user_roles)) as $role) {
                 if (!empty($role)) {
                     DB::insert(prefixTable('roles_values'), [
@@ -445,7 +445,7 @@ 
      */
     private function copyCustomFieldsCategories($parent_id, $newId)
     {
-        $rows = DB::query('SELECT id_category FROM ' . prefixTable('categories_folders') . ' WHERE id_folder = %i', $parent_id);
+        $rows = DB::query('SELECT id_category FROM '.prefixTable('categories_folders').' WHERE id_folder = %i', $parent_id);
         foreach ($rows as $record) {
             DB::insert(prefixTable('categories_folders'), [
                 'id_category' => $record['id_category'],
@@ -470,7 +470,7 @@ 
             // Search for existing job
             $count = DB::queryFirstRow(
                 'SELECT COUNT(*) AS count
-                FROM ' . prefixTable('background_tasks') . '
+                FROM ' . prefixTable('background_tasks').'
                 WHERE is_in_progress = %i AND process_type = %s AND arguments = %s',
                 0,
                 'user_build_cache_tree',
@@ -504,7 +504,7 @@ 
         return [
             'error' => true,
             'message' => $message,
-            'newId' => '' . $newIdSuffix,
+            'newId' => ''.$newIdSuffix,
         ];
     }
 }

sources/import.queries.php

Indentation +1 added lines, -1 removed lines

@@ -1364,4 +1364,4 @@
     $string = str_replace("{%}", "?", $string);
     // Trim and return.
     return trim($string);
-  }
+    }

Spacing +38 added lines, -38 removed lines

@@ -79,7 +79,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -167,7 +167,7 @@ 
         );
 
         // Initialisation
-        $file = $SETTINGS['path_to_files_folder'] . '/' . $data['valeur'];
+        $file = $SETTINGS['path_to_files_folder'].'/'.$data['valeur'];
         $importation_possible = true;
         $valuesToImport = [];
         $items_number = 0;
@@ -224,26 +224,26 @@ 
                 'ISO-8859-1',
                 'ISO-8859-15',
                 'Windows-1252',
-                'Windows-1251',  // Cyrillique
-                'CP1251',        // Cyrillique alternatif
-                'KOI8-R',        // Cyrillique russe
-                'Shift_JIS',     // Japonais
-                'EUC-JP',        // Japonais
-                'ISO-2022-JP',   // Japonais
-                'TIS-620',       // Thaï
-                'Windows-874',   // Thaï Windows
-                'Big5',          // Chinois traditionnel
-                'GB2312',        // Chinois simplifié
-                'GBK',           // Chinois simplifié étendu
-                'EUC-KR',        // Coréen
-                'ISO-8859-2',    // Europe centrale
-                'ISO-8859-5',    // Cyrillique ISO
-                'ISO-8859-7',    // Grec
-                'Windows-1250',  // Europe centrale
-                'Windows-1253',  // Grec
-                'Windows-1254',  // Turc
-                'Windows-1255',  // Hébreu
-                'Windows-1256',  // Arabe
+                'Windows-1251', // Cyrillique
+                'CP1251', // Cyrillique alternatif
+                'KOI8-R', // Cyrillique russe
+                'Shift_JIS', // Japonais
+                'EUC-JP', // Japonais
+                'ISO-2022-JP', // Japonais
+                'TIS-620', // Thaï
+                'Windows-874', // Thaï Windows
+                'Big5', // Chinois traditionnel
+                'GB2312', // Chinois simplifié
+                'GBK', // Chinois simplifié étendu
+                'EUC-KR', // Coréen
+                'ISO-8859-2', // Europe centrale
+                'ISO-8859-5', // Cyrillique ISO
+                'ISO-8859-7', // Grec
+                'Windows-1250', // Europe centrale
+                'Windows-1253', // Grec
+                'Windows-1254', // Turc
+                'Windows-1255', // Hébreu
+                'Windows-1256', // Arabe
             ];
 
             // Get the list of encodings supported by the system
@@ -286,7 +286,7 @@ 
 
         // Get the data and ensure columns are correctly mapped
         $interpreter = new Interpreter();
-        $interpreter->addObserver(function (array $row) use (&$valuesToImport, $header) {
+        $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
             $rowData = array_combine($header, $row);
 
             if ($rowData !== false) {
@@ -339,7 +339,7 @@ 
             // Handle multiple lignes description
             if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) {
                 $continue_on_next_line = true;
-                $comment .= " " . $label . " " . $comments;
+                $comment .= " ".$label." ".$comments;
             } else {
                 // Insert previous line if changing line
                 if (!empty($label)) {
@@ -348,7 +348,7 @@ 
                     // Insert in batch
                     $batchInsert[] = array(
                         'label'        => $label,
-                        'description'  => $comment . $comments,
+                        'description'  => $comment.$comments,
                         'pwd'          => $pwd,
                         'url'          => $url,
                         'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -379,7 +379,7 @@ 
             // Insert in batch
             $batchInsert[] = array(
                 'label'        => $label,
-                'description'  => $comment . $comments,
+                'description'  => $comment.$comments,
                 'pwd'          => $pwd,
                 'url'          => $url,
                 'folder'       => ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1) ? $folder : '',
@@ -403,10 +403,10 @@ 
             $values = [];
 
             foreach ($batchInsert as $data) {
-                $values[] = "('" . implode("','", array_map('addslashes', $data)) . "')";
+                $values[] = "('".implode("','", array_map('addslashes', $data))."')";
             }
 
-            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES " . implode(',', $values);
+            $sql = "INSERT INTO `$tableName` (`label`, `description`, `pwd`, `url`, `folder`, `login`, `operation_id`) VALUES ".implode(',', $values);
 
             DB::query($sql);
         }
@@ -489,7 +489,7 @@ 
             $parentId = $dataReceived['folderId']; // Strating with provided folder
 
             foreach ($parts as $part) {
-                $currentPath = trim($currentPath . "/" . $part, "/");
+                $currentPath = trim($currentPath."/".$part, "/");
                 $currentFolder = $part;
 
                 // Check if this folder has already been created
@@ -550,7 +550,7 @@ 
                         // Get ID of existing folder
                         $ret = DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('nested_tree') . '
+                            FROM ' . prefixTable('nested_tree').'
                             WHERE title = %s',
                             $currentFolder
                         );
@@ -760,9 +760,9 @@ 
                 ];
 
                 error_log(
-                    'SQL Error during import | increment_id: ' . $item['increment_id'] .
-                    ' | Message: ' . $e->getMessage() .
-                    ' | StackTrace: ' . $e->getTraceAsString()
+                    'SQL Error during import | increment_id: '.$item['increment_id'].
+                    ' | Message: '.$e->getMessage().
+                    ' | StackTrace: '.$e->getTraceAsString()
                 );
             }
         }
@@ -1071,7 +1071,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             if (!isset($arrFolders[$folder['parentFolderId']])) {
                 // If parent folder is not in the array, it means it is the destination folder
@@ -1147,7 +1147,7 @@ 
         DB::startTransaction();
 
         // Import all items
-        foreach($post_items as $item) {
+        foreach ($post_items as $item) {
             // get info about this folder
             $destinationFolderMore = DB::queryFirstRow(
                 'SELECT title FROM '.prefixTable('nested_tree').' WHERE id = %i',
@@ -1178,7 +1178,7 @@ 
                     'pw' => $cryptedStuff['encrypted'],
                     'pw_iv' => '',
                     'url' => substr($item['URL'], 0, 500),
-                    'id_tree' => isset($post_folders[$item['parentFolderId']]['id']) ? (int)$post_folders[$item['parentFolderId']]['id'] : 0,
+                    'id_tree' => isset($post_folders[$item['parentFolderId']]['id']) ? (int) $post_folders[$item['parentFolderId']]['id'] : 0,
                     'login' => substr($item['UserName'], 0, 500),
                     'anyone_can_modify' => $$inputData['editAll'],
                     'encryption_type' => 'teampass_aes',
@@ -1313,7 +1313,7 @@ 
 
         //For each role to which the user depends on, add the folder just created.
         // (if not personal, otherwise, add to user-personal_folders)
-        if ( $isPersonalFolder ) {
+        if ($isPersonalFolder) {
             SessionManager::addRemoveFromSessionArray('user-personal_folders', [$id], 'add');
         } else {
             foreach ($session->get('system-array_roles') as $role) {
@@ -1384,7 +1384,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

scripts/traits/UserHandlerTrait.php

Braces +9 added lines, -3 removed lines

@@ -54,13 +54,17 @@ 
         );
     
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}");
+            if (LOG_TASKS=== true) {
+                $this->logger->log("No subtask was found for task {$this->taskId}");
+            }
             return;
         }
     
         // Process each subtask
         foreach ($subtasks as $subtask) {
-            if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            if (LOG_TASKS=== true) {
+                $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            }
             $this->processGenerateUserKeysSubtask($subtask, $arguments);
         }
     
@@ -97,7 +101,9 @@ 
                 $subtask['increment_id']
             );
             
-            if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            if (LOG_TASKS=== true) {
+                $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            }
             switch ($taskData['step'] ?? '') {
                 case 'step0':
                     $this->generateNewUserStep0($arguments);

Spacing +29 added lines, -29 removed lines

@@ -50,24 +50,24 @@ 
     private function generateUserKeys($arguments) {
         // Get all subtasks related to this task
         $subtasks = DB::query(
-            'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
+            'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0 ORDER BY `task` ASC',
             $this->taskId
         );
     
         if (empty($subtasks)) {
-            if (LOG_TASKS=== true) $this->logger->log("No subtask was found for task {$this->taskId}");
+            if (LOG_TASKS === true) $this->logger->log("No subtask was found for task {$this->taskId}");
             return;
         }
     
         // Process each subtask
         foreach ($subtasks as $subtask) {
-            if (LOG_TASKS=== true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
+            if (LOG_TASKS === true) $this->logger->log("Processing subtask {$subtask['increment_id']} for task {$this->taskId}");
             $this->processGenerateUserKeysSubtask($subtask, $arguments);
         }
     
         // Are all subtasks completed?
         $remainingSubtasks = DB::queryFirstField(
-            'SELECT COUNT(*) FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i AND is_in_progress = 0',
+            'SELECT COUNT(*) FROM '.prefixTable('background_subtasks').' WHERE task_id = %i AND is_in_progress = 0',
             $this->taskId
         );    
         if ($remainingSubtasks == 0) {
@@ -98,7 +98,7 @@ 
                 $subtask['increment_id']
             );
             
-            if (LOG_TASKS=== true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
+            if (LOG_TASKS === true) $this->logger->log("Subtask is in progress: ".$taskData['step'], 'INFO');
             switch ($taskData['step'] ?? '') {
                 case 'step0':
                     $this->generateNewUserStep0($arguments);
@@ -152,7 +152,7 @@ 
                 $subtask['increment_id']
             );
             
-            $this->logger->log("Subtask {$subtask['increment_id']} failure: " . $e->getMessage(), 'ERROR');
+            $this->logger->log("Subtask {$subtask['increment_id']} failure: ".$e->getMessage(), 'ERROR');
         }
     }
     
@@ -186,7 +186,7 @@ 
         // Loop on items
         $rows = DB::query(
             'SELECT id, pw, perso
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE perso =  %i
             ORDER BY id ASC
             LIMIT %i, %i',
@@ -199,7 +199,7 @@ 
             // 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'],
                 (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id']
@@ -226,7 +226,7 @@ 
             
             $currentUserKey = DB::queryFirstRow(
                 'SELECT increment_id
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['new_user_id']
@@ -276,16 +276,16 @@ 
         // 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"
             ORDER BY increment_id ASC
-            LIMIT ' . $taskData['index'] . ', ' . $taskData['nb']
+            LIMIT ' . $taskData['index'].', '.$taskData['nb']
         );
         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'],
                 $arguments['owner_id']
@@ -317,7 +317,7 @@ 
                 if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_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'],
                         $arguments['new_user_id']
@@ -358,7 +358,7 @@ 
         // Loop on fields
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('categories_items') . '
+            FROM ' . prefixTable('categories_items').'
             WHERE encryption_type = "teampass_aes"
             ORDER BY id ASC
             LIMIT %i, %i',
@@ -369,7 +369,7 @@ 
             // 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'],
                 $arguments['owner_id']
@@ -397,7 +397,7 @@ 
                     if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_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'],
                             $arguments['new_user_id']
@@ -439,7 +439,7 @@ 
         // Loop on suggestions
         $rows = DB::query(
             'SELECT id
-            FROM ' . prefixTable('suggestion') . '
+            FROM ' . prefixTable('suggestion').'
             ORDER BY id ASC
             LIMIT %i, %i',
             $taskData['index'],
@@ -449,7 +449,7 @@ 
             // 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'],
                 $arguments['owner_id']
@@ -481,7 +481,7 @@ 
                 if ((int) $arguments['new_user_id'] !== (int) $arguments['owner_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'],
                         $arguments['new_user_id']
@@ -522,9 +522,9 @@ 
         // Loop on files
         $rows = DB::query(
             'SELECT f.id AS id, i.perso AS perso
-            FROM ' . prefixTable('files') . ' AS f
-            INNER JOIN ' . prefixTable('items') . ' AS i ON i.id = f.id_item
-            WHERE f.status = "' . TP_ENCRYPTION_NAME . '"
+            FROM ' . prefixTable('files').' AS f
+            INNER JOIN ' . prefixTable('items').' AS i ON i.id = f.id_item
+            WHERE f.status = "' . TP_ENCRYPTION_NAME.'"
             LIMIT %i, %i',
             $taskData['index'],
             $taskData['nb']
@@ -533,7 +533,7 @@ 
             // Get itemKey from current user
             $currentUserKey = DB::queryFirstRow(
                 'SELECT share_key, increment_id
-                FROM ' . prefixTable('sharekeys_files') . '
+                FROM ' . prefixTable('sharekeys_files').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 (int) $record['perso'] === 0 ? $arguments['owner_id'] : $arguments['new_user_id']
@@ -561,7 +561,7 @@ 
 
             $currentUserKey = DB::queryFirstRow(
                 'SELECT increment_id
-                FROM ' . prefixTable('sharekeys_files') . '
+                FROM ' . prefixTable('sharekeys_files').'
                 WHERE object_id = %i AND user_id = %i',
                 $record['id'],
                 $arguments['new_user_id']
@@ -623,7 +623,7 @@ 
         // get user info
         $userInfo = DB::queryFirstRow(
             'SELECT email, login, auth_type, special, lastname, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $arguments['new_user_id']
         );
@@ -638,10 +638,10 @@ 
                 filter_var($userInfo['email'], FILTER_SANITIZE_EMAIL),
                 // @scrutinizer ignore-type
                 empty($arguments['email_body']) === false ? $arguments['email_body'] : $lang->get('email_body_user_config_1'),
-                'TEAMPASS - ' . $lang->get('login_credentials'),
+                'TEAMPASS - '.$lang->get('login_credentials'),
                 (array) filter_var_array(
                     [
-                        '#code#' => cryption($arguments['new_user_code'], '','decrypt', $this->settings)['string'],
+                        '#code#' => cryption($arguments['new_user_code'], '', 'decrypt', $this->settings)['string'],
                         '#lastname#' => isset($userInfo['name']) === true ? $userInfo['name'] : '',
                         '#login#' => isset($userInfo['login']) === true ? $userInfo['login'] : '',
                     ],
@@ -677,13 +677,13 @@ 
     private function getOwnerInfos(int $owner_id, string $owner_pwd) {
         $userInfo = DB::queryFirstRow(
             'SELECT pw, public_key, private_key, login, name
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             WHERE id = %i',
             $owner_id
         );
 
         // decrypt owner password
-        $pwd = cryption($owner_pwd, '','decrypt', $this->settings)['string'];
+        $pwd = cryption($owner_pwd, '', 'decrypt', $this->settings)['string'];
         // decrypt private key and send back
         return [
             'private_key' => decryptPrivateKey($pwd, $userInfo['private_key']),