Passed
Push — teampass_3.0 ( ae6be7...59a813 )
by Nils
04:28
created
sources/identify.php 1 patch
Spacing   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -44,23 +44,23 @@  discard block
 block discarded – undo
44 44
     throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
45 45
 }
46 46
 
47
-if (! isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
47
+if (!isset($SETTINGS['cpassman_dir']) || empty($SETTINGS['cpassman_dir']) === true || $SETTINGS['cpassman_dir'] === '.') {
48 48
     $SETTINGS = [];
49 49
     $SETTINGS['cpassman_dir'] = '..';
50 50
 }
51 51
 
52
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
53
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
54
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
52
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
53
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
54
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
55 55
 
56 56
 // If Debug then clean the files
57 57
 if (DEBUGLDAP === true) {
58
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
58
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
59 59
     $fp = fopen(DEBUGLDAPFILE, 'w');
60 60
     fclose($fp);
61 61
 }
62 62
 if (DEBUGDUO === true) {
63
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
63
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
64 64
     $fp = fopen(DEBUGDUOFILE, 'w');
65 65
     fclose($fp);
66 66
 }
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 if (defined('DB_PASSWD_CLEAR') === false) {
77 77
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
78 78
 }
79
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
79
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
80 80
 if (defined('DB_PASSWD_CLEAR') === false) {
81 81
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
82 82
 }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     // Get DUO keys
96 96
     $duoData = DB::query(
97 97
         'SELECT intitule, valeur
98
-        FROM ' . prefixTable('misc') . '
98
+        FROM ' . prefixTable('misc').'
99 99
         WHERE type = %s',
100 100
         'duoSecurity'
101 101
     );
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     }
106 106
 
107 107
     // load library
108
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
108
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
109 109
     $sig_request = Duo::signRequest(
110 110
         $_GLOBALS['IKEY'],
111 111
         $_GLOBALS['SKEY'],
@@ -116,16 +116,16 @@  discard block
 block discarded – undo
116 116
         debugIdentify(
117 117
             DEBUGDUO,
118 118
             DEBUGDUOFILE,
119
-            "\n\n-----\n\n" .
120
-                'sig request : ' . $post_login . "\n" .
121
-                'resp : ' . $sig_request . "\n"
119
+            "\n\n-----\n\n".
120
+                'sig request : '.$post_login."\n".
121
+                'resp : '.$sig_request."\n"
122 122
         );
123 123
     }
124 124
 
125 125
     // load csrfprotector
126
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
126
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
127 127
     // return result
128
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
128
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
129 129
 // ---
130 130
     // ---
131 131
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
     //--------
136 136
 
137 137
     // load library
138
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
138
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
139 139
     $authenticated_username = Duo::verifyResponse(
140 140
         $SETTINGS['duo_ikey'],
141 141
         $SETTINGS['duo_skey'],
@@ -146,9 +146,9 @@  discard block
 block discarded – undo
146 146
         debugIdentify(
147 147
             DEBUGDUO,
148 148
             DEBUGDUOFILE,
149
-            "\n\n-----\n\n" .
150
-                'sig response : ' . $post_sig_response . "\n" .
151
-                'resp : ' . $authenticated_username . "\n"
149
+            "\n\n-----\n\n".
150
+                'sig response : '.$post_sig_response."\n".
151
+                'resp : '.$authenticated_username."\n"
152 152
         );
153 153
     }
154 154
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             // is user in Teampass?
160 160
             DB::queryfirstrow(
161 161
                 'SELECT id
162
-                FROM ' . prefixTable('users') . '
162
+                FROM ' . prefixTable('users').'
163 163
                 WHERE login = %s',
164 164
                 $post_login
165 165
             );
@@ -169,9 +169,9 @@  discard block
 block discarded – undo
169 169
             }
170 170
         }
171 171
 
172
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
172
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
173 173
     } else {
174
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
174
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
175 175
     }
176 176
     // ---
177 177
     // ---
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
     }
198 198
 
199 199
     // Load superGlobals
200
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
200
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
201 201
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
202 202
     // Prepare GET variables
203 203
     $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
@@ -285,19 +285,19 @@  discard block
 block discarded – undo
285 285
     } else {
286 286
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
287 287
     }
288
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
289
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
290
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
288
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
289
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
290
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
291 291
     
292 292
     header('Content-type: text/html; charset=utf-8');
293 293
     error_reporting(E_ERROR);
294 294
 
295 295
     // Load AntiXSS
296
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
296
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
297 297
     $antiXss = new voku\helper\AntiXSS();
298 298
 
299 299
     // Load superGlobals
300
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
300
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
301 301
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
302 302
 
303 303
     // Prepare GET variables
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
     $server['PHP_AUTH_PW'] = $superGlobal->get('PHP_AUTH_PW', 'SERVER');
312 312
 
313 313
     // connect to the server
314
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
314
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
315 315
     DB::$host = DB_HOST;
316 316
     DB::$user = DB_USER;
317 317
     DB::$password = defined('DB_PASSWD_CLEAR') === false ? defuseReturnDecrypted(DB_PASSWD, $SETTINGS) : DB_PASSWD_CLEAR;
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
     DB::$port = DB_PORT;
320 320
     DB::$encoding = DB_ENCODING;
321 321
     // User's language loading
322
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
322
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
323 323
     
324 324
     // decrypt and retreive data in JSON format
325 325
     if (empty($sessionKey) === true) {
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
         //$arrAttempts = array();
448 448
         $rows = DB::query(
449 449
             'SELECT date
450
-            FROM ' . prefixTable('log_system') . "
450
+            FROM ' . prefixTable('log_system')."
451 451
             WHERE field_1 = %s
452 452
             AND type = 'failed_auth'
453 453
             AND label = 'password_is_not_correct'
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
             foreach ($rows as $record) {
464 464
                 array_push(
465 465
                     $arrAttempts,
466
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date'])
466
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date'])
467 467
                 );
468 468
             }
469 469
         }
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
602 602
             $resRoles = DB::queryFirstRow(
603 603
                 'SELECT title, complexity
604
-                FROM ' . prefixTable('roles_title') . '
604
+                FROM ' . prefixTable('roles_title').'
605 605
                 WHERE id=%i',
606 606
                 $role
607 607
             );
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 
623 623
         // build complete array of roles
624 624
         $superGlobal->put('arr_roles_full', [], 'SESSION');
625
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
625
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
626 626
         foreach ($rows as $record) {
627 627
             $superGlobal->put(
628 628
                 $record['id'],
@@ -713,10 +713,10 @@  discard block
 block discarded – undo
713 713
         $superGlobal->put('latest_items_tab', [], 'SESSION');
714 714
         $superGlobal->put('nb_roles', 0, 'SESSION');
715 715
         foreach ($superGlobal->get('latest_items', 'SESSION') as $item) {
716
-            if (! empty($item)) {
716
+            if (!empty($item)) {
717 717
                 $dataLastItems = DB::queryFirstRow(
718 718
                     'SELECT id,label,id_tree
719
-                    FROM ' . prefixTable('items') . '
719
+                    FROM ' . prefixTable('items').'
720 720
                     WHERE id=%i',
721 721
                     $item
722 722
                 );
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
                     [
726 726
                         'id' => $item,
727 727
                         'label' => $dataLastItems['label'],
728
-                        'url' => 'index.php?page=items&group=' . $dataLastItems['id_tree'] . '&id=' . $item,
728
+                        'url' => 'index.php?page=items&group='.$dataLastItems['id_tree'].'&id='.$item,
729 729
                     ],
730 730
                     'SESSION',
731 731
                     'latest_items_tab'
@@ -742,12 +742,12 @@  discard block
 block discarded – undo
742 742
         ) {
743 743
             // get all Admin users
744 744
             $receivers = '';
745
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
745
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
746 746
             foreach ($rows as $record) {
747 747
                 if (empty($receivers)) {
748 748
                     $receivers = $record['email'];
749 749
                 } else {
750
-                    $receivers = ',' . $record['email'];
750
+                    $receivers = ','.$record['email'];
751 751
                 }
752 752
             }
753 753
             // Add email to table
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
                             '#tp_time#',
764 764
                         ],
765 765
                         [
766
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
766
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
767 767
                             date($SETTINGS['date_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
768 768
                             date($SETTINGS['time_format'], (int) $superGlobal->get('last_connection', 'SESSION')),
769 769
                         ],
@@ -981,44 +981,44 @@  discard block
 block discarded – undo
981 981
     }
982 982
 
983 983
     // Load expected libraries
984
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
985
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
986
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
987
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
988
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
989
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
990
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
991
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
992
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
993
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
994
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
995
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
996
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
997
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
998
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
999
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
1000
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
1001
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
1002
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
1003
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
1004
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
1005
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
1006
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
1007
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
1008
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
1009
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
1010
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
1011
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
1012
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
1013
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
1014
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
1015
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
1016
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
1017
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
1018
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
1019
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
1020
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
1021
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
984
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
985
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
986
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
987
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
988
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
989
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
990
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
991
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
992
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
993
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
994
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
995
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
996
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
997
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
998
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
999
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
1000
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
1001
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
1002
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
1003
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
1004
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
1005
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
1006
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
1007
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
1008
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
1009
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
1010
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
1011
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
1012
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
1013
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
1014
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
1015
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
1016
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
1017
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
1018
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
1019
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
1020
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
1021
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
1022 1022
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
1023 1023
     $ad->register();
1024 1024
     $connection = new Connection($config);
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
         $error = $e->getDetailedError();
1031 1031
         return [
1032 1032
             'error' => true,
1033
-            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage(). '<br>'.$error->getDiagnosticMessage().' '.$config['username'],
1033
+            'message' => langHdl('error').' : '.$error->getErrorCode().' - '.$error->getErrorMessage().'<br>'.$error->getDiagnosticMessage().' '.$config['username'],
1034 1034
 
1035 1035
         ];
1036 1036
     }
@@ -1058,7 +1058,7 @@  discard block
 block discarded – undo
1058 1058
     }
1059 1059
 
1060 1060
     // load passwordLib library
1061
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1061
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1062 1062
     $pwdlib->register();
1063 1063
     $pwdlib = new PasswordLib\PasswordLib();
1064 1064
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
 function yubicoMFACheck($dataReceived, string $userInfo, array $SETTINGS): array
1124 1124
 {
1125 1125
     // Load superGlobals
1126
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1126
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1127 1127
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
1128 1128
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
1129 1129
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1162,7 +1162,7 @@  discard block
 block discarded – undo
1162 1162
     }
1163 1163
 
1164 1164
     // Now check yubico validity
1165
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
1165
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
1166 1166
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
1167 1167
     $auth = $yubi->verify($yubico_key);
1168 1168
     //, null, null, null, 60
@@ -1214,7 +1214,7 @@  discard block
 block discarded – undo
1214 1214
             'gestionnaire' => '0',
1215 1215
             'can_manage_all_users' => '0',
1216 1216
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
1217
-            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'] . ';' : '') . (isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
1217
+            'fonction_id' => (empty($retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass']) === false ? $retLDAP['user_info_from_ad'][0]['commonGroupsLdapVsTeampass'].';' : '').(isset($SETTINGS['ldap_new_user_role']) === true ? $SETTINGS['ldap_new_user_role'] : '0'),
1218 1218
             'groupes_interdits' => '',
1219 1219
             'groupes_visibles' => '',
1220 1220
             'last_pw_change' => (int) time(),
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
             ]
1240 1240
         );
1241 1241
         // Rebuild tree
1242
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1242
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
1243 1243
         $tree->register();
1244 1244
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
1245 1245
         $tree->rebuild();
@@ -1270,13 +1270,13 @@  discard block
 block discarded – undo
1270 1270
         && empty($dataReceived['GACode']) === false
1271 1271
     ) {
1272 1272
         // Load superGlobals
1273
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1273
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1274 1274
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
1275 1275
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
1276 1276
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
1277 1277
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
1278 1278
         // load library
1279
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
1279
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
1280 1280
         // create new instance
1281 1281
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
1282 1282
         // Init
@@ -1298,7 +1298,7 @@  discard block
 block discarded – undo
1298 1298
             $mfaMessage = langHdl('ga_flash_qr_and_login');
1299 1299
             // generate new QR
1300 1300
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
1301
-                'Teampass - ' . $username,
1301
+                'Teampass - '.$username,
1302 1302
                 $userInfo['ga']
1303 1303
             );
1304 1304
             // clear temporary code from DB
@@ -1311,7 +1311,7 @@  discard block
 block discarded – undo
1311 1311
                 $userInfo['id']
1312 1312
             );
1313 1313
             $firstTime = [
1314
-                'value' => '<img src="' . $new_2fa_qr . '">',
1314
+                'value' => '<img src="'.$new_2fa_qr.'">',
1315 1315
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
1316 1316
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
1317 1317
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1363,8 +1363,8 @@  discard block
 block discarded – undo
1363 1363
     // Set to false
1364 1364
     $userPasswordVerified = false;
1365 1365
     // load passwordLib library
1366
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
1367
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1366
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
1367
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1368 1368
     $pwdlib->register();
1369 1369
     $pwdlib = new PasswordLib\PasswordLib();
1370 1370
     // Check if old encryption used
@@ -1495,7 +1495,7 @@  discard block
 block discarded – undo
1495 1495
     // Brute force management
1496 1496
     if ($sessionPwdAttempts > 3) {
1497 1497
         // Load superGlobals
1498
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1498
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1499 1499
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
1500 1500
         $superGlobal->put('next_possible_pwd_attempts', time() + 10, 'SESSION');
1501 1501
         $superGlobal->put('pwd_attempts', 0, 'SESSION');
@@ -1537,7 +1537,7 @@  discard block
 block discarded – undo
1537 1537
     // Check if user exists
1538 1538
     $userInfo = DB::queryFirstRow(
1539 1539
         'SELECT *
1540
-        FROM ' . prefixTable('users') . ' WHERE login=%s',
1540
+        FROM ' . prefixTable('users').' WHERE login=%s',
1541 1541
         $username
1542 1542
     );
1543 1543
     
Please login to merge, or discard this patch.
pages/profile.php 1 patch
Spacing   +38 added lines, -40 removed lines patch added patch discarded remove patch
@@ -43,16 +43,16 @@  discard block
 block discarded – undo
43 43
 }
44 44
 
45 45
 /* do checks */
46
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
46
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47 47
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS) === false) {
48 48
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49
-    include $SETTINGS['cpassman_dir'] . '/error.php';
49
+    include $SETTINGS['cpassman_dir'].'/error.php';
50 50
     exit;
51 51
 }
52 52
 
53 53
 // Load template
54
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
55
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
54
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
55
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
56 56
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
57 57
 // Prepare GET variables
58 58
 $get = [];
@@ -73,25 +73,25 @@  discard block
 block discarded – undo
73 73
 // prepare list of timezones
74 74
 $zones = timezone_list();
75 75
 // prepare list of languages
76
-$languages = DB::query('SELECT label FROM ' . prefixTable('languages') . ' ORDER BY label ASC');
76
+$languages = DB::query('SELECT label FROM '.prefixTable('languages').' ORDER BY label ASC');
77 77
 // Do some stats
78
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_creation" AND  id_user = "' . $_SESSION['user_id'] . '"');
78
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_creation" AND  id_user = "'.$_SESSION['user_id'].'"');
79 79
 $userItemsNumber = DB::count();
80
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_modification" AND  id_user = "' . $_SESSION['user_id'] . '"');
80
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_modification" AND  id_user = "'.$_SESSION['user_id'].'"');
81 81
 $userModificationNumber = DB::count();
82
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_shown" AND  id_user = "' . $_SESSION['user_id'] . '"');
82
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_shown" AND  id_user = "'.$_SESSION['user_id'].'"');
83 83
 $userSeenItemsNumber = DB::count();
84
-DB::query('SELECT id_item FROM ' . prefixTable('log_items') . ' WHERE action = "at_password_shown" AND  id_user = "' . $_SESSION['user_id'] . '"');
84
+DB::query('SELECT id_item FROM '.prefixTable('log_items').' WHERE action = "at_password_shown" AND  id_user = "'.$_SESSION['user_id'].'"');
85 85
 $userSeenPasswordsNumber = DB::count();
86 86
 $userInfo = DB::queryFirstRow(
87 87
     'SELECT avatar 
88
-    FROM ' . prefixTable('users') . ' 
89
-    WHERE id = "' . $_SESSION['user_id'] . '"'
88
+    FROM ' . prefixTable('users').' 
89
+    WHERE id = "' . $_SESSION['user_id'].'"'
90 90
 );
91 91
 if (empty($userInfo['avatar']) === true) {
92
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/images/photo.jpg';
92
+    $avatar = $SETTINGS['cpassman_url'].'/includes/images/photo.jpg';
93 93
 } else {
94
-    $avatar = $SETTINGS['cpassman_url'] . '/includes/avatars/' . $userInfo['avatar'];
94
+    $avatar = $SETTINGS['cpassman_url'].'/includes/avatars/'.$userInfo['avatar'];
95 95
 }
96 96
 
97 97
 // Get Groups name
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 foreach ($_SESSION['user_roles'] as $role) {
100 100
     $tmp = DB::queryFirstRow(
101 101
         'SELECT title 
102
-        FROM ' . prefixTable('roles_title') . ' 
103
-        WHERE id = "' . $role . '"'
102
+        FROM ' . prefixTable('roles_title').' 
103
+        WHERE id = "' . $role.'"'
104 104
     );
105 105
     if ($tmp !== null) {
106 106
         array_push($userParOfGroups, $tmp['title']);
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
                         <h3 id="profile-username" class="text-center">
145 145
                             <?php
146 146
                             if (isset($_SESSION['name']) === true && empty($_SESSION['name']) === false) {
147
-                                echo $_SESSION['name'] . ' ' . $_SESSION['lastname'];
147
+                                echo $_SESSION['name'].' '.$_SESSION['lastname'];
148 148
                             } else {
149 149
                                 echo $_SESSION['login'];
150 150
                             }
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
                                             } else {
212 212
                                                 echo date('d/m/Y', (int) $_SESSION['last_connection']);
213 213
                                             }
214
-                                            echo ' ' . langHdl('at') . ' ';
214
+                                            echo ' '.langHdl('at').' ';
215 215
                                             if (isset($SETTINGS['time_format']) === true) {
216 216
                                                 echo date($SETTINGS['time_format'], (int) $_SESSION['last_connection']);
217 217
                                             } else {
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                                         </a>
222 222
                                     </li>
223 223
                                     <?php
224
-                                    if (isset($_SESSION['last_pw_change']) && ! empty($_SESSION['last_pw_change'])) {
224
+                                    if (isset($_SESSION['last_pw_change']) && !empty($_SESSION['last_pw_change'])) {
225 225
                                         // Handle last password change string
226 226
                                         if (isset($_SESSION['last_pw_change']) === true) {
227 227
                                             if (isset($SETTINGS['date_format']) === true) {
@@ -241,12 +241,12 @@  discard block
 block discarded – undo
241 241
                                         ) {
242 242
                                             $numDaysBeforePwExpiration = '';
243 243
                                         } else {
244
-                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'] . ' ' . $_SESSION['numDaysBeforePwExpiration'] . ' ' . $LANG['days'] . '.';
244
+                                            $numDaysBeforePwExpiration = $LANG['index_pw_expiration'].' '.$_SESSION['numDaysBeforePwExpiration'].' '.$LANG['days'].'.';
245 245
                                         }
246 246
                                         echo '
247 247
                                     <li class="list-group-item">
248
-                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change') . '</b>
249
-                                        <a class="float-right">' . $last_pw_change . ' ' . $numDaysBeforePwExpiration . '</a>
248
+                                        <b><i class="fas fa-calendar-alt fa-fw fa-lg mr-2"></i>' . langHdl('index_last_pw_change').'</b>
249
+                                        <a class="float-right">' . $last_pw_change.' '.$numDaysBeforePwExpiration.'</a>
250 250
                                     </li>';
251 251
                                     }
252 252
                                     ?>
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
                                     if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
267 267
                                         echo '
268 268
                                     <li class="list-group-item">
269
-                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key') . '</b>
269
+                                        <b><i class="fas fa-paper-plane fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_api_key').'</b>
270 270
                                         <a class="float-right" id="profile-user-api-token">',
271 271
                                             isset($_SESSION['user']['api-key']) === true ? $_SESSION['user']['api-key'] : '',
272 272
                                             '</a>
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
                                     ) {
279 279
                                         echo '
280 280
                                     <li class="list-group-item">
281
-                                        <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id') . '</b>
281
+                                        <b><i class="fas fa-id-card-o fa-fw fa-lg mr-2"></i>' . langHdl('user_profile_agses_card_id').'</b>
282 282
                                         <a class="float-right">',
283 283
                                             $_SESSION['user_agsescardid'] ?? '',
284 284
                                             '</a>
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
                                         <ul class="">
303 303
                                             <?php
304 304
                                                 foreach ($_SESSION['user']['unsuccessfull_login_attempts_list'] as $entry) {
305
-                                                    echo '<li class="">' . $entry . '</li>';
305
+                                                    echo '<li class="">'.$entry.'</li>';
306 306
                                                 } ?>
307 307
                                         </ul>
308 308
                                     </div>
@@ -315,12 +315,12 @@  discard block
 block discarded – undo
315 315
                                         <?php
316 316
                                         $rows = DB::query(
317 317
                                             'SELECT label AS labelAction, date, null
318
-                                                    FROM ' . prefixTable('log_system') . '
318
+                                                    FROM ' . prefixTable('log_system').'
319 319
                                                     WHERE qui = %i
320 320
                                                     UNION
321 321
                                                     SELECT l.action, l.date, i.label AS itemLabel
322
-                                                    FROM ' . prefixTable('log_items') . ' AS l
323
-                                                    INNER JOIN ' . prefixTable('items') . ' AS i ON (l.id_item = i.id)
322
+                                                    FROM ' . prefixTable('log_items').' AS l
323
+                                                    INNER JOIN ' . prefixTable('items').' AS i ON (l.id_item = i.id)
324 324
                                                     WHERE l.id_user = %i AND l.action IN ("at_access")
325 325
                                                     ORDER BY date DESC
326 326
                                                     LIMIT 0, 40',
@@ -334,9 +334,9 @@  discard block
 block discarded – undo
334 334
                                                 $text = langHdl($record['labelAction']);
335 335
                                             }
336 336
                                             if (empty($record['NULL']) === false) {
337
-                                                $text .= ' ' . langHdl('for') . ' <span class="font-weight-light">' . addslashes($record['NULL']) . '</span>';
337
+                                                $text .= ' '.langHdl('for').' <span class="font-weight-light">'.addslashes($record['NULL']).'</span>';
338 338
                                             }
339
-                                            echo '<li class="list-group-item">' . date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $record['date']) . ' - ' . $text . '</li>';
339
+                                            echo '<li class="list-group-item">'.date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $record['date']).' - '.$text.'</li>';
340 340
                                         }
341 341
                                         ?>
342 342
                                     </ul>
@@ -374,11 +374,10 @@  discard block
 block discarded – undo
374 374
                                                 <?php
375 375
                                                 foreach ($zones as $key => $zone) {
376 376
                                                     echo '
377
-                                                <option value="' . $key . '"',
377
+                                                <option value="' . $key.'"',
378 378
                                                     isset($_SESSION['user_timezone']) === true && $_SESSION['user_timezone'] === $key ?
379
-                                                    ' selected' :
380
-                                                    (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
381
-                                                '>' . $zone . '</option>';
379
+                                                    ' selected' : (isset($SETTINGS['timezone']) === true && $SETTINGS['timezone'] === $key ? ' selected' : ''),
380
+                                                '>'.$zone.'</option>';
382 381
                                                 }
383 382
                                                 ?>
384 383
                                             </select>
@@ -390,11 +389,10 @@  discard block
 block discarded – undo
390 389
                                             <select class="form-control" id="profile-user-language">
391 390
                                                 <?php
392 391
                                                 foreach ($languages as $language) {
393
-                                                    echo '<option value="' . $language['label'] . '"',
392
+                                                    echo '<option value="'.$language['label'].'"',
394 393
                                                     $_SESSION['user_language'] === strtolower($language['label']) ?
395
-                                                    ' selected="selected"' :
396
-                                                    ($SETTINGS['default_language'] === strtolower($language['label']) ? ' selected="selected"' : ''),
397
-                                                '>' . $language['label'] . '</option>';
394
+                                                    ' selected="selected"' : ($SETTINGS['default_language'] === strtolower($language['label']) ? ' selected="selected"' : ''),
395
+                                                '>'.$language['label'].'</option>';
398 396
                                                 }
399 397
                                                 ?>
400 398
                                             </select>
@@ -406,10 +404,10 @@  discard block
 block discarded – undo
406 404
                                         <div class="col-sm-10">
407 405
                                             <select class="form-control" id="profile-user-treeloadstrategy">
408 406
                                                 <option value="<?php echo langHdl('sequential'); ?>"
409
-                                                    <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'sequential' ? ' selected' : '';?>
407
+                                                    <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'sequential' ? ' selected' : ''; ?>
410 408
                                                 ><?php echo langHdl('sequential'); ?></option>
411 409
                                                 <option value="<?php echo langHdl('full'); ?>"
412
-                                                    <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'full' ? ' selected' : '';?>
410
+                                                    <?php echo isset($_SESSION['user_treeloadstrategy']) === true && $_SESSION['user_treeloadstrategy'] === 'full' ? ' selected' : ''; ?>
413 411
                                                 ><?php echo langHdl('full'); ?></option>
414 412
                                             </select>
415 413
                                         </div>
@@ -443,7 +441,7 @@  discard block
 block discarded – undo
443 441
                                                 <button type="button" class="btn btn-warning float-right ml-2" id="profile-avatar-file"><?php echo langHdl('upload_new_avatar'); ?></button>
444 442
                                                 <?php
445 443
                                                 if (isset($SETTINGS['api']) === true && (int) $SETTINGS['api'] === 1) {
446
-                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">' . langHdl('generate_api_token') . '</button>';
444
+                                                    echo '<button type="button" class="btn btn-warning float-right" id="profile-button-api_token">'.langHdl('generate_api_token').'</button>';
447 445
                                                 }
448 446
                                                 ?>
449 447
                                                 <div id="profile-avatar-file-container" class="hidden"></div>
Please login to merge, or discard this patch.
pages/profile.js.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,11 +43,11 @@  discard block
 block discarded – undo
43 43
 }
44 44
 
45 45
 /* do checks */
46
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
46
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
47 47
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'profile', $SETTINGS) === false) {
48 48
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
49 49
     //not allowed page
50
-    include $SETTINGS['cpassman_dir'] . '/error.php';
50
+    include $SETTINGS['cpassman_dir'].'/error.php';
51 51
     exit;
52 52
 }
53 53
 ?>
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
                     $('#profile-username').html($('#profile-user-name').val() + ' ' + $('#profile-user-lastname').val());
213 213
 
214 214
                     // reload page in case of language change
215
-                    if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $_SESSION['user_language'];?>') {
215
+                    if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $_SESSION['user_language']; ?>') {
216 216
                         // prepare reload
217 217
                         $(this).delay(3000).queue(function() {
218 218
                             document.location.href = "index.php?page=profile";
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
                         // Inform user
224 224
                         toastr.remove();
225 225
                         toastr.info(
226
-                            '<?php echo langHdl('alert_page_will_reload') . ' ... ' . langHdl('please_wait'); ?>',
226
+                            '<?php echo langHdl('alert_page_will_reload').' ... '.langHdl('please_wait'); ?>',
227 227
                             '', {
228 228
                                 timeOut: 3000,
229 229
                                 progressBar: true
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
72 72
 }
73 73
 
74 74
 // Include files
75
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
76
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
75
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
76
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
77 77
 // Quick major version check -> upgrade needed?
78 78
 if (isset($SETTINGS['cpassman_version']) === true && version_compare(TP_VERSION, $SETTINGS['cpassman_version']) > 0) {
79 79
     // Perform redirection
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     exit;
87 87
 }
88 88
 
89
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
89
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
90 90
 $superGlobal = new protect\SuperGlobal\SuperGlobal();
91 91
 
92 92
 if (isset($SETTINGS['cpassman_url']) === false || $SETTINGS['cpassman_url'] === '') {
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
 }
95 95
 
96 96
 // Include files
97
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
98
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
97
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
98
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
99 99
 // Open MYSQL database connection
100 100
 require_once './includes/libraries/Database/Meekrodb/db.class.php';
101 101
 if (defined('DB_PASSWD_CLEAR') === false) {
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 DB::$port = DB_PORT;
109 109
 DB::$encoding = DB_ENCODING;
110 110
 // Load Core library
111
-require_once $SETTINGS['cpassman_dir'] . '/sources/core.php';
111
+require_once $SETTINGS['cpassman_dir'].'/sources/core.php';
112 112
 // Prepare POST variables
113 113
 $post_language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
114 114
 // Prepare superGlobal variables
@@ -138,8 +138,8 @@  discard block
 block discarded – undo
138 138
     //get default language
139 139
     $dataLanguage = DB::queryFirstRow(
140 140
         'SELECT m.valeur AS valeur, l.flag AS flag
141
-        FROM ' . prefixTable('misc') . ' AS m
142
-        INNER JOIN ' . prefixTable('languages') . ' AS l ON (m.valeur = l.name)
141
+        FROM ' . prefixTable('misc').' AS m
142
+        INNER JOIN ' . prefixTable('languages').' AS l ON (m.valeur = l.name)
143 143
         WHERE m.type=%s_type AND m.intitule=%s_intitule',
144 144
         [
145 145
             'type' => 'admin',
@@ -181,23 +181,23 @@  discard block
 block discarded – undo
181 181
 
182 182
 // Load user languages files
183 183
 if (in_array($session_user_language, $languagesList) === true) {
184
-    if (file_exists($SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php') === true) {
185
-        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'] . '/includes/language/' . $session_user_language . '.php';
184
+    if (file_exists($SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php') === true) {
185
+        $_SESSION['teampass']['lang'] = include $SETTINGS['cpassman_dir'].'/includes/language/'.$session_user_language.'.php';
186 186
     }
187 187
 } else {
188 188
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
189 189
     //not allowed page
190
-    include $SETTINGS['cpassman_dir'] . '/error.php';
190
+    include $SETTINGS['cpassman_dir'].'/error.php';
191 191
 }
192 192
 
193 193
 // load 2FA Google
194 194
 if (isset($SETTINGS['google_authentication']) === true && $SETTINGS['google_authentication'] === '1') {
195
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
195
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
196 196
 }
197 197
 
198 198
 // load 2FA Yubico
199 199
 if (isset($SETTINGS['yubico_authentication']) === true && $SETTINGS['yubico_authentication'] === '1') {
200
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
200
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
201 201
 }
202 202
 
203 203
 // Some template adjust
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
     <!-- Toastr -->
255 255
     <link rel="stylesheet" href="plugins/toastr/toastr.min.css" />
256 256
     <!-- favicon -->
257
-    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon'];?>"/>
257
+    <link rel="shortcut icon" type="image/png" href="<?php echo $SETTINGS['favicon']; ?>"/>
258 258
 </head>
259 259
 
260 260
 
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
             ),
286 286
             'SESSION'
287 287
         );
288
-        include $SETTINGS['cpassman_dir'] . '/error.php';
288
+        include $SETTINGS['cpassman_dir'].'/error.php';
289 289
     }
290 290
 } elseif (
291 291
     $session_validite_pw !== null
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
                         <div class="dropdown show">
330 330
                             <a class="btn btn-primary dropdown-toggle" href="#" data-toggle="dropdown">
331 331
                                 <?php
332
-                                    echo $session_name . '&nbsp;' . $session_lastname; ?>
332
+                                    echo $session_name.'&nbsp;'.$session_lastname; ?>
333 333
                             </a>
334 334
 
335 335
                             <div class="dropdown-menu dropdown-menu-right">
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
             <!-- Main Sidebar Container -->
368 368
             <aside class="main-sidebar sidebar-dark-primary elevation-4">
369 369
                 <!-- Brand Logo -->
370
-                <a href="<?php echo $SETTINGS['cpassman_url'] . '/index.php?page=items'; ?>" class="brand-link">
370
+                <a href="<?php echo $SETTINGS['cpassman_url'].'/index.php?page=items'; ?>" class="brand-link">
371 371
                     <img src="includes/images/teampass-logo2-home.png" alt="Teampass Logo" class="brand-image">
372 372
                     <span class="brand-text font-weight-light"><?php echo TP_TOOL_NAME; ?></span>
373 373
                 </a>
@@ -385,7 +385,7 @@  discard block
 block discarded – undo
385 385
                         <a href="#" data-name="items" class="nav-link', $get['page'] === 'items' ? ' active' : '', '">
386 386
                         <i class="nav-icon fas fa-key"></i>
387 387
                         <p>
388
-                            ' . langHdl('pw') . '
388
+                            ' . langHdl('pw').'
389 389
                         </p>
390 390
                         </a>
391 391
                     </li>';
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
                         <a href="#" data-name="import" class="nav-link', $get['page'] === 'import' ? ' active' : '', '">
402 402
                         <i class="nav-icon fas fa-file-import"></i>
403 403
                         <p>
404
-                            ' . langHdl('import') . '
404
+                            ' . langHdl('import').'
405 405
                         </p>
406 406
                         </a>
407 407
                     </li>';
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
                         <a href="#" data-name="export" class="nav-link', $get['page'] === 'export' ? ' active' : '', '">
423 423
                         <i class="nav-icon fas fa-file-export"></i>
424 424
                         <p>
425
-                            ' . langHdl('export') . '
425
+                            ' . langHdl('export').'
426 426
                         </p>
427 427
                         </a>
428 428
                     </li>';
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
                         <a href="#" data-name="search" class="nav-link', $get['page'] === 'search' ? ' active' : '', '">
450 450
                         <i class="nav-icon fas fa-search"></i>
451 451
                         <p>
452
-                            ' . langHdl('find') . '
452
+                            ' . langHdl('find').'
453 453
                         </p>
454 454
                         </a>
455 455
                     </li>';
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
                         <a href="#" data-name="favourites" class="nav-link', $get['page'] === 'admin' ? ' favourites' : '', '">
467 467
                         <i class="nav-icon fas fa-star"></i>
468 468
                         <p>
469
-                            ' . langHdl('favorites') . '
469
+                            ' . langHdl('favorites').'
470 470
                         </p>
471 471
                         </a>
472 472
                     </li>';
@@ -496,7 +496,7 @@  discard block
 block discarded – undo
496 496
                         <a href="#" data-name="suggestion" class="nav-link', $get['page'] === 'suggestion' ? ' active' : '', '">
497 497
                         <i class="nav-icon fas fa-lightbulb"></i>
498 498
                         <p>
499
-                            ' . langHdl('suggestion_menu') . '
499
+                            ' . langHdl('suggestion_menu').'
500 500
                         </p>
501 501
                         </a>
502 502
                     </li>';
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
                         <a href="#" data-name="admin" class="nav-link', $get['page'] === 'admin' ? ' active' : '', '">
510 510
                         <i class="nav-icon fas fa-info"></i>
511 511
                         <p>
512
-                            ' . langHdl('admin_main') . '
512
+                            ' . langHdl('admin_main').'
513 513
                         </p>
514 514
                         </a>
515 515
                     </li>
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
                         <a href="#" class="nav-link">
518 518
                             <i class="nav-icon fas fa-wrench"></i>
519 519
                             <p>
520
-                                ' . langHdl('admin_settings') . '
520
+                                ' . langHdl('admin_settings').'
521 521
                                 <i class="fas fa-angle-left right"></i>
522 522
                             </p>
523 523
                         </a>
@@ -525,55 +525,55 @@  discard block
 block discarded – undo
525 525
                             <li class="nav-item">
526 526
                                 <a href="#" data-name="options" class="nav-link', $get['page'] === 'options' ? ' active' : '', '">
527 527
                                     <i class="fas fa-check-double nav-icon"></i>
528
-                                    <p>' . langHdl('options') . '</p>
528
+                                    <p>' . langHdl('options').'</p>
529 529
                                 </a>
530 530
                             </li>
531 531
                             <li class="nav-item">
532 532
                                 <a href="#" data-name="2fa" class="nav-link', $get['page'] === '2fa' ? ' active' : '', '">
533 533
                                     <i class="fas fa-qrcode nav-icon"></i>
534
-                                    <p>' . langHdl('mfa_short') . '</p>
534
+                                    <p>' . langHdl('mfa_short').'</p>
535 535
                                 </a>
536 536
                             </li>
537 537
                             <li class="nav-item">
538 538
                                 <a href="#" data-name="api" class="nav-link', $get['page'] === 'api' ? ' active' : '', '">
539 539
                                     <i class="fas fa-cubes nav-icon"></i>
540
-                                    <p>' . langHdl('api') . '</p>
540
+                                    <p>' . langHdl('api').'</p>
541 541
                                 </a>
542 542
                             </li>
543 543
                             <li class="nav-item">
544 544
                                 <a href="#" data-name="backups" class="nav-link', $get['page'] === 'backups' ? ' active' : '', '">
545 545
                                     <i class="fas fa-database nav-icon"></i>
546
-                                    <p>' . langHdl('backups') . '</p>
546
+                                    <p>' . langHdl('backups').'</p>
547 547
                                 </a>
548 548
                             </li>
549 549
                             <li class="nav-item">
550 550
                                 <a href="#" data-name="emails" class="nav-link', $get['page'] === 'emails' ? ' active' : '', '">
551 551
                                     <i class="fas fa-envelope nav-icon"></i>
552
-                                    <p>' . langHdl('emails') . '</p>
552
+                                    <p>' . langHdl('emails').'</p>
553 553
                                 </a>
554 554
                             </li>
555 555
                             <li class="nav-item">
556 556
                                 <a href="#" data-name="fields" class="nav-link', $get['page'] === 'fields' ? ' active' : '', '">
557 557
                                     <i class="fas fa-keyboard nav-icon"></i>
558
-                                    <p>' . langHdl('fields') . '</p>
558
+                                    <p>' . langHdl('fields').'</p>
559 559
                                 </a>
560 560
                             </li>
561 561
                             <li class="nav-item">
562 562
                                 <a href="#" data-name="ldap" class="nav-link', $get['page'] === 'ldap' ? ' active' : '', '">
563 563
                                     <i class="fas fa-id-card nav-icon"></i>
564
-                                    <p>' . langHdl('ldap') . '</p>
564
+                                    <p>' . langHdl('ldap').'</p>
565 565
                                 </a>
566 566
                             </li>
567 567
                             <li class="nav-item">
568 568
                                 <a href="#" data-name="uploads" class="nav-link', $get['page'] === 'uploads' ? ' active' : '', '">
569 569
                                     <i class="fas fa-file-upload nav-icon"></i>
570
-                                    <p>' . langHdl('uploads') . '</p>
570
+                                    <p>' . langHdl('uploads').'</p>
571 571
                                 </a>
572 572
                             </li>
573 573
                             <li class="nav-item">
574 574
                                 <a href="#" data-name="statistics" class="nav-link', $get['page'] === 'statistics' ? ' active' : '', '">
575 575
                                     <i class="fas fa-chart-bar nav-icon"></i>
576
-                                    <p>' . langHdl('statistics') . '</p>
576
+                                    <p>' . langHdl('statistics').'</p>
577 577
                                 </a>
578 578
                             </li>
579 579
                         </ul>
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
                         <a href="#" data-name="actions" class="nav-link', $get['page'] === 'actions' ? ' active' : '', '">
583 583
                         <i class="nav-icon fas fa-cogs"></i>
584 584
                         <p>
585
-                            ' . langHdl('actions') . '
585
+                            ' . langHdl('actions').'
586 586
                         </p>
587 587
                         </a>
588 588
                     </li>';
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
599 599
                         <i class="nav-icon fas fa-folder-open"></i>
600 600
                         <p>
601
-                            ' . langHdl('folders') . '
601
+                            ' . langHdl('folders').'
602 602
                         </p>
603 603
                         </a>
604 604
                     </li>
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
606 606
                         <a href="#" data-name="roles" class="nav-link', $get['page'] === 'roles' ? ' active' : '', '">
607 607
                         <i class="nav-icon fas fa-graduation-cap"></i>
608 608
                         <p>
609
-                            ' . langHdl('roles') . '
609
+                            ' . langHdl('roles').'
610 610
                         </p>
611 611
                         </a>
612 612
                     </li>
@@ -614,38 +614,38 @@  discard block
 block discarded – undo
614 614
                         <a href="#" data-name="users" class="nav-link', $get['page'] === 'users' ? ' active' : '', '">
615 615
                         <i class="nav-icon fas fa-users"></i>
616 616
                         <p>
617
-                            ' . langHdl('users') . '
617
+                            ' . langHdl('users').'
618 618
                         </p>
619 619
                         </a>
620 620
                     </li>
621 621
                     <li class="nav-item has-treeview', $menuUtilities === true ? ' menu-open' : '', '">
622 622
                         <a href="#" class="nav-link">
623 623
                         <i class="nav-icon fas fa-cubes"></i>
624
-                        <p>' . langHdl('admin_views') . '<i class="fas fa-angle-left right"></i></p>
624
+                        <p>' . langHdl('admin_views').'<i class="fas fa-angle-left right"></i></p>
625 625
                         </a>
626 626
                         <ul class="nav nav-treeview">
627 627
                           <li class="nav-item">
628 628
                             <a href="#" data-name="utilities.renewal" class="nav-link', $get['page'] === 'utilities.renewal' ? ' active' : '', '">
629 629
                               <i class="far fa-calendar-alt nav-icon"></i>
630
-                              <p>' . langHdl('renewal') . '</p>
630
+                              <p>' . langHdl('renewal').'</p>
631 631
                             </a>
632 632
                           </li>
633 633
                           <li class="nav-item">
634 634
                             <a href="#" data-name="utilities.deletion" class="nav-link', $get['page'] === 'utilities.deletion' ? ' active' : '', '">
635 635
                               <i class="fas fa-trash-alt nav-icon"></i>
636
-                              <p>' . langHdl('deletion') . '</p>
636
+                              <p>' . langHdl('deletion').'</p>
637 637
                             </a>
638 638
                           </li>
639 639
                           <li class="nav-item">
640 640
                             <a href="#" data-name="utilities.logs" class="nav-link', $get['page'] === 'utilities.logs' ? ' active' : '', '">
641 641
                               <i class="fas fa-history nav-icon"></i>
642
-                              <p>' . langHdl('logs') . '</p>
642
+                              <p>' . langHdl('logs').'</p>
643 643
                             </a>
644 644
                           </li>
645 645
                           <li class="nav-item">
646 646
                             <a href="#" data-name="utilities.database" class="nav-link', $get['page'] === 'utilities.database' ? ' active' : '', '">
647 647
                               <i class="fas fa-database nav-icon"></i>
648
-                              <p>' . langHdl('database') . '</p>
648
+                              <p>' . langHdl('database').'</p>
649 649
                             </a>
650 650
                           </li>
651 651
                         </ul>
@@ -656,10 +656,10 @@  discard block
 block discarded – undo
656 656
                     <!-- /.sidebar-menu -->
657 657
                 <div class="menu-footer">
658 658
                     <div class="" id="sidebar-footer">
659
-                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
660
-                            date($SETTINGS['date_format'], (int) $server['request_time']) . ' - ' .
659
+                        <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time').' '.
660
+                            date($SETTINGS['date_format'], (int) $server['request_time']).' - '.
661 661
                             date($SETTINGS['time_format'], (int) $server['request_time']); ?>"></i>
662
-                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online . ' ' . langHdl('users_online'); ?>"></i>
662
+                        <i class="fas fa-users mr-2 infotip text-info pointer" title="<?php echo $session_nb_users_online.' '.langHdl('users_online'); ?>"></i>
663 663
                         <a href="<?php echo READTHEDOC_URL; ?>" target="_blank" class="text-info"><i class="fas fa-book mr-2 infotip" title="<?php echo langHdl('documentation_canal'); ?> ReadTheDocs"></i></a>
664 664
                         <a href="<?php echo REDDIT_URL; ?>" target="_blank" class="text-info"><i class="fab fa-reddit-alien mr-2 infotip" title="<?php echo langHdl('admin_help'); ?>"></i></a>
665 665
                         <i class="fas fa-bug infotip pointer text-info" title="<?php echo langHdl('bugs_page'); ?>" onclick="generateBugReport()"></i>
@@ -962,18 +962,18 @@  discard block
 block discarded – undo
962 962
                     } elseif ($get['page'] === 'items') {
963 963
                         // SHow page with Items
964 964
                         if ((int) $session_user_admin !== 1) {
965
-                            include $SETTINGS['cpassman_dir'] . '/pages/items.php';
965
+                            include $SETTINGS['cpassman_dir'].'/pages/items.php';
966 966
                         } elseif ((int) $session_user_admin === 1) {
967
-                            include $SETTINGS['cpassman_dir'] . '/pages/admin.php';
967
+                            include $SETTINGS['cpassman_dir'].'/pages/admin.php';
968 968
                         } else {
969 969
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
970 970
                             //not allowed page
971
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
971
+                            include $SETTINGS['cpassman_dir'].'/error.php';
972 972
                         }
973 973
                     } elseif (in_array($get['page'], array_keys($mngPages)) === true) {
974 974
                         // Define if user is allowed to see management pages
975 975
                         if ($session_user_admin === 1) {
976
-                            include $SETTINGS['cpassman_dir'] . '/pages/' . $mngPages[$get['page']];
976
+                            include $SETTINGS['cpassman_dir'].'/pages/'.$mngPages[$get['page']];
977 977
                         } elseif ($session_user_manager === 1 || $session_user_human_resources === 1) {
978 978
                             if ($get['page'] !== 'manage_main'
979 979
                                 && $get['page'] !== 'manage_settings'
@@ -982,15 +982,15 @@  discard block
 block discarded – undo
982 982
                             } else {
983 983
                                 $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
984 984
                                 //not allowed page
985
-                                include $SETTINGS['cpassman_dir'] . '/error.php';
985
+                                include $SETTINGS['cpassman_dir'].'/error.php';
986 986
                             }
987 987
                         } else {
988 988
                             $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
989 989
                             //not allowed page
990
-                            include $SETTINGS['cpassman_dir'] . '/error.php';
990
+                            include $SETTINGS['cpassman_dir'].'/error.php';
991 991
                         }
992 992
                     } elseif (empty($get['page']) === false) {
993
-                        include $SETTINGS['cpassman_dir'] . '/pages/' . $get['page'] . '.php';
993
+                        include $SETTINGS['cpassman_dir'].'/pages/'.$get['page'].'.php';
994 994
                     } else {
995 995
                         $_SESSION['error']['code'] = ERR_NOT_EXIST;
996 996
                         //page doesn't exist
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
     $superGlobal->put('initialUrl', '', 'SESSION');
1081 1081
 
1082 1082
     // LOGIN form
1083
-    include $SETTINGS['cpassman_dir'] . '/includes/core/login.php';
1083
+    include $SETTINGS['cpassman_dir'].'/includes/core/login.php';
1084 1084
 }
1085 1085
 
1086 1086
     ?>
@@ -1270,61 +1270,61 @@  discard block
 block discarded – undo
1270 1270
     isset($_SESSION['CPM']) === true
1271 1271
     && isset($SETTINGS['cpassman_dir']) === true
1272 1272
 ) {
1273
-    include_once $SETTINGS['cpassman_dir'] . '/includes/core/load.js.php';
1273
+    include_once $SETTINGS['cpassman_dir'].'/includes/core/load.js.php';
1274 1274
     if ($menuAdmin === true) {
1275
-        include_once $SETTINGS['cpassman_dir'] . '/pages/admin.js.php';
1275
+        include_once $SETTINGS['cpassman_dir'].'/pages/admin.js.php';
1276 1276
         if ($get['page'] === '2fa') {
1277
-            include_once $SETTINGS['cpassman_dir'] . '/pages/2fa.js.php';
1277
+            include_once $SETTINGS['cpassman_dir'].'/pages/2fa.js.php';
1278 1278
         } elseif ($get['page'] === 'api') {
1279
-            include_once $SETTINGS['cpassman_dir'] . '/pages/api.js.php';
1279
+            include_once $SETTINGS['cpassman_dir'].'/pages/api.js.php';
1280 1280
         } elseif ($get['page'] === 'backups') {
1281
-            include_once $SETTINGS['cpassman_dir'] . '/pages/backups.js.php';
1281
+            include_once $SETTINGS['cpassman_dir'].'/pages/backups.js.php';
1282 1282
         } elseif ($get['page'] === 'emails') {
1283
-            include_once $SETTINGS['cpassman_dir'] . '/pages/emails.js.php';
1283
+            include_once $SETTINGS['cpassman_dir'].'/pages/emails.js.php';
1284 1284
         } elseif ($get['page'] === 'ldap') {
1285
-            include_once $SETTINGS['cpassman_dir'] . '/pages/ldap.js.php';
1285
+            include_once $SETTINGS['cpassman_dir'].'/pages/ldap.js.php';
1286 1286
         } elseif ($get['page'] === 'uploads') {
1287
-            include_once $SETTINGS['cpassman_dir'] . '/pages/uploads.js.php';
1287
+            include_once $SETTINGS['cpassman_dir'].'/pages/uploads.js.php';
1288 1288
         } elseif ($get['page'] === 'actions') {
1289
-            include_once $SETTINGS['cpassman_dir'] . '/pages/actions.js.php';
1289
+            include_once $SETTINGS['cpassman_dir'].'/pages/actions.js.php';
1290 1290
         } elseif ($get['page'] === 'fields') {
1291
-            include_once $SETTINGS['cpassman_dir'] . '/pages/fields.js.php';
1291
+            include_once $SETTINGS['cpassman_dir'].'/pages/fields.js.php';
1292 1292
         } elseif ($get['page'] === 'options') {
1293
-            include_once $SETTINGS['cpassman_dir'] . '/pages/options.js.php';
1293
+            include_once $SETTINGS['cpassman_dir'].'/pages/options.js.php';
1294 1294
         } elseif ($get['page'] === 'statistics') {
1295
-            include_once $SETTINGS['cpassman_dir'] . '/pages/statistics.js.php';
1295
+            include_once $SETTINGS['cpassman_dir'].'/pages/statistics.js.php';
1296 1296
         }
1297 1297
     } elseif (isset($get['page']) === true && $get['page'] !== '') {
1298 1298
         if ($get['page'] === 'items') {
1299
-            include_once $SETTINGS['cpassman_dir'] . '/pages/items.js.php';
1299
+            include_once $SETTINGS['cpassman_dir'].'/pages/items.js.php';
1300 1300
         } elseif ($get['page'] === 'import') {
1301
-            include_once $SETTINGS['cpassman_dir'] . '/pages/import.js.php';
1301
+            include_once $SETTINGS['cpassman_dir'].'/pages/import.js.php';
1302 1302
         } elseif ($get['page'] === 'export') {
1303
-            include_once $SETTINGS['cpassman_dir'] . '/pages/export.js.php';
1303
+            include_once $SETTINGS['cpassman_dir'].'/pages/export.js.php';
1304 1304
         } elseif ($get['page'] === 'offline') {
1305
-            include_once $SETTINGS['cpassman_dir'] . '/pages/offline.js.php';
1305
+            include_once $SETTINGS['cpassman_dir'].'/pages/offline.js.php';
1306 1306
         } elseif ($get['page'] === 'search') {
1307
-            include_once $SETTINGS['cpassman_dir'] . '/pages/search.js.php';
1307
+            include_once $SETTINGS['cpassman_dir'].'/pages/search.js.php';
1308 1308
         } elseif ($get['page'] === 'profile') {
1309
-            include_once $SETTINGS['cpassman_dir'] . '/pages/profile.js.php';
1309
+            include_once $SETTINGS['cpassman_dir'].'/pages/profile.js.php';
1310 1310
         } elseif ($get['page'] === 'favourites') {
1311
-            include_once $SETTINGS['cpassman_dir'] . '/pages/favorites.js.php';
1311
+            include_once $SETTINGS['cpassman_dir'].'/pages/favorites.js.php';
1312 1312
         } elseif ($get['page'] === 'folders') {
1313
-            include_once $SETTINGS['cpassman_dir'] . '/pages/folders.js.php';
1313
+            include_once $SETTINGS['cpassman_dir'].'/pages/folders.js.php';
1314 1314
         } elseif ($get['page'] === 'users') {
1315
-            include_once $SETTINGS['cpassman_dir'] . '/pages/users.js.php';
1315
+            include_once $SETTINGS['cpassman_dir'].'/pages/users.js.php';
1316 1316
         } elseif ($get['page'] === 'roles') {
1317
-            include_once $SETTINGS['cpassman_dir'] . '/pages/roles.js.php';
1317
+            include_once $SETTINGS['cpassman_dir'].'/pages/roles.js.php';
1318 1318
         } elseif ($get['page'] === 'utilities.deletion') {
1319
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.deletion.js.php';
1319
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.deletion.js.php';
1320 1320
         } elseif ($get['page'] === 'utilities.logs') {
1321
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.logs.js.php';
1321
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.logs.js.php';
1322 1322
         } elseif ($get['page'] === 'utilities.database') {
1323
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.database.js.php';
1323
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.database.js.php';
1324 1324
         } elseif ($get['page'] === 'utilities.renewal') {
1325
-            include_once $SETTINGS['cpassman_dir'] . '/pages/utilities.renewal.js.php';
1325
+            include_once $SETTINGS['cpassman_dir'].'/pages/utilities.renewal.js.php';
1326 1326
         }
1327 1327
     } else {
1328
-        include_once $SETTINGS['cpassman_dir'] . '/includes/core/login.js.php';
1328
+        include_once $SETTINGS['cpassman_dir'].'/includes/core/login.js.php';
1329 1329
     }
1330 1330
 }
Please login to merge, or discard this patch.
sources/ldap.queries.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -45,26 +45,26 @@  discard block
 block discarded – undo
45 45
 }
46 46
 
47 47
 /* do checks */
48
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
49
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
48
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
49
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
50 50
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
51 51
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
52
-    include $SETTINGS['cpassman_dir'] . '/error.php';
52
+    include $SETTINGS['cpassman_dir'].'/error.php';
53 53
     exit();
54 54
 }
55 55
 
56
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
57
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
58
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
56
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
57
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
58
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
59 59
 
60 60
 header('Content-type: text/html; charset=utf-8');
61 61
 header('Cache-Control: no-cache, no-store, must-revalidate');
62 62
 
63
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
64
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
63
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
64
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
65 65
 
66 66
 // connect to the server
67
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
67
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
68 68
 if (defined('DB_PASSWD_CLEAR') === false) {
69 69
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
70 70
 }
@@ -124,38 +124,38 @@  discard block
 block discarded – undo
124 124
         ];
125 125
 
126 126
         // Load expected libraries
127
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
128
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
129
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
130
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
131
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
132
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
133
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
134
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
135
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
136
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
137
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
138
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
139
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
140
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
141
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
142
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
143
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
144
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
145
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
146
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
147
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
148
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
149
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
150
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
151
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
152
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
153
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
154
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
155
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
156
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
157
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
158
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
127
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
128
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
129
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
130
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
131
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
132
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
133
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
134
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
135
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
136
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
137
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
138
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
139
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
140
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
141
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
142
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
143
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
144
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
145
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
146
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
147
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
148
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
149
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
150
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
151
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
152
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
153
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
154
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
155
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
156
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
157
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
158
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
159 159
 
160 160
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
161 161
         $ad->register();
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
             echo prepareExchangedData(
171 171
                 array(
172 172
                     'error' => true,
173
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
173
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
174 174
                 ),
175 175
                 'encode'
176 176
             );
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
             echo prepareExchangedData(
189 189
                 array(
190 190
                     'error' => true,
191
-                    'message' => "Error : ".(null !== $error->getErrorCode() ? $error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage() : ""),
191
+                    'message' => "Error : ".(null !== $error->getErrorCode() ? $error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage() : ""),
192 192
                 ),
193 193
                 'encode'
194 194
             );
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             echo prepareExchangedData(
208 208
                 array(
209 209
                     'error' => true,
210
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
210
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
211 211
                 ),
212 212
                 'encode'
213 213
             );
Please login to merge, or discard this patch.