nilsteampassnet / TeamPass

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 +16 added lines, -16 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 = [
@@ -376,7 +376,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'), [
@@ -396,7 +396,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']);
         }
     }
 
@@ -406,7 +406,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'],
@@ -414,7 +414,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'), [
@@ -432,7 +432,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'],
@@ -457,7 +457,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',
@@ -491,7 +491,7 @@ 
         return [
             'error' => true,
             'message' => $message,
-            'newId' => '' . $newIdSuffix,
+            'newId' => ''.$newIdSuffix,
         ];
     }
 }

pages/import.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
     || isset($SETTINGS['allow_import']) === false || (int) $SETTINGS['allow_import'] !== 1) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -183,7 +183,7 @@ 
                                         <?php
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
 echo $complexitySelect;
                                         ?>

pages/import.js.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === 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;
 }
 ?>
@@ -1043,7 +1043,7 @@ 
                                     // Isolate first item
                                     if (itemsList.length > 0) {
                                         $('#import-feedback-progress-text')
-                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i id="item-title"></i>');
+                                            .html('<i class="fa-solid fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i id="item-title"></i>');
 
                                         // XSS Filtering :
                                         $('#import-feedback-progress-text').text(itemsList[0].Title);

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 +11 added lines, -11 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;
@@ -210,7 +210,7 @@ 
 
         // Observer pour récupérer les données et respecter l'ordre des colonnes
         $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) {
@@ -261,7 +261,7 @@ 
             // Handle multiple lignes description
             if (strpos($comments, '<br>') !== false || strpos($label, '<br>') !== false) {
                 $continue_on_next_line = true;
-                $comment .= " " . $label;
+                $comment .= " ".$label;
             } else {
                 // Insert previous line if changing line
                 if (!empty($label)) {
@@ -325,10 +325,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);
         }
@@ -411,7 +411,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
@@ -472,7 +472,7 @@ 
                         // Get ID of existing folder
                         $ret = DB::queryFirstRow(
                             'SELECT *
-                            FROM ' . prefixTable('nested_tree') . '
+                            FROM ' . prefixTable('nested_tree').'
                             WHERE title = %s',
                             $currentFolder
                         );
@@ -994,7 +994,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -1065,7 +1065,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',
@@ -1290,7 +1290,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']),

scripts/traits/ItemHandlerTrait.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 trait ItemHandlerTrait {    
 
     private function generateUserPasswordKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
         // Generate keys for user passwords   
         storeUsersShareKey(
             prefixTable('sharekeys_items'),
@@ -49,8 +49,8 @@ 
      * @param array $taskData
      */
     private function generateUserFileKeys($taskData) {    
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
-        foreach($taskData['files_keys'] as $file) {
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        foreach ($taskData['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_files'),
                 0,
@@ -70,9 +70,9 @@ 
      * @param array $arguments
      */
     private function generateUserFieldKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
-        foreach($arguments['fields_keys'] as $field) {
-            $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG');
+        if (LOG_TASKS === true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        foreach ($arguments['fields_keys'] as $field) {
+            $this->logger->log('Processing generateUserFieldKeys for: '.$field['object_id'], 'DEBUG');
             storeUsersShareKey(
                 prefixTable('sharekeys_fields'),
                 0,

Braces +9 added lines, -3 removed lines

@@ -29,7 +29,9 @@ 
 trait ItemHandlerTrait {    
 
     private function generateUserPasswordKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserPasswordKeys : '.print_r($arguments, true), 'DEBUG');
+        }
         // Generate keys for user passwords   
         storeUsersShareKey(
             prefixTable('sharekeys_items'),
@@ -49,7 +51,9 @@ 
      * @param array $taskData
      */
     private function generateUserFileKeys($taskData) {    
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserFileKeys : '.print_r($taskData, true), 'DEBUG');
+        }
         foreach($taskData['files_keys'] as $file) {
             storeUsersShareKey(
                 prefixTable('sharekeys_files'),
@@ -70,7 +74,9 @@ 
      * @param array $arguments
      */
     private function generateUserFieldKeys($arguments) {
-        if (LOG_TASKS=== true) $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        if (LOG_TASKS=== true) {
+            $this->logger->log('Processing generateUserFieldKeys : '.print_r($arguments, true), 'DEBUG');
+        }
         foreach($arguments['fields_keys'] as $field) {
             $this->logger->log('Processing generateUserFieldKeys for: ' . $field['object_id'], 'DEBUG');
             storeUsersShareKey(

scripts/task_maintenance_users_personal_folder.php

Spacing +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
     //get through all users with enabled personnal folder.
     $users = DB::query(
         'SELECT id, login, email
-        FROM ' . prefixTable('users') . '
+        FROM ' . prefixTable('users').'
         WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
         AND personal_folder = 1
         ORDER BY login ASC'
@@ -89,7 +89,7 @@ 
         //if folder doesn't exist then create it
         $data = DB::queryFirstRow(
             'SELECT id
-            FROM ' . prefixTable('nested_tree') . '
+            FROM ' . prefixTable('nested_tree').'
             WHERE title = %s AND parent_id = %i',
             $user['id'],
             0