nilsteampassnet / TeamPass

api/Model/Operation.php

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                 "error" => '',
             );
     
-        }catch (Exception $e) {    
+        } catch (Exception $e) {    
             return false;
         }
     }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
                 "error" => '',
             );
     
-        }catch (Exception $e) {    
+        } catch (Exception $e) {    
             return false;
         }
     }

api/Model/FolderModel.php

Indentation +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
         $ret = [];
 
         foreach ($rows as $row) {
-			$isVisible = in_array((int) $row['id'], $foldersId);
+            $isVisible = in_array((int) $row['id'], $foldersId);
             $childrens = $this->getFoldersChildren($row['id'], $foldersId);
 
             if ($isVisible || count($childrens) > 0) {
@@ -43,7 +43,7 @@ 
                     [
                         'id' => (int) $row['id'],
                         'title' => $row['title'],
-						'isVisible' => $isVisible,
+                        'isVisible' => $isVisible,
                         'childrens' => $childrens
                     ]
                 );
@@ -63,7 +63,7 @@ 
 
         if ( count($childrens) > 0) {
             foreach ($childrens as $children) {
-				$isVisible = in_array((int) $children['id'], $foldersId);
+                $isVisible = in_array((int) $children['id'], $foldersId);
                 $childs = $this->getFoldersChildren($children['id'], $foldersId);
 
                 if (in_array((int) $children['id'], $foldersId) || count($childs) > 0) {
@@ -72,7 +72,7 @@ 
                         [
                             'id' => (int) $children['id'],
                             'title' => $children['title'],
-							'isVisible' => $isVisible,
+                            'isVisible' => $isVisible,
                             'childrens' => $childs
                         ]
                     );

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';

sources/users.queries.php

Braces +3 added lines, -1 removed lines

@@ -2603,7 +2603,9 @@
             }
             
             foreach ($results as $adUser) {
-                if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue;
+                if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) {
+                    continue;
+                }
                 // Build the list of all groups in AD
                 if (isset($adUser['memberof']) === true) {
                     foreach($adUser['memberof'] as $j => $adUserGroup) {

Spacing +80 added lines, -80 removed lines

@@ -73,7 +73,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -144,7 +144,7 @@ 
 
         // Get info about user to modify
         $targetUserInfos = DB::queryfirstrow(
-            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+            'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
             WHERE id = %i',
             (int) $dataReceived['user_id']
         );
@@ -264,7 +264,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s
                 AND deleted_at IS NULL',
                 $login
@@ -483,7 +483,7 @@ 
 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
-                'SELECT login, admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT login, admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -517,7 +517,7 @@ 
                 );
                 // delete personal folder and subfolders
                 $data = DB::queryfirstrow(
-                    'SELECT id FROM ' . prefixTable('nested_tree') . '
+                    'SELECT id FROM '.prefixTable('nested_tree').'
                     WHERE title = %s AND personal_folder = %i',
                     $post_id,
                     '1'
@@ -530,7 +530,7 @@ 
                         DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                         // delete items & logs
                         $items = DB::query(
-                            'SELECT id FROM ' . prefixTable('items') . '
+                            'SELECT id FROM '.prefixTable('items').'
                             WHERE id_tree=%i AND perso = %i',
                             $folder->id,
                             '1'
@@ -554,7 +554,7 @@ 
                 // Delete any process related to user
                 $processes = DB::query(
                     'SELECT increment_id
-                    FROM ' . prefixTable('background_tasks') . '
+                    FROM ' . prefixTable('background_tasks').'
                     WHERE JSON_EXTRACT(arguments, "$.new_user_id") = %i',
                     $post_id
                 );
@@ -607,7 +607,7 @@ 
             $return = array();
             // Check if folder exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('nested_tree') . '
+                'SELECT * FROM '.prefixTable('nested_tree').'
                 WHERE title = %s AND parent_id = %i',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                 '0'
@@ -620,7 +620,7 @@ 
             }
             // Check if role exists
             $data = DB::query(
-                'SELECT * FROM ' . prefixTable('roles_title') . '
+                'SELECT * FROM '.prefixTable('roles_title').'
                 WHERE title = %s',
                 filter_input(INPUT_POST, 'domain', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
             );
@@ -649,7 +649,7 @@ 
             // Get info about user to delete
             $data_user = DB::queryfirstrow(
                 'SELECT admin, isAdministratedByRole, gestionnaire
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_user_id
             );
@@ -705,7 +705,7 @@ 
             // Get info about user
             $rowUser = DB::queryfirstrow(
                 'SELECT *
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -730,7 +730,7 @@ 
                 $selected = '';
                 $users_functions = array_filter(array_unique(explode(';', empty($rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups']) === true ? '' : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups'])));
 
-                $rows = DB::query('SELECT id,title,creator_id FROM ' . prefixTable('roles_title'));
+                $rows = DB::query('SELECT id,title,creator_id FROM '.prefixTable('roles_title'));
                 foreach ($rows as $record) {
                     if (
                         (int) $session->get('user-admin') === 1
@@ -765,7 +765,7 @@ 
                 $rolesList = array();
                 $managedBy = array();
                 $selected = '';
-                $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+                $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
                 foreach ($rows as $reccord) {
                     $rolesList[$reccord['id']] = array('id' => $reccord['id'], 'title' => $reccord['title']);
                 }
@@ -796,7 +796,7 @@ 
                         array_push(
                             $managedBy,
                             array(
-                                'title' => $lang->get('managers_of') . ' ' . $fonction['title'],
+                                'title' => $lang->get('managers_of').' '.$fonction['title'],
                                 'id' => $fonction['id'],
                                 'selected' => $selected,
                             )
@@ -878,9 +878,9 @@ 
 
                 // get USER STATUS
                 if ($rowUser['disabled'] == 1) {
-                    $arrData['info'] = $lang->get('user_info_locked') . '<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">' . $lang->get('user_info_unlock_question') . '</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">' . $lang->get('user_info_delete_question') . '</label>';
+                    $arrData['info'] = $lang->get('user_info_locked').'<br><input type="checkbox" value="unlock" name="1" class="chk">&nbsp;<label for="1">'.$lang->get('user_info_unlock_question').'</label><br><input type="checkbox"  value="delete" id="account_delete" class="chk mr-2" name="2" onclick="confirmDeletion()">label for="2">'.$lang->get('user_info_delete_question').'</label>';
                 } else {
-                    $arrData['info'] = $lang->get('user_info_active') . '<br><input type="checkbox" value="lock" class="chk">&nbsp;' . $lang->get('user_info_lock_question');
+                    $arrData['info'] = $lang->get('user_info_active').'<br><input type="checkbox" value="lock" class="chk">&nbsp;'.$lang->get('user_info_lock_question');
                 }
 
                 $arrData['error'] = false;
@@ -967,7 +967,7 @@ 
 
             // Get info about user to modify
             $data_user = DB::queryfirstrow(
-                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, gestionnaire, can_manage_all_users, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -978,7 +978,7 @@ 
                 // count number of admins
                 $users = DB::query(
                     'SELECT id
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = 1 AND email != "" AND pw != "" AND id != %i',
                     $post_id
                 );
@@ -1001,7 +1001,7 @@ 
             // Exclude roles from AD - PR #3635
             $adRoles = DB::query(
                 'SELECT roles_from_ad_groups
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             )[0]['roles_from_ad_groups'];
@@ -1105,7 +1105,7 @@ 
                     );
                     // delete personal folder and subfolders
                     $data = DB::queryfirstrow(
-                        'SELECT id FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id FROM '.prefixTable('nested_tree').'
                         WHERE title = %s AND personal_folder = %i',
                         $post_id,
                         '1'
@@ -1118,7 +1118,7 @@ 
                             DB::delete(prefixTable('nested_tree'), 'id = %i AND personal_folder = %i', $folder->id, '1');
                             // delete items & logs
                             $items = DB::query(
-                                'SELECT id FROM ' . prefixTable('items') . '
+                                'SELECT id FROM '.prefixTable('items').'
                                 WHERE id_tree=%i AND perso = %i',
                                 $folder->id,
                                 '1'
@@ -1139,7 +1139,7 @@ 
                 } else {
                     // Get old data about user
                     $oldData = DB::queryfirstrow(
-                        'SELECT * FROM ' . prefixTable('users') . '
+                        'SELECT * FROM '.prefixTable('users').'
                         WHERE id = %i',
                         $post_id
                     );
@@ -1176,7 +1176,7 @@ 
 
                     // update LOG
                     if ($oldData['email'] !== $post_email) {
-                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:' . $oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id);
+                        logEvents($SETTINGS, 'user_mngt', 'at_user_email_changed:'.$oldData['email'], (string) $session->get('user-id'), $session->get('user-login'), $post_id);
                     }
                 }
                 echo prepareExchangedData(
@@ -1224,7 +1224,7 @@ 
             }
 
             DB::queryfirstrow(
-                'SELECT * FROM ' . prefixTable('users') . '
+                'SELECT * FROM '.prefixTable('users').'
                 WHERE login = %s
                 AND deleted_at IS NULL',
                 filter_input(INPUT_POST, 'login', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
@@ -1276,7 +1276,7 @@ 
             // get User info
             $rowUser = DB::queryFirstRow(
                 'SELECT login, name, lastname, email, disabled, fonction_id, groupes_interdits, groupes_visibles, isAdministratedByRole, avatar_thumb, roles_from_ad_groups
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -1286,7 +1286,7 @@ 
             $html = '';
 
             if (isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
-                $rowUser['fonction_id'] = empty($rowUser['fonction_id'])  === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id']. ';' . $rowUser['roles_from_ad_groups'];
+                $rowUser['fonction_id'] = empty($rowUser['fonction_id']) === true ? $rowUser['roles_from_ad_groups'] : $rowUser['fonction_id'].';'.$rowUser['roles_from_ad_groups'];
             }
             $arrData['functions'] = array_filter(explode(';', $rowUser['fonction_id']));
             $arrData['allowed_folders'] = array_filter(explode(';', $rowUser['groupes_visibles']));
@@ -1297,7 +1297,7 @@ 
                 // refine folders based upon roles
                 $rows = DB::query(
                     'SELECT folder_id, type
-                    FROM ' . prefixTable('roles_values') . '
+                    FROM ' . prefixTable('roles_values').'
                     WHERE role_id IN %ls
                     ORDER BY folder_id ASC',
                     $arrData['functions']
@@ -1320,7 +1320,7 @@ 
                 }
 
                 // add allowed folders
-                foreach($arrData['allowed_folders'] as $Fld) {
+                foreach ($arrData['allowed_folders'] as $Fld) {
                     array_push($arrFolders, array('id' => $Fld, 'type' => 'W', 'special' => true));
                 }
                 
@@ -1331,7 +1331,7 @@ 
                             // get folder name
                             $row = DB::queryFirstRow(
                                 'SELECT title, nlevel, id
-                                FROM ' . prefixTable('nested_tree') . '
+                                FROM ' . prefixTable('nested_tree').'
                                 WHERE id = %i',
                                 $fld['id']
                             );
@@ -1344,38 +1344,38 @@ 
 
                             // manage right icon
                             if ($fld['type'] == 'W') {
-                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="' . $lang->get('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-success mr-2" title="'.$lang->get('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>';
                             } elseif ($fld['type'] == 'ND') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-success mr-2" title="' . $lang->get('edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-success mr-2" title="'.$lang->get('edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>';
                             } elseif ($fld['type'] == 'NE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-success" title="' . $lang->get('delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-success" title="'.$lang->get('delete').'"></i>';
                             } elseif ($fld['type'] == 'NDNE') {
-                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="' . $lang->get('write') . '"></i>' .
-                                    '<i class="fas fa-edit infotip text-danger mr-2" title="' . $lang->get('no_edit') . '"></i>' .
-                                    '<i class="fas fa-eraser infotip text-danger" title="' . $lang->get('no_delete') . '"></i>';
+                                $label = '<i class="fas fa-indent infotip text-warning mr-2" title="'.$lang->get('write').'"></i>'.
+                                    '<i class="fas fa-edit infotip text-danger mr-2" title="'.$lang->get('no_edit').'"></i>'.
+                                    '<i class="fas fa-eraser infotip text-danger" title="'.$lang->get('no_delete').'"></i>';
                             } elseif ($fld['type'] == '') {
-                                $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="' . $lang->get('no_access') . '"></i>';
+                                $label = '<i class="fas fa-eye-slash infotip text-danger mr-2" title="'.$lang->get('no_access').'"></i>';
                             } else {
-                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="' . $lang->get('read') . '"></i>';
+                                $label = '<i class="fas fa-eye infotip text-info mr-2" title="'.$lang->get('read').'"></i>';
                             }
 
-                            $html .= '<tr><td>' . $ident . $row['title'] .
-                                ' <small class="text-info">[' . $row['id'] . ']</small>'.
-                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="' . $lang->get('user_specific_right') . '"></i>' : '').
-                                '</td><td>' . $label . '</td></tr>';
+                            $html .= '<tr><td>'.$ident.$row['title'].
+                                ' <small class="text-info">['.$row['id'].']</small>'.
+                                ($fld['special'] === true ? '<i class="fas fa-user-tag infotip text-primary ml-5" title="'.$lang->get('user_specific_right').'"></i>' : '').
+                                '</td><td>'.$label.'</td></tr>';
                             break;
                         }
                     }
                 }
 
-                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>' .
-                    $html . '</tbody></table>';
+                $html_full = '<table id="table-folders" class="table table-bordered table-striped dt-responsive nowrap" style="width:100%"><tbody>'.
+                    $html.'</tbody></table>';
             } else {
                 $html_full = '';
             }
@@ -1421,7 +1421,7 @@ 
             if ((int) $session->get('user-admin') === 0 && (int) $session->get('user-can_manage_all_users') === 0) {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i AND isAdministratedByRole IN %ls',
                     '0',
                     array_filter($session->get('user-roles_array'))
@@ -1429,7 +1429,7 @@ 
             } else {
                 $rows = DB::query(
                     'SELECT *
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE admin = %i',
                     '0'
                 );
@@ -1441,7 +1441,7 @@ 
                 $groupIds = [];
                 foreach (explode(';', $record['fonction_id']) as $group) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                        'SELECT id, title FROM '.prefixTable('roles_title').'
                         WHERE id = %i',
                         $group
                     );
@@ -1453,7 +1453,7 @@ 
 
                 // Get managed_by
                 $managedBy = DB::queryfirstrow(
-                    'SELECT id, title FROM ' . prefixTable('roles_title') . '
+                    'SELECT id, title FROM '.prefixTable('roles_title').'
                     WHERE id = %i',
                     $record['isAdministratedByRole']
                 );
@@ -1463,7 +1463,7 @@ 
                 $foldersAllowedIds = [];
                 foreach (explode(';', $record['groupes_visibles']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1476,7 +1476,7 @@ 
                 $foldersForbiddenIds = [];
                 foreach (explode(';', $record['groupes_interdits']) as $role) {
                     $tmp = DB::queryfirstrow(
-                        'SELECT id, title FROM ' . prefixTable('nested_tree') . '
+                        'SELECT id, title FROM '.prefixTable('nested_tree').'
                         WHERE id = %i',
                         $role
                     );
@@ -1494,7 +1494,7 @@ 
                         'login' => $record['login'],
                         'groups' => implode(', ', $groups),
                         'groupIds' => $groupIds,
-                        'managedBy' => $managedBy=== null ? $lang->get('administrator') : $managedBy['title'],
+                        'managedBy' => $managedBy === null ? $lang->get('administrator') : $managedBy['title'],
                         'managedById' => $managedBy === null ? 0 : $managedBy['id'],
                         'foldersAllowed' => implode(', ', $foldersAllowed),
                         'foldersAllowedIds' => $foldersAllowedIds,
@@ -1595,7 +1595,7 @@ 
 
             // Get info about user
             $data_user = DB::queryfirstrow(
-                'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+                'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
                 WHERE id = %i',
                 $inputData['source_id']
             );
@@ -1797,14 +1797,14 @@ 
             if (empty($post_context) === false && $post_context === 'add_one_role_to_user') {
                 $data_user = DB::queryfirstrow(
                     'SELECT fonction_id, public_key
-                    FROM ' . prefixTable('users') . '
+                    FROM ' . prefixTable('users').'
                     WHERE id = %i',
                     $post_user_id
                 );
 
                 if ($data_user) {
                     // Ensure array is unique
-                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']) . ';' . $post_new_value;
+                    $post_new_value = str_replace(',', ';', $data_user['fonction_id']).';'.$post_new_value;
                     $post_new_value = implode(';', array_unique(explode(';', $post_new_value)));
                 } else {
                     // User not found
@@ -1820,14 +1820,14 @@ 
             }
 
             // Manage specific case of api key
-            if($post_field === 'user_api_key') {
+            if ($post_field === 'user_api_key') {
                 $encrypted_key = encryptUserObjectKey(base64_encode($post_new_value), $session->get('user-public_key'));
                 $session->set('user-api_key', $post_new_value);
 
                 // test if user has an api key
                 $data_user = DB::queryfirstrow(
                     'SELECT value
-                    FROM ' . prefixTable('api') . '
+                    FROM ' . prefixTable('api').'
                     WHERE user_id = %i',
                     $post_user_id
                 );
@@ -1947,7 +1947,7 @@ 
             } catch (\LdapRecord\Auth\BindException $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 it is encrypted before sending
                 echo prepareExchangedData(
@@ -1977,7 +1977,7 @@ 
             } catch (\LdapRecord\Auth\BindException $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 it is encrypted before sending
                 echo prepareExchangedData(
@@ -1994,7 +1994,7 @@ 
                 if (isset($adUser[$SETTINGS['ldap_user_attribute']][0]) === false) continue;
                 // Build the list of all groups in AD
                 if (isset($adUser['memberof']) === true) {
-                    foreach($adUser['memberof'] as $j => $adUserGroup) {
+                    foreach ($adUser['memberof'] as $j => $adUserGroup) {
                         if (empty($adUserGroup) === false && $j !== "count") {
                             $adGroup = substr($adUserGroup, 3, strpos($adUserGroup, ',') - 3);
                             if (in_array($adGroup, $adRoles) === false && empty($adGroup) === false) {
@@ -2010,7 +2010,7 @@ 
                     // Get his ID
                     $userInfo = DB::queryfirstrow(
                         'SELECT id, login, fonction_id, auth_type
-                        FROM ' . prefixTable('users') . '
+                        FROM ' . prefixTable('users').'
                         WHERE login = %s',
                         $userLogin
                     );
@@ -2046,7 +2046,7 @@ 
 
             // Get all groups in Teampass
             $teampassRoles = array();
-            $rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title'));
+            $rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title'));
             foreach ($rows as $record) {
                 array_push(
                     $teampassRoles,
@@ -2110,7 +2110,7 @@ 
             // Check if user already exists
             $data = DB::query(
                 'SELECT id, fonction_id, groupes_interdits, groupes_visibles
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE login = %s',
                 $post_login
             );
@@ -2287,7 +2287,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2373,7 +2373,7 @@ 
             // Check if user already exists
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 $post_id
             );
@@ -2440,7 +2440,7 @@ 
             // Search TP_USER in db        
             $userTP = DB::queryFirstRow(
                 'SELECT pw
-                FROM ' . prefixTable('users') . '
+                FROM ' . prefixTable('users').'
                 WHERE id = %i',
                 TP_USER_ID
             );
@@ -2462,8 +2462,8 @@ 
                     'process_type' => 'create_user_keys',
                     'arguments' => json_encode([
                         'new_user_id' => (int) $post_user_id,
-                        'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '','encrypt', $SETTINGS)['string'],
-                        'new_user_code' => cryption($post_user_code, '','encrypt', $SETTINGS)['string'],
+                        'new_user_pwd' => empty($post_user_pwd) === true ? '' : cryption($post_user_pwd, '', 'encrypt', $SETTINGS)['string'],
+                        'new_user_code' => cryption($post_user_code, '', 'encrypt', $SETTINGS)['string'],
                         'owner_id' => (int) TP_USER_ID,
                         'creator_pwd' => $userTP['pw'],
                         'email_body' => $lang->get('email_body_user_config_5'),
@@ -2638,8 +2638,8 @@ 
             // get user info
             $processesProgress = DB::query(
                 'SELECT u.ongoing_process_id, pt.task, pt.updated_at, pt.finished_at, pt.is_in_progress
-                FROM ' . prefixTable('users') . ' AS u
-                INNER JOIN ' . prefixTable('background_subtasks') . ' AS pt ON (pt.task_id = u.ongoing_process_id)
+                FROM ' . prefixTable('users').' AS u
+                INNER JOIN ' . prefixTable('background_subtasks').' AS pt ON (pt.task_id = u.ongoing_process_id)
                 WHERE u.id = %i',
                 $user_id
             );
@@ -2647,9 +2647,9 @@ 
             //print_r($processesProgress);
             $finished_steps = 0;
             $nb_steps = count($processesProgress);
-            foreach($processesProgress as $process) {
+            foreach ($processesProgress as $process) {
                 if ((int) $process['is_in_progress'] === -1) {
-                    $finished_steps ++;
+                    $finished_steps++;
                 }
             }
 
@@ -2658,7 +2658,7 @@ 
                     'error' => false,
                     'message' => '',
                     'user_id' => $user_id,
-                    'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps/$nb_steps*100, 0).'%',
+                    'status' => $finished_steps === $nb_steps ? 'finished' : number_format($finished_steps / $nb_steps * 100, 0).'%',
                     'debug' => $finished_steps.",".$nb_steps,
                 ),
                 'encode'
@@ -2722,7 +2722,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );
@@ -2756,7 +2756,7 @@ 
             logEvents(
                 $SETTINGS,
                 'user_mngt',
-                'at_user_new_' . $value[0] . ':' . $value[1],
+                'at_user_new_'.$value[0].':'.$value[1],
                 (string) $session->get('user-id'),
                 $session->get('user-login'),
                 filter_input(INPUT_POST, 'id', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
@@ -2790,7 +2790,7 @@ 
 
     // Get info about user
     $data_user = DB::queryfirstrow(
-        'SELECT admin, isAdministratedByRole FROM ' . prefixTable('users') . '
+        'SELECT admin, isAdministratedByRole FROM '.prefixTable('users').'
         WHERE id = %i',
         $value[1]
     );

api/Controller/Api/AuthController.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
         $arrQueryStringParams = $this->getQueryStringParams();
 
         if (strtoupper($requestMethod) === 'POST') {
-            require API_ROOT_PATH . "/Model/AuthModel.php";
+            require API_ROOT_PATH."/Model/AuthModel.php";
             try {
                 $authModel = new AuthModel();
                 $arrUser = $authModel->getUserAuth(
@@ -50,7 +50,7 @@ 
                 if (array_key_exists("token", $arrUser)) {
                     $responseData = json_encode($arrUser);
                 } else {
-                    $strErrorDesc = $arrUser['error'] . " (" . $arrUser['info'] . ")";
+                    $strErrorDesc = $arrUser['error']." (".$arrUser['info'].")";
                     $strErrorHeader = 'HTTP/1.1 401 Unauthorized';
                 }
             } catch (Error $e) {

pages/statistics.php

Spacing +1 added lines, -1 removed lines

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

pages/folders.php

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('folders') === 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;
 }
 
@@ -99,28 +99,28 @@ 
 $complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">';
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
-$complexityHtml .= $complexitySelect . '</select></div>';
+$complexityHtml .= $complexitySelect.'</select></div>';
 
 /* Get full tree structure */
 $tst = $tree->getDescendants();
 // prepare options list
-$droplist = '<option value="na">---' . $lang->get('select') . '---</option>';
+$droplist = '<option value="na">---'.$lang->get('select').'---</option>';
 if ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_create_root_folder') === 1) {
-    $droplist .= '<option value="0">' . $lang->get('root') . '</option>';
+    $droplist .= '<option value="0">'.$lang->get('root').'</option>';
 }
 foreach ($tst as $t) {
     if (
         in_array($t->id, $session->get('user-accessible_folders')) === true
         && in_array($t->id, $session->get('user-personal_visible_folders')) === false
     ) {
-        $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title);
+        $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title);
         $text = '';
         foreach ($tree->getPath($t->id, false) as $fld) {
-            $text .= empty($text) === true ? '     [' . $fld->title : ' > ' . $fld->title;
+            $text .= empty($text) === true ? '     ['.$fld->title : ' > '.$fld->title;
         }
-        $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>';
+        $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>';
     }
 }
 
@@ -199,14 +199,14 @@ 
                                     <label><?php echo $lang->get('icon'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon" data-field="icon">
                                     <small class='form-text text-muted'>
-                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
                                     <label><?php echo $lang->get('icon_on_selection'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon-selected" data-field="iconSelected">
                                     <small class='form-text text-muted'>
-                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
@@ -297,7 +297,7 @@ 
                                 <th scope="col" min-width="200px"><?php echo $lang->get('group'); ?></th>
                                 <th scope="col" min-width="200px"><?php echo $lang->get('group_parent'); ?></th>
                                 <th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo $lang->get('password_strength'); ?>"></i></th>
-                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration') . ' ' . $lang->get('group_pw_duration_tip'); ?>"></i></th>
+                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration').' '.$lang->get('group_pw_duration_tip'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo $lang->get('auth_creation_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo $lang->get('auth_modification_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-folder fa-lg infotip" title="<?php echo $lang->get('icon'); ?>"></i></th>

pages/users.js.php

Spacing +10 added lines, -10 removed lines

@@ -70,7 +70,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === 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;
 }
 ?>
@@ -302,8 +302,8 @@ 
         if (store.get('teampassApplication').formUserAction === "add_new_user") {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>',
-                'body': '<?php echo $lang->get('email_body_new_user');?>',
+                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>',
+                'body': '<?php echo $lang->get('email_body_new_user'); ?>',
                 'pre_replace' : {
                     '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                     '#login#' : store.get('teampassUser').admin_new_user_login,
@@ -313,8 +313,8 @@ 
         } else {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>',
-                'body': '<?php echo $lang->get('email_body_temporary_encryption_code');?>',
+                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>',
+                'body': '<?php echo $lang->get('email_body_temporary_encryption_code'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                 }
@@ -567,14 +567,14 @@ 
             }
             // Inform user
             $("#warningModalBody").html('<b><?php echo $lang->get('encryption_keys'); ?> - ' +
-                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
+                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
                 '... <?php echo $lang->get('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             // If expected, show the OPT to the admin
             if (constVisibleOTP === true) {
                 toastr.info(
-                    '<?php echo $lang->get('show_encryption_code_to_admin');?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>'
-                    + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close');?></button>',
+                    '<?php echo $lang->get('show_encryption_code_to_admin'); ?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>'
+                    + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close'); ?></button>',
                     '<?php echo $lang->get('information'); ?>',
                     {
                         extendedTimeOut: 0,
@@ -593,7 +593,7 @@ 
             var data = {
                 action: step,
                 start: start,
-                length: <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                 user_id: userId,
             }
             if (debugJavascript === true) {
@@ -1401,7 +1401,7 @@ 
                         } else {
                             // Show icon or not
                             if ($('#user-disabled').prop('checked') === true) {
-                                $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked');?>" id="user-disable-'+userID+'"></i>');
+                                $('#user-login-'+userID).before('<i class="fas fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>');
                             } else {
                                 $('#user-disable-'+userID).remove();
                             }

pages/uploads.js.php

Spacing +1 added lines, -1 removed lines

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

pages/emails.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('emails') === 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;
 }
 
@@ -244,7 +244,7 @@ 
                     <div class="card-body">
                         <div id="unsent-emails">
                             <?php
-                            DB::query('SELECT * FROM ' . prefixTable('emails') . ' WHERE status = %s OR status = %s', 'not_sent', '');
+                            DB::query('SELECT * FROM '.prefixTable('emails').' WHERE status = %s OR status = %s', 'not_sent', '');
 echo str_replace('#nb_emails#', (string) DB::count(), $lang->get('email_send_backlog'));
                             ?>
                         </div>