nilsteampassnet / TeamPass

api/Model/UserModel.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         return DB::query(
             'SELECT * 
-            FROM ' . prefixTable('users') . '
+            FROM ' . prefixTable('users').'
             ORDER BY id ASC LIMIT %i',
             $limit
         );

api/Model/FolderModel.php

Spacing +5 added lines, -5 removed lines

@@ -37,7 +37,7 @@ 
         // Get folders
         $rows = DB::query(
             'SELECT id, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE nlevel = %i',
             1
         );
@@ -69,12 +69,12 @@ 
         $ret = [];
         $childrens = DB::query(
             'SELECT id, title
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE parent_id = %i',
             $parentId
         );
 
-        if ( count($childrens) > 0) {
+        if (count($childrens) > 0) {
             foreach ($childrens as $children) {
 				$isVisible = in_array((int) $children['id'], $foldersId);
                 $childs = $this->getFoldersChildren($children['id'], $foldersId);
@@ -116,7 +116,7 @@ 
     ): array
     {
         // Validate inputs
-        include_once API_ROOT_PATH . '/../sources/main.functions.php';
+        include_once API_ROOT_PATH.'/../sources/main.functions.php';
         $data = [
             'title' => $title,
             'parent_id' => $parent_id,
@@ -181,7 +181,7 @@ 
                 'error' => true,
                 'error_header' => 'HTTP/1.1 422 Unprocessable Entity',
                 'error_message' => 'Invalid parameters'
-            ];}
+            ]; }
 
         // Create folder
         require_once TEAMPASS_ROOT_PATH.'/sources/folders.class.php';

api/Model/AuthModel.php

Spacing +8 added lines, -8 removed lines

@@ -49,7 +49,7 @@ 
     public function getUserAuth(string $login, string $password, string $apikey): array
     {
         // Sanitize
-        include_once API_ROOT_PATH . '/../sources/main.functions.php';
+        include_once API_ROOT_PATH.'/../sources/main.functions.php';
         $inputData = dataSanitizer(
             [
                 'login' => isset($login) === true ? $login : '',
@@ -74,8 +74,8 @@ 
             // Check if user exists
             $userInfo = DB::queryfirstrow(
                 "SELECT u.id, u.pw, u.login, u.admin, u.gestionnaire, u.can_manage_all_users, u.fonction_id, u.can_create_root_folder, u.public_key, u.private_key, u.personal_folder, u.fonction_id, u.groupes_visibles, u.groupes_interdits, a.value AS user_api_key, a.allowed_folders as user_api_allowed_folders, a.enabled, a.allowed_to_create, a.allowed_to_read, a.allowed_to_update, a.allowed_to_delete
-                FROM " . prefixTable('users') . " AS u
-                INNER JOIN " . prefixTable('api') . " AS a ON (a.user_id=u.id)
+                FROM " . prefixTable('users')." AS u
+                INNER JOIN " . prefixTable('api')." AS a ON (a.user_id=u.id)
                 WHERE login = %s",
                 $inputData['login']
             );
@@ -251,7 +251,7 @@ 
         if (count($userFunctionId) > 0) {
             $rows = DB::query(
                 'SELECT * 
-                FROM ' . prefixTable('roles_values') . '
+                FROM ' . prefixTable('roles_values').'
                 WHERE role_id IN %li  AND type IN ("W", "ND", "NE", "NDNE", "R")',
                 $userFunctionId
             );
@@ -277,7 +277,7 @@ 
         $inc = 0;
         $rows = DB::query(
             'SELECT id, id_tree 
-            FROM ' . prefixTable('items') . '
+            FROM ' . prefixTable('items').'
             WHERE restricted_to LIKE %s'.
             (count($userFunctionId) > 0 ? ' AND id_tree NOT IN %li' : ''),
             $userInfo['id'],
@@ -292,8 +292,8 @@ 
         // Check for the users roles if some specific rights exist on items
         $rows = DB::query(
             'SELECT i.id_tree, r.item_id
-            FROM ' . prefixTable('items') . ' AS i
-            INNER JOIN ' . prefixTable('restriction_to_roles') . ' AS r ON (r.item_id=i.id)
+            FROM ' . prefixTable('items').' AS i
+            INNER JOIN ' . prefixTable('restriction_to_roles').' AS r ON (r.item_id=i.id)
             WHERE '.(count($userFunctionId) > 0 ? ' id_tree NOT IN %li AND ' : '').' i.id_tree != ""
             ORDER BY i.id_tree ASC',
             count($userFunctionId) > 0 ? $userFunctionId : DB::sqleval('0')
@@ -309,7 +309,7 @@ 
         // Add all personal folders
         $rows = DB::queryFirstRow(
             'SELECT id 
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %i AND personal_folder = 1'.
             (count($userFunctionId) > 0 ? ' AND id NOT IN %li' : ''),
             $userInfo['id'],

api/Model/ItemModel.php

Spacing +11 added lines, -11 removed lines

@@ -50,18 +50,18 @@ 
         // Get items
         $rows = DB::query(
             'SELECT i.id, label, description, i.pw, i.url, i.id_tree, i.login, i.email, i.viewed_no, i.fa_icon, i.inactif, i.perso, t.title as folder_label
-            FROM ' . prefixTable('items') . ' AS i
+            FROM ' . prefixTable('items').' AS i
             LEFT JOIN '.prefixTable('nested_tree').' as t ON (t.id = i.id_tree) '.
-            $sqlExtra . 
-            " ORDER BY i.id ASC" .
-            ($limit > 0 ? " LIMIT ". $limit : '')
+            $sqlExtra. 
+            " ORDER BY i.id ASC".
+            ($limit > 0 ? " LIMIT ".$limit : '')
         );
 
         $ret = [];
         foreach ($rows as $row) {
             $userKey = DB::queryfirstrow(
                 'SELECT share_key
-                FROM ' . prefixTable('sharekeys_items') . '
+                FROM ' . prefixTable('sharekeys_items').'
                 WHERE user_id = %i AND object_id = %i',
                 $userId,
                 $row['id']
@@ -98,7 +98,7 @@ 
                 if (empty($path) === true) {
                     $path = htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                 } else {
-                    $path .= '/' . htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
+                    $path .= '/'.htmlspecialchars(stripslashes(htmlspecialchars_decode($elem->title, ENT_QUOTES)), ENT_QUOTES);
                 }
             }
 
@@ -148,7 +148,7 @@ 
     ) : array
     {
         try {
-            include_once API_ROOT_PATH . '/../sources/main.functions.php';
+            include_once API_ROOT_PATH.'/../sources/main.functions.php';
 
             // Load config
             $configManager = new ConfigManager();
@@ -271,7 +271,7 @@ 
         }
 
         if (strlen($password) > $SETTINGS['pwd_maximum_length']) {
-            throw new Exception('Password is too long (max allowed is ' . $SETTINGS['pwd_maximum_length'] . ' characters)');
+            throw new Exception('Password is too long (max allowed is '.$SETTINGS['pwd_maximum_length'].' characters)');
         }
     }
 
@@ -284,7 +284,7 @@ 
     {
         $dataFolderSettings = DB::queryFirstRow(
             'SELECT bloquer_creation, bloquer_modification, personal_folder
-            FROM ' . prefixTable('nested_tree') . ' 
+            FROM ' . prefixTable('nested_tree').' 
             WHERE id = %i',
             $folderId
         );
@@ -307,7 +307,7 @@ 
     {
         $folderComplexity = DB::queryFirstRow(
             'SELECT valeur
-            FROM ' . prefixTable('misc') . '
+            FROM ' . prefixTable('misc').'
             WHERE type = %s AND intitule = %i',
             'complex',
             $itemInfos['folderId']
@@ -335,7 +335,7 @@ 
     private function checkForDuplicates(string $label, array $SETTINGS, array $itemInfos) : void
     {
         DB::queryFirstRow(
-            'SELECT * FROM ' . prefixTable('items') . '
+            'SELECT * FROM '.prefixTable('items').'
             WHERE label = %s AND inactif = %i',
             $label,
             0

api/Controller/Api/ItemController.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
             // SQL where clause with folders list
             if (isset($arrQueryStringParams['folders']) === true) {
                 // convert the folders to an array
-                $arrQueryStringParams['folders'] = explode(',', str_replace( array('[',']') , ''  , $arrQueryStringParams['folders']));
+                $arrQueryStringParams['folders'] = explode(',', str_replace(array('[', ']'), '', $arrQueryStringParams['folders']));
 
                 // ensure to only use the intersection
                 $foldersList = implode(',', array_intersect($arrQueryStringParams['folders'], $userData['folders_list']));
@@ -216,7 +216,7 @@ 
                 } else {
                     // Gérer le cas où les paramètres ne sont pas un tableau
                     $strErrorDesc = 'Data not consistent';
-                    $strErrorHeader = 'Expected array, received ' . gettype($arrQueryStringParams);
+                    $strErrorHeader = 'Expected array, received '.gettype($arrQueryStringParams);
                 }
             }
         } else {
@@ -263,10 +263,10 @@ 
             // SQL where clause with item id
             if (isset($arrQueryStringParams['id']) === true) {
                 // build sql where clause by ID
-                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'] . $sql_constraint;
+                $sqlExtra = ' WHERE i.id = '.$arrQueryStringParams['id'].$sql_constraint;
             } else if (isset($arrQueryStringParams['label']) === true) {
                 // build sql where clause by LABEL
-                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']) . $sql_constraint;
+                $sqlExtra = ' WHERE i.label '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['label'] : ' = '.$arrQueryStringParams['label']).$sql_constraint;
             } else if (isset($arrQueryStringParams['description']) === true) {
                 // build sql where clause by LABEL
                 $sqlExtra = ' WHERE i.description '.(isset($arrQueryStringParams['like']) === true && (int) $arrQueryStringParams['like'] === 1 ? ' LIKE '.$arrQueryStringParams['description'] : ' = '.$arrQueryStringParams['description']).$sql_constraint;

api/index.php

Spacing +6 added lines, -6 removed lines

@@ -39,13 +39,13 @@ 
 header("Access-Control-Allow-Methods: POST, GET");
 header("Access-Control-Max-Age: 3600");
 header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With");
-require __DIR__ . "/inc/bootstrap.php";
+require __DIR__."/inc/bootstrap.php";
 
 // sanitize url segments
 $base = new BaseController();
 $uri = $base->getUriSegments();
 if (!is_array($uri)) {
-    $uri = [$uri];  // ensure $uril is table
+    $uri = [$uri]; // ensure $uril is table
 }
 
 // Prepare DB password
@@ -61,9 +61,9 @@ 
 if ($uri[0] === 'authorize') {
     // Is API enabled in Teampass settings
     if ($apiStatus['error'] === false) {
-        require API_ROOT_PATH . "/Controller/Api/AuthController.php";
+        require API_ROOT_PATH."/Controller/Api/AuthController.php";
         $objFeedController = new AuthController();
-        $strMethodName = $uri[0] . 'Action';
+        $strMethodName = $uri[0].'Action';
         $objFeedController->{$strMethodName}();
     } else {
         // Error management
@@ -89,9 +89,9 @@ 
 
     // action related to USER
     } elseif ($controller === 'user') {
-        require API_ROOT_PATH . "/Controller/Api/UserController.php";
+        require API_ROOT_PATH."/Controller/Api/UserController.php";
         $objFeedController = new UserController();
-        $strMethodName = (string) $action . 'Action';
+        $strMethodName = (string) $action.'Action';
         $objFeedController->{$strMethodName}();
 
     // action related to ITEM

includes/core/login.php

Spacing +40 added lines, -41 removed lines

@@ -47,7 +47,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');
 }
@@ -77,7 +77,7 @@ 
         exit;
     } else {
         // Gérer les erreurs
-        echo 'Erreur lors de la récupération des informations utilisateur : ' . htmlspecialchars($userInfo['message'], ENT_QUOTES, 'UTF-8');
+        echo 'Erreur lors de la récupération des informations utilisateur : '.htmlspecialchars($userInfo['message'], ENT_QUOTES, 'UTF-8');
     };
 }
 
@@ -100,8 +100,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;">
@@ -121,14 +120,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) {
@@ -142,42 +141,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 ?
         '
@@ -210,14 +209,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>
@@ -235,7 +234,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);
@@ -244,7 +243,7 @@ 
         if (seconds >= 0) {
             updateLogonButton(seconds);
         } else if(seconds === 0) {
-            launchIdentify("", "' . $nextUrl . '");
+            launchIdentify("", "' . $nextUrl.'");
         }
         updateLogonButton(seconds);
     },
@@ -265,15 +264,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>';
@@ -282,22 +281,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>
@@ -312,7 +311,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>';
 }
@@ -325,10 +324,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>
 
@@ -338,20 +337,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">
@@ -362,7 +361,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>
@@ -370,20 +369,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>

sources/ldap.queries.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,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;
 }
 
@@ -154,7 +154,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) {
             if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -173,7 +173,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', '=', $post_username)
+                ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
                 ->firstOrFail();
 
             // Is user enabled? Only ActiveDirectory
@@ -194,7 +194,7 @@ 
         } catch (\LdapRecord\Query\ObjectNotFoundException $e) {
             $error = $e->getDetailedError();
             if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
             } 
             // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent
             echo prepareExchangedData(
@@ -213,7 +213,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'],
                 $post_password
             );
@@ -232,7 +232,7 @@ 
         } catch (\LdapRecord\Query\ObjectNotFoundException $e) {
             $error = $e->getDetailedError();
             if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
             }
             // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent
             echo prepareExchangedData(

scripts/background_tasks___functions.php

Spacing +6 added lines, -6 removed lines

@@ -102,11 +102,11 @@ 
 function provideLog(string $message, array $SETTINGS)
 {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-        error_log((string) date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], time()) . ' - '.$message);
+        error_log((string) date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], time()).' - '.$message);
     }
 }
 
-function performVisibleFoldersHtmlUpdate (int $user_id)
+function performVisibleFoldersHtmlUpdate(int $user_id)
 {
     $html = [];
 
@@ -116,10 +116,10 @@ 
 
     // get current folders visible for user
     $cache_tree = DB::queryFirstRow(
-        'SELECT increment_id, data FROM ' . prefixTable('cache_tree') . ' WHERE user_id = %i',
+        'SELECT increment_id, data FROM '.prefixTable('cache_tree').' WHERE user_id = %i',
         $user_id
     );
-    $folders = json_decode($cache_tree['data'], true);//print_r($folders);
+    $folders = json_decode($cache_tree['data'], true); //print_r($folders);
     foreach ($folders as $folder) {
         $idFolder = (int) explode("li_", $folder['id'])[1];
 
@@ -132,7 +132,7 @@ 
 
         // get folder info
         $folder = DB::queryFirstRow(
-            'SELECT title, parent_id, personal_folder FROM ' . prefixTable('nested_tree') . ' WHERE id = %i',
+            'SELECT title, parent_id, personal_folder FROM '.prefixTable('nested_tree').' WHERE id = %i',
             $idFolder
         );
 
@@ -167,7 +167,7 @@ 
 function subTaskStatus($taskId)
 {
     $subTasks = DB::query(
-        'SELECT * FROM ' . prefixTable('background_subtasks') . ' WHERE task_id = %i',
+        'SELECT * FROM '.prefixTable('background_subtasks').' WHERE task_id = %i',
         $taskId
     );