Passed
Pull Request — master (#4638)
by Nils
05:48
created
sources/identify.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     $sessionPwdAttempts = $session->get('pwd_attempts');
148 148
     $sessionUrl = $session->get('user-initial_url');
149 149
     $server = [];
150
-    $server['PHP_AUTH_USER'] =  $request->getUser();
150
+    $server['PHP_AUTH_USER'] = $request->getUser();
151 151
     $server['PHP_AUTH_PW'] = $request->getPassword();
152 152
     
153 153
     // decrypt and retreive data in JSON format
@@ -162,18 +162,18 @@  discard block
 block discarded – undo
162 162
     }
163 163
 
164 164
     // Check if Duo auth is in progress and pass the pw and login back to the standard login process
165
-    if(
165
+    if (
166 166
         isKeyExistingAndEqual('duo', 1, $SETTINGS) === true
167 167
         && $dataReceived['user_2fa_selection'] === 'duo'
168 168
         && $session->get('user-duo_status') === 'IN_PROGRESS'
169 169
         && !empty($dataReceived['duo_state'])
170
-    ){
170
+    ) {
171 171
         $key = hash('sha256', $dataReceived['duo_state']);
172 172
         $iv = substr(hash('sha256', $dataReceived['duo_state']), 0, 16);
173 173
         $duo_data_dec = openssl_decrypt(base64_decode($session->get('user-duo_data')), 'AES-256-CBC', $key, 0, $iv);
174 174
         // Clear the data from the Duo process to continue clean with the standard login process
175
-        $session->set('user-duo_data','');
176
-        if($duo_data_dec === false) {
175
+        $session->set('user-duo_data', '');
176
+        if ($duo_data_dec === false) {
177 177
             // Add failed authentication log
178 178
             addFailedAuthentication(filter_var($dataReceived['login'], FILTER_SANITIZE_FULL_SPECIAL_CHARS), getClientIpServer());
179 179
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         $dataReceived['login'] = $duo_data['duo_login'];
192 192
     }
193 193
 
194
-    if(isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
194
+    if (isset($dataReceived['pw']) === false || isset($dataReceived['login']) === false) {
195 195
         echo json_encode([
196 196
             'data' => prepareExchangedData(
197 197
                 [
@@ -536,7 +536,7 @@  discard block
 block discarded – undo
536 536
         }
537 537
         // Append with roles from AD groups
538 538
         if (is_null($userInfo['roles_from_ad_groups']) === false) {
539
-            $userInfo['fonction_id'] = empty($userInfo['fonction_id'])  === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id']. ';' . $userInfo['roles_from_ad_groups'];
539
+            $userInfo['fonction_id'] = empty($userInfo['fonction_id']) === true ? $userInfo['roles_from_ad_groups'] : $userInfo['fonction_id'].';'.$userInfo['roles_from_ad_groups'];
540 540
         }
541 541
         // store
542 542
         $session->set('user-roles', $userInfo['fonction_id']);
@@ -548,7 +548,7 @@  discard block
 block discarded – undo
548 548
         if (count($session->get('user-roles_array')) > 0) {
549 549
             $rolesList = DB::query(
550 550
                 'SELECT id, title, complexity
551
-                FROM ' . prefixTable('roles_title') . '
551
+                FROM ' . prefixTable('roles_title').'
552 552
                 WHERE id IN %li',
553 553
                 $session->get('user-roles_array')
554 554
             );
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
             if ($adjustPermissions) {
595 595
                 $session->set('user-admin', (int) $userInfo['admin']);
596 596
                 $session->set('user-manager', (int) $userInfo['gestionnaire']);
597
-                $session->set('user-can_manage_all_users',(int)  $userInfo['can_manage_all_users']);
597
+                $session->set('user-can_manage_all_users', (int) $userInfo['can_manage_all_users']);
598 598
                 $session->set('user-read_only', (int) $userInfo['read_only']);
599 599
                 DB::update(
600 600
                     prefixTable('users'),
@@ -665,10 +665,10 @@  discard block
 block discarded – undo
665 665
         $session->set('user-latest_items_tab', []);
666 666
         $session->set('user-nb_roles', 0);
667 667
         foreach ($session->get('user-latest_items') as $item) {
668
-            if (! empty($item)) {
668
+            if (!empty($item)) {
669 669
                 $dataLastItems = DB::queryFirstRow(
670 670
                     'SELECT id,label,id_tree
671
-                    FROM ' . prefixTable('items') . '
671
+                    FROM ' . prefixTable('items').'
672 672
                     WHERE id=%i',
673 673
                     $item
674 674
                 );
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
                     [
678 678
                         'id' => $item,
679 679
                         'label' => $dataLastItems['label'],
680
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
680
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
681 681
                     ],
682 682
                     'add'
683 683
                 );
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
         // Get cahce tree info
688 688
         $cacheTreeData = DB::queryFirstRow(
689 689
             'SELECT visible_folders
690
-            FROM ' . prefixTable('cache_tree') . '
690
+            FROM ' . prefixTable('cache_tree').'
691 691
             WHERE user_id=%i',
692 692
             (int) $session->get('user-id')
693 693
         );
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
             && (int) $sessionAdmin !== 1
720 720
         ) {
721 721
             // get all Admin users
722
-            $val = DB::queryfirstrow('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
722
+            $val = DB::queryfirstrow('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
723 723
             if (DB::count() > 0) {
724 724
                 // Add email to table
725 725
                 prepareSendingEmail(
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
                             '#tp_time#',
732 732
                         ],
733 733
                         [
734
-                            ' ' . $session->get('user-login') . ' (IP: ' . getClientIpServer() . ')',
734
+                            ' '.$session->get('user-login').' (IP: '.getClientIpServer().')',
735 735
                             date($SETTINGS['date_format'], (int) $session->get('user-last_connection')),
736 736
                             date($SETTINGS['time_format'], (int) $session->get('user-last_connection')),
737 737
                         ],
@@ -842,7 +842,7 @@  discard block
 block discarded – undo
842 842
 {
843 843
     $rows = DB::query(
844 844
         'SELECT date
845
-        FROM ' . prefixTable('log_system') . "
845
+        FROM ' . prefixTable('log_system')."
846 846
         WHERE field_1 = %s
847 847
         AND type = 'failed_auth'
848 848
         AND label = 'password_is_not_correct'
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
         foreach ($rows as $record) {
857 857
             array_push(
858 858
                 $arrAttempts,
859
-                date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
859
+                date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
860 860
             );
861 861
         }
862 862
     }
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
     $ldapConnection
892 892
 ) : bool
893 893
 {
894
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
894
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
895 895
 
896 896
     if ((int) $userInfoDisabled === 1) {
897 897
         return false;
@@ -1086,7 +1086,7 @@  discard block
 block discarded – undo
1086 1086
     } catch (Exception $e) {
1087 1087
         return [
1088 1088
             'error' => true,
1089
-            'message' => "Error: " . $e->getMessage(),
1089
+            'message' => "Error: ".$e->getMessage(),
1090 1090
         ];
1091 1091
     }
1092 1092
 }
@@ -1117,7 +1117,7 @@  discard block
 block discarded – undo
1117 1117
                 'type' => 'OpenLDAP'
1118 1118
             ];
1119 1119
         default:
1120
-            throw new Exception("Unsupported LDAP type: " . $SETTINGS['ldap_type']);
1120
+            throw new Exception("Unsupported LDAP type: ".$SETTINGS['ldap_type']);
1121 1121
     }
1122 1122
 }
1123 1123
 
@@ -1254,7 +1254,7 @@  discard block
 block discarded – undo
1254 1254
         );
1255 1255
     }
1256 1256
     
1257
-    throw new Exception("Unsupported LDAP type: " . $ldapHandler['type']);
1257
+    throw new Exception("Unsupported LDAP type: ".$ldapHandler['type']);
1258 1258
 }
1259 1259
 
1260 1260
 /**
@@ -1271,12 +1271,12 @@  discard block
 block discarded – undo
1271 1271
     if (isset($SETTINGS['enable_ad_users_with_ad_groups']) === true && (int) $SETTINGS['enable_ad_users_with_ad_groups'] === 1) {
1272 1272
         // Get user groups from AD
1273 1273
         $user_ad_groups = [];
1274
-        foreach($groups as $group) {
1274
+        foreach ($groups as $group) {
1275 1275
             //print_r($group);
1276 1276
             // get relation role id for AD group
1277 1277
             $role = DB::queryFirstRow(
1278 1278
                 'SELECT lgr.role_id
1279
-                FROM ' . prefixTable('ldap_groups_roles') . ' AS lgr
1279
+                FROM ' . prefixTable('ldap_groups_roles').' AS lgr
1280 1280
                 WHERE lgr.ldap_group_id = %s',
1281 1281
                 $group
1282 1282
             );
@@ -1421,7 +1421,7 @@  discard block
 block discarded – undo
1421 1421
     }
1422 1422
 
1423 1423
     // Now check yubico validity
1424
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
1424
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
1425 1425
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
1426 1426
     $auth = $yubi->verify($yubico_key);
1427 1427
     //, null, null, null, 60
@@ -1480,7 +1480,7 @@  discard block
 block discarded – undo
1480 1480
             // Check if exists in DB
1481 1481
             $groupData = DB::queryFirstRow(
1482 1482
                 'SELECT id
1483
-                FROM ' . prefixTable('roles_title') . '
1483
+                FROM ' . prefixTable('roles_title').'
1484 1484
                 WHERE title = %s',
1485 1485
                 $group["displayName"]
1486 1486
             );
@@ -1610,7 +1610,7 @@  discard block
 block discarded – undo
1610 1610
             
1611 1611
             // generate new QR
1612 1612
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
1613
-                'Teampass - ' . $username,
1613
+                'Teampass - '.$username,
1614 1614
                 $userInfo['ga']
1615 1615
             );
1616 1616
             // clear temporary code from DB
@@ -1623,7 +1623,7 @@  discard block
 block discarded – undo
1623 1623
                 $userInfo['id']
1624 1624
             );
1625 1625
             $firstTime = [
1626
-                'value' => '<img src="' . $new_2fa_qr . '">',
1626
+                'value' => '<img src="'.$new_2fa_qr.'">',
1627 1627
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
1628 1628
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
1629 1629
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1779,7 +1779,7 @@  discard block
 block discarded – undo
1779 1779
         }*/
1780 1780
         return [
1781 1781
             'error' => true,
1782
-            'message' => $duo_error . $lang->get('duo_error_check_config'),
1782
+            'message' => $duo_error.$lang->get('duo_error_check_config'),
1783 1783
             'pwd_attempts' => (int) $sessionPwdAttempts,
1784 1784
             'debug_message' => $e->getMessage(),
1785 1785
             'proceedIdentification' => false,
@@ -1795,7 +1795,7 @@  discard block
 block discarded – undo
1795 1795
         } catch (DuoException $e) {
1796 1796
             return [
1797 1797
                 'error' => true,
1798
-                'message' => $duo_error . $lang->get('duo_error_url'),
1798
+                'message' => $duo_error.$lang->get('duo_error_url'),
1799 1799
                 'pwd_attempts' => (int) $sessionPwdAttempts,
1800 1800
                 'debug_message' => $e->getMessage(),
1801 1801
                 'proceedIdentification' => false,
@@ -1803,7 +1803,7 @@  discard block
 block discarded – undo
1803 1803
         }
1804 1804
         
1805 1805
         // Somethimes Duo return success but fail to return a URL, double check if the URL has been created
1806
-        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url,FILTER_SANITIZE_URL)) {
1806
+        if (!empty($duo_redirect_url) && isset($duo_redirect_url) && filter_var($duo_redirect_url, FILTER_SANITIZE_URL)) {
1807 1807
             // Since Duo Universal requires a redirect, let's store some info when the user get's back after completing the Duo prompt
1808 1808
             $key = hash('sha256', $duo_state);
1809 1809
             $iv = substr(hash('sha256', $duo_state), 0, 16);
@@ -1831,7 +1831,7 @@  discard block
 block discarded – undo
1831 1831
         } else {
1832 1832
             return [
1833 1833
                 'error' => true,
1834
-                'message' => $duo_error . $lang->get('duo_error_url'),
1834
+                'message' => $duo_error.$lang->get('duo_error_url'),
1835 1835
                 'pwd_attempts' => (int) $sessionPwdAttempts,
1836 1836
                 'proceedIdentification' => false,
1837 1837
             ];
@@ -1852,8 +1852,8 @@  discard block
 block discarded – undo
1852 1852
         // return the response (which should be the user name)
1853 1853
         if ($decoded_token['preferred_username'] === $username) {
1854 1854
             $session->set('user-duo_status', 'COMPLET');
1855
-            $session->set('user-duo_state','');
1856
-            $session->set('user-duo_data','');
1855
+            $session->set('user-duo_state', '');
1856
+            $session->set('user-duo_data', '');
1857 1857
             $session->set('user-login', $username);
1858 1858
 
1859 1859
             return [
@@ -1864,9 +1864,9 @@  discard block
 block discarded – undo
1864 1864
             ];
1865 1865
         } else {
1866 1866
             // Something wrong, username from the original Duo request is different than the one received now
1867
-            $session->set('user-duo_status','');
1868
-            $session->set('user-duo_state','');
1869
-            $session->set('user-duo_data','');
1867
+            $session->set('user-duo_status', '');
1868
+            $session->set('user-duo_state', '');
1869
+            $session->set('user-duo_data', '');
1870 1870
 
1871 1871
             return [
1872 1872
                 'error' => true,
@@ -1877,9 +1877,9 @@  discard block
 block discarded – undo
1877 1877
         }
1878 1878
     }
1879 1879
     // If we are here something wrong
1880
-    $session->set('user-duo_status','');
1881
-    $session->set('user-duo_state','');
1882
-    $session->set('user-duo_data','');
1880
+    $session->set('user-duo_status', '');
1881
+    $session->set('user-duo_state', '');
1882
+    $session->set('user-duo_data', '');
1883 1883
     return [
1884 1884
         'error' => true,
1885 1885
         'message' => $lang->get('duo_login_mismatch'),
@@ -1991,7 +1991,7 @@  discard block
 block discarded – undo
1991 1991
         // Check for existing lock
1992 1992
         $unlock_at = DB::queryFirstField(
1993 1993
             'SELECT MAX(unlock_at)
1994
-             FROM ' . prefixTable('auth_failures') . '
1994
+             FROM ' . prefixTable('auth_failures').'
1995 1995
              WHERE unlock_at > %s
1996 1996
              AND ((source = %s AND value = %s) OR (source = %s AND value = %s))',
1997 1997
             date('Y-m-d H:i:s', time()),
@@ -2013,8 +2013,8 @@  discard block
 block discarded – undo
2013 2013
         // Get user info from DB
2014 2014
         $data = DB::queryFirstRow(
2015 2015
             'SELECT u.*, a.value AS api_key
2016
-            FROM ' . prefixTable('users') . ' AS u
2017
-            LEFT JOIN ' . prefixTable('api') . ' AS a ON (u.id = a.user_id)
2016
+            FROM ' . prefixTable('users').' AS u
2017
+            LEFT JOIN ' . prefixTable('api').' AS a ON (u.id = a.user_id)
2018 2018
             WHERE login = %s AND deleted_at IS NULL',
2019 2019
             $login
2020 2020
         );
@@ -2134,7 +2134,7 @@  discard block
 block discarded – undo
2134 2134
             'array' => [
2135 2135
                 'value' => 'bruteforce_wait',
2136 2136
                 'error' => true,
2137
-                'message' => $lang->get('bruteforce_wait') . (string) $e->getMessage(),
2137
+                'message' => $lang->get('bruteforce_wait').(string) $e->getMessage(),
2138 2138
             ]
2139 2139
         ];
2140 2140
     }
@@ -2566,15 +2566,15 @@  discard block
 block discarded – undo
2566 2566
 
2567 2567
             if ($ret['error'] !== false) {
2568 2568
                 logEvents($SETTINGS, 'failed_auth', 'bad_duo_mfa', '', stripslashes($username), stripslashes($username));
2569
-                $session->set('user-duo_status','');
2570
-                $session->set('user-duo_state','');
2571
-                $session->set('user-duo_data','');
2569
+                $session->set('user-duo_status', '');
2570
+                $session->set('user-duo_state', '');
2571
+                $session->set('user-duo_data', '');
2572 2572
                 return [
2573 2573
                     'error' => true,
2574 2574
                     'mfaData' => $ret,
2575 2575
                     'mfaQRCodeInfos' => false,
2576 2576
                 ];
2577
-            } else if ($ret['duo_url_ready'] === true){
2577
+            } else if ($ret['duo_url_ready'] === true) {
2578 2578
                 return [
2579 2579
                     'error' => false,
2580 2580
                     'mfaData' => $ret,
@@ -2638,7 +2638,7 @@  discard block
 block discarded – undo
2638 2638
     // Count failed attempts from this source
2639 2639
     $count = DB::queryFirstField(
2640 2640
         'SELECT COUNT(*)
2641
-        FROM ' . prefixTable('auth_failures') . '
2641
+        FROM ' . prefixTable('auth_failures').'
2642 2642
         WHERE source = %s AND value = %s',
2643 2643
         $source,
2644 2644
         $value
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +181 added lines, -181 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 csrfProtector::init();
73 73
 
74 74
 // Load functions
75
-require_once __DIR__. '/includes/config/include.php';
75
+require_once __DIR__.'/includes/config/include.php';
76 76
 require_once __DIR__.'/sources/main.functions.php';
77 77
 
78 78
 // init
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 $SETTINGS = $antiXss->xss_clean($SETTINGS);
107 107
 
108 108
 // Load Core library
109
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
109
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
110 110
 // Prepare POST variables
111 111
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
112 112
 $session_user_language = $session->get('user-language');
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 // Force log of all queries
144 144
 if (defined('MYSQL_LOG') && MYSQL_LOG === true) {
145 145
     DB::query("SET GLOBAL general_log = 'ON'");
146
-    DB::query("SET GLOBAL general_log_file = " . (defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'"));
146
+    DB::query("SET GLOBAL general_log_file = ".(defined('MYSQL_LOG_FILE') ? MYSQL_LOG_FILE : "'/var/log/teampass_mysql_query.log'"));
147 147
 } else {
148 148
     DB::query("SET GLOBAL general_log = 'OFF'");
149 149
 }
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
     //get default language
154 154
     $dataLanguage = DB::queryFirstRow(
155 155
         'SELECT m.valeur AS valeur, l.flag AS flag
156
-        FROM ' . prefixTable('misc') . ' AS m
157
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
156
+        FROM ' . prefixTable('misc').' AS m
157
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
158 158
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
159 159
         [
160 160
             'type' => 'admin',
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
         $session_user_language = $SETTINGS['default_language'];
186 186
     }
187 187
 }
188
-$lang = new Language($session_user_language, __DIR__. '/includes/language/'); 
188
+$lang = new Language($session_user_language, __DIR__.'/includes/language/'); 
189 189
 
190 190
 if (isset($SETTINGS['cpassman_dir']) === false || $SETTINGS['cpassman_dir'] === '') {
191 191
     $SETTINGS['cpassman_dir'] = __DIR__;
@@ -259,29 +259,29 @@  discard block
 block discarded – undo
259 259
     </script>
260 260
 
261 261
     <!-- IonIcons -->
262
-    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
262
+    <link rel="stylesheet" href="includes/css/ionicons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
263 263
     <!-- Theme style -->
264
-    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
265
-    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
266
-    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
267
-    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
264
+    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
265
+    <link rel="stylesheet" href="plugins/pace-progress/themes/corner-indicator.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
266
+    <link rel="stylesheet" href="plugins/select2/css/select2.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
267
+    <link rel="stylesheet" href="plugins/select2/theme/select2-bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
268 268
     <!-- Theme style -->
269
-    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
269
+    <link rel="stylesheet" href="includes/css/teampass.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
270 270
     <!-- Google Font: Source Sans Pro -->
271
-    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
271
+    <link rel="stylesheet" type="text/css" href="includes/fonts/fonts.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
272 272
     <!-- Altertify -->
273
-    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
274
-    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
273
+    <link rel="stylesheet" href="plugins/alertifyjs/css/alertify.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
274
+    <link rel="stylesheet" href="plugins/alertifyjs/css/themes/bootstrap.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
275 275
     <!-- Toastr -->
276
-    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
276
+    <link rel="stylesheet" href="plugins/toastr/toastr.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
277 277
     <!-- favicon -->
278
-    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon;?>"/>
278
+    <link rel="shortcut icon" type="image/png" href="<?php echo $favicon; ?>"/>
279 279
     <!-- manifest (PWA) -->
280
-    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
280
+    <link rel="manifest" href="manifest.json?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
281 281
     <!-- Custom style -->
282 282
     <?php
283
-    if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?>
284
-        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
283
+    if (file_exists(__DIR__.'/includes/css/custom.css') === true) {?>
284
+        <link rel="stylesheet" href="includes/css/custom.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
285 285
     <?php
286 286
     } ?>
287 287
 </head>
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
                         <div class="dropdown show">
329 329
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
330 330
                                 <?php
331
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
331
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
332 332
                             </a>
333 333
 
334 334
                             <div class="dropdown-menu dropdown-menu-right">
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
                                     </a>
353 353
                                 <?php
354 354
                                     } ?>
355
-                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : '';?>" href="#" data-name="generate-new_keys">
355
+                                <a class="dropdown-item user-menu<?php echo (int) $session_user_admin === 1 ? ' hidden' : ''; ?>" href="#" data-name="generate-new_keys">
356 356
                                     <i class="fa-solid fa-spray-can-sparkles fa-fw mr-2"></i><?php echo $lang->get('generate_new_keys'); ?>
357 357
                                 </a>
358 358
 
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
             <!-- Main Sidebar Container -->
387 387
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
388 388
                 <!-- Brand Logo -->
389
-                <a href="<?php echo $cpassman_url . '/index.php?page=' . ((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
389
+                <a href="<?php echo $cpassman_url.'/index.php?page='.((int) $session_user_admin === 1 ? 'admin' : 'items'); ?>" class="brand-link">
390 390
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
391 391
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
392 392
                 </a>
@@ -404,20 +404,20 @@  discard block
 block discarded – undo
404 404
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
405 405
                         <i class="nav-icon fa-solid fa-key"></i>
406 406
                         <p>
407
-                            ' . $lang->get('pw') . '
407
+                            ' . $lang->get('pw').'
408 408
                         </p>
409 409
                         </a>
410 410
                     </li>';
411 411
                                 }
412 412
 
413 413
     // IMPORT menu
414
-    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1&& $session_user_admin === 0) {
414
+    if (isset($SETTINGS['allow_import']) === true && (int) $SETTINGS['allow_import'] === 1 && $session_user_admin === 0) {
415 415
         echo '
416 416
                     <li class="nav-item">
417 417
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
418 418
                         <i class="nav-icon fa-solid fa-file-import"></i>
419 419
                         <p>
420
-                            ' . $lang->get('import') . '
420
+                            ' . $lang->get('import').'
421 421
                         </p>
422 422
                         </a>
423 423
                     </li>';
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
439 439
                         <i class="nav-icon fa-solid fa-file-export"></i>
440 440
                         <p>
441
-                            ' . $lang->get('export') . '
441
+                            ' . $lang->get('export').'
442 442
                         </p>
443 443
                         </a>
444 444
                     </li>';
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
466 466
                         <i class="nav-icon fa-solid fa-search"></i>
467 467
                         <p>
468
-                            ' . $lang->get('find') . '
468
+                            ' . $lang->get('find').'
469 469
                         </p>
470 470
                         </a>
471 471
                     </li>';
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'favourites' ? ' active' : '', '">
482 482
                         <i class="nav-icon fa-solid fa-star"></i>
483 483
                         <p>
484
-                            ' . $lang->get('favorites') . '
484
+                            ' . $lang->get('favorites').'
485 485
                         </p>
486 486
                         </a>
487 487
                     </li>';
@@ -511,7 +511,7 @@  discard block
 block discarded – undo
511 511
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
512 512
                         <i class="nav-icon fa-solid fa-lightbulb"></i>
513 513
                         <p>
514
-                            ' . $lang->get('suggestion_menu') . '
514
+                            ' . $lang->get('suggestion_menu').'
515 515
                         </p>
516 516
                         </a>
517 517
                     </li>';
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
525 525
                         <i class="nav-icon fa-solid fa-info"></i>
526 526
                         <p>
527
-                            ' . $lang->get('admin_main') . '
527
+                            ' . $lang->get('admin_main').'
528 528
                         </p>
529 529
                         </a>
530 530
                     </li>
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
                         <a href="#" class="nav-link">
533 533
                             <i class="nav-icon fa-solid fa-wrench"></i>
534 534
                             <p>
535
-                                ' . $lang->get('admin_settings') . '
535
+                                ' . $lang->get('admin_settings').'
536 536
                                 <i class="fa-solid fa-angle-left right"></i>
537 537
                             </p>
538 538
                         </a>
@@ -540,63 +540,63 @@  discard block
 block discarded – undo
540 540
                             <li class="nav-item">
541 541
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
542 542
                                     <i class="fa-solid fa-check-double nav-icon"></i>
543
-                                    <p>' . $lang->get('options') . '</p>
543
+                                    <p>' . $lang->get('options').'</p>
544 544
                                 </a>
545 545
                             </li>
546 546
                             <li class="nav-item">
547 547
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
548 548
                                     <i class="fa-solid fa-qrcode nav-icon"></i>
549
-                                    <p>' . $lang->get('mfa_short') . '</p>
549
+                                    <p>' . $lang->get('mfa_short').'</p>
550 550
                                 </a>
551 551
                             </li>
552 552
                             <li class="nav-item">
553 553
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
554 554
                                     <i class="fa-solid fa-cubes nav-icon"></i>
555
-                                    <p>' . $lang->get('api') . '</p>
555
+                                    <p>' . $lang->get('api').'</p>
556 556
                                 </a>
557 557
                             </li>
558 558
                             <li class="nav-item">
559 559
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
560 560
                                     <i class="fa-solid fa-database nav-icon"></i>
561
-                                    <p>' . $lang->get('backups') . '</p>
561
+                                    <p>' . $lang->get('backups').'</p>
562 562
                                 </a>
563 563
                             </li>
564 564
                             <li class="nav-item">
565 565
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
566 566
                                     <i class="fa-solid fa-envelope nav-icon"></i>
567
-                                    <p>' . $lang->get('emails') . '</p>
567
+                                    <p>' . $lang->get('emails').'</p>
568 568
                                 </a>
569 569
                             </li>
570 570
                             <li class="nav-item">
571 571
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
572 572
                                     <i class="fa-solid fa-keyboard nav-icon"></i>
573
-                                    <p>' . $lang->get('fields') . '</p>
573
+                                    <p>' . $lang->get('fields').'</p>
574 574
                                 </a>
575 575
                             </li>
576 576
                             <li class="nav-item">
577 577
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
578 578
                                     <i class="fa-solid fa-id-card nav-icon"></i>
579
-                                    <p>' . $lang->get('ldap') . '</p>
579
+                                    <p>' . $lang->get('ldap').'</p>
580 580
                                 </a>
581 581
                             </li>
582 582
 
583 583
                             <li class="nav-item">
584 584
                                 <a href="#" data-name="oauth" class="nav-link', $get['page'] === 'oauth' ? ' active' : '', '">
585 585
                                     <i class="fa-solid fa-plug nav-icon"></i>
586
-                                    <p>' . $lang->get('oauth') . '</p>
586
+                                    <p>' . $lang->get('oauth').'</p>
587 587
                                 </a>
588 588
                             </li>
589 589
                             
590 590
                             <li class="nav-item">
591 591
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
592 592
                                     <i class="fa-solid fa-file-upload nav-icon"></i>
593
-                                    <p>' . $lang->get('uploads') . '</p>
593
+                                    <p>' . $lang->get('uploads').'</p>
594 594
                                 </a>
595 595
                             </li>
596 596
                             <li class="nav-item">
597 597
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
598 598
                                     <i class="fa-solid fa-chart-bar nav-icon"></i>
599
-                                    <p>' . $lang->get('statistics') . '</p>
599
+                                    <p>' . $lang->get('statistics').'</p>
600 600
                                 </a>
601 601
                             </li>
602 602
                         </ul>
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
                     <li class="nav-item">
608 608
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
609 609
                         <i class="fa-solid fa-tasks nav-icon"></i>
610
-                        <p>' . $lang->get('tasks') . '</p>
610
+                        <p>' . $lang->get('tasks').'</p>
611 611
                         </a>
612 612
                     </li>';
613 613
         }
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
                         <a href="#" data-name="tools" class="nav-link', $get['page'] === 'tools' ? ' active' : '', '">
619 619
                         <i class="nav-icon fa-solid fa-person-drowning"></i>
620 620
                         <p>
621
-                            ' . $lang->get('tools') . '
621
+                            ' . $lang->get('tools').'
622 622
                         </p>
623 623
                         </a>
624 624
                     </li>';
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
636 636
                         <i class="nav-icon fa-solid fa-folder-open"></i>
637 637
                         <p>
638
-                            ' . $lang->get('folders') . '
638
+                            ' . $lang->get('folders').'
639 639
                         </p>
640 640
                         </a>
641 641
                     </li>
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
644 644
                         <i class="nav-icon fa-solid fa-graduation-cap"></i>
645 645
                         <p>
646
-                            ' . $lang->get('roles') . '
646
+                            ' . $lang->get('roles').'
647 647
                         </p>
648 648
                         </a>
649 649
                     </li>
@@ -651,38 +651,38 @@  discard block
 block discarded – undo
651 651
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
652 652
                         <i class="nav-icon fa-solid fa-users"></i>
653 653
                         <p>
654
-                            ' . $lang->get('users') . '
654
+                            ' . $lang->get('users').'
655 655
                         </p>
656 656
                         </a>
657 657
                     </li>
658 658
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
659 659
                         <a href="#" class="nav-link">
660 660
                         <i class="nav-icon fa-solid fa-cubes"></i>
661
-                        <p>' . $lang->get('admin_views') . '<i class="fa-solid fa-angle-left right"></i></p>
661
+                        <p>' . $lang->get('admin_views').'<i class="fa-solid fa-angle-left right"></i></p>
662 662
                         </a>
663 663
                         <ul class="nav nav-treeview">
664 664
                             <li class="nav-item">
665 665
                                 <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
666 666
                                 <i class="far fa-calendar-alt nav-icon"></i>
667
-                                <p>' . $lang->get('renewal') . '</p>
667
+                                <p>' . $lang->get('renewal').'</p>
668 668
                                 </a>
669 669
                             </li>
670 670
                             <li class="nav-item">
671 671
                                 <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
672 672
                                 <i class="fa-solid fa-trash-alt nav-icon"></i>
673
-                                <p>' . $lang->get('deletion') . '</p>
673
+                                <p>' . $lang->get('deletion').'</p>
674 674
                                 </a>
675 675
                             </li>
676 676
                             <li class="nav-item">
677 677
                                 <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
678 678
                                 <i class="fa-solid fa-history nav-icon"></i>
679
-                                <p>' . $lang->get('logs') . '</p>
679
+                                <p>' . $lang->get('logs').'</p>
680 680
                                 </a>
681 681
                             </li>
682 682
                             <li class="nav-item">
683 683
                                 <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
684 684
                                 <i class="fa-solid fa-database nav-icon"></i>
685
-                                <p>' . $lang->get('database') . '</p>
685
+                                <p>' . $lang->get('database').'</p>
686 686
                                 </a>
687 687
                             </li>
688 688
                         </ul>
@@ -693,10 +693,10 @@  discard block
 block discarded – undo
693 693
                     <!-- /.sidebar-menu -->
694 694
                 <div class="menu-footer">
695 695
                     <div class="" id="sidebar-footer">
696
-                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time') . ' ' .
697
-                            date($date_format, (int) $server['request_time']) . ' - ' .
696
+                        <i class="fa-solid fa-clock-o mr-2 infotip text-info pointer" title="<?php echo htmlspecialchars($lang->get('server_time').' '.
697
+                            date($date_format, (int) $server['request_time']).' - '.
698 698
                             date($time_format, (int) $server['request_time']), ENT_QUOTES, 'UTF-8'); ?>"></i>
699
-                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . $lang->get('users_online'); ?>"></i>
699
+                        <i class="fa-solid fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.$lang->get('users_online'); ?>"></i>
700 700
                         <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>
701 701
                         <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>
702 702
                         <?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; ?>
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
                                 </div>
848 848
                                 <div class="mt-3">                                    
849 849
                                     <label>
850
-                                        <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>
850
+                                        <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>
851 851
                                         <input type="checkbox" id="dialog-admin-change-user-password-do-show-password" class="pointer">
852 852
                                     </label>
853 853
                                 </div>
@@ -1014,34 +1014,34 @@  discard block
 block discarded – undo
1014 1014
                     if ($get['page'] === 'items') {
1015 1015
                         // SHow page with Items
1016 1016
                         if ((int) $session_user_admin !== 1) {
1017
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
1017
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
1018 1018
                         } elseif ((int) $session_user_admin === 1) {
1019
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
1019
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
1020 1020
                         } else {
1021 1021
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
1022 1022
                             //not allowed page
1023
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
1023
+                            include $SETTINGS['cpassman_dir'].'/error.php';
1024 1024
                         }
1025 1025
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
1026 1026
                         // Define if user is allowed to see management pages
1027 1027
                         if ($session_user_admin === 1) {
1028 1028
                             // deepcode ignore FileInclusion: $get['page'] is secured through usage of array_keys test bellow
1029
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . basename($mngPages[$get['page']]);
1029
+                            include $SETTINGS['cpassman_dir'].'/pages/'.basename($mngPages[$get['page']]);
1030 1030
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
1031 1031
                             if ($get['page'] === 'manage_main' || $get['page'] === 'manage_settings'
1032 1032
                             ) {
1033 1033
                                 $session->set('system-error_code', ERR_NOT_ALLOWED);
1034 1034
                                 //not allowed page
1035
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
1035
+                                include $SETTINGS['cpassman_dir'].'/error.php';
1036 1036
                             }
1037 1037
                         } else {
1038 1038
                             $session->set('system-error_code', ERR_NOT_ALLOWED);
1039 1039
                             //not allowed page
1040
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
1040
+                            include $SETTINGS['cpassman_dir'].'/error.php';
1041 1041
                         }
1042
-                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php') === true) {
1042
+                    } elseif (empty($get['page']) === false && file_exists($SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php') === true) {
1043 1043
                         // deepcode ignore FileInclusion: $get['page'] is tested against file_exists just below
1044
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . basename($get['page'] . '.php');
1044
+                        include $SETTINGS['cpassman_dir'].'/pages/'.basename($get['page'].'.php');
1045 1045
                     } else {
1046 1046
                         $session->set('system-array_roles', ERR_NOT_EXIST);
1047 1047
                         //page doesn't exist
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
1070 1070
             <footer class="main-footer">
1071 1071
                 <!-- To the right -->
1072 1072
                 <div class="float-right d-none d-sm-inline">
1073
-                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>
1073
+                    <?php echo $lang->get('version_alone'); ?>&nbsp;<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>
1074 1074
                 </div>
1075 1075
                 <!-- Default to the left -->
1076 1076
                 <strong>Copyright &copy; <?php echo TP_COPYRIGHT; ?> <a href="<?php echo TEAMPASS_URL; ?>"><?php echo TP_TOOL_NAME; ?></a>.</strong> All rights reserved.
@@ -1084,7 +1084,7 @@  discard block
 block discarded – undo
1084 1084
         echo '
1085 1085
 <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />';
1086 1086
 // display an item in the context of OTV link
1087
-} elseif ((null === $session->get('user-validite_pw')|| empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
1087
+} elseif ((null === $session->get('user-validite_pw') || empty($session->get('user-validite_pw')) === true || empty($session->get('user-id')) === true)
1088 1088
     && empty($get['otv']) === false
1089 1089
 ) {
1090 1090
     // case where one-shot viewer
@@ -1103,7 +1103,7 @@  discard block
 block discarded – undo
1103 1103
                 FILTER_SANITIZE_URL
1104 1104
             )
1105 1105
         );
1106
-        include $SETTINGS['cpassman_dir'] . '/error.php';
1106
+        include $SETTINGS['cpassman_dir'].'/error.php';
1107 1107
     }
1108 1108
 } elseif (//(empty($session->get('user-id')) === false && $session->get('user-id') !== null) ||
1109 1109
         empty($session->get('user-id')) === true
@@ -1128,7 +1128,7 @@  discard block
 block discarded – undo
1128 1128
     }
1129 1129
     
1130 1130
     // LOGIN form  
1131
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
1131
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
1132 1132
     
1133 1133
 } else {
1134 1134
     // Clear session
@@ -1161,153 +1161,153 @@  discard block
 block discarded – undo
1161 1161
     <!-- REQUIRED SCRIPTS -->
1162 1162
 
1163 1163
     <!-- Font Awesome Icons -->
1164
-    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1165
-    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1166
-    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1167
-    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet">
1168
-    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
1164
+    <link href="plugins/fontawesome-free-6/css/fontawesome.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1165
+    <link href="plugins/fontawesome-free-6/css/solid.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1166
+    <link href="plugins/fontawesome-free-6/css/regular.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1167
+    <link href="plugins/fontawesome-free-6/css/brands.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet">
1168
+    <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" rel="stylesheet" /> 
1169 1169
     <!-- jQuery -->
1170
-    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1171
-    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1170
+    <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1171
+    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1172 1172
     <!-- jQuery UI -->
1173
-    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1174
-    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1173
+    <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1174
+    <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1175 1175
     <!-- Popper -->
1176
-    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1176
+    <script src="plugins/popper/umd/popper.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1177 1177
     <!-- Bootstrap -->
1178
-    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1178
+    <script src="plugins/bootstrap/js/bootstrap.bundle.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1179 1179
     <!-- AdminLTE -->
1180
-    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1180
+    <script src="plugins/adminlte/js/adminlte.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1181 1181
     <!-- Altertify -->
1182 1182
     <!--<script type="text/javascript" src="plugins/alertifyjs/alertify.min.js"></script>-->
1183 1183
     <!-- Toastr -->
1184
-    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1184
+    <script type="text/javascript" src="plugins/toastr/toastr.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1185 1185
     <!-- STORE.JS -->
1186
-    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1186
+    <script type="text/javascript" src="plugins/store.js/dist/store.everything.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1187 1187
     <!-- cryptojs-aesphp -->
1188
-    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1189
-    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1188
+    <script type="text/javascript" src="includes/libraries/cryptojs/crypto-js.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1189
+    <script type="text/javascript" src="includes/libraries/cryptojs/encryption.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1190 1190
     <!-- pace -->
1191
-    <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>
1191
+    <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>
1192 1192
     <!-- select2 -->
1193
-    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1193
+    <script type="text/javascript" src="plugins/select2/js/select2.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1194 1194
     <!-- simplePassMeter -->
1195
-    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
1196
-    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1195
+    <link rel="stylesheet" href="plugins/simplePassMeter/simplePassMeter.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
1196
+    <script type="text/javascript" src="plugins/simplePassMeter/simplePassMeter.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1197 1197
     <!-- platform -->
1198
-    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1198
+    <script type="text/javascript" src="plugins/platform/platform.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1199 1199
     <!-- radiobuttons -->
1200
-    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/css" />
1201
-    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1200
+    <link rel="stylesheet" href="plugins/radioforbuttons/bootstrap-buttons.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/css" />
1201
+    <script type="text/javascript" src="plugins/radioforbuttons/jquery.radiosforbuttons.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1202 1202
     <!-- ICHECK -->
1203 1203
     <!--<link rel="stylesheet" href="./plugins/icheck-material/icheck-material.min.css">-->
1204
-    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1205
-    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1204
+    <link rel="stylesheet" href="./plugins/icheck/skins/all.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1205
+    <script type="text/javascript" src="./plugins/icheck/icheck.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1206 1206
     <!-- bootstrap-add-clear -->
1207
-    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1207
+    <script type="text/javascript" src="plugins/bootstrap-add-clear/bootstrap-add-clear.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1208 1208
     <!-- DOMPurify -->
1209
-    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1209
+    <script type="text/javascript" src="plugins/DOMPurify/purify.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1210 1210
 
1211 1211
     <?php
1212 1212
     $get['page'] = $request->query->filter('page', null, FILTER_SANITIZE_SPECIAL_CHARS);
1213 1213
     if ($menuAdmin === true) {
1214 1214
         ?>
1215
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1216
-        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1217
-        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1215
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1216
+        <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1217
+        <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1218 1218
         <!-- InputMask -->
1219
-        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1219
+        <script src="./plugins/inputmask/jquery.inputmask.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1220 1220
         <!-- Sortable -->
1221 1221
         <!--<script src="./plugins/sortable/jquery.sortable.js"></script>-->
1222 1222
         <!-- PLUPLOAD -->
1223
-        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1223
+        <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1224 1224
         <!-- DataTables -->
1225
-        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1226
-        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1227
-        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1228
-        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1229
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1230
-        <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>
1231
-        <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>
1232
-        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1233
-        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1234
-        <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>
1225
+        <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1226
+        <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1227
+        <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1228
+        <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1229
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1230
+        <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>
1231
+        <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>
1232
+        <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1233
+        <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1234
+        <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>
1235 1235
     <?php
1236 1236
     } elseif (isset($get['page']) === true) {
1237 1237
         if (in_array($get['page'], ['items', 'import']) === true) {
1238 1238
             ?>
1239
-            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1240
-            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1241
-            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1239
+            <link rel="stylesheet" href="./plugins/jstree/themes/default/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1240
+            <link rel="stylesheet" href="./plugins/jstree/themes/default-dark/style.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1241
+            <script src="./plugins/jstree/jstree.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1242 1242
             <!-- countdownTimer -->
1243
-            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1243
+            <script src="./plugins/jquery.countdown360/jquery.countdown360.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1244 1244
             <!-- SUMMERNOTE -->
1245
-            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1246
-            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1245
+            <link rel="stylesheet" href="./plugins/summernote/summernote-bs4.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1246
+            <script src="./plugins/summernote/summernote-bs4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1247 1247
             <!-- date-picker -->
1248
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1249
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1248
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1249
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1250 1250
             <!-- time-picker -->
1251
-            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1252
-            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1251
+            <link rel="stylesheet" href="./plugins/timepicker/bootstrap-timepicker.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1252
+            <script src="./plugins/timepicker/bootstrap-timepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1253 1253
             <!-- PLUPLOAD -->
1254
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1254
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1255 1255
             <!-- VALIDATE -->
1256
-            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1256
+            <script type="text/javascript" src="plugins/jquery-validation/jquery.validate.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1257 1257
             <!-- PWSTRENGHT -->
1258
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1259
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1258
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1259
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1260 1260
             <!-- TOGGLE -->
1261
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1262
-            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" />
1263
-            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1261
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1262
+            <link rel="stylesheet" href="./plugins/toggles/css/toggles-modern.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" />
1263
+            <script src="./plugins/toggles/toggles.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>" type="text/javascript"></script>
1264 1264
         <?php
1265 1265
         } elseif (in_array($get['page'], ['search', 'folders', 'users', 'roles', 'utilities.deletion', 'utilities.logs', 'utilities.database', 'utilities.renewal', 'tasks']) === true) {
1266 1266
             ?>
1267 1267
             <!-- DataTables -->
1268
-            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1269
-            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1270
-            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1271
-            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1272
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1273
-            <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>
1274
-            <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>
1275
-            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1276
-            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1277
-            <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>
1268
+            <link rel="stylesheet" src="./plugins/datatables/css/jquery.dataTables.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1269
+            <link rel="stylesheet" src="./plugins/datatables/css/dataTables.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1270
+            <script type="text/javascript" src="./plugins/datatables/js/jquery.dataTables.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1271
+            <script type="text/javascript" src="./plugins/datatables/js/dataTables.bootstrap4.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1272
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Responsive-2.2.2/css/responsive.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1273
+            <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>
1274
+            <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>
1275
+            <script type="text/javascript" src="./plugins/datatables/plugins/select.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1276
+            <link rel="stylesheet" src="./plugins/datatables/extensions/Scroller-1.5.0/css/scroller.bootstrap4.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1277
+            <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>
1278 1278
             <!-- dater picker -->
1279
-            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1280
-            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1279
+            <link rel="stylesheet" href="./plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1280
+            <script src="./plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1281 1281
             <!-- daterange picker -->
1282
-            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>">
1283
-            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1284
-            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1282
+            <link rel="stylesheet" href="./plugins/daterangepicker/daterangepicker.css?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>">
1283
+            <script src="./plugins/moment/moment.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1284
+            <script src="./plugins/daterangepicker/daterangepicker.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1285 1285
             <!-- SlimScroll -->
1286
-            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1286
+            <script src="./plugins/slimScroll/jquery.slimscroll.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1287 1287
             <!-- FastClick -->
1288
-            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1288
+            <script src="./plugins/fastclick/fastclick.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1289 1289
         <?php
1290 1290
         } elseif ($get['page'] === 'profile') {
1291 1291
             ?>
1292 1292
             <!-- FILESAVER -->
1293
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1293
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1294 1294
             <!-- PLUPLOAD -->
1295
-            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1295
+            <script type="text/javascript" src="plugins/plupload/js/plupload.full.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1296 1296
         <?php
1297 1297
         } elseif ($get['page'] === 'export') {
1298 1298
             ?>
1299 1299
             <!-- FILESAVER -->
1300
-            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1300
+            <script type="text/javascript" src="plugins/downloadjs/download.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1301 1301
             <!-- PWSTRENGHT -->
1302
-            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1303
-            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1302
+            <script type="text/javascript" src="plugins/zxcvbn/zxcvbn.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1303
+            <script type="text/javascript" src="plugins/jquery.pwstrength/pwstrength-bootstrap.min.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1304 1304
         <?php
1305 1305
         }
1306 1306
     }
1307 1307
     ?>
1308 1308
     <!-- functions -->
1309
-    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1310
-    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1309
+    <script type="text/javascript" src="includes/js/functions.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1310
+    <script type="text/javascript" src="includes/js/CreateRandomString.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1311 1311
     <input type="hidden" id="encryptClientServerStatus" value="<?php echo $SETTINGS['encryptClientServer'] ?? 1; ?>" />
1312 1312
 
1313 1313
     </body>
@@ -1349,7 +1349,7 @@  discard block
 block discarded – undo
1349 1349
     };
1350 1350
 </script>
1351 1351
 
1352
-<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION . '.' . TP_VERSION_MINOR; ?>"></script>
1352
+<script type="text/javascript" src="includes/js/secure-clipboard-cleaner.js?v=<?php echo TP_VERSION.'.'.TP_VERSION_MINOR; ?>"></script>
1353 1353
 
1354 1354
 <script>
1355 1355
     $(document).ready(function() {
@@ -1408,65 +1408,65 @@  discard block
 block discarded – undo
1408 1408
 
1409 1409
 // Load links, css and javascripts
1410 1410
 if (isset($SETTINGS['cpassman_dir']) === true) {
1411
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
1411
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
1412 1412
     if ($menuAdmin === true) {
1413
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
1413
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
1414 1414
         if ($get['page'] === '2fa') {
1415
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
1415
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
1416 1416
         } elseif ($get['page'] === 'api') {
1417
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
1417
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
1418 1418
         } elseif ($get['page'] === 'backups') {
1419
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
1419
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
1420 1420
         } elseif ($get['page'] === 'emails') {
1421
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
1421
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
1422 1422
         } elseif ($get['page'] === 'ldap') {
1423
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
1423
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
1424 1424
         } elseif ($get['page'] === 'uploads') {
1425
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
1425
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
1426 1426
         } elseif ($get['page'] === 'fields') {
1427
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
1427
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
1428 1428
         } elseif ($get['page'] === 'options') {
1429
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
1429
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
1430 1430
         } elseif ($get['page'] === 'statistics') {
1431
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
1431
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
1432 1432
         } elseif ($get['page'] === 'tasks') {
1433
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tasks.js.php';
1433
+            include_once $SETTINGS['cpassman_dir'].'/pages/tasks.js.php';
1434 1434
         } elseif ($get['page'] === 'oauth' && WIP === true) {
1435
-            include_once $SETTINGS['cpassman_dir'] . '/pages/oauth.js.php';        
1435
+            include_once $SETTINGS['cpassman_dir'].'/pages/oauth.js.php';        
1436 1436
         } elseif ($get['page'] === 'tools') {
1437
-            include_once $SETTINGS['cpassman_dir'] . '/pages/tools.js.php';
1437
+            include_once $SETTINGS['cpassman_dir'].'/pages/tools.js.php';
1438 1438
         }
1439 1439
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
1440 1440
         if ($get['page'] === 'items') {
1441
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
1441
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
1442 1442
         } elseif ($get['page'] === 'import') {
1443
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
1443
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
1444 1444
         } elseif ($get['page'] === 'export') {
1445
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
1445
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
1446 1446
         } elseif ($get['page'] === 'offline') {
1447
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
1447
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
1448 1448
         } elseif ($get['page'] === 'search') {
1449
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
1449
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
1450 1450
         } elseif ($get['page'] === 'profile') {
1451
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
1451
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
1452 1452
         } elseif ($get['page'] === 'favourites') {
1453
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
1453
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
1454 1454
         } elseif ($get['page'] === 'folders') {
1455
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
1455
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
1456 1456
         } elseif ($get['page'] === 'users') {
1457
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
1457
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
1458 1458
         } elseif ($get['page'] === 'roles') {
1459
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
1459
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
1460 1460
         } elseif ($get['page'] === 'utilities.deletion') {
1461
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
1461
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
1462 1462
         } elseif ($get['page'] === 'utilities.logs') {
1463
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
1463
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
1464 1464
         } elseif ($get['page'] === 'utilities.database') {
1465
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
1465
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
1466 1466
         } elseif ($get['page'] === 'utilities.renewal') {
1467
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
1467
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
1468 1468
         }
1469 1469
     } else {
1470
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
1470
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
1471 1471
     }
1472 1472
 }
Please login to merge, or discard this patch.