nilsteampassnet / TeamPass

api/Controller/Api/ItemController.php

Spacing +4 added lines, -4 removed lines

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

index.php

Spacing +180 added lines, -180 removed lines

@@ -73,7 +73,7 @@ 
 csrfProtector::init();
 
 // Load functions
-require_once __DIR__. '/includes/config/include.php';
+require_once __DIR__.'/includes/config/include.php';
 require_once __DIR__.'/sources/main.functions.php';
 
 // init
@@ -107,7 +107,7 @@ 
 $SETTINGS = $antiXss->xss_clean($SETTINGS);
 
 // Load Core library
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
 // Prepare POST variables
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 $session_user_language = $session->get('user-language');
@@ -146,8 +146,8 @@ 
     //get default language
     $dataLanguage = DB::queryFirstRow(
         'SELECT m.valeur AS valeur, l.flag AS flag
-        FROM ' . prefixTable('misc') . ' AS m
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
+        FROM ' . prefixTable('misc').' AS m
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
         [
             'type' => 'admin',
@@ -178,7 +178,7 @@ 
         $session_user_language = $SETTINGS['default_language'];
     }
 }
-$lang = new Language($session_user_language, __DIR__. '/includes/language/'); 
+$lang = new Language($session_user_language, __DIR__.'/includes/language/'); 
 
 if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') {
     $SETTINGS['cpassman_dir'] = __DIR__;
@@ -252,29 +252,29 @@ 
     </script>
 
     <!-- IonIcons -->
-    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Theme style -->
-    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
+    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
     <!-- Theme style -->
-    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Google Font: Source Sans Pro -->
-    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Altertify -->
-    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
+    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
     <!-- Toastr -->
-    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
+    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
     <!-- favicon -->
-    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/>
+    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/>
     <!-- manifest (PWA) -->
-    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Custom style -->
     <?php
-    if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?>
-        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?>
+        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <?php
     } ?>
 </head>
@@ -322,7 +322,7 @@ 
                         <div class="dropdown show">
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
                                 <?php
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
                             </a>
 
                             <div class="dropdown-menu dropdown-menu-right">
@@ -346,7 +346,7 @@ 
                                     </a>
                                 <?php
                                     } ?>
-                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys">
+                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys">
                                     <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?>
                                 </a>
 
@@ -380,7 +380,7 @@ 
             <!-- Main Sidebar Container -->
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
                 <!-- Brand Logo -->
-                <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
+                <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
                 </a>
@@ -398,20 +398,20 @@ 
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-key"></i>
                         <p>
-                            ' . $lang->get('pw') . '
+                            ' . $lang->get('pw').'
                         </p>
                         </a>
                     </li>';
                                 }
 
     // IMPORT menu
-    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1&& $session_user_admin === 0) {
+    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1 && $session_user_admin === 0) {
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-file-import"></i>
                         <p>
-                            ' . $lang->get('import') . '
+                            ' . $lang->get('import').'
                         </p>
                         </a>
                     </li>';
@@ -432,7 +432,7 @@ 
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-file-export"></i>
                         <p>
-                            ' . $lang->get('export') . '
+                            ' . $lang->get('export').'
                         </p>
                         </a>
                     </li>';
@@ -459,7 +459,7 @@ 
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-search"></i>
                         <p>
-                            ' . $lang->get('find') . '
+                            ' . $lang->get('find').'
                         </p>
                         </a>
                     </li>';
@@ -475,7 +475,7 @@ 
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-star"></i>
                         <p>
-                            ' . $lang->get('favorites') . '
+                            ' . $lang->get('favorites').'
                         </p>
                         </a>
                     </li>';
@@ -505,7 +505,7 @@ 
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-lightbulb"></i>
                         <p>
-                            ' . $lang->get('suggestion_menu') . '
+                            ' . $lang->get('suggestion_menu').'
                         </p>
                         </a>
                     </li>';
@@ -518,7 +518,7 @@ 
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-info"></i>
                         <p>
-                            ' . $lang->get('admin_main') . '
+                            ' . $lang->get('admin_main').'
                         </p>
                         </a>
                     </li>
@@ -526,7 +526,7 @@ 
                         <a href="#" class="nav-link">
                             <i class="nav-icon fa-solid fa-wrench"></i>
                             <p>
-                                ' . $lang->get('admin_settings') . '
+                                ' . $lang->get('admin_settings').'
                                 <i class="fa-solid fa-angle-left right"></i>
                             </p>
                         </a>
@@ -534,63 +534,63 @@ 
                             <li class="nav-item">
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
                                     <i class="fa-solid fa-check-double nav-icon"></i>
-                                    <p>' . $lang->get('options') . '</p>
+                                    <p>' . $lang->get('options').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
                                     <i class="fa-solid fa-qrcode nav-icon"></i>
-                                    <p>' . $lang->get('mfa_short') . '</p>
+                                    <p>' . $lang->get('mfa_short').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
                                     <i class="fa-solid fa-cubes nav-icon"></i>
-                                    <p>' . $lang->get('api') . '</p>
+                                    <p>' . $lang->get('api').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
                                     <i class="fa-solid fa-database nav-icon"></i>
-                                    <p>' . $lang->get('backups') . '</p>
+                                    <p>' . $lang->get('backups').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
                                     <i class="fa-solid fa-envelope nav-icon"></i>
-                                    <p>' . $lang->get('emails') . '</p>
+                                    <p>' . $lang->get('emails').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
                                     <i class="fa-solid fa-keyboard nav-icon"></i>
-                                    <p>' . $lang->get('fields') . '</p>
+                                    <p>' . $lang->get('fields').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
                                     <i class="fa-solid fa-id-card nav-icon"></i>
-                                    <p>' . $lang->get('ldap') . '</p>
+                                    <p>' . $lang->get('ldap').'</p>
                                 </a>
                             </li>
 
                             <li class="nav-item">
                                 <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '">
                                     <i class="fa-solid fa-plug nav-icon"></i>
-                                    <p>' . $lang->get('oauth') . '</p>
+                                    <p>' . $lang->get('oauth').'</p>
                                 </a>
                             </li>
                             
                             <li class="nav-item">
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
                                     <i class="fa-solid fa-file-upload nav-icon"></i>
-                                    <p>' . $lang->get('uploads') . '</p>
+                                    <p>' . $lang->get('uploads').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
                                     <i class="fa-solid fa-chart-bar nav-icon"></i>
-                                    <p>' . $lang->get('statistics') . '</p>
+                                    <p>' . $lang->get('statistics').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -601,7 +601,7 @@ 
                     <li class="nav-item">
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
                         <i class="fa-solid fa-tasks nav-icon"></i>
-                        <p>' . $lang->get('tasks') . '</p>
+                        <p>' . $lang->get('tasks').'</p>
                         </a>
                     </li>';
         }
@@ -612,7 +612,7 @@ 
                         <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-screwdriver-wrench"></i>
                         <p>
-                            ' . $lang->get('tools') . '
+                            ' . $lang->get('tools').'
                         </p>
                         </a>
                     </li>';
@@ -629,7 +629,7 @@ 
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-folder-open"></i>
                         <p>
-                            ' . $lang->get('folders') . '
+                            ' . $lang->get('folders').'
                         </p>
                         </a>
                     </li>
@@ -637,7 +637,7 @@ 
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-graduation-cap"></i>
                         <p>
-                            ' . $lang->get('roles') . '
+                            ' . $lang->get('roles').'
                         </p>
                         </a>
                     </li>
@@ -645,38 +645,38 @@ 
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
                         <i class="nav-icon fa-solid fa-users"></i>
                         <p>
-                            ' . $lang->get('users') . '
+                            ' . $lang->get('users').'
                         </p>
                         </a>
                     </li>
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
                         <a href="#" class="nav-link">
                         <i class="nav-icon fa-solid fa-cubes"></i>
-                        <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p>
+                        <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p>
                         </a>
                         <ul class="nav nav-treeview">
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
                                 <i class="far fa-calendar-alt nav-icon"></i>
-                                <p>' . $lang->get('renewal') . '</p>
+                                <p>' . $lang->get('renewal').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
                                 <i class="fa-solid fa-trash-alt nav-icon"></i>
-                                <p>' . $lang->get('deletion') . '</p>
+                                <p>' . $lang->get('deletion').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
                                 <i class="fa-solid fa-history nav-icon"></i>
-                                <p>' . $lang->get('logs') . '</p>
+                                <p>' . $lang->get('logs').'</p>
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
                                 <i class="fa-solid fa-database nav-icon"></i>
-                                <p>' . $lang->get('database') . '</p>
+                                <p>' . $lang->get('database').'</p>
                                 </a>
                             </li>
                         </ul>
@@ -687,10 +687,10 @@ 
                     <!-- /.sidebar-menu -->
                 <div class="menu-footer">
                     <div class="" id="sidebar-footer">
-                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' .
-                            date($date_format, (int) $server['request_time']) . ' - ' .
+                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '.
+                            date($date_format, (int) $server['request_time']).' - '.
                             date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i>
-                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i>
+                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i>
                         <a href="<?php echo DOCUMENTATION_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-book mr-2 infotip" title="<?php echo $lang->get('documentation_canal'); ?>"></i></a>
                         <a href="<?php echo HELP_URL; ?>" target="_blank" class="text-info"><i class="fa-solid fa-life-ring mr-2 infotip" title="<?php echo $lang->get('admin_help'); ?>"></i></a>
                         <?php if ($session_user_admin === 1) : ?><i class="fa-solid fa-bug infotip pointer text-info" title="<?php echo $lang->get('bugs_page'); ?>" onclick="generateBugReport()"></i><?php endif; ?>
@@ -839,7 +839,7 @@ 
                                 </div>
                                 <div class="mt-3">                                    
                                     <label>
-                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password');?></span>
+                                        <span class="mr-2 pointer fw-normal"><i class="fa-solid fa-eye mr-2 text-orange"></i><?php echo $lang->get('show_user_password'); ?></span>
                                         <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer">
                                     </label>
                                 </div>
@@ -998,34 +998,34 @@ 
                     if ($get['page'] === 'items') {
                         // SHow page with Items
                         if ((int) $session_user_admin !== 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
                         } elseif ((int) $session_user_admin === 1) {
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
                         } else {
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
                         // Define if user is allowed to see management pages
                         if ($session_user_admin === 1) {
                             // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]);
+                            include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]);
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
                             if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings'
                             ) {
                                 $session->set('system-error_code', ERR_NOT_ALLOWED);
                                 //not allowed page
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
+                                include $SETTINGS['cpassman_dir'].'/error.php';
                             }
                         } else {
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
                             //not allowed page
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
+                            include $SETTINGS['cpassman_dir'].'/error.php';
                         }
-                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) {
+                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) {
                         // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php');
+                        include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php');
                     } else {
                         $session->set('system-array_roles', ERR_NOT_EXIST);
                         //page doesn't exist
@@ -1061,7 +1061,7 @@ 
             <footer class="main-footer">
                 <!-- To the right -->
                 <div class="float-right d-none d-sm-inline">
-                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>
+                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>
                 </div>
                 <!-- Default to the left -->
                 <strong>Copyright &copy; <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved.
@@ -1075,7 +1075,7 @@ 
         echo '
 <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />';
 // display an item in the context of OTV link
-} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
+} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
     && empty($get['otv']) === false
 ) {
     // case where one-shot viewer
@@ -1094,7 +1094,7 @@ 
                 FILTER_SANITIZE_URL
             )
         );
-        include $SETTINGS['cpassman_dir'] . '/error.php';
+        include $SETTINGS['cpassman_dir'].'/error.php';
     }
 } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) ||
         empty($session->get('user-id')) === true
@@ -1126,7 +1126,7 @@ 
     }
     
     // LOGIN form  
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
     
 } else {
     // Clear session
@@ -1159,155 +1159,155 @@ 
     <!-- REQUIRED SCRIPTS -->
 
     <!-- Font Awesome Icons -->
-    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
-    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
+    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
+    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
     <!-- jQuery -->
-    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
     <!-- jQuery UI -->
-    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
+    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
     <!-- Popper -->
-    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- Bootstrap -->
-    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- AdminLTE -->
-    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- Altertify -->
     <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>-->
     <!-- Toastr -->
-    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- STORE.JS -->
-    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- cryptojs-aesphp -->
-    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- pace -->
-    <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" data-pace-options='{ "ajax": true, "eventLag": false }' src="plugins/pace-progress/pace.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- clipboardjs -->
-    <script type="text/javascript" src="plugins/clipboard/clipboard.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/clipboard/clipboard.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- select2 -->
-    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- simplePassMeter -->
-    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- platform -->
-    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- radiobuttons -->
-    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
-    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
+    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- ICHECK -->
     <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">-->
-    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- bootstrap-add-clear -->
-    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <!-- DOMPurify -->
-    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
 
     <?php
     $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS);
     if ($menuAdmin === true) {
         ?>
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
         <!-- InputMask -->
-        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <!-- Sortable -->
         <!--<script src="./plugins/sortable/jquery.sortable.js"></script>-->
         <!-- PLUPLOAD -->
-        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <!-- DataTables -->
-        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-        <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+        <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <?php
     } elseif (isset($get['page']) === true) {
         if (in_array($get['page'], ['items', 'import']) === true) {
             ?>
-            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
             <!-- countdownTimer -->
-            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- SUMMERNOTE -->
-            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- date-picker -->
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- time-picker -->
-            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PLUPLOAD -->
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- VALIDATE -->
-            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PWSTRENGHT -->
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- TOGGLE -->
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
-            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
+            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
         <?php
         } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) {
             ?>
             <!-- DataTables -->
-            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/dataTables.responsive.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="./plugins/datatables/extensions/Responsive-2.2.2/js/responsive.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script type="text/javascript" src="./plugins/datatables/extensions/Scroller-1.5.0/js/dataTables.scroller.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- dater picker -->
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- daterange picker -->
-            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
-            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
+            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- SlimScroll -->
-            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- FastClick -->
-            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <?php
         } elseif ($get['page'] === 'profile') {
             ?>
             <!-- FILESAVER -->
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PLUPLOAD -->
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <?php
         } elseif ($get['page'] === 'export') {
             ?>
             <!-- FILESAVER -->
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
             <!-- PWSTRENGHT -->
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
         <?php
         }
     }
     ?>
     <!-- functions -->
-    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
-    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
+    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
     <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" />
 
     </body>
@@ -1397,65 +1397,65 @@ 
 
 // Load links, css and javascripts
 if (isset($SETTINGS['cpassman_dir']) === true) {
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
     if ($menuAdmin === true) {
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
         if ($get['page'] === '2fa') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
         } elseif ($get['page'] === 'api') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
         } elseif ($get['page'] === 'backups') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
         } elseif ($get['page'] === 'emails') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
         } elseif ($get['page'] === 'ldap') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
         } elseif ($get['page'] === 'uploads') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
         } elseif ($get['page'] === 'fields') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
         } elseif ($get['page'] === 'options') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
         } elseif ($get['page'] === 'statistics') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
         } elseif ($get['page'] === 'tasks') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php';
         } elseif ($get['page'] === 'oauth' && WIP === true) {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php';        
+            include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php';        
         } elseif ($get['page'] === 'tools') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php';
         }
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
         if ($get['page'] === 'items') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
         } elseif ($get['page'] === 'import') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
         } elseif ($get['page'] === 'export') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
         } elseif ($get['page'] === 'offline') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
         } elseif ($get['page'] === 'search') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
         } elseif ($get['page'] === 'profile') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
         } elseif ($get['page'] === 'favourites') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
         } elseif ($get['page'] === 'folders') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
         } elseif ($get['page'] === 'users') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
         } elseif ($get['page'] === 'roles') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
         } elseif ($get['page'] === 'utilities.deletion') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
         } elseif ($get['page'] === 'utilities.logs') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
         } elseif ($get['page'] === 'utilities.database') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
         } elseif ($get['page'] === 'utilities.renewal') {
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
         }
     } else {
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
     }
 }

Braces +6 added lines, -2 removed lines

@@ -81,8 +81,9 @@ 
 $session = SessionManager::getSession();
 
 // Random encryption key
-if ($session->get('key') === null)
+if ($session->get('key') === null) {
     $session->set('key', generateQuickPassword(30, false));
+}
 
 $request = SymfonyRequest::createFromGlobals();
 $configManager = new ConfigManager(__DIR__, $request->getRequestUri());
@@ -943,7 +944,10 @@ 
                                     <input type="password" class="form-control" id="dialog-ldap-user-build-keys-database-code">
                                     <br/>
                                 </div>
-                                <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') echo ' hidden'; ?>">
+                                <div class="input-group mb-3<?php if ($session_auth_type === 'oauth2') {
+    echo ' hidden';
+}
+?>">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><?php echo $lang->get('provide_your_current_password'); ?></span>
                                     </div>

sources/import.queries.php

Spacing +5 added lines, -5 removed lines

@@ -78,7 +78,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;
 }
 
@@ -166,7 +166,7 @@ 
             $lexer = new Lexer($config);
             $config->setIgnoreHeaderLine('true');
             $interpreter = new Interpreter();
-            $interpreter->addObserver(function (array $row) use (&$valuesToImport,$header) {
+            $interpreter->addObserver(function(array $row) use (&$valuesToImport, $header) {
                 $rowData = array_combine($header, $row);
                 $valuesToImport[] = array(
                     'Label' => $rowData['label'],
@@ -707,7 +707,7 @@ 
         ];
         $startPathLevel = 1;
 
-        foreach($post_folders as $folder) {
+        foreach ($post_folders as $folder) {
             // get parent id
             $parentId = $arrFolders[$folder['parentFolderId']];
 
@@ -778,7 +778,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',
@@ -1019,7 +1019,7 @@ 
     ];
 }
 
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     $prefix = 'League\\Csv\\';
     $base_dir = __DIR__.'/src/';
     $len = strlen($prefix);

api/inc/jwt_utils.php

Indentation +51 added lines, -51 removed lines

@@ -37,45 +37,45 @@ 
  * @return boolean
  */
 function is_jwt_valid($jwt) {
-	try {
-		$decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'));
+    try {
+        $decoded = (array) JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'));
 
-		// Check if expiration is reached
-		if ($decoded['exp'] - time() < 0) {
-			return false;
-		}
+        // Check if expiration is reached
+        if ($decoded['exp'] - time() < 0) {
+            return false;
+        }
 /*
 		$decoded1 = JWT::decode($jwt, new Key(DB_PASSWD, 'HS256'), $headers = new stdClass());
 		print_r($headers);
 */
 
-		return true;
-	} catch (InvalidArgumentException $e) {
-		// provided key/key-array is empty or malformed.
-		return false;
-	} catch (DomainException $e) {
-		// provided algorithm is unsupported OR
-		// provided key is invalid OR
-		// unknown error thrown in openSSL or libsodium OR
-		// libsodium is required but not available.
-		return false;
-	} catch (SignatureInvalidException $e) {
-		// provided JWT signature verification failed.
-		return false;
-	} catch (BeforeValidException $e) {
-		// provided JWT is trying to be used before "nbf" claim OR
-		// provided JWT is trying to be used before "iat" claim.
-		return false;
-	} catch (ExpiredException $e) {
-		// provided JWT is trying to be used after "exp" claim.
-		return false;
-	} catch (UnexpectedValueException $e) {
-		// provided JWT is malformed OR
-		// provided JWT is missing an algorithm / using an unsupported algorithm OR
-		// provided JWT algorithm does not match provided key OR
-		// provided key ID in key/key-array is empty or invalid.
-		return false;
-	}
+        return true;
+    } catch (InvalidArgumentException $e) {
+        // provided key/key-array is empty or malformed.
+        return false;
+    } catch (DomainException $e) {
+        // provided algorithm is unsupported OR
+        // provided key is invalid OR
+        // unknown error thrown in openSSL or libsodium OR
+        // libsodium is required but not available.
+        return false;
+    } catch (SignatureInvalidException $e) {
+        // provided JWT signature verification failed.
+        return false;
+    } catch (BeforeValidException $e) {
+        // provided JWT is trying to be used before "nbf" claim OR
+        // provided JWT is trying to be used before "iat" claim.
+        return false;
+    } catch (ExpiredException $e) {
+        // provided JWT is trying to be used after "exp" claim.
+        return false;
+    } catch (UnexpectedValueException $e) {
+        // provided JWT is malformed OR
+        // provided JWT is missing an algorithm / using an unsupported algorithm OR
+        // provided JWT algorithm does not match provided key OR
+        // provided key ID in key/key-array is empty or invalid.
+        return false;
+    }
 }
 
 function base64url_encode($data) {
@@ -84,24 +84,24 @@ 
 
 function get_authorization_header()
 {
-	$request = symfonyRequest::createFromGlobals();
-	$authorizationHeader = $request->headers->get('Authorization');
-	$headers = null;
+    $request = symfonyRequest::createFromGlobals();
+    $authorizationHeader = $request->headers->get('Authorization');
+    $headers = null;
 	
-	// Check if the authorization header is not empty
-	if (!empty($authorizationHeader)) {
-		$headers = trim($authorizationHeader);
-	} else if (function_exists('apache_request_headers') === true) {
-		$requestHeaders = (array) apache_request_headers();
-		// Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
-		$requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
-		//print_r($requestHeaders);
-		if (isset($requestHeaders['Authorization']) === true) {
-			$headers = trim($requestHeaders['Authorization']);
-		}
-	}
+    // Check if the authorization header is not empty
+    if (!empty($authorizationHeader)) {
+        $headers = trim($authorizationHeader);
+    } else if (function_exists('apache_request_headers') === true) {
+        $requestHeaders = (array) apache_request_headers();
+        // Server-side fix for bug in old Android versions (a nice side-effect of this fix means we don't care about capitalization for Authorization)
+        $requestHeaders = array_combine(array_map('ucwords', array_keys($requestHeaders)), array_values($requestHeaders));
+        //print_r($requestHeaders);
+        if (isset($requestHeaders['Authorization']) === true) {
+            $headers = trim($requestHeaders['Authorization']);
+        }
+    }
 	
-	return $headers;
+    return $headers;
 }
 
 function get_bearer_token() {
@@ -118,8 +118,8 @@ 
 
 function get_bearer_data($jwt) {
     // split the jwt
-	$tokenParts = explode('.', $jwt);
-	$payload = base64_decode($tokenParts[1]);
+    $tokenParts = explode('.', $jwt);
+    $payload = base64_decode($tokenParts[1]);
 	
     // HEADER: Get the access token from the header
     if (empty($payload) === false) {

api/index.php

Spacing +6 added lines, -6 removed lines

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

sources/roles.queries.php

Spacing +5 added lines, -5 removed lines

@@ -77,7 +77,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -462,7 +462,7 @@ 
                         );
 
                         // add new role to user
-                        $tmp = $data_tmp['fonction_id'] . (substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';' . $role_id);
+                        $tmp = $data_tmp['fonction_id'].(substr($data_tmp['fonction_id'], -1) == ';' ? $role_id : ';'.$role_id);
                         $session->set('user-roles', str_replace(';;', ';', $tmp));
 
                         // store in DB
@@ -723,7 +723,7 @@ 
                         $groupsData = $openLdapExtra->getADGroups($ldapConnection, $SETTINGS);
                         break;
                     default:
-                        throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                        throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
                 }
             } catch (Exception $e) {
                 if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -743,7 +743,7 @@ 
             } else {
                 // Handle successful retrieval of groups
                 // exists in Teampass
-                foreach($groupsData['userGroups'] as $key => $group) {
+                foreach ($groupsData['userGroups'] as $key => $group) {
                     $role_detail = DB::queryfirstrow(
                         'SELECT a.increment_id as increment_id, a.role_id as role_id, r.title as title
                         FROM '.prefixTable('ldap_groups_roles').' AS a
@@ -768,7 +768,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,

sources/ldap.queries.php

Spacing +6 added lines, -6 removed lines

@@ -80,7 +80,7 @@ 
 ) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -154,7 +154,7 @@ 
                     $openLdapExtra = new OpenLdapExtra();
                     break;
                 default:
-                    throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
+                    throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
             }
         } catch (Exception $e) {
             if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
@@ -173,7 +173,7 @@ 
             // 2- Get user info from AD
             // We want to isolate attribute ldap_user_attribute or mostly samAccountName
             $userADInfos = $ldapConnection->query()
-                ->where((isset($SETTINGS['ldap_user_attribute']) ===true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
+                ->where((isset($SETTINGS['ldap_user_attribute']) === true && empty($SETTINGS['ldap_user_attribute']) === false) ? $SETTINGS['ldap_user_attribute'] : 'samaccountname', '=', $post_username)
                 ->firstOrFail();
 
             // Is user enabled? Only ActiveDirectory
@@ -194,7 +194,7 @@ 
         } catch (\LdapRecord\Query\ObjectNotFoundException $e) {
             $error = $e->getDetailedError();
             if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
             } 
             // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent
             echo prepareExchangedData(
@@ -213,7 +213,7 @@ 
             // For OpenLDAP and others, we use attribute dn
             $userAuthAttempt = $ldapConnection->auth()->attempt(
                 $SETTINGS['ldap_type'] === 'ActiveDirectory' ?
-                    $userADInfos['userprincipalname'][0] :  // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
+                    $userADInfos['userprincipalname'][0] : // refering to https://ldaprecord.com/docs/core/v2/authentication#basic-authentication
                     $userADInfos['dn'],
                 $post_password
             );
@@ -232,7 +232,7 @@ 
         } catch (\LdapRecord\Query\ObjectNotFoundException $e) {
             $error = $e->getDetailedError();
             if ($error && defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
-                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage(). " - ".$error->getDiagnosticMessage());
+                error_log('TEAMPASS Error - LDAP - '.$error->getErrorCode()." - ".$error->getErrorMessage()." - ".$error->getDiagnosticMessage());
             }
             // deepcode ignore ServerLeak: No important data is sent and is encrypted before being sent
             echo prepareExchangedData(

scripts/background_tasks___functions.php

Spacing +6 added lines, -6 removed lines

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

pages/tasks.php

Braces +1 added lines, -2 removed lines

@@ -149,8 +149,7 @@
                                             </div>
         <?php
     }
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     if (defined('LOG_TO_SERVER') && LOG_TO_SERVER === true) {
         error_log('TEAMPASS Error - tasks page - '.$e->getMessage());
     }

Spacing +7 added lines, -7 removed lines

@@ -64,7 +64,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === 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;
 }
 
@@ -126,7 +126,7 @@ 
     // Get last cron execution timestamp
     DB::query(
         'SELECT valeur
-        FROM ' . prefixTable('misc') . '
+        FROM ' . prefixTable('misc').'
         WHERE type = %s AND intitule = %s and valeur >= %d',
         'admin',
         'last_cron_exec',
@@ -234,7 +234,7 @@ 
                                             $task = isset($SETTINGS['users_personal_folder_task']) === true ? explode(";", $SETTINGS['users_personal_folder_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='users_personal_folder_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="users_personal_folder_task">
@@ -256,7 +256,7 @@ 
                                             $task = isset($SETTINGS['clean_orphan_objects_task']) === true ? explode(";", $SETTINGS['clean_orphan_objects_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='clean_orphan_objects_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="clean_orphan_objects_task">
@@ -278,7 +278,7 @@ 
                                             $task = isset($SETTINGS['purge_temporary_files_task']) === true ? explode(";", $SETTINGS['purge_temporary_files_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='purge_temporary_files_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="purge_temporary_files_task">
@@ -300,7 +300,7 @@ 
                                             $task = isset($SETTINGS['reload_cache_table_task']) === true ? explode(";", $SETTINGS['reload_cache_table_task']) : [];
                                             ?>
                                             <input type='text' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter' value='<?php echo isset($task[0]) === true && empty($task[0]) === false ? $lang->get($task[0])." ".(isset($task[2]) === true ? strtolower($lang->get('day')).' '.$task[2].' ' : '').$lang->get('at')." ".(isset($task[1]) === true ? $task[1] : '') : $lang->get('not_defined') ?>'>
-                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : '';?>'>
+                                            <input type='hidden' disabled class='form-control form-control-sm' id='reload_cache_table_task_parameter_value' value='<?php echo isset($task[0]) === true ? $task[0].";".(isset($task[1]) === true ? $task[1] : '').(isset($task[2]) === true ? $task[2] : '') : ''; ?>'>
                                         </div>
                                         <div class='col-2'>
                                             <button class="btn btn-primary task-define" data-task="reload_cache_table_task">
@@ -517,7 +517,7 @@ 
                         <h5><?php echo $lang->get('day_of_month'); ?></h5>              
                         <select class='form-control form-control-sm no-save' id='task-define-modal-parameter-monthly-value' style="width:100%;">
                             <?php
-                            for ($i=1; $i<=31; $i++) {
+                            for ($i = 1; $i <= 31; $i++) {
                                 echo '<option value="'.$i.'">'.$lang->get('day').' '.$i.'</option>';
                             }
                             ?>