nilsteampassnet / TeamPass

pages/profile.js.php

Spacing +15 added lines, -15 removed lines

@@ -71,7 +71,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('profile') === 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;
 }
 ?>
@@ -95,7 +95,7 @@ 
     })
 
     // Select user properties
-    $('#profile-user-language option[value=<?php echo $session->get('user-language');?>').attr('selected','selected');
+    $('#profile-user-language option[value=<?php echo $session->get('user-language'); ?>').attr('selected','selected');
 
 
     // AVATAR IMPORT
@@ -262,7 +262,7 @@ 
                     $('#profile-user-email').val(data.email)
 
                     // reload page in case of language change
-                    if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language');?>') {
+                    if ($('#profile-user-language').val().toLowerCase() !== '<?php echo $session->get('user-language'); ?>') {
                         // prepare reload
                         $(this).delay(3000).queue(function() {
                             document.location.href = "index.php?page=profile";
@@ -273,7 +273,7 @@ 
                         // Inform user
                         toastr.remove();
                         toastr.info(
-                            '<?php echo $lang->get('alert_page_will_reload') . ' ... ' . $lang->get('please_wait'); ?>',
+                            '<?php echo $lang->get('alert_page_will_reload').' ... '.$lang->get('please_wait'); ?>',
                             '', {
                                 timeOut: 3000,
                                 progressBar: true
@@ -377,27 +377,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -490,27 +490,27 @@ 
         "defaultText": "<?php echo $lang->get('index_pw_level_txt'); ?>",
         "ratings": [
             {
-                "minScore": <?php echo TP_PW_STRENGTH_1;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_1; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level1'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_2;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_2; ?>,
                 "className": "meterWarn",
                 "text": "<?php echo $lang->get('complex_level2'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_3;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_3; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level3'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_4;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_4; ?>,
                 "className": "meterGood",
                 "text": "<?php echo $lang->get('complex_level4'); ?>"
             },
             {
-                "minScore": <?php echo TP_PW_STRENGTH_5;?>,
+                "minScore": <?php echo TP_PW_STRENGTH_5; ?>,
                 "className": "meterExcel",
                 "text": "<?php echo $lang->get('complex_level5'); ?>"
             }
@@ -526,7 +526,7 @@ 
         }
     });
 
-    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
+    $('#profile-keys_download-date').text('<?php echo null === $session->get('user-keys_recovery_time') ? $lang->get('none') : date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $session->get('user-keys_recovery_time')); ?>');
 
     $("#open-dialog-keys-download").on('click', function(event) {
         event.preventDefault();

pages/utilities.logs.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('utilities.logs') === 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;
 }
 
@@ -202,7 +202,7 @@ 
                                             echo null !== $session->get('user-admin') && (int) $session->get('user-admin') === 1 ? '' : ' hidden';
                                             ?>">
                         <div class="form-group">
-                            <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge') . ' ' . $lang->get('date_range'); ?></h5>
+                            <h5><i class="fas fa-broom mr-2"></i><?php echo $lang->get('purge').' '.$lang->get('date_range'); ?></h5>
                             <div class="input-group">
                                 <div class="input-group-prepend">
                                     <span class="input-group-text">
@@ -225,7 +225,7 @@ 
                                     <select class="form-control" id="purge-filter-user">
                                         <option value="-1"><?php echo $lang->get('all'); ?></option>
                                     <?php
-                                    $rows = DB::query('SELECT id, name, lastname FROM ' . prefixTable('users') . ' WHERE admin = 0');
+                                    $rows = DB::query('SELECT id, name, lastname FROM '.prefixTable('users').' WHERE admin = 0');
 foreach ($rows as $record) {
     echo '
                                         <option value="'.$record['id'].'">'.$record['name'].' '.$record['lastname'].'</option>';

pages/favourites.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('favourites') === 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;
 }
 
@@ -118,12 +118,12 @@ 
                             if (empty($fav) === false) {
                                 $data = DB::queryFirstRow(
                                     'SELECT i.label, i.description, i.id, i.id_tree, t.title
-                                    FROM ' . prefixTable('items') . ' as i
-                                    INNER JOIN ' . prefixTable('nested_tree') . ' as t ON (t.id = i.id_tree)
+                                    FROM ' . prefixTable('items').' as i
+                                    INNER JOIN ' . prefixTable('nested_tree').' as t ON (t.id = i.id_tree)
                                     WHERE i.id = %i',
                                     $fav
                                 );
-                                if (! empty($data['label'])) {
+                                if (!empty($data['label'])) {
                                     ?>
                                     <tr>
                                         <td>

pages/folders.php

Spacing +11 added lines, -11 removed lines

@@ -66,7 +66,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('folders') === 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;
 }
 
@@ -99,28 +99,28 @@ 
 $complexityHtml = '<div id="hidden-select-complexity" class="hidden"><select id="select-complexity" class="form-control form-item-control save-me">';
 $complexitySelect = '';
 foreach (TP_PW_COMPLEXITY as $level) {
-    $complexitySelect .= '<option value="' . $level[0] . '">' . $level[1] . '</option>';
+    $complexitySelect .= '<option value="'.$level[0].'">'.$level[1].'</option>';
 }
-$complexityHtml .= $complexitySelect . '</select></div>';
+$complexityHtml .= $complexitySelect.'</select></div>';
 
 /* Get full tree structure */
 $tst = $tree->getDescendants();
 // prepare options list
-$droplist = '<option value="na">---' . $lang->get('select') . '---</option>';
+$droplist = '<option value="na">---'.$lang->get('select').'---</option>';
 if ((int) $session->get('user-admin') === 1 || (int) $session->get('user-manager') === 1 || (int) $session->get('user-can_create_root_folder') === 1) {
-    $droplist .= '<option value="0">' . $lang->get('root') . '</option>';
+    $droplist .= '<option value="0">'.$lang->get('root').'</option>';
 }
 foreach ($tst as $t) {
     if (
         in_array($t->id, $session->get('user-accessible_folders')) === true
         && in_array($t->id, $session->get('user-personal_visible_folders')) === false
     ) {
-        $droplist .= '<option value="' . $t->id . '">' . addslashes($t->title);
+        $droplist .= '<option value="'.$t->id.'">'.addslashes($t->title);
         $text = '';
         foreach ($tree->getPath($t->id, false) as $fld) {
-            $text .= empty($text) === true ? '     [' . $fld->title : ' > ' . $fld->title;
+            $text .= empty($text) === true ? '     ['.$fld->title : ' > '.$fld->title;
         }
-        $droplist .= (empty($text) === true ? '' : $text . '</i>]') . '</option>';
+        $droplist .= (empty($text) === true ? '' : $text.'</i>]').'</option>';
     }
 }
 
@@ -199,14 +199,14 @@ 
                                     <label><?php echo $lang->get('icon'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon" data-field="icon">
                                     <small class='form-text text-muted'>
-                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
                                     <label><?php echo $lang->get('icon_on_selection'); ?></label>
                                     <input type="text" class="form-control form-folder-control purify" id="new-folder-add-icon-selected" data-field="iconSelected">
                                     <small class='form-text text-muted'>
-                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
+                                        <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fas fa-external-link-alt ml-1"></i></a>
                                     </small>
                                 </div>
                                 <div class="form-group">
@@ -297,7 +297,7 @@ 
                                 <th scope="col" min-width="200px"><?php echo $lang->get('group'); ?></th>
                                 <th scope="col" min-width="200px"><?php echo $lang->get('group_parent'); ?></th>
                                 <th scope="col" width="50px"><i class="fas fa-gavel fa-lg infotip" title="<?php echo $lang->get('password_strength'); ?>"></i></th>
-                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration') . ' ' . $lang->get('group_pw_duration_tip'); ?>"></i></th>
+                                <th scope="col" width="50px"><i class="fas fa-recycle fa-lg infotip" title="<?php echo $lang->get('group_pw_duration').' '.$lang->get('group_pw_duration_tip'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-pen fa-lg infotip" title="<?php echo $lang->get('auth_creation_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-edit fa-lg infotip" title="<?php echo $lang->get('auth_modification_without_complexity'); ?>"></i></th>
                                 <th scope="col" width="50px"><i class="fas fa-folder fa-lg infotip" title="<?php echo $lang->get('icon'); ?>"></i></th>

pages/users.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,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;
 }
 
@@ -85,24 +85,24 @@ 
 // If administrator then all roles are shown
 // else only the Roles the users is associated to.
 if ((int) $session->get('user-admin') === 1) {
-    $optionsManagedBy .= '<option value="0">' . $lang->get('administrators_only') . '</option>';
+    $optionsManagedBy .= '<option value="0">'.$lang->get('administrators_only').'</option>';
 }
 
 $rows = DB::query(
     'SELECT id, title, creator_id
-    FROM ' . prefixTable('roles_title') . '
+    FROM ' . prefixTable('roles_title').'
     ORDER BY title ASC'
 );
 foreach ($rows as $record) {
     if ((int) $session->get('user-admin') === 1 || in_array($record['id'], $session->get('user-roles_array')) === true) {
-        $optionsManagedBy .= '<option value="' . $record['id'] . '">' . $lang->get('managers_of') . ' ' . addslashes($record['title']) . '</option>';
+        $optionsManagedBy .= '<option value="'.$record['id'].'">'.$lang->get('managers_of').' '.addslashes($record['title']).'</option>';
     }
     if (
         (int) $session->get('user-admin') === 1
         || (((int) $session->get('user-manager') === 1 || (int) $session->get('user-can_manage_all_users') === 1)
             && (in_array($record['id'], $userRoles) === true) || (int) $record['creator_id'] === (int) $session->get('user-id'))
     ) {
-        $optionsRoles .= '<option value="' . $record['id'] . '">' . addslashes($record['title']) . '</option>';
+        $optionsRoles .= '<option value="'.$record['id'].'">'.addslashes($record['title']).'</option>';
     }
 }
 
@@ -117,7 +117,7 @@ 
         for ($y = 1; $y < $t->nlevel; ++$y) {
             $ident .= '&nbsp;&nbsp;';
         }
-        $foldersList .= '<option value="' . $t->id . '">' . $ident . htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8') . '</option>';
+        $foldersList .= '<option value="'.$t->id.'">'.$ident.htmlspecialchars($t->title, ENT_COMPAT, 'UTF-8').'</option>';
     }
 }
 
@@ -154,7 +154,7 @@ 
                         </button><?php
                                     echo isset($SETTINGS['ldap_mode']) === true && (int) $SETTINGS['ldap_mode'] === 1 && (int) $session->get('user-admin') === 1 ?
                                         '<button type="button" class="btn btn-primary btn-sm tp-action mr-2" data-action="ldap-sync">
-                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization') . '
+                            <i class="fa-solid fa-address-card mr-2"></i>' . $lang->get('ldap_synchronization').'
                         </button>' : '';
                                     ?>
                     </h3>
@@ -226,7 +226,7 @@ 
                                             <?php
                                             foreach (TP_PW_COMPLEXITY as $entry) {
                                                 echo '
-                                            <option value="' . $entry[0] . '">' . addslashes($entry[1]) . '</option>';
+                                            <option value="' . $entry[0].'">'.addslashes($entry[1]).'</option>';
                                             }
                                             ?>
                                         </select>

pages/2fa.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('mfa') === 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;
 }
 
@@ -141,7 +141,7 @@ 
                                     );
                                     foreach ($roles as $role) {
                                         echo '
-                                    <option value="' . $role['id'] . '"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>' . addslashes($role['title']) . '</option>';
+                                    <option value="' . $role['id'].'"', in_array($role['id'], $arrRolesMFA) === true ? ' selected' : '', '>'.addslashes($role['title']).'</option>';
                                     }
                                     ?>
                                 </select>

pages/import.js.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 if ($checkUserAccess->checkSession() === false || $checkUserAccess->userAccessPage('import') === 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;
 }
 ?>
@@ -702,7 +702,7 @@ 
                                     // Isolate first item
                                     if (itemsList.length > 0) {
                                         $('#import-feedback-progress-text')
-                                            .html('<i class="fas fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress');?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i>'+itemsList[0].Title + '</i>');
+                                            .html('<i class="fas fa-cog fa-spin ml-4 mr-2"></i><?php echo $lang->get('operation_progress'); ?> ('+((counter*100)/itemsNumber).toFixed(2)+'%) - <i>'+itemsList[0].Title + '</i>');
 
                                         data = {
                                             'edit-all': $('#import-keepass-edit-all-checkbox').prop('checked') === true ? 1 : 0,

pages/items.php

Spacing +34 added lines, -34 removed lines

@@ -63,7 +63,7 @@ 
     error_log('DEBUG: En ERREUR /!\\');
     // Not allowed page
     $session->set('system-error_code', ERR_NOT_ALLOWED);
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 // Define Timezone
@@ -84,7 +84,7 @@ 
 
 // Get list of users
 $usersList = [];
-$rows = DB::query('SELECT id,login,email FROM ' . prefixTable('users') . ' ORDER BY login ASC');
+$rows = DB::query('SELECT id,login,email FROM '.prefixTable('users').' ORDER BY login ASC');
 foreach ($rows as $record) {
     $usersList[$record['login']] = [
         'id' => $record['id'],
@@ -95,16 +95,16 @@ 
 // Get list of roles
 $arrRoles = [];
 $listRoles = '';
-$rows = DB::query('SELECT id,title FROM ' . prefixTable('roles_title') . ' ORDER BY title ASC');
+$rows = DB::query('SELECT id,title FROM '.prefixTable('roles_title').' ORDER BY title ASC');
 foreach ($rows as $reccord) {
     $arrRoles[$reccord['title']] = [
         'id' => $reccord['id'],
         'title' => $reccord['title'],
     ];
     if (empty($listRoles)) {
-        $listRoles = $reccord['id'] . '#' . $reccord['title'];
+        $listRoles = $reccord['id'].'#'.$reccord['title'];
     } else {
-        $listRoles .= ';' . $reccord['id'] . '#' . $reccord['title'];
+        $listRoles .= ';'.$reccord['id'].'#'.$reccord['title'];
     }
 }
 
@@ -179,7 +179,7 @@ 
                         <li class="nav-item"><a class="nav-link" href="#tab_3" data-toggle="tab"><i class="fa-solid fa-archive mr-2"></i><?php echo $lang->get('attachments'); ?></a></li>
                         <?php
                         echo isset($SETTINGS['item_extra_fields']) === true && (int) $SETTINGS['item_extra_fields'] === 1 ? '
-                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields') . '</a></li>' : '';
+                            <li class="nav-item"><a class="nav-link" href="#tab_4" data-toggle="tab"><i class="fa-solid fa-cubes mr-2"></i>' . $lang->get('fields').'</a></li>' : '';
                         ?>
                     </ul>
                 </div><!-- /.card-header -->
@@ -248,7 +248,7 @@ 
                                                 <?php
                                                 for ($i = 4; $i <= $SETTINGS['pwd_maximum_length']; ++$i) {
                                                     echo '
-                                                <option>' . $i . '</option>';
+                                                <option>' . $i.'</option>';
                                                 }
                                                 ?>
                                             </select>
@@ -278,7 +278,7 @@ 
                                     <span class="ml-2 col-md-1 clear-me-html" id="form-item-icon-show"></span>
                                 </div>
                                 <small class='form-text text-muted'>
-                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                    <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                                 </small>
                             </div>
 
@@ -467,38 +467,38 @@ 
                             <div class="tab-pane" id="tab_4">
                                 <div id="form-item-field" class="hidden">
                                     <?php
-                                        $session_item_fields = $session->get('system-item_fields');//print_r($session_item_fields);
+                                        $session_item_fields = $session->get('system-item_fields'); //print_r($session_item_fields);
                                         if (isset($session_item_fields) === true) {
                                             foreach ($session_item_fields as $category) {print_r($category);
                                                 echo '
-                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'] . '">
-                                                <h5>' . $category['title'] . '</h5>
+                                            <div class="callout callout-info form-item-category hidden" id="form-item-category-' . $category['id'].'">
+                                                <h5>' . $category['title'].'</h5>
                                                 <p>';
                                                 foreach ($category['fields'] as $field) {
                                                     if ($field['type'] === 'textarea') {
                                                         echo '
-                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="form-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <label>' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</label>
-                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0"></textarea>
+                                                        <textarea class="form-control form-item-control form-item-field-custom" rows="2" data-field-name="' . $field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0"></textarea>
                                                     </div>';
                                                     } else {
                                                         echo '
-                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'] . '" data-field-id="' . $field['id'] . '">
+                                                    <div class="input-group mb-3 form-item-field" id="form-item-field-' . $field['id'].'" data-field-id="'.$field['id'].'">
                                                         <div class="input-group-prepend">
                                                             <span class="input-group-text">' . $field['title'],
                                                             $field['is_mandatory'] === '1' ?
-                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="' . $lang->get('is_mandatory') . '"></span>' : '',
+                                                                '<span class="fa-solid fa-fire text-danger ml-1 infotip" title="'.$lang->get('is_mandatory').'"></span>' : '',
                                                             '</span>
                                                         </div>
-                                                        <input type="' . $field['type'] . '" class="form-control form-item-control form-item-field-custom" data-field-name="' . $field['id'] . '" data-field-mandatory="' . $field['is_mandatory'] . '" data-field-regex="' . $field['regex'] . '" data-change-ongoing="0">
+                                                        <input type="' . $field['type'].'" class="form-control form-item-control form-item-field-custom" data-field-name="'.$field['id'].'" data-field-mandatory="'.$field['is_mandatory'].'" data-field-regex="'.$field['regex'].'" data-change-ongoing="0">
                                                     </div>';
                                                     }
                                                     if (!empty($field['regex'])) {
                                                         echo '
-                                                    <div>Regex: '. $field['regex'] .'</div>
+                                                    <div>Regex: '. $field['regex'].'</div>
                                                         ';
                                                     }
                                                 }
@@ -509,8 +509,8 @@ 
                                                 ) {
                                                     echo '
                                                     <div class="form-check icheck-blue">
-                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'] . '" data-change-ongoing="0" data-field-name="template" id="template_' . $category['id'] . '">
-                                                        <label class="form-check-label ml-3" for="template_' . $category['id'] . '">' . $lang->get('main_template') . '</label>
+                                                        <input type="checkbox" class="form-check-input form-check-input-template form-item-control flat-blue" data-category-id="' . $category['id'].'" data-change-ongoing="0" data-field-name="template" id="template_'.$category['id'].'">
+                                                        <label class="form-check-label ml-3" for="template_' . $category['id'].'">'.$lang->get('main_template').'</label>
                                                     </div>';
                                                 }
                                                 echo '
@@ -520,8 +520,8 @@ 
                                         } else {
                                             echo
                                             '<div class="alert alert-info">
-                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information') . '</h5>
-                                                ' . $lang->get('no_fields') . '
+                                                <h5><i class="icon fa fa-info mr-3"></i>' . $lang->get('information').'</h5>
+                                                ' . $lang->get('no_fields').'
                                             </div>';
                                         } ?>
                                 </div>
@@ -714,18 +714,18 @@ 
                         <?php
                             foreach ($session_item_fields as $elem) {
                                 echo '
-                        <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'] . '">
-                            <h5>' . $elem['title'] . '</h5>
+                        <div class="callout callout-info card-item-category hidden" id="card-item-category-' . $elem['id'].'">
+                            <h5>' . $elem['title'].'</h5>
                             <p>
                                 <ul class="list-group list-group-unbordered mb-3">';
                                 foreach ($elem['fields'] as $field) {
                                     echo '
-                                    <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'] . '">
-                                        <span id="card-item-field-title-' . $field['id'] . '"><b>' . $field['title'] . '</b></span>
-                                        <button type="button" class="float-right btn btn-outline-info btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="#card-item-field-value-' . $field['id'] . '">
+                                    <li class="list-group-item card-item-field hidden" id="card-item-field-' . $field['id'].'">
+                                        <span id="card-item-field-title-' . $field['id'].'"><b>'.$field['title'].'</b></span>
+                                        <button type="button" class="float-right btn btn-outline-info btn-sm ml-1 btn-copy-clipboard-clear"  data-clipboard-target="#card-item-field-value-' . $field['id'].'">
                                             <i class="fa-solid fa-copy"></i>
                                         </button>
-                                        <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'] . '"></span>
+                                        <span class="card-item-field-value float-right ml-1" id="card-item-field-value-' . $field['id'].'"></span>
                                     </li>';
                                 }
                                 echo '
@@ -1112,7 +1112,7 @@ 
                         <p><?php
                             echo str_replace(
         ['##otv_expiration_period##', '. '],
-        ['<span class="text-bold text-primary">' . $SETTINGS['otv_expiration_period'] . '</span>', '<br>'],
+        ['<span class="text-bold text-primary">'.$SETTINGS['otv_expiration_period'].'</span>', '<br>'],
         $lang->get('otv_message')
     );
                             ?></p>
@@ -1130,9 +1130,9 @@ 
 
                     <div class="row">
                         <div class="form-group col-4">
-                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period'];?>)</label>
+                            <label for="form-item-otv-days"><i class="fa-regular fa-calendar-days mr-2"></i><?php echo $lang->get('number_of_days'); ?> (<?php echo $lang->get('maximum').': '.$SETTINGS['otv_expiration_period']; ?>)</label>
                             <div class="input-group mb-3">
-                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period'];?>" value="<?php echo $SETTINGS['otv_expiration_period'];?>">
+                                <input type="number" class="form-control clear-me-val" id="form-item-otv-days" min="0" max="<?php echo $SETTINGS['otv_expiration_period']; ?>" value="<?php echo $SETTINGS['otv_expiration_period']; ?>">
                             </div>
                         </div>
 
@@ -1220,7 +1220,7 @@ 
                             <select class="form-control form-folder-control select2" style="width:100%;" id="form-folder-add-complexicity" required>
                                 <?php
                                 foreach (TP_PW_COMPLEXITY as $key => $value) {
-                                    echo '<option value="' . $key . '">' . $value[1] . '</option>';
+                                    echo '<option value="'.$key.'">'.$value[1].'</option>';
                                 }
                                 ?>
                             </select>
@@ -1238,14 +1238,14 @@ 
                             <label><?php echo $lang->get('icon'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                         <div class="form-group">
                             <label><?php echo $lang->get('icon_on_selection'); ?></label>
                             <input type="text" class="form-control form-folder-control" id="form-folder-add-icon-selected">
                             <small class='form-text text-muted'>
-                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL;?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
+                                <?php echo $lang->get('fontawesome_icon_tip'); ?><a href="<?php echo FONTAWESOME_URL; ?>" target="_blank"><i class="fa-solid fa-external-link-alt ml-1"></i></a>
                             </small>
                         </div>
                     </div>

pages/users.js.php

Spacing +10 added lines, -10 removed lines

@@ -70,7 +70,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;
 }
 ?>
@@ -302,8 +302,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,
@@ -313,8 +313,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,
                 }
@@ -567,14 +567,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="fas 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,
@@ -593,7 +593,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) {
@@ -1401,7 +1401,7 @@ 
                         } else {
                             // Show icon or not
                             if ($('#user-disabled').prop('checked') === true) {
-                                $('#user-login-'+userID).before('<i class="fas 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="fas 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();
                             }