Passed
Push — teampass_3.0 ( 580312...70e905 )
by Nils
05:00
created
sources/identify.php 1 patch
Spacing   +92 added lines, -92 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
 }
44 44
 
45 45
 // Load AntiXSS
46
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
46
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
47 47
 $antiXss = new voku\helper\AntiXSS();
48 48
 
49
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
50
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
51
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
49
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
50
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
51
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
52 52
 
53 53
 // init
54 54
 $ldap_suffix = '';
@@ -57,12 +57,12 @@  discard block
 block discarded – undo
57 57
 
58 58
 // If Debug then clean the files
59 59
 if (DEBUGLDAP === true) {
60
-    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'] . '/ldap.debug.txt');
60
+    define('DEBUGLDAPFILE', $SETTINGS['path_to_files_folder'].'/ldap.debug.txt');
61 61
     $fp = fopen(DEBUGLDAPFILE, 'w');
62 62
     fclose($fp);
63 63
 }
64 64
 if (DEBUGDUO === true) {
65
-    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'] . '/duo.debug.txt');
65
+    define('DEBUGDUOFILE', $SETTINGS['path_to_files_folder'].'/duo.debug.txt');
66 66
     $fp = fopen(DEBUGDUOFILE, 'w');
67 67
     fclose($fp);
68 68
 }
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 if (defined('DB_PASSWD_CLEAR') === false) {
80 80
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
81 81
 }
82
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
82
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
83 83
 if (defined('DB_PASSWD_CLEAR') === false) {
84 84
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
85 85
 }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     // Get DUO keys
100 100
     $duoData = DB::query(
101 101
         'SELECT intitule, valeur
102
-        FROM ' . prefixTable('misc') . '
102
+        FROM ' . prefixTable('misc').'
103 103
         WHERE type = %s',
104 104
         'duoSecurity'
105 105
     );
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     }
109 109
 
110 110
     // load library
111
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
111
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
112 112
     $sig_request = Duo::signRequest(
113 113
         $_GLOBALS['IKEY'],
114 114
         $_GLOBALS['SKEY'],
@@ -120,17 +120,17 @@  discard block
 block discarded – undo
120 120
         debugIdentify(
121 121
             DEBUGDUO,
122 122
             DEBUGDUOFILE,
123
-            "\n\n-----\n\n" .
124
-                'sig request : ' . $post_login . "\n" .
125
-                'resp : ' . $sig_request . "\n"
123
+            "\n\n-----\n\n".
124
+                'sig request : '.$post_login."\n".
125
+                'resp : '.$sig_request."\n"
126 126
         );
127 127
     }
128 128
 
129 129
     // load csrfprotector
130
-    $csrfp_config = include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/csrfp/libs/csrfp.config.php';
130
+    $csrfp_config = include_once $SETTINGS['cpassman_dir'].'/includes/libraries/csrfp/libs/csrfp.config.php';
131 131
 
132 132
     // return result
133
-    echo '[{"sig_request" : "' . $sig_request . '" , "csrfp_token" : "' . $csrfp_config['CSRFP_TOKEN'] . '" , "csrfp_key" : "' . filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING) . '"}]';
133
+    echo '[{"sig_request" : "'.$sig_request.'" , "csrfp_token" : "'.$csrfp_config['CSRFP_TOKEN'].'" , "csrfp_key" : "'.filter_var($_COOKIE[$csrfp_config['CSRFP_TOKEN']], FILTER_SANITIZE_STRING).'"}]';
134 134
     // ---
135 135
     // ---
136 136
 } elseif ($post_type === 'identify_duo_user_check') {
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     //--------
141 141
 
142 142
     // load library
143
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/DuoSecurity/Duo.php';
143
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/DuoSecurity/Duo.php';
144 144
     $authenticated_username = Duo::verifyResponse(
145 145
         $SETTINGS['duo_ikey'],
146 146
         $SETTINGS['duo_skey'],
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
         debugIdentify(
153 153
             DEBUGDUO,
154 154
             DEBUGDUOFILE,
155
-            "\n\n-----\n\n" .
156
-                'sig response : ' . $post_sig_response . "\n" .
157
-                'resp : ' . $authenticated_username . "\n"
155
+            "\n\n-----\n\n".
156
+                'sig response : '.$post_sig_response."\n".
157
+                'resp : '.$authenticated_username."\n"
158 158
         );
159 159
     }
160 160
 
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             // is user in Teampass?
166 166
             $userInfo = DB::queryfirstrow(
167 167
                 'SELECT id
168
-                FROM ' . prefixTable('users') . '
168
+                FROM ' . prefixTable('users').'
169 169
                 WHERE login = %s',
170 170
                 $post_login
171 171
             );
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
             }
177 177
         }
178 178
 
179
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
179
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
180 180
     } else {
181
-        echo '[{"authenticated_username" : "' . $authenticated_username . '"}]';
181
+        echo '[{"authenticated_username" : "'.$authenticated_username.'"}]';
182 182
     }
183 183
     // ---
184 184
     // ---
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 
191 191
     // Load superGlobals
192
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
192
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
193 193
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
194 194
 
195 195
     // Prepare GET variables
@@ -282,19 +282,19 @@  discard block
 block discarded – undo
282 282
     } else {
283 283
         throw new Exception("Error file '/includes/config/tp.config.php' not exists", 1);
284 284
     }
285
-    include_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
285
+    include_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
286 286
 
287 287
     header('Content-type: text/html; charset=utf-8');
288 288
     error_reporting(E_ERROR);
289
-    include_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
290
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
289
+    include_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
290
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
291 291
 
292 292
     // Load AntiXSS
293
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
293
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
294 294
     $antiXss = new voku\helper\AntiXSS();
295 295
 
296 296
     // Load superGlobals
297
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
297
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
298 298
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
299 299
 
300 300
     // Prepare GET variables
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
306 306
 
307 307
     // connect to the server
308
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
308
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
309 309
     if (defined('DB_PASSWD_CLEAR') === false) {
310 310
         define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
311 311
     }
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
     DB::$encoding = DB_ENCODING;
318 318
 
319 319
     // User's language loading
320
-    include_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $sessionUserLanguage . '.php';
320
+    include_once $SETTINGS['cpassman_dir'].'/includes/language/'.$sessionUserLanguage.'.php';
321 321
     //echo $dataReceived." -->".empty($sessionKey)."<-- ".$sessionKey." ** " ;
322 322
     // decrypt and retreive data in JSON format
323 323
     if (empty($sessionKey) === true) {
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
     // Check if user exists
398 398
     $userInfo = DB::queryFirstRow(
399 399
         'SELECT *
400
-        FROM ' . prefixTable('users') . '
400
+        FROM ' . prefixTable('users').'
401 401
         WHERE login=%s',
402 402
         $username
403 403
     );
@@ -608,7 +608,7 @@  discard block
 block discarded – undo
608 608
         //$arrAttempts = array();
609 609
         $rows = DB::query(
610 610
             'SELECT date
611
-            FROM ' . prefixTable('log_system') . "
611
+            FROM ' . prefixTable('log_system')."
612 612
             WHERE field_1 = %s
613 613
             AND type = 'failed_auth'
614 614
             AND label = 'user_password_not_correct'
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
             foreach ($rows as $record) {
625 625
                 array_push(
626 626
                     $arrAttempts,
627
-                    date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], $record['date'])
627
+                    date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], $record['date'])
628 628
                 );
629 629
             }
630 630
         }
@@ -764,7 +764,7 @@  discard block
 block discarded – undo
764 764
         foreach ($superGlobal->get('user_roles', 'SESSION') as $role) {
765 765
             $resRoles = DB::queryFirstRow(
766 766
                 'SELECT title, complexity
767
-                FROM ' . prefixTable('roles_title') . '
767
+                FROM ' . prefixTable('roles_title').'
768 768
                 WHERE id=%i',
769 769
                 $role
770 770
             );
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 
786 786
         // build complete array of roles
787 787
         $superGlobal->put('arr_roles_full', array(), 'SESSION');
788
-        $rows = DB::query('SELECT id, title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
788
+        $rows = DB::query('SELECT id, title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
789 789
         foreach ($rows as $record) {
790 790
             $superGlobal->put(
791 791
                 $record['id'],
@@ -880,7 +880,7 @@  discard block
 block discarded – undo
880 880
             if (!empty($item)) {
881 881
                 $dataLastItems = DB::queryFirstRow(
882 882
                     'SELECT id,label,id_tree
883
-                    FROM ' . prefixTable('items') . '
883
+                    FROM ' . prefixTable('items').'
884 884
                     WHERE id=%i',
885 885
                     $item
886 886
                 );
@@ -889,7 +889,7 @@  discard block
 block discarded – undo
889 889
                     array(
890 890
                         'id' => $item,
891 891
                         'label' => $dataLastItems['label'],
892
-                        'url' => 'index.php?page=items&amp;group=' . $dataLastItems['id_tree'] . '&amp;id=' . $item,
892
+                        'url' => 'index.php?page=items&amp;group='.$dataLastItems['id_tree'].'&amp;id='.$item,
893 893
                     ),
894 894
                     'SESSION',
895 895
                     'latest_items_tab'
@@ -906,12 +906,12 @@  discard block
 block discarded – undo
906 906
         ) {
907 907
             // get all Admin users
908 908
             $receivers = '';
909
-            $rows = DB::query('SELECT email FROM ' . prefixTable('users') . " WHERE admin = %i and email != ''", 1);
909
+            $rows = DB::query('SELECT email FROM '.prefixTable('users')." WHERE admin = %i and email != ''", 1);
910 910
             foreach ($rows as $record) {
911 911
                 if (empty($receivers)) {
912 912
                     $receivers = $record['email'];
913 913
                 } else {
914
-                    $receivers = ',' . $record['email'];
914
+                    $receivers = ','.$record['email'];
915 915
                 }
916 916
             }
917 917
             // Add email to table
@@ -927,7 +927,7 @@  discard block
 block discarded – undo
927 927
                             '#tp_time#',
928 928
                         ),
929 929
                         array(
930
-                            ' ' . $superGlobal->get('login', 'SESSION') . ' (IP: ' . getClientIpServer() . ')',
930
+                            ' '.$superGlobal->get('login', 'SESSION').' (IP: '.getClientIpServer().')',
931 931
                             date($SETTINGS['date_format'], $superGlobal->get('last_connection', 'SESSION')),
932 932
                             date($SETTINGS['time_format'], $superGlobal->get('last_connection', 'SESSION')),
933 933
                         ),
@@ -1076,8 +1076,8 @@  discard block
 block discarded – undo
1076 1076
     debugIdentify(
1077 1077
         DEBUGDUO,
1078 1078
         DEBUGDUOFILE,
1079
-        "\n\n----\n" .
1080
-            'Identified : ' . filter_var($return, FILTER_SANITIZE_STRING) . "\n\n"
1079
+        "\n\n----\n".
1080
+            'Identified : '.filter_var($return, FILTER_SANITIZE_STRING)."\n\n"
1081 1081
     );
1082 1082
 
1083 1083
     echo prepareExchangedData(
@@ -1143,44 +1143,44 @@  discard block
 block discarded – undo
1143 1143
     ];
1144 1144
     
1145 1145
     // Load expected libraries
1146
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
1147
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
1148
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
1149
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
1150
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
1151
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
1152
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
1153
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
1154
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Collection.php';
1155
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
1156
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
1157
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
1158
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
1159
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
1160
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
1161
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
1162
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
1163
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
1164
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
1165
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
1166
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
1167
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
1168
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
1169
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
1170
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
1171
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
1172
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
1173
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
1174
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
1175
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
1176
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
1177
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
1178
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
1179
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
1180
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
1181
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
1182
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
1183
-    require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Ldap.php';
1146
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Illuminate/Contracts/Auth/Authenticatable.php';
1147
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/EnumeratesValues.php';
1148
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
1149
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
1150
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
1151
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Jsonable.php';
1152
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Contracts/Support/Arrayable.php';
1153
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Enumerable.php';
1154
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Collection.php';
1155
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
1156
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
1157
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
1158
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
1159
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
1160
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
1161
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
1162
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
1163
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
1164
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
1165
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
1166
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
1167
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
1168
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
1169
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
1170
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
1171
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
1172
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
1173
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
1174
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
1175
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
1176
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
1177
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
1178
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
1179
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
1180
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
1181
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
1182
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
1183
+    require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Ldap.php';
1184 1184
 
1185 1185
     $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
1186 1186
     $ad->register();
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 
1196 1196
         return array(
1197 1197
             'error' => true,
1198
-            'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage()." ".$config['username'],
1198
+            'message' => langHdl('error').' : '.$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage()." ".$config['username'],
1199 1199
              
1200 1200
         );
1201 1201
     }
@@ -1223,7 +1223,7 @@  discard block
 block discarded – undo
1223 1223
     }
1224 1224
 
1225 1225
     // load passwordLib library
1226
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1226
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1227 1227
     $pwdlib->register();
1228 1228
     $pwdlib = new PasswordLib\PasswordLib();
1229 1229
     $hashedPassword = $pwdlib->createPasswordHash($passwordClear);
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
             'id = %i',
1240 1240
             $userInfo['id']
1241 1241
         );
1242
-    } else if ($userInfo['special']=== 'user_added_from_ldap') {
1242
+    } else if ($userInfo['special'] === 'user_added_from_ldap') {
1243 1243
         // Case where user has been added from LDAP and never being connected to TP
1244 1244
         // We need to create his keys
1245 1245
         /*$userKeys = generateUserKeys($passwordClear);
@@ -1292,7 +1292,7 @@  discard block
 block discarded – undo
1292 1292
 function yubicoMFACheck($dataReceived, $userInfo, $SETTINGS)
1293 1293
 {
1294 1294
     // Load superGlobals
1295
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1295
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1296 1296
     $superGlobal = new protect\SuperGlobal\SuperGlobal();
1297 1297
     $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
1298 1298
     $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
@@ -1334,7 +1334,7 @@  discard block
 block discarded – undo
1334 1334
     }
1335 1335
 
1336 1336
     // Now check yubico validity
1337
-    include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/Yubico/Yubico.php';
1337
+    include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/Yubico/Yubico.php';
1338 1338
     $yubi = new Auth_Yubico($yubico_user_id, $yubico_user_key);
1339 1339
     $auth = $yubi->verify($yubico_key); //, null, null, null, 60
1340 1340
 
@@ -1386,7 +1386,7 @@  discard block
 block discarded – undo
1386 1386
             'gestionnaire' => '0',
1387 1387
             'can_manage_all_users' => '0',
1388 1388
             'personal_folder' => $SETTINGS['enable_pf_feature'] === '1' ? '1' : '0',
1389
-            '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'),
1389
+            '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'),
1390 1390
             'groupes_interdits' => '',
1391 1391
             'groupes_visibles' => '',
1392 1392
             'last_pw_change' => time(),
@@ -1412,7 +1412,7 @@  discard block
 block discarded – undo
1412 1412
         );
1413 1413
 
1414 1414
         // Rebuild tree
1415
-        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1415
+        $tree = new SplClassLoader('Tree\NestedTree', $SETTINGS['cpassman_dir'].'/includes/libraries');
1416 1416
         $tree->register();
1417 1417
         $tree = new Tree\NestedTree\NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
1418 1418
         $tree->rebuild();
@@ -1443,14 +1443,14 @@  discard block
 block discarded – undo
1443 1443
         && empty($dataReceived['GACode']) === false
1444 1444
     ) {
1445 1445
         // Load superGlobals
1446
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1446
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/protect/SuperGlobal/SuperGlobal.php';
1447 1447
         $superGlobal = new protect\SuperGlobal\SuperGlobal();
1448 1448
         $sessionAdmin = $superGlobal->get('user_admin', 'SESSION');
1449 1449
         $sessionUrl = $superGlobal->get('initial_url', 'SESSION');
1450 1450
         $sessionPwdAttempts = $superGlobal->get('pwd_attempts', 'SESSION');
1451 1451
         
1452 1452
         // load library
1453
-        include_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
1453
+        include_once $SETTINGS['cpassman_dir'].'/includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php';
1454 1454
 
1455 1455
         // create new instance
1456 1456
         $tfa = new Authentication\TwoFactorAuth\TwoFactorAuth($SETTINGS['ga_website_name']);
@@ -1476,7 +1476,7 @@  discard block
 block discarded – undo
1476 1476
 
1477 1477
             // generate new QR
1478 1478
             $new_2fa_qr = $tfa->getQRCodeImageAsDataUri(
1479
-                'Teampass - ' . $username,
1479
+                'Teampass - '.$username,
1480 1480
                 $userInfo['ga']
1481 1481
             );
1482 1482
 
@@ -1491,7 +1491,7 @@  discard block
 block discarded – undo
1491 1491
             );
1492 1492
 
1493 1493
             $firstTime = array(
1494
-                'value' => '<img src="' . $new_2fa_qr . '">',
1494
+                'value' => '<img src="'.$new_2fa_qr.'">',
1495 1495
                 'user_admin' => isset($sessionAdmin) ? (int) $sessionAdmin : '',
1496 1496
                 'initial_url' => isset($sessionUrl) === true ? $sessionUrl : '',
1497 1497
                 'pwd_attempts' => (int) $sessionPwdAttempts,
@@ -1544,8 +1544,8 @@  discard block
 block discarded – undo
1544 1544
     $userPasswordVerified = false;
1545 1545
 
1546 1546
     // load passwordLib library
1547
-    include_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
1548
-    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'] . '/includes/libraries');
1547
+    include_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
1548
+    $pwdlib = new SplClassLoader('PasswordLib', $SETTINGS['cpassman_dir'].'/includes/libraries');
1549 1549
     $pwdlib->register();
1550 1550
     $pwdlib = new PasswordLib\PasswordLib();
1551 1551
 
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
@@ -44,26 +44,26 @@  discard block
 block discarded – undo
44 44
 }
45 45
 
46 46
 /* do checks */
47
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
48
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
47
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
48
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
49 49
 if (!checkUser($_SESSION['user_id'], $_SESSION['key'], 'ldap', $SETTINGS)) {
50 50
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED; //not allowed page
51
-    include $SETTINGS['cpassman_dir'] . '/error.php';
51
+    include $SETTINGS['cpassman_dir'].'/error.php';
52 52
     exit();
53 53
 }
54 54
 
55
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user_language'] . '.php';
56
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
57
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/tp.config.php';
55
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user_language'].'.php';
56
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
57
+require_once $SETTINGS['cpassman_dir'].'/includes/config/tp.config.php';
58 58
 
59 59
 header('Content-type: text/html; charset=utf-8');
60 60
 header('Cache-Control: no-cache, no-store, must-revalidate');
61 61
 
62
-require_once $SETTINGS['cpassman_dir'] . '/sources/SplClassLoader.php';
63
-require_once $SETTINGS['cpassman_dir'] . '/sources/main.functions.php';
62
+require_once $SETTINGS['cpassman_dir'].'/sources/SplClassLoader.php';
63
+require_once $SETTINGS['cpassman_dir'].'/sources/main.functions.php';
64 64
 
65 65
 // connect to the server
66
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
66
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
67 67
 if (defined('DB_PASSWD_CLEAR') === false) {
68 68
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
69 69
 }
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 $aes->register();
79 79
 
80 80
 // Load AntiXSS
81
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/voku/helper/AntiXSS.php';
81
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/voku/helper/AntiXSS.php';
82 82
 $antiXss = new voku\helper\AntiXSS();
83 83
 
84 84
 // Prepare POST variables
@@ -132,38 +132,38 @@  discard block
 block discarded – undo
132 132
         ];
133 133
 
134 134
         // Load expected libraries
135
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/helpers.php';
136
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
137
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Tightenco/Collect/Support/Arr.php';
138
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
139
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonTimeZone.php';
140
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Units.php';
141
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Week.php';
142
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Timestamp.php';
143
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Test.php';
144
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
145
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Serialization.php';
146
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/IntervalRounding.php';
147
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Rounding.php';
148
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Localization.php';
149
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Options.php';
150
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Cast.php';
151
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mutability.php';
152
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Modifiers.php';
153
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Mixin.php';
154
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Macro.php';
155
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Difference.php';
156
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Creator.php';
157
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Converter.php';
158
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Comparison.php';
159
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Boundaries.php';
160
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Traits/Date.php';
161
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/CarbonInterface.php';
162
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Carbon/Carbon.php';
163
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/DetectsErrors.php';
164
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/Connection.php';
165
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapInterface.php';
166
-        require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/LdapRecord/LdapBase.php';
135
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/helpers.php';
136
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Traits/Macroable.php';
137
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Tightenco/Collect/Support/Arr.php';
138
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Symfony/contracts/Translation/TranslatorInterface.php';
139
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonTimeZone.php';
140
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Units.php';
141
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Week.php';
142
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Timestamp.php';
143
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Test.php';
144
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/ObjectInitialisation.php';
145
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Serialization.php';
146
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/IntervalRounding.php';
147
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Rounding.php';
148
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Localization.php';
149
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Options.php';
150
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Cast.php';
151
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mutability.php';
152
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Modifiers.php';
153
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Mixin.php';
154
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Macro.php';
155
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Difference.php';
156
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Creator.php';
157
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Converter.php';
158
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Comparison.php';
159
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Boundaries.php';
160
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Traits/Date.php';
161
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/CarbonInterface.php';
162
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Carbon/Carbon.php';
163
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/DetectsErrors.php';
164
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/Connection.php';
165
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapInterface.php';
166
+        require_once $SETTINGS['cpassman_dir'].'/includes/libraries/LdapRecord/LdapBase.php';
167 167
 
168 168
         $ad = new SplClassLoader('LdapRecord', '../includes/libraries');
169 169
         $ad->register();
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
             echo prepareExchangedData(
179 179
                 array(
180 180
                     'error' => true,
181
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
181
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
182 182
                 ),
183 183
                 'encode'
184 184
             );
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
             echo prepareExchangedData(
200 200
                 array(
201 201
                     'error' => true,
202
-                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage(). "<br>".$error->getDiagnosticMessage(),
202
+                    'message' => "Error : ".$error->getErrorCode()." - ".$error->getErrorMessage()."<br>".$error->getDiagnosticMessage(),
203 203
                 ),
204 204
                 'encode'
205 205
             );
Please login to merge, or discard this patch.