Passed
Push — master ( e7d28b...261004 )
by Nils
06:20
created
sources/tasks.queries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 ) {
79 79
     // Not allowed page
80 80
     $session->set('system-error_code', ERR_NOT_ALLOWED);
81
-    include $SETTINGS['cpassman_dir'] . '/error.php';
81
+    include $SETTINGS['cpassman_dir'].'/error.php';
82 82
     exit;
83 83
 }
84 84
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
     // get exec from processes table
164 164
     $rows = DB::query(
165 165
         'SELECT max(finished_at), process_type
166
-        FROM ' . prefixTable('background_tasks') . '
166
+        FROM ' . prefixTable('background_tasks').'
167 167
         GROUP BY process_type'
168 168
     );
169 169
     foreach ($rows as $row) {
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
     // get exec from background_tasks_log table
180 180
     $rows = DB::query(
181 181
         'SELECT MAX(finished_at) AS max_finished_at, job AS process_type 
182
-        FROM ' . prefixTable('background_tasks_logs') . '
182
+        FROM ' . prefixTable('background_tasks_logs').'
183 183
         WHERE finished_at >= UNIX_TIMESTAMP(DATE_SUB(NOW(), INTERVAL 7 DAY))
184 184
         GROUP BY process_type'
185 185
     );
Please login to merge, or discard this patch.
api/Controller/Api/BaseController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
         $requestUri = $request->getRequestUri();
48 48
 
49 49
         $uri = parse_url($requestUri, PHP_URL_PATH);
50
-        $uri = explode( '/', $uri );
50
+        $uri = explode('/', $uri);
51 51
         return $this->sanitizeUrl(array_slice($uri, ((int) array_search('index.php', $uri) + 1)));
52 52
     }
53 53
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     {
75 75
         $filters = [];
76 76
         $array_size = count($array);
77
-        for ($i=0; $i < $array_size; $i++) {
77
+        for ($i = 0; $i < $array_size; $i++) {
78 78
             array_push($filters, 'trim|escape');
79 79
         }
80 80
         
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
      * @param mixed  $data
93 93
      * @param string $httpHeader
94 94
      */
95
-    protected function sendOutput($data, $httpHeaders=array()): void
95
+    protected function sendOutput($data, $httpHeaders = array()): void
96 96
     {
97 97
         header_remove('Set-Cookie');
98 98
 
Please login to merge, or discard this patch.
api/Controller/Api/FolderController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
                     $arrFolders = $folderModel->getFoldersInfo(explode(",", $userData['folders_list']));
49 49
                     $responseData = json_encode($arrFolders);
50 50
                 } catch (Error $e) {
51
-                    $strErrorDesc = $e->getMessage() . ' Something went wrong! Please contact support.3';
51
+                    $strErrorDesc = $e->getMessage().' Something went wrong! Please contact support.3';
52 52
                     $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
53 53
                 }
54 54
             }
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
                         
122 122
                         $responseData = json_encode($arrFolder);
123 123
                     } catch (Error $e) {
124
-                        $strErrorDesc = $e->getMessage() . ' Something went wrong! Please contact support.1';
124
+                        $strErrorDesc = $e->getMessage().' Something went wrong! Please contact support.1';
125 125
                         $strErrorHeader = 'HTTP/1.1 500 Internal Server Error';
126 126
                     }
127 127
                 }
Please login to merge, or discard this patch.
pages/tools.js.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === false) {
73 73
     // Not allowed page
74 74
     $session->set('system-error_code', ERR_NOT_ALLOWED);
75
-    include $SETTINGS['cpassman_dir'] . '/error.php';
75
+    include $SETTINGS['cpassman_dir'].'/error.php';
76 76
     exit;
77 77
 }
78 78
 ?>
Please login to merge, or discard this patch.
pages/tools.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tools') === false) {
70 70
     // Not allowed page
71 71
     $session->set('system-error_code', ERR_NOT_ALLOWED);
72
-    include $SETTINGS['cpassman_dir'] . '/error.php';
72
+    include $SETTINGS['cpassman_dir'].'/error.php';
73 73
     exit;
74 74
 }
75 75
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
                             </div>
131 131
 <?php                            
132 132
 // Check if table  exists
133
-$tableExists = DB::queryFirstField('SHOW TABLES LIKE %s', 'teampass_items_v2');;
133
+$tableExists = DB::queryFirstField('SHOW TABLES LIKE %s', 'teampass_items_v2'); ;
134 134
 if (is_null($tableExists) === true) {
135 135
     echo '
136 136
                             <div class="alert alert-warning" role="warning"><i class="fas fa-lightbulb mr-2"></i>'.$lang->get('table_not_exists').'</div>';
Please login to merge, or discard this patch.
pages/export.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 ) {
70 70
     // Not allowed page
71 71
     $session->set('system-error_code', ERR_NOT_ALLOWED);
72
-    include $SETTINGS['cpassman_dir'] . '/error.php';
72
+    include $SETTINGS['cpassman_dir'].'/error.php';
73 73
     exit;
74 74
 }
75 75
 
Please login to merge, or discard this patch.
pages/tasks.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('tasks') === false) {
74 74
     // Not allowed page
75 75
     $session->set('system-error_code', ERR_NOT_ALLOWED);
76
-    include $SETTINGS['cpassman_dir'] . '/error.php';
76
+    include $SETTINGS['cpassman_dir'].'/error.php';
77 77
     exit;
78 78
 }
79 79
 ?>
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
                         // error
371 371
                         toastr.remove();
372 372
                         toastr.error(
373
-                            '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
373
+                            '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
374 374
                             '', {
375 375
                                 closeButton: true,
376 376
                                 positionClass: 'toast-bottom-right'
@@ -393,11 +393,11 @@  discard block
 block discarded – undo
393 393
                         $('#'+field+'_parameter_value').val(frequency === null ? '' : frequency + ';' +value,);
394 394
                         param = value.split(';');
395 395
                         if (param.length === 1) {
396
-                            txt = ' <?php echo $lang->get('at');?> ' + param[0];
396
+                            txt = ' <?php echo $lang->get('at'); ?> ' + param[0];
397 397
                         } else {
398
-                            txt = ' <?php echo $lang->get('day');?> ' + param[1] + ' <?php echo $lang->get('at');?> ' + param[0];
398
+                            txt = ' <?php echo $lang->get('day'); ?> ' + param[1] + ' <?php echo $lang->get('at'); ?> ' + param[0];
399 399
                         }
400
-                        $('#'+field+'_parameter').val(frequency === null ? '<?php echo $lang->get('not_defined');?>' : (data.message + txt));
400
+                        $('#'+field+'_parameter').val(frequency === null ? '<?php echo $lang->get('not_defined'); ?>' : (data.message + txt));
401 401
                         $("#task-define-modal").modal('hide');
402 402
                         $('#task-define-modal-type, #task-define-modal-parameter-hourly-value, #task-define-modal-parameter-daily-value, #task-define-modal-frequency').val('');
403 403
                     }
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
                         // error
504 504
                         toastr.remove();
505 505
                         toastr.error(
506
-                            '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
506
+                            '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
507 507
                             '', {
508 508
                                 closeButton: true,
509 509
                                 positionClass: 'toast-bottom-right'
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
                     // error
565 565
                     toastr.remove();
566 566
                     toastr.error(
567
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
567
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
568 568
                         '', {
569 569
                             closeButton: true,
570 570
                             positionClass: 'toast-bottom-right'
Please login to merge, or discard this patch.
pages/oauth.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('oauth') === false) {
72 72
     // Not allowed page
73 73
     $session->set('system-error_code', ERR_NOT_ALLOWED);
74
-    include $SETTINGS['cpassman_dir'] . '/error.php';
74
+    include $SETTINGS['cpassman_dir'].'/error.php';
75 75
     exit;
76 76
 }
77 77
 
Please login to merge, or discard this patch.
includes/core/login.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,9 @@
 block discarded – undo
58 58
     $get['state'] = filter_var($_GET['state'], FILTER_SANITIZE_SPECIAL_CHARS);
59 59
     $get['session_state'] = filter_var($_GET['session_state'], FILTER_SANITIZE_SPECIAL_CHARS);
60 60
 
61
-    if (WIP === true) error_log('---- OAUTH2 START ----');
61
+    if (WIP === true) {
62
+        error_log('---- OAUTH2 START ----');
63
+    }
62 64
 
63 65
     // Création d'une instance du contrôleur
64 66
     $OAuth2 = new OAuth2Controller($SETTINGS);
Please login to merge, or discard this patch.
Spacing   +40 added lines, -41 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 $postType = $request->query->get('post_type', '');
48 48
 $postType = filter_var($postType, FILTER_SANITIZE_SPECIAL_CHARS);
49 49
 $get['post_type'] = $postType;
50
-if (isset($SETTINGS['duo']) === true && (int) $SETTINGS['duo'] === 1 && $get['post_type'] === 'duo' ) {
50
+if (isset($SETTINGS['duo']) === true && (int) $SETTINGS['duo'] === 1 && $get['post_type'] === 'duo') {
51 51
     $get['duo_state'] = $request->query->get('state');
52 52
     $get['duo_code'] = $request->query->get('duo_code');
53 53
 }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         exit;
78 78
     } else {
79 79
         // Gérer les erreurs
80
-        echo 'Erreur lors de la récupération des informations utilisateur : ' . htmlspecialchars($userInfo['message'], ENT_QUOTES, 'UTF-8');
80
+        echo 'Erreur lors de la récupération des informations utilisateur : '.htmlspecialchars($userInfo['message'], ENT_QUOTES, 'UTF-8');
81 81
     };
82 82
 }
83 83
 
@@ -100,8 +100,7 @@  discard block
 block discarded – undo
100 100
 <div class="login-box">
101 101
     <div class="login-logo"><div style="margin:30px;">',
102 102
     isset($SETTINGS['custom_logo']) === true && empty($SETTINGS['custom_logo']) === false ?
103
-        '<img src="' . (string) $SETTINGS['custom_logo'] . '" alt="" style="text-align:center; max-width:100px;" />' :
104
-        '<img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">',
103
+        '<img src="'.(string) $SETTINGS['custom_logo'].'" alt="" style="text-align:center; max-width:100px;" />' : '<img src="includes/images/teampass-logo2-login.png" alt="Teampass Logo">',
105 104
         '
106 105
         </div>
107 106
         <div style="font-weight:bold;">
@@ -121,14 +120,14 @@  discard block
 block discarded – undo
121 120
 
122 121
         <div class="card-body login-card-body1">
123 122
             <div class="input-group has-feedback mb-2">
124
-                <div class="input-group-prepend infotip" title="' . $lang->get('login') . '">
123
+                <div class="input-group-prepend infotip" title="' . $lang->get('login').'">
125 124
                     <span class="input-group-text"><i class="fa-solid fa-user fa-fw"></i></span>
126 125
                 </div>';
127 126
 if (
128 127
     isset($SETTINGS['enable_http_request_login']) === true
129 128
     && (int) $SETTINGS['enable_http_request_login'] === 1
130 129
     && $request->getUser() !== null
131
-    && ! (isset($SETTINGS['maintenance_mode']) === true
130
+    && !(isset($SETTINGS['maintenance_mode']) === true
132 131
         && (int) $SETTINGS['maintenance_mode'] === 1)
133 132
 ) {
134 133
     if (strpos($request->getUser(), '@') !== false) {
@@ -142,42 +141,42 @@  discard block
 block discarded – undo
142 141
             <input type="text" id="login" class="form-control" placeholder="', filter_var($username, FILTER_SANITIZE_FULL_SPECIAL_CHARS), '" readonly>';
143 142
 } else {
144 143
     echo '
145
-            <input type="text" id="login" class="form-control" placeholder="' . $lang->get('index_login') . '" value="'.(null !== $session->get('user-login') && empty($session->get('user-login')) === false ? filter_var($session->get('user-login'), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '').'">';
144
+            <input type="text" id="login" class="form-control" placeholder="' . $lang->get('index_login').'" value="'.(null !== $session->get('user-login') && empty($session->get('user-login')) === false ? filter_var($session->get('user-login'), FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '').'">';
146 145
 }
147 146
 
148 147
 echo '
149 148
         </div>';
150
-if (! (isset($SETTINGS['enable_http_request_login']) === true
149
+if (!(isset($SETTINGS['enable_http_request_login']) === true
151 150
     && (int) $SETTINGS['enable_http_request_login'] === 1
152 151
     && $request->getUser() !== null
153
-    && ! (isset($SETTINGS['maintenance_mode']) === true
152
+    && !(isset($SETTINGS['maintenance_mode']) === true
154 153
         && (int) $SETTINGS['maintenance_mode'] === 1))) {
155 154
     echo '
156 155
         <div class="input-group has-feedback mb-2">
157
-            <div class="input-group-prepend infotip" title="' . $lang->get('password') . '">
156
+            <div class="input-group-prepend infotip" title="' . $lang->get('password').'">
158 157
                 <span class="input-group-text"><i class="fa-solid fa-lock fa-fw"></i></span>
159 158
             </div>
160
-            <input type="password" id="pw" class="form-control submit-button" placeholder="' . $lang->get('index_password') . '">
159
+            <input type="password" id="pw" class="form-control submit-button" placeholder="' . $lang->get('index_password').'">
161 160
         </div>';
162 161
 }
163 162
 
164 163
 echo '
165 164
         <div class="input-group has-feedback mb-2">
166
-            <div class="input-group-prepend infotip" title="' . $lang->get('session_expiration_in_minutes') . '">
165
+            <div class="input-group-prepend infotip" title="' . $lang->get('session_expiration_in_minutes').'">
167 166
                 <span class="input-group-text"><i class="fa-solid fa-clock fa-fw"></i></span>
168 167
             </div>
169 168
             <input type="text" id="session_duration" class="form-control submit-button" 
170
-            placeholder="' . $lang->get('index_session_duration') .'&nbsp;(' . $lang->get('minutes') . ')" 
169
+            placeholder="' . $lang->get('index_session_duration').'&nbsp;('.$lang->get('minutes').')" 
171 170
             value="', isset($SETTINGS['default_session_expiration_time']) === true ? $SETTINGS['default_session_expiration_time'] : '', '">
172 171
         </div>';
173 172
 // 2FA auth selector
174 173
 $mfaHtmlPart = '
175
-        <input type="hidden" id="2fa_user_selection" value="'.htmlspecialchars((isset($get['post_type']) === true && $get['post_type'] === 'duo') ? 'duo' : ''). '">
176
-        <input type="hidden" id="duo_code" value="'.htmlspecialchars(isset($get['duo_code']) === true && is_null($get['duo_code']) === false ? $get['duo_code'] : ''). '">
177
-        <input type="hidden" id="duo_state" value="'.htmlspecialchars(isset($get['duo_state']) === true && is_null($get['duo_state']) === false ? $get['duo_state'] : ''). '">
174
+        <input type="hidden" id="2fa_user_selection" value="'.htmlspecialchars((isset($get['post_type']) === true && $get['post_type'] === 'duo') ? 'duo' : '').'">
175
+        <input type="hidden" id="duo_code" value="'.htmlspecialchars(isset($get['duo_code']) === true && is_null($get['duo_code']) === false ? $get['duo_code'] : '').'">
176
+        <input type="hidden" id="duo_state" value="'.htmlspecialchars(isset($get['duo_state']) === true && is_null($get['duo_state']) === false ? $get['duo_state'] : '').'">
178 177
         <div class="row mb-3 hidden" id="2fa_methods_selector">
179 178
             <div class="col-12">
180
-                <h8 class="login-box-msg">' . $lang->get('2fa_authentication_selector') . '</h8>
179
+                <h8 class="login-box-msg">' . $lang->get('2fa_authentication_selector').'</h8>
181 180
                 <div class="2fa-methods text-center mt-2">'.
182 181
                 (isset($SETTINGS['google_authentication']) === true && (int) $SETTINGS['google_authentication'] === 1 ?
183 182
         '
@@ -210,14 +209,14 @@  discard block
 block discarded – undo
210 209
     echo '
211 210
         <div id="div-2fa-google" class="mb-3 div-2fa-method hidden">
212 211
             <div class="input-group has-feedback mb-2">
213
-                <div class="input-group-prepend infotip" title="' . $lang->get('mfa_unique_code') . '">
212
+                <div class="input-group-prepend infotip" title="' . $lang->get('mfa_unique_code').'">
214 213
                     <span class="input-group-text"><i class="fa-solid fa-key fa-fw"></i></span>
215 214
                 </div>
216
-                <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . $lang->get('ga_identification_code') . '" />
215
+                <input type="text" id="ga_code" class="form-control submit-button" placeholder="' . $lang->get('ga_identification_code').'" />
217 216
                 <span class="input-group-append">
218 217
                     <button type="button" class="btn btn-info btn-flat" onclick="send_user_new_temporary_ga_code()">
219 218
                         <i class="fa-solid fa-envelope form-control-feedback pointer infotip" 
220
-                    title="' . $lang->get('i_need_to_generate_new_ga_code') . '"></i>
219
+                    title="' . $lang->get('i_need_to_generate_new_ga_code').'"></i>
221 220
                     </button>
222 221
                 </span>
223 222
             </div>
@@ -235,7 +234,7 @@  discard block
 block discarded – undo
235 234
 <script>
236 235
 var seconds = 1;
237 236
 function updateLogonButton(timeToGo){
238
-    document.getElementById("but_identify_user").value = "' . $lang->get('duration_login_attempt') . ' " + timeToGo;
237
+    document.getElementById("but_identify_user").value = "' . $lang->get('duration_login_attempt').' " + timeToGo;
239 238
 }
240 239
 $( window ).on( "load", function() {
241 240
     updateLogonButton(seconds);
@@ -244,7 +243,7 @@  discard block
 block discarded – undo
244 243
         if (seconds >= 0) {
245 244
             updateLogonButton(seconds);
246 245
         } else if(seconds === 0) {
247
-            launchIdentify("", "' . $nextUrl . '");
246
+            launchIdentify("", "' . $nextUrl.'");
248 247
         }
249 248
         updateLogonButton(seconds);
250 249
     },
@@ -265,15 +264,15 @@  discard block
 block discarded – undo
265 264
             <div class="col-8">
266 265
                 <div id="yubiko-new-key" class="alert alert-info hidden">
267 266
                     <p>
268
-                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . $lang->get('yubico_user_id') . '">
267
+                        <input type="text" size="10" id="yubico_user_id" class="form-control" placeholder="' . $lang->get('yubico_user_id').'">
269 268
                     </p>
270 269
                     <p>
271
-                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . $lang->get('yubico_user_key') . '">
270
+                    <input type="text" size="10" id="yubico_user_key" class="form-control" placeholder="' . $lang->get('yubico_user_key').'">
272 271
                     </p>
273 272
                 </div>
274
-                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . $lang->get('press_your_yubico_key') . '">
273
+                <input autocomplete="off" type="text" id="yubico_key" class="form-control submit-button" placeholder="' . $lang->get('press_your_yubico_key').'">
275 274
                 <div class="row">
276
-                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . $lang->get('register_new_yubiko_key') . '</span>
275
+                    <span class="ml-2 mt-1 font-weight-light small pointer" id="register-yubiko-key">' . $lang->get('register_new_yubiko_key').'</span>
277 276
                 </div>
278 277
             </div>
279 278
         </div>';
@@ -282,22 +281,22 @@  discard block
 block discarded – undo
282 281
 echo '
283 282
         <div class="row mt-5">
284 283
             <div class="col-12">
285
-                <button id="but_identify_user" class="btn btn-primary btn-block">' . $lang->get('log_in') . '</button>
284
+                <button id="but_identify_user" class="btn btn-primary btn-block">' . $lang->get('log_in').'</button>
286 285
                 
287 286
                 <!-- In case of upgrade, the user has to provide his One Time Code -->
288 287
                 <div class="card-body user-one-time-code-card-body hidden">
289
-                    <h5 class="login-box-msg">' . $lang->get('provide_personal_one_time_code') . '</h5>
288
+                    <h5 class="login-box-msg">' . $lang->get('provide_personal_one_time_code').'</h5>
290 289
 
291 290
                     <div class="input-group has-feedback mb-2 mt-4">
292 291
                         <div class="input-group-prepend">
293 292
                             <span class="input-group-text"><i class="fa-solid fa-unlock-alt"></i></span>
294 293
                         </div>
295
-                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . $lang->get('one_time_code') . '">
294
+                        <input type="password" id="user-one-time-code" class="form-control" placeholder="' . $lang->get('one_time_code').'">
296 295
                     </div>
297 296
 
298 297
                     <div class="row mb-3">
299 298
                         <div class="col-12">
300
-                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . $lang->get('confirm') . '</button>
299
+                            <button id="but_confirm_otc" class="btn btn-primary btn-block">' . $lang->get('confirm').'</button>
301 300
                         </div>
302 301
                     </div>
303 302
                 </div>
@@ -312,7 +311,7 @@  discard block
 block discarded – undo
312 311
         <hr class="mt-3 mb-3"/>
313 312
         <div class="row mb-2">
314 313
             <div class="col-12">
315
-                <button id="but_login_with_oauth2" class="btn btn-primary btn-block">' . $SETTINGS['oauth2_client_appname'] . '</button>
314
+                <button id="but_login_with_oauth2" class="btn btn-primary btn-block">' . $SETTINGS['oauth2_client_appname'].'</button>
316 315
             </div>
317 316
         </div>';
318 317
 }
@@ -325,10 +324,10 @@  discard block
 block discarded – undo
325 324
 // In case of password change
326 325
 echo '
327 326
     <div class="card-body confirm-password-card-body hidden">
328
-        <h5 class="login-box-msg">' . $lang->get('new_password_required') . '</h5>
327
+        <h5 class="login-box-msg">' . $lang->get('new_password_required').'</h5>
329 328
 
330 329
         <div class="alert alert-info">
331
-            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('password_strength') . '
330
+            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('password_strength').'
332 331
             <span id="confirm-password-level" class="ml-2 font-weight-bold"></span></div>
333 332
         </div>
334 333
 
@@ -338,20 +337,20 @@  discard block
 block discarded – undo
338 337
                     <div class="input-group-prepend">
339 338
                         <span class="input-group-text"><i class="fas fa-key"></i></span>
340 339
                     </div>
341
-                    <input type="password" id="current-user-password" class="form-control" placeholder="' . $lang->get('current_password') . '">
340
+                    <input type="password" id="current-user-password" class="form-control" placeholder="' . $lang->get('current_password').'">
342 341
                 </div>
343 342
             </div>
344 343
             <div class="input-group has-feedback mb-2 mt-4">
345 344
                 <div class="input-group-prepend">
346 345
                     <span class="input-group-text"><i class="fas fa-key"></i></span>
347 346
                 </div>
348
-                <input type="password" id="new-user-password" class="form-control" placeholder="' . $lang->get('index_new_pw') . '">
347
+                <input type="password" id="new-user-password" class="form-control" placeholder="' . $lang->get('index_new_pw').'">
349 348
             </div>
350 349
             <div class="input-group has-feedback mb-2">
351 350
                 <div class="input-group-prepend">
352 351
                     <span class="input-group-text"><i class="fas fa-key"></i></span>
353 352
                 </div>
354
-                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . $lang->get('index_change_pw_confirmation') . '">
353
+                <input type="password" id="new-user-password-confirm" class="form-control" placeholder="' . $lang->get('index_change_pw_confirmation').'">
355 354
             </div>
356 355
             <div class="row mb-3">
357 356
                 <div class="col-md-12 offset-sm-4 text-center">
@@ -362,7 +361,7 @@  discard block
 block discarded – undo
362 361
             </div>
363 362
             <div class="row mb-3">
364 363
                 <div class="col-12">
365
-                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . $lang->get('confirm') . '</button>
364
+                    <button id="but_confirm_new_password" class="btn btn-primary btn-block">' . $lang->get('confirm').'</button>
366 365
                 </div>
367 366
             </div>
368 367
         </div>
@@ -370,20 +369,20 @@  discard block
 block discarded – undo
370 369
 
371 370
     <div class="card-body hidden" id="card-user-treat-psk">
372 371
         <div class="alert alert-info">
373
-            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('user_has_psk_info') . '</div>
372
+            <div class="text-center"><i class="icon fa fa-info"></i>' . $lang->get('user_has_psk_info').'</div>
374 373
         </div>
375 374
         <div class="input-group has-feedback mb-2">
376 375
             <div class="input-group-prepend">
377 376
                 <span class="input-group-text"><i class="fas fa-key"></i></span>
378 377
             </div>
379
-            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . $lang->get('home_personal_saltkey') . '">
378
+            <input type="password" id="user-old-defuse-psk" class="form-control" placeholder="' . $lang->get('home_personal_saltkey').'">
380 379
         </div>
381 380
         <div class="row mb-3 mt-4">
382 381
             <div class="col-12">
383
-                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . $lang->get('launch') . '</button>
382
+                <button id="but_confirm_defuse_psk" class="btn btn-primary btn-block">' . $lang->get('launch').'</button>
384 383
             </div>
385 384
             <div class="col-12 mt-3">
386
-                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . $lang->get('i_cannot_remember') . '</button>
385
+                <button id="but_confirm_forgot_defuse_psk" class="btn btn-danger btn-block text-bold">' . $lang->get('i_cannot_remember').'</button>
387 386
             </div>
388 387
         </div>
389 388
     </div>
Please login to merge, or discard this patch.