nilsteampassnet / TeamPass

sources/downloadFile.php

Spacing +13 added lines, -13 removed lines

@@ -76,7 +76,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;
 }
 
@@ -100,19 +100,19 @@ 
 $get_filename = str_replace(array("\r", "\n"), '', $get_filename);
 
 // prepare Encryption class calls
-header('Content-disposition: attachment; filename=' . rawurldecode(basename($get_filename)));
+header('Content-disposition: attachment; filename='.rawurldecode(basename($get_filename)));
 header('Content-Type: application/octet-stream');
 header('Cache-Control: must-revalidate, no-cache, no-store');
 header('Expires: 0');
 if (null !== $request->query->get('pathIsFiles') && (int) $get_pathIsFiles === 1) {
-    readfile($SETTINGS['path_to_files_folder'] . '/' . basename($get_filename));
+    readfile($SETTINGS['path_to_files_folder'].'/'.basename($get_filename));
 } else {
     // get file key
     $file_info = DB::queryfirstrow(
         'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension,
         s.share_key AS share_key
-        FROM ' . prefixTable('files') . ' AS f
-        INNER JOIN ' . prefixTable('sharekeys_files') . ' AS s ON (f.id = s.object_id)
+        FROM ' . prefixTable('files').' AS f
+        INNER JOIN ' . prefixTable('sharekeys_files').' AS s ON (f.id = s.object_id)
         WHERE s.user_id = %i AND s.object_id = %i',
         $session->get('user-id'),
         $get_fileid
@@ -131,7 +131,7 @@ 
         // if not encrypted
         $file_info = DB::queryfirstrow(
             'SELECT f.id AS id, f.file AS file, f.name AS name, f.status AS status, f.extension AS extension
-            FROM ' . prefixTable('files') . ' AS f
+            FROM ' . prefixTable('files').' AS f
             WHERE f.id = %i',
             $get_fileid
         );
@@ -141,25 +141,25 @@ 
     // Set the filename of the download
     $filename = basename($file_info['name'], '.'.$file_info['extension']);
     $filename = isBase64($filename) === true ? base64_decode($filename) : $filename;
-    $filename = $filename . '.' . $file_info['extension'];
+    $filename = $filename.'.'.$file_info['extension'];
     // Get the full path to the file to be downloaded
-    if (file_exists($SETTINGS['path_to_upload_folder'] . '/' .TP_FILE_PREFIX . $file_info['file'])) {
-        $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . $file_info['file'];
+    if (file_exists($SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'])) {
+        $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.$file_info['file'];
     } else {
-        $filePath = $SETTINGS['path_to_upload_folder'] . '/' . TP_FILE_PREFIX . base64_decode($file_info['file']);
+        $filePath = $SETTINGS['path_to_upload_folder'].'/'.TP_FILE_PREFIX.base64_decode($file_info['file']);
     }
     $filePath = realpath($filePath);
 
-    if (WIP === true) error_log('downloadFile.php: filePath: ' . $filePath." - ");
+    if (WIP === true) error_log('downloadFile.php: filePath: '.$filePath." - ");
 
     if ($filePath && is_readable($filePath) && strpos($filePath, realpath($SETTINGS['path_to_upload_folder'])) === 0) {
         header('Content-Description: File Transfer');
         header('Content-Type: application/octet-stream');
-        header('Content-Disposition: attachment; filename="' . basename($filename) . '"');
+        header('Content-Disposition: attachment; filename="'.basename($filename).'"');
         header('Expires: 0');
         header('Cache-Control: must-revalidate');
         header('Pragma: public');
-        header('Content-Length: ' . filesize($filePath));
+        header('Content-Length: '.filesize($filePath));
         flush(); // Clear system output buffer
         if (empty($fileContent) === true) {
             // deepcode ignore PT: File and path are secured directly inside the function decryptFile()

sources/identify.php

Spacing +48 added lines, -48 removed lines

@@ -123,7 +123,7 @@ 
      * @param array $SETTINGS
      * @return bool|string
      */
-    function handleAuthAttempts($post_data, $SETTINGS): bool|string
+    function handleAuthAttempts($post_data, $SETTINGS): bool | string
     {
         $session = SessionManager::getSession();
         $lang = new Language($session->get('user-language') ?? 'english');
@@ -297,7 +297,7 @@ 
     $sessionPwdAttempts = $session->get('pwd_attempts');
     $sessionUrl = $session->get('user-initial_url');
     $server = [];
-    $server['PHP_AUTH_USER'] =  $request->getUser();
+    $server['PHP_AUTH_USER'] = $request->getUser();
     $server['PHP_AUTH_PW'] = $request->getPassword();
     
     // decrypt and retreive data in JSON format
@@ -312,18 +312,18 @@ 
     }
 
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
-    if(
+    if (
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
         && $dataReceived['user_2fa_selection'] === 'duo'
         && $session->get('user-duo_status') === 'IN_PROGRESS'
         && !empty($dataReceived['duo_state'])
-    ){
+    ) {
         $key = hash('sha256', $dataReceived['duo_state']);
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
         $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv);
         // Clear the data from the Duo process to continue clean with the standard login process
-        $session->set('user-duo_data','');
-        if($duo_data_dec === false){
+        $session->set('user-duo_data', '');
+        if ($duo_data_dec === false) {
             echo prepareExchangedData(
                 [
                     'error' => true,
@@ -338,7 +338,7 @@ 
         $dataReceived['login'] = $duo_data['duo_login'];
     }
 
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
         echo json_encode([
             'data' => prepareExchangedData(
                 [
@@ -647,7 +647,7 @@ 
         }
         // Append with roles from AD groups
         if (is_null($userInfo['roles_from_ad_groups']) === false) {
-            $userInfo['fonction_id'] = empty($userInfo['fonction_id'])  === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id']. ';' . $userInfo['roles_from_ad_groups'];
+            $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
         }
         // store
         $session->set('user-roles', $userInfo['fonction_id']);
@@ -659,7 +659,7 @@ 
         if (count($session->get('user-roles_array')) > 0) {
             $rolesList = DB::query(
                 'SELECT id, title, complexity
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE id IN %li',
                 $session->get('user-roles_array')
             );
@@ -705,7 +705,7 @@ 
             if ($adjustPermissions) {
                 $session->set('user-admin', (int) $userInfo['admin']);
                 $session->set('user-manager', (int) $userInfo['gestionnaire']);
-                $session->set('user-can_manage_all_users',(int)  $userInfo['can_manage_all_users']);
+                $session->set('user-can_manage_all_users', (int) $userInfo['can_manage_all_users']);
                 $session->set('user-read_only', (int) $userInfo['read_only']);
                 DB::update(
                     prefixTable('users'),
@@ -777,10 +777,10 @@ 
         $session->set('user-latest_items_tab', []);
         $session->set('user-nb_roles', 0);
         foreach ($session->get('user-latest_items') as $item) {
-            if (! empty($item)) {
+            if (!empty($item)) {
                 $dataLastItems = DB::queryFirstRow(
                     'SELECT id,label,id_tree
-                    FROM ' . prefixTable('items') . '
+                    FROM ' . prefixTable('items').'
                     WHERE id=%i',
                     $item
                 );
@@ -789,7 +789,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'
                 );
@@ -799,7 +799,7 @@ 
         // Get cahce tree info
         $cacheTreeData = DB::queryFirstRow(
             'SELECT visible_folders
-            FROM ' . prefixTable('cache_tree') . '
+            FROM ' . prefixTable('cache_tree').'
             WHERE user_id=%i',
             (int) $session->get('user-id')
         );
@@ -831,7 +831,7 @@ 
             && (int) $sessionAdmin !== 1
         ) {
             // get all Admin users
-            $val = DB::queryfirstrow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
+            $val = DB::queryfirstrow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
             if (DB::count() > 0) {
                 // Add email to table
                 prepareSendingEmail(
@@ -843,7 +843,7 @@ 
                             '#tp_time#',
                         ],
                         [
-                            ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
+                            ' '.$session->get('user-login').' (IP: '.getClientIpServer().')',
                             date($SETTINGS['date_format'], (int) $session->get('user-last_connection')),
                             date($SETTINGS['time_format'], (int) $session->get('user-last_connection')),
                         ],
@@ -991,7 +991,7 @@ 
 {
     $rows = DB::query(
         'SELECT date
-        FROM ' . prefixTable('log_system') . "
+        FROM ' . prefixTable('log_system')."
         WHERE field_1 = %s
         AND type = 'failed_auth'
         AND label = 'password_is_not_correct'
@@ -1005,7 +1005,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'])
             );
         }
     }
@@ -1059,7 +1059,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;
@@ -1268,7 +1268,7 @@ 
                 $openLdapExtra = new OpenLdapExtra();
                 break;
             default:
-                throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
         }
     } catch (Exception $e) {
         return [
@@ -1281,7 +1281,7 @@ 
         // 2- Get user info from AD
         // We want to isolate attribute ldap_user_attribute or mostly samAccountName
         $userADInfos = $ldapConnection->query()
-            ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $username)
+            ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $username)
             ->firstOrFail();
 
         // Is user enabled? Only ActiveDirectory
@@ -1299,7 +1299,7 @@ 
         // For OpenLDAP and others, we use attribute dn
         $userAuthAttempt = $ldapConnection->auth()->attempt(
             $SETTINGS['ldap_type'] === 'ActiveDirectory' ?
-                $userADInfos['userprincipalname'][0] :  // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
+                $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
                 $userADInfos['dn'],
             $passwordClear
         );
@@ -1382,7 +1382,7 @@ 
         // error
         return [
             'error' => true,
-            'message' => "Error: Unsupported LDAP type: " . $SETTINGS['ldap_type'],
+            'message' => "Error: Unsupported LDAP type: ".$SETTINGS['ldap_type'],
         ];
     }
     
@@ -1417,12 +1417,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
             );
@@ -1516,7 +1516,7 @@ 
             $userInfo['id']
         );
     }
-    if (WIP === true) error_log("finalizeAuthentication - hashedPassword: " . $hashedPassword. " | ".$passwordManager->verifyPassword($userInfo['pw'], $passwordClear)." || ".$passwordClear);
+    if (WIP === true) error_log("finalizeAuthentication - hashedPassword: ".$hashedPassword." | ".$passwordManager->verifyPassword($userInfo['pw'], $passwordClear)." || ".$passwordClear);
 }
 
 /**
@@ -1568,7 +1568,7 @@ 
     }
 
     // Now check yubico validity
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
     $auth = $yubi->verify($yubico_key);
     //, null, null, null, 60
@@ -1627,7 +1627,7 @@ 
             // Check if exists in DB
             $groupData = DB::queryFirstRow(
                 'SELECT id
-                FROM ' . prefixTable('roles_title') . '
+                FROM ' . prefixTable('roles_title').'
                 WHERE title = %s',
                 $group["displayName"]
             );
@@ -1756,7 +1756,7 @@ 
             
             // generate new QR
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
-                'Teampass - ' . $username,
+                'Teampass - '.$username,
                 $userInfo['ga']
             );
             // clear temporary code from DB
@@ -1769,7 +1769,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,
@@ -1925,7 +1925,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,
@@ -1941,7 +1941,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,
@@ -1949,7 +1949,7 @@ 
         }
         
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
-        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
+        if (!empty($duo_redirect_url) && isset($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);
@@ -1977,7 +1977,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,
             ];
@@ -1998,8 +1998,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 [
@@ -2010,9 +2010,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,
@@ -2023,9 +2023,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'),
@@ -2141,8 +2141,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
         );
@@ -2578,15 +2578,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,

includes/core/login.php

Spacing +40 added lines, -41 removed lines

@@ -48,7 +48,7 @@ 
 $postType = $request->query->get('post_type', '');
 $postType = filter_var($postType, FILTER_SANITIZE_SPECIAL_CHARS);
 $get['post_type'] = $postType;
-if (isset($SETTINGS['duo']) === true && (int) $SETTINGS['duo'] === 1 && $get['post_type'] === 'duo' ) {
+if (isset($SETTINGS['duo']) === true && (int) $SETTINGS['duo'] === 1 && $get['post_type'] === 'duo') {
     $get['duo_state'] = $request->query->get('state');
     $get['duo_code'] = $request->query->get('duo_code');
 }
@@ -78,7 +78,7 @@ 
         exit;
     } else {
         // Gérer les erreurs
-        echo 'Erreur lors de la récupération des informations utilisateur : ' . $userInfo['message'];
+        echo 'Erreur lors de la récupération des informations utilisateur : '.$userInfo['message'];
     };
 }
 
@@ -99,8 +99,7 @@ 
 <div class="login-box">
     <div class="login-logo"><div style="margin:30px;">',
     isset($SETTINGS['custom_logo']) === true && empty($SETTINGS['custom_logo']) === false ?
-        '<img src="' . (string) $SETTINGS['custom_logo'] . '" alt="" style="text-align:center; max-width:100px;" />' :
-        '<img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">',
+        '<img src="'.(string) $SETTINGS['custom_logo'].'" alt="" style="text-align:center; max-width:100px;" />' : '<img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">',
         '
         </div>
         <div style="font-weight:bold;">
@@ -120,14 +119,14 @@ 
 
         <div class="card-body login-card-body1">
             <div class="input-group has-feedback mb-2">
-                <div class="input-group-prepend infotip" title="' . $lang->get('login') . '">
+                <div class="input-group-prepend infotip" title="' . $lang->get('login').'">
                     <span class="input-group-text"><i class="fa-solid fa-user fa-fw"></i></span>
                 </div>';
 if (
     isset($SETTINGS['enable_http_request_login']) === true
     && (int) $SETTINGS['enable_http_request_login'] === 1
     && $request->getUser() !== null
-    && ! (isset($SETTINGS['maintenance_mode']) === true
+    && !(isset($SETTINGS['maintenance_mode']) === true
         && (int) $SETTINGS['maintenance_mode'] === 1)
 ) {
     if (strpos($request->getUser(), '@') !== false) {
@@ -141,42 +140,42 @@ 
             <input type="text" id="login" class="form-control" placeholder="', filter_var($username, FILTER_SANITIZE_FULL_SPECIAL_CHARS), '" readonly>';
 } else {
     echo '
-            <input type="text" id="login" class="form-control" placeholder="' . $lang->get('index_login') . '" value="'.(null !== $session->get('user-login') && empty($session->get('user-login')) === false ? filter_var($session->get('user-login'), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '').'">';
+            <input type="text" id="login" class="form-control" placeholder="' . $lang->get('index_login').'" value="'.(null !== $session->get('user-login') && empty($session->get('user-login')) === false ? filter_var($session->get('user-login'), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '').'">';
 }
 
 echo '
         </div>';
-if (! (isset($SETTINGS['enable_http_request_login']) === true
+if (!(isset($SETTINGS['enable_http_request_login']) === true
     && (int) $SETTINGS['enable_http_request_login'] === 1
     && $request->getUser() !== null
-    && ! (isset($SETTINGS['maintenance_mode']) === true
+    && !(isset($SETTINGS['maintenance_mode']) === true
         && (int) $SETTINGS['maintenance_mode'] === 1))) {
     echo '
         <div class="input-group has-feedback mb-2">
-            <div class="input-group-prepend infotip" title="' . $lang->get('password') . '">
+            <div class="input-group-prepend infotip" title="' . $lang->get('password').'">
                 <span class="input-group-text"><i class="fa-solid fa-lock fa-fw"></i></span>
             </div>
-            <input type="password" id="pw" class="form-control submit-button" placeholder="' . $lang->get('index_password') . '">
+            <input type="password" id="pw" class="form-control submit-button" placeholder="' . $lang->get('index_password').'">
         </div>';
 }
 
 echo '
         <div class="input-group has-feedback mb-2">
-            <div class="input-group-prepend infotip" title="' . $lang->get('session_expiration_in_minutes') . '">
+            <div class="input-group-prepend infotip" title="' . $lang->get('session_expiration_in_minutes').'">
                 <span class="input-group-text"><i class="fa-solid fa-clock fa-fw"></i></span>
             </div>
             <input type="text" id="session_duration" class="form-control submit-button" 
-            placeholder="' . $lang->get('index_session_duration') .'&nbsp;(' . $lang->get('minutes') . ')" 
+            placeholder="' . $lang->get('index_session_duration').'&nbsp;('.$lang->get('minutes').')" 
             value="', isset($SETTINGS['default_session_expiration_time']) === true ? $SETTINGS['default_session_expiration_time'] : '', '">
         </div>';
 // 2FA auth selector
 $mfaHtmlPart = '
-        <input type="hidden" id="2fa_user_selection" value="'.htmlspecialchars((isset($get['post_type']) === true && $get['post_type'] === 'duo') ? 'duo' : ''). '">
-        <input type="hidden" id="duo_code" value="'.htmlspecialchars(isset($get['duo_code']) === true && is_null($get['duo_code']) === false ? $get['duo_code'] : ''). '">
-        <input type="hidden" id="duo_state" value="'.htmlspecialchars(isset($get['duo_state']) === true && is_null($get['duo_state']) === false ? $get['duo_state'] : ''). '">
+        <input type="hidden" id="2fa_user_selection" value="'.htmlspecialchars((isset($get['post_type']) === true && $get['post_type'] === 'duo') ? 'duo' : '').'">
+        <input type="hidden" id="duo_code" value="'.htmlspecialchars(isset($get['duo_code']) === true && is_null($get['duo_code']) === false ? $get['duo_code'] : '').'">
+        <input type="hidden" id="duo_state" value="'.htmlspecialchars(isset($get['duo_state']) === true && is_null($get['duo_state']) === false ? $get['duo_state'] : '').'">
         <div class="row mb-3 hidden" id="2fa_methods_selector">
             <div class="col-12">
-                <h8 class="login-box-msg">' . $lang->get('2fa_authentication_selector') . '</h8>
+                <h8 class="login-box-msg">' . $lang->get('2fa_authentication_selector').'</h8>
                 <div class="2fa-methods text-center mt-2">'.
                 (isset($SETTINGS['google_authentication']) === true && (int) $SETTINGS['google_authentication'] === 1 ?
         '
@@ -209,14 +208,14 @@ 
     echo '
         <div id="div-2fa-google" class="mb-3 div-2fa-method hidden">
             <div class="input-group has-feedback mb-2">
-                <div class="input-group-prepend infotip" title="' . $lang->get('mfa_unique_code') . '">
+                <div class="input-group-prepend infotip" title="' . $lang->get('mfa_unique_code').'">
                     <span class="input-group-text"><i class="fa-solid fa-key fa-fw"></i></span>
                 </div>
-                <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . $lang->get('ga_identification_code') . '" />
+                <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . $lang->get('ga_identification_code').'" />
                 <span class="input-group-append">
                     <button type="button" class="btn btn-info btn-flat" onclick="send_user_new_temporary_ga_code()">
                         <i class="fa-solid fa-envelope form-control-feedback pointer infotip" 
-                    title="' . $lang->get('i_need_to_generate_new_ga_code') . '"></i>
+                    title="' . $lang->get('i_need_to_generate_new_ga_code').'"></i>
                     </button>
                 </span>
             </div>
@@ -234,7 +233,7 @@ 
 <script>
 var seconds = 1;
 function updateLogonButton(timeToGo){
-    document.getElementById("but_identify_user").value = "' . $lang->get('duration_login_attempt') . ' " + timeToGo;
+    document.getElementById("but_identify_user").value = "' . $lang->get('duration_login_attempt').' " + timeToGo;
 }
 $( window ).on( "load", function() {
     updateLogonButton(seconds);
@@ -243,7 +242,7 @@ 
         if (seconds >= 0) {
             updateLogonButton(seconds);
         } else if(seconds === 0) {
-            launchIdentify("", "' . $nextUrl . '");
+            launchIdentify("", "' . $nextUrl.'");
         }
         updateLogonButton(seconds);
     },
@@ -264,15 +263,15 @@ 
             <div class="col-8">
                 <div id="yubiko-new-key" class="alert alert-info hidden">
                     <p>
-                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . $lang->get('yubico_user_id') . '">
+                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . $lang->get('yubico_user_id').'">
                     </p>
                     <p>
-                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . $lang->get('yubico_user_key') . '">
+                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . $lang->get('yubico_user_key').'">
                     </p>
                 </div>
-                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . $lang->get('press_your_yubico_key') . '">
+                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . $lang->get('press_your_yubico_key').'">
                 <div class="row">
-                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . $lang->get('register_new_yubiko_key') . '</span>
+                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . $lang->get('register_new_yubiko_key').'</span>
                 </div>
             </div>
         </div>';
@@ -281,22 +280,22 @@ 
 echo '
         <div class="row mt-5">
             <div class="col-12">
-                <button id="but_identify_user" class="btn btn-primary btn-block">' . $lang->get('log_in') . '</button>
+                <button id="but_identify_user" class="btn btn-primary btn-block">' . $lang->get('log_in').'</button>
                 
                 <!-- In case of upgrade, the user has to provide his One Time Code -->
                 <div class="card-body user-one-time-code-card-body hidden">
-                    <h5 class="login-box-msg">' . $lang->get('provide_personal_one_time_code') . '</h5>
+                    <h5 class="login-box-msg">' . $lang->get('provide_personal_one_time_code').'</h5>
 
                     <div class="input-group has-feedback mb-2 mt-4">
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa-solid fa-unlock-alt"></i></span>
                         </div>
-                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . $lang->get('one_time_code') . '">
+                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . $lang->get('one_time_code').'">
                     </div>
 
                     <div class="row mb-3">
                         <div class="col-12">
-                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . $lang->get('confirm') . '</button>
+                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . $lang->get('confirm').'</button>
                         </div>
                     </div>
                 </div>
@@ -311,7 +310,7 @@ 
         <hr class="mt-3 mb-3"/>
         <div class="row mb-2">
             <div class="col-12">
-                <button id="but_login_with_oauth2" class="btn btn-primary btn-block">' . $SETTINGS['oauth2_client_appname'] . '</button>
+                <button id="but_login_with_oauth2" class="btn btn-primary btn-block">' . $SETTINGS['oauth2_client_appname'].'</button>
             </div>
         </div>';
 }
@@ -324,10 +323,10 @@ 
 // In case of password change
 echo '
     <div class="card-body confirm-password-card-body hidden">
-        <h5 class="login-box-msg">' . $lang->get('new_password_required') . '</h5>
+        <h5 class="login-box-msg">' . $lang->get('new_password_required').'</h5>
 
         <div class="alert alert-info">
-            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('password_strength') . '
+            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('password_strength').'
             <span id="confirm-password-level" class="ml-2 font-weight-bold"></span></div>
         </div>
 
@@ -337,20 +336,20 @@ 
                     <div class="input-group-prepend">
                         <span class="input-group-text"><i class="fas fa-key"></i></span>
                     </div>
-                    <input type="password" id="current-user-password" class="form-control" placeholder="' . $lang->get('current_password') . '">
+                    <input type="password" id="current-user-password" class="form-control" placeholder="' . $lang->get('current_password').'">
                 </div>
             </div>
             <div class="input-group has-feedback mb-2 mt-4">
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fas fa-key"></i></span>
                 </div>
-                <input type="password" id="new-user-password" class="form-control" placeholder="' . $lang->get('index_new_pw') . '">
+                <input type="password" id="new-user-password" class="form-control" placeholder="' . $lang->get('index_new_pw').'">
             </div>
             <div class="input-group has-feedback mb-2">
                 <div class="input-group-prepend">
                     <span class="input-group-text"><i class="fas fa-key"></i></span>
                 </div>
-                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . $lang->get('index_change_pw_confirmation') . '">
+                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . $lang->get('index_change_pw_confirmation').'">
             </div>
             <div class="row mb-3">
                 <div class="col-md-12 offset-sm-4 text-center">
@@ -361,7 +360,7 @@ 
             </div>
             <div class="row mb-3">
                 <div class="col-12">
-                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . $lang->get('confirm') . '</button>
+                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . $lang->get('confirm').'</button>
                 </div>
             </div>
         </div>
@@ -369,20 +368,20 @@ 
 
     <div class="card-body hidden" id="card-user-treat-psk">
         <div class="alert alert-info">
-            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('user_has_psk_info') . '</div>
+            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('user_has_psk_info').'</div>
         </div>
         <div class="input-group has-feedback mb-2">
             <div class="input-group-prepend">
                 <span class="input-group-text"><i class="fas fa-key"></i></span>
             </div>
-            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . $lang->get('home_personal_saltkey') . '">
+            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . $lang->get('home_personal_saltkey').'">
         </div>
         <div class="row mb-3 mt-4">
             <div class="col-12">
-                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . $lang->get('launch') . '</button>
+                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . $lang->get('launch').'</button>
             </div>
             <div class="col-12 mt-3">
-                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . $lang->get('i_cannot_remember') . '</button>
+                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . $lang->get('i_cannot_remember').'</button>
             </div>
         </div>
     </div>

pages/oauth.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('oauth') === 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;
 }
 

sources/backups.queries.php

Spacing +26 added lines, -26 removed lines

@@ -77,7 +77,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;
 }
 
@@ -138,21 +138,21 @@ 
             // Prepare variables
             $post_key = filter_var($dataReceived['encryptionKey'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
-            require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
             $return = '';
 
             //Get all tables
             $tables = array();
             $result = DB::query('SHOW TABLES');
             foreach ($result as $row) {
-                $tables[] = $row['Tables_in_' . DB_NAME];
+                $tables[] = $row['Tables_in_'.DB_NAME];
             }
 
             //cycle through
             foreach ($tables as $table) {
                 if (empty($pre) || substr_count($table, $pre) > 0) {
                     // Do query
-                    $result = DB::queryRaw('SELECT * FROM ' . $table);
+                    $result = DB::queryRaw('SELECT * FROM '.$table);
                     DB::queryRaw(
                         'SELECT *
                         FROM INFORMATION_SCHEMA.COLUMNS
@@ -164,17 +164,17 @@ 
                     $numFields = DB::count();
 
                     // prepare a drop table
-                    $return .= 'DROP TABLE ' . $table . ';';
-                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE ' . $table);
-                    $return .= "\n\n" . $row2['Create Table'] . ";\n\n";
+                    $return .= 'DROP TABLE '.$table.';';
+                    $row2 = DB::queryfirstrow('SHOW CREATE TABLE '.$table);
+                    $return .= "\n\n".$row2['Create Table'].";\n\n";
 
                     //prepare all fields and datas
                     for ($i = 0; $i < $numFields; ++$i) {
                         while ($row = $result->fetch_row()) {
-                            $return .= 'INSERT INTO ' . $table . ' VALUES(';
+                            $return .= 'INSERT INTO '.$table.' VALUES(';
                             for ($j = 0; $j < $numFields; ++$j) {
                                 // Gestion des valeurs NULL
-                                $value = $row[$j] === null ? 'NULL' : '"' . addslashes(preg_replace("/\n/", '\\n', $row[$j])) . '"';                    
+                                $value = $row[$j] === null ? 'NULL' : '"'.addslashes(preg_replace("/\n/", '\\n', $row[$j])).'"';                    
                                 $return .= $value;
                                 if ($j < ($numFields - 1)) {
                                     $return .= ',';
@@ -192,8 +192,8 @@ 
                 $token = GenerateCryptKey(20, false, true, true, false, true);
 
                 //save file
-                $filename = time() . '-' . $token . '.sql';
-                $handle = fopen($SETTINGS['path_to_files_folder'] . '/' . $filename, 'w+');
+                $filename = time().'-'.$token.'.sql';
+                $handle = fopen($SETTINGS['path_to_files_folder'].'/'.$filename, 'w+');
                 if ($handle !== false) {
                     //write file
                     fwrite($handle, $return);
@@ -205,17 +205,17 @@ 
                     // Encrypt the file
                     prepareFileWithDefuse(
                         'encrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
                         $SETTINGS,
                         $post_key
                     );
 
                     // Do clean
-                    unlink($SETTINGS['path_to_files_folder'] . '/' . $filename);
+                    unlink($SETTINGS['path_to_files_folder'].'/'.$filename);
                     rename(
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $filename,
-                        $SETTINGS['path_to_files_folder'] . '/' . $filename
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$filename,
+                        $SETTINGS['path_to_files_folder'].'/'.$filename
                     );
                 }
 
@@ -235,9 +235,9 @@ 
                     array(
                         'error' => false,
                         'message' => '',
-                        'download' => 'sources/downloadFile.php?name=' . urlencode($filename) .
-                            '&sub=files&file=' . $filename . '&type=sql&key=' . $session->get('key') . '&key_tmp=' .
-                            $session->get('user-key_tmp') . '&pathIsFiles=1',
+                        'download' => 'sources/downloadFile.php?name='.urlencode($filename).
+                            '&sub=files&file='.$filename.'&type=sql&key='.$session->get('key').'&key_tmp='.
+                            $session->get('user-key_tmp').'&pathIsFiles=1',
                     ),
                     'encode'
                 );
@@ -292,13 +292,13 @@ 
 
             if (WIP === true) error_log('DEBUG: Offset -> '.$post_offset.' | File -> '.$post_clearFilename.' | key -> '.$post_key);
 
-            include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
+            include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
 
             if (empty($post_clearFilename) === true) {
                 // Get filename from database
                 $data = DB::queryFirstRow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . '
+                    FROM ' . prefixTable('misc').'
                     WHERE increment_id = %i',
                     $post_backupFile
                 );
@@ -317,8 +317,8 @@ 
                     // Decrypt the file
                     $ret = prepareFileWithDefuse(
                         'decrypt',
-                        $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile,
-                        $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/'.$post_backupFile,
+                        $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile,
                         $SETTINGS,
                         $post_key
                     );
@@ -335,10 +335,10 @@ 
                     }
 
                     // Do clean
-                    fileDelete($SETTINGS['path_to_files_folder'] . '/' . $post_backupFile, $SETTINGS);
-                    $post_backupFile = $SETTINGS['path_to_files_folder'] . '/defuse_temp_' . $post_backupFile;
+                    fileDelete($SETTINGS['path_to_files_folder'].'/'.$post_backupFile, $SETTINGS);
+                    $post_backupFile = $SETTINGS['path_to_files_folder'].'/defuse_temp_'.$post_backupFile;
                 } else {
-                    $post_backupFile = $SETTINGS['path_to_files_folder'] . '/' . $post_backupFile;
+                    $post_backupFile = $SETTINGS['path_to_files_folder'].'/'.$post_backupFile;
                 }
             } else {
                 $post_backupFile = $post_clearFilename;

scripts/background_tasks___sending_emails.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 $emailService = new EmailService();
 $rows = DB::query(
     'SELECT *
-    FROM ' . prefixTable('background_tasks') . '
+    FROM ' . prefixTable('background_tasks').'
     WHERE is_in_progress = %i AND process_type = %s
     ORDER BY increment_id ASC LIMIT 0,10',
     0,
@@ -138,7 +138,7 @@ 
     
     //if ((int) $SETTINGS['enable_backlog_mail'] === 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'
         );
@@ -146,7 +146,7 @@ 
         if ((int) (time() - $row['valeur']) >= 300 || (int) $row['valeur'] === 0) {
             $rows = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('emails') .
+                FROM ' . prefixTable('emails').
                 ' WHERE status != %s',
                 'sent'
             );

sources/folders.class.php

Spacing +15 added lines, -15 removed lines

@@ -86,7 +86,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));
@@ -135,7 +135,7 @@ 
         ) {
             DB::query(
                 'SELECT *
-                FROM ' . prefixTable('nested_tree') . '
+                FROM ' . prefixTable('nested_tree').'
                 WHERE title = %s AND personal_folder = 0',
                 $title
             );
@@ -159,7 +159,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
         );
@@ -198,7 +198,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'
@@ -249,11 +249,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);
     }
 
     /**
@@ -332,7 +332,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 = [
@@ -346,7 +346,7 @@ 
             "is_visible_active" => 0,
         ];
 
-        $cache_tree = DB::queryFirstRow('SELECT increment_id, folders, visible_folders FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i', (int)$user_id);
+        $cache_tree = DB::queryFirstRow('SELECT increment_id, folders, visible_folders FROM '.prefixTable('cache_tree').' WHERE user_id = %i', (int) $user_id);
 
         if (empty($cache_tree)) {
             DB::insert(prefixTable('cache_tree'), [
@@ -366,7 +366,7 @@ 
                 'folders' => json_encode($folders),
                 'visible_folders' => json_encode($visible_folders),
                 'timestamp' => time(),
-            ], 'increment_id = %i', (int)$cache_tree['increment_id']);
+            ], 'increment_id = %i', (int) $cache_tree['increment_id']);
         }
     }
 
@@ -376,7 +376,7 @@ 
     private function manageFolderPermissions($parent_id, $newId, $user_roles, $access_rights, $user_is_admin)
     {
         if ($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'],
@@ -384,7 +384,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'), [
@@ -402,7 +402,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'],
@@ -430,7 +430,7 @@ 
         return [
             'error' => true,
             'message' => $message,
-            'newId' => '' . $newIdSuffix,
+            'newId' => ''.$newIdSuffix,
         ];
     }
 }
\ No newline at end of file

includes/core/login.oauth2.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 use TeampassClasses\OAuth2Controller\OAuth2Controller;
 
 session_start();
-require_once __DIR__. '/../../includes/config/include.php';
+require_once __DIR__.'/../../includes/config/include.php';
 require_once __DIR__.'/../../sources/main.functions.php';
 
 // init

sources/oauth.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 use TeampassClasses\OAuth2Controller\OAuth2Controller;
 session_start();
-require_once __DIR__. '/../includes/config/include.php';
+require_once __DIR__.'/../includes/config/include.php';
 require_once __DIR__.'/../sources/main.functions.php';
 
 // init