nilsteampassnet / TeamPass

pages/admin.js.php

Spacing +7 added lines, -7 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('admin') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -169,7 +169,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -248,7 +248,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -310,7 +310,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -404,7 +404,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'
@@ -433,7 +433,7 @@ 
                     
                     //const className = result.success ? 'success' : 'error';
                     const icon = result.success ? '<i class="fa-solid fa-check text-success mr-1"></i>' : '<i class="fa-solid fa-xmark text-danger mr-1"></i>';
-                    const message = result.success ? '<?php echo $lang->get('server_returned_data');?>' : 'Error: ' + result.error;
+                    const message = result.success ? '<?php echo $lang->get('server_returned_data'); ?>' : 'Error: ' + result.error;
                     
                     output += '<li>' + icon + '<b>' + file + '</b><br/>' + message + '</li>';
                 });
@@ -464,7 +464,7 @@ 
                     // error
                     toastr.remove();
                     toastr.error(
-                        '<?php echo $lang->get('server_answer_error') . '<br />' . $lang->get('server_returned_data') . ':<br />'; ?>' + data.error,
+                        '<?php echo $lang->get('server_answer_error').'<br />'.$lang->get('server_returned_data').':<br />'; ?>' + data.error,
                         '', {
                             closeButton: true,
                             positionClass: 'toast-bottom-right'

includes/language/english.php

Indentation +2 added lines, -2 removed lines

@@ -28,8 +28,8 @@
  * @see       https://www.teampass.net
  */
 
- // TO REMOVE
- // - selected_items_to_be_imported
+    // TO REMOVE
+    // - selected_items_to_be_imported
 
 return array(
     'newly_created_user_belongs_to_role' => 'Newly created user belongs to role',

pages/items.js.php

Spacing +7 added lines, -7 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('items') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -1056,7 +1056,7 @@ 
             //
         } else if ($(this).data('item-action') === 'link') {
             // Add link to clipboard.
-            navigator.clipboard.writeText("<?php echo $SETTINGS['cpassman_url'];?>/index.php?page=items&group="+store.get('teampassItem').folderId+"&id="+store.get('teampassItem').id);
+            navigator.clipboard.writeText("<?php echo $SETTINGS['cpassman_url']; ?>/index.php?page=items&group="+store.get('teampassItem').folderId+"&id="+store.get('teampassItem').id);
 
             // Display message.
             toastr.remove();
@@ -2698,7 +2698,7 @@ 
                 progress: "#form-item-password-strength",
                 score: "#form-item-password-strength"
             },
-            scores: [<?php echo TP_PW_STRENGTH_1;?>, <?php echo TP_PW_STRENGTH_2;?>, <?php echo TP_PW_STRENGTH_3;?>, <?php echo TP_PW_STRENGTH_4;?>, <?php echo TP_PW_STRENGTH_5;?>],
+            scores: [<?php echo TP_PW_STRENGTH_1; ?>, <?php echo TP_PW_STRENGTH_2; ?>, <?php echo TP_PW_STRENGTH_3; ?>, <?php echo TP_PW_STRENGTH_4; ?>, <?php echo TP_PW_STRENGTH_5; ?>],
         },
         i18n : {
             t: function (key) {
@@ -2725,7 +2725,7 @@ 
     <?php
     $max_file_size = '';
     if (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) {
-        $max_file_size = $SETTINGS['upload_maxfilesize'] . 'mb';
+        $max_file_size = $SETTINGS['upload_maxfilesize'].'mb';
     } else {
         $max_file_size = $SETTINGS['upload_maxfilesize'];
     }
@@ -4647,7 +4647,7 @@ 
                         (retData.edition_locked_delay === null ? 
                         '' 
                         :
-                        ' : ' + retData.edition_locked_delay + ' <?php echo $lang->get('seconds');?>'),
+                        ' : ' + retData.edition_locked_delay + ' <?php echo $lang->get('seconds'); ?>'),
                     '', {
                         timeOut: 5000,
                         progressBar: true
@@ -4804,7 +4804,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-ldap-user-change-password-info')
-                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                         } else if (data.error_type !== 'undefined') {
@@ -4823,7 +4823,7 @@ 
 
                                 // Show passwords inputs and form
                                 $('#dialog-ldap-user-change-password-info')
-                                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password');?>')
+                                    .html('<i class="icon fa-solid fa-info mr-2"></i><?php echo $lang->get('ldap_user_has_changed_his_password'); ?>')
                                     .removeClass('hidden');
                                 $('#dialog-ldap-user-change-password').removeClass('hidden');
                             });

pages/users.js.php

Spacing +11 added lines, -11 removed lines

@@ -72,7 +72,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('users') === false) {
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 ?>
@@ -134,7 +134,7 @@ 
         'stateSave': true,
         'autoWidth': true,
         'ajax': {
-            url: '<?php $SETTINGS['cpassman_url']= ''; echo $SETTINGS['cpassman_url']; ?>/sources/users.datatable.php',
+            url: '<?php $SETTINGS['cpassman_url'] = ''; echo $SETTINGS['cpassman_url']; ?>/sources/users.datatable.php',
             data: function(d) {
                 d.display_warnings = $('#warnings_display').is(':checked');
             },
@@ -330,8 +330,8 @@ 
         if (store.get('teampassApplication').formUserAction === "add_new_user") {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>',
-                'body': '<?php echo $lang->get('email_body_new_user');?>',
+                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>',
+                'body': '<?php echo $lang->get('email_body_new_user'); ?>',
                 'pre_replace' : {
                     '#code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                     '#login#' : store.get('teampassUser').admin_new_user_login,
@@ -341,8 +341,8 @@ 
         } else {
             var data = {
                 'receipt': $('#form-email').val(),
-                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code');?>',
-                'body': '<?php echo $lang->get('email_body_temporary_encryption_code');?>',
+                'subject': 'TEAMPASS - <?php echo $lang->get('temporary_encryption_code'); ?>',
+                'body': '<?php echo $lang->get('email_body_temporary_encryption_code'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : store.get('teampassUser').admin_new_user_temporary_encryption_code,
                 }
@@ -537,14 +537,14 @@ 
             }
             // Inform user
             $("#warningModalBody").html('<b><?php echo $lang->get('encryption_keys'); ?> - ' +
-                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
+                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + ']<span id="warningModalBody_extra">' + $nbItemsToConvert + '</span> ' +
                 '... <?php echo $lang->get('please_wait'); ?><i class="fa-solid fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             // If expected, show the OPT to the admin
             if (constVisibleOTP === true) {
                 toastr.info(
-                    '<?php echo $lang->get('show_encryption_code_to_admin');?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>'
-                    + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close');?></button>',
+                    '<?php echo $lang->get('show_encryption_code_to_admin'); ?> <div><input class="form-control form-item-control flex-nowrap" value="' + userTemporaryCode + '" readonly></div>'
+                    + '<br /><button type="button" class="btn clear"><?php echo $lang->get('close'); ?></button>',
                     '<?php echo $lang->get('information'); ?>',
                     {
                         extendedTimeOut: 0,
@@ -563,7 +563,7 @@ 
             var data = {
                 action: step,
                 start: start,
-                length: <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                length: <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                 user_id: userId,
             }
             if (debugJavascript === true) {
@@ -1400,7 +1400,7 @@ 
                         } else {
                             // Show icon or not
                             if ($('#user-disabled').prop('checked') === true) {
-                                $('#user-login-'+userID).before('<i class="fa-solid fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked');?>" id="user-disable-'+userID+'"></i>');
+                                $('#user-login-'+userID).before('<i class="fa-solid fa-user-slash infotip text-danger mr-2" title="<?php echo $lang->get('account_is_locked'); ?>" id="user-disable-'+userID+'"></i>');
                             } else {
                                 $('#user-disable-'+userID).remove();
                             }