nilsteampassnet / TeamPass

pages/items.js.php

Spacing +6 added lines, -6 removed lines

@@ -43,11 +43,11 @@ 
 }
 
 /* do checks */
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
-if (! checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS)) {
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
+if (!checkUser($_SESSION['user_id'], $_SESSION['key'], curPage($SETTINGS), $SETTINGS)) {
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
     //not allowed page
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit;
 }
 
@@ -2296,7 +2296,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) {
@@ -2326,7 +2326,7 @@ 
         container: 'form-item-upload-zone',
         max_file_size: '<?php
                         if (strrpos($SETTINGS['upload_maxfilesize'], 'mb') === false) {
-                            echo $SETTINGS['upload_maxfilesize'] . 'mb';
+                            echo $SETTINGS['upload_maxfilesize'].'mb';
                         } else {
                             echo $SETTINGS['upload_maxfilesize'];
                         }
@@ -4264,7 +4264,7 @@ 
 
                         // Show passwords inputs and form
                         $('#dialog-ldap-user-change-password-info')
-                            .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                            .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                             .removeClass('hidden');
                         $('#dialog-ldap-user-change-password').removeClass('hidden');
                     }

includes/core/load.js.php

Spacing +13 added lines, -13 removed lines

@@ -130,7 +130,7 @@ 
                             if (debugJavascript === true) console.log('User has to regenerate keys')
                             // HIde
                             $('.content-header, .content').addClass('hidden');
-                            $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+                            $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
                             // Show passwords inputs and form
                             $('#dialog-user-temporary-code').removeClass('hidden');
@@ -144,7 +144,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-user-change-password-info')
-                                .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info');?>')
+                                .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('user_has_to_change_password_info'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-user-change-password').removeClass('hidden');
 
@@ -157,7 +157,7 @@ 
 
                             // Show passwords inputs and form
                             $('#dialog-ldap-user-change-password-info')
-                                .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                                .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                                 .removeClass('hidden');
                             $('#dialog-ldap-user-change-password').removeClass('hidden');
                             
@@ -238,7 +238,7 @@ 
         console.log('User has to regenerate keys')
         // HIde
         $('.content-header, .content').addClass('hidden');
-        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected');?>');
+        $('#dialog-user-temporary-code-info').html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('renecyption_expected'); ?>');
 
         // Show passwords inputs and form
         $('#dialog-user-temporary-code').removeClass('hidden');
@@ -316,13 +316,13 @@ 
             {
                 if (step === 'psk') {
                     // Inform user
-                    $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                    $("#user-current-defuse-psk-progress").html('<b><?php echo langHdl('encryption_keys'); ?> </b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                         '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
 
                     var data = {
                         'userPsk' : $('#user-current-defuse-psk').val(),
                             'start': start,
-                            'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                            'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                             'user_id': userId,
                     };
                     // Do query
@@ -399,7 +399,7 @@ 
 
                 // Show passwords inputs and form
                 $('#dialog-ldap-user-change-password-info')
-                    .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password');?>')
+                    .html('<i class="icon fas fa-info mr-2"></i><?php echo langHdl('ldap_user_has_changed_his_password'); ?>')
                     .removeClass('hidden');
                 $('#dialog-ldap-user-change-password').removeClass('hidden');
 
@@ -825,15 +825,15 @@ 
             // Prepare data
             var data = {
                 'receipt': $('#temp-user-email').val(),
-                'subject': '[Teampass] <?php echo langHdl('your_new_password');?>',
-                'body': '<?php echo langHdl('email_body_temporary_login_password');?>',
+                'subject': '[Teampass] <?php echo langHdl('your_new_password'); ?>',
+                'body': '<?php echo langHdl('email_body_temporary_login_password'); ?>',
                 'pre_replace' : {
                     '#enc_code#' : $('#temp-user-pwd').val(),
                 }
             }
             if (debugJavascript === true) console.log(data);
             // Prepare form
-            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message');?>');
+            $('#dialog-admin-change-user-password-info').html('<?php echo langHdl('sending_email_message'); ?>');
             toastr.remove();
             toastr.info(
                 '<?php echo langHdl('in_progress'); ?><i class="fas fa-circle-notch fa-spin fa-2x ml-3"></i>'
@@ -1312,7 +1312,7 @@ 
             '#warningModal',
             '<i class="fas fa-clock fa-lg warning mr-2"></i><?php echo langHdl('index_add_one_hour'); ?>',
             '<div class="form-group">' +
-            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration') . ' (' . langHdl('minutes') . ')'; ?>:</label>' +
+            '<label for="warningModal-input" class="col-form-label"><?php echo langHdl('index_session_duration').' ('.langHdl('minutes').')'; ?>:</label>' +
             '<input type="text" class="form-control" id="warningModal-input" value="<?php echo isset($_SESSION['user']['session_duration']) === true ? (int) $_SESSION['user']['session_duration'] / 60 : 60; ?>">' +
             '</div>',
             '<?php echo langHdl('confirm'); ?>',
@@ -1571,13 +1571,13 @@ 
         if (step !== 'finished') {
             // Inform user
             $("#"+divIdDialog+'-progress').html('<b><?php echo langHdl('encryption_keys'); ?> - ' +
-                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH;?>) + '] ' +
+                stepText + '</b> [' + start + ' - ' + (parseInt(start) + <?php echo NUMBER_ITEMS_IN_BATCH; ?>) + '] ' +
                 '... <?php echo langHdl('please_wait'); ?><i class="fas fa-spinner fa-pulse ml-3 text-primary"></i>');
 
             var data = {
                 'action': step,
                 'start': start,
-                'length': <?php echo NUMBER_ITEMS_IN_BATCH;?>,
+                'length': <?php echo NUMBER_ITEMS_IN_BATCH; ?>,
                 'user_id': userId,
             }
             // Do query

sources/utilities.queries.php

Spacing +44 added lines, -44 removed lines

@@ -37,12 +37,12 @@ 
 }
 
 // Do checks
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/include.php';
-require_once $SETTINGS['cpassman_dir'] . '/sources/checks.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/include.php';
+require_once $SETTINGS['cpassman_dir'].'/sources/checks.php';
 if (checkUser($_SESSION['user_id'], $_SESSION['key'], 'utilities.database', $SETTINGS) === false) {
     // Not allowed page
     $_SESSION['error']['code'] = ERR_NOT_ALLOWED;
-    include $SETTINGS['cpassman_dir'] . '/error.php';
+    include $SETTINGS['cpassman_dir'].'/error.php';
     exit();
 }
 
@@ -55,14 +55,14 @@ 
     date_default_timezone_set('UTC');
 }
 
-require_once $SETTINGS['cpassman_dir'] . '/includes/language/' . $_SESSION['user']['user_language'] . '.php';
-require_once $SETTINGS['cpassman_dir'] . '/includes/config/settings.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/language/'.$_SESSION['user']['user_language'].'.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/config/settings.php';
 header('Content-type: text/html; charset=utf-8');
 header('Cache-Control: no-cache, must-revalidate');
 require_once 'main.functions.php';
 
 //Connect to DB
-require_once $SETTINGS['cpassman_dir'] . '/includes/libraries/Database/Meekrodb/db.class.php';
+require_once $SETTINGS['cpassman_dir'].'/includes/libraries/Database/Meekrodb/db.class.php';
 if (defined('DB_PASSWD_CLEAR') === false) {
     define('DB_PASSWD_CLEAR', defuseReturnDecrypted(DB_PASSWD, $SETTINGS));
 }
@@ -104,7 +104,7 @@ 
             $arrFolders = array();
             $rows = DB::query(
                 'SELECT valeur, intitule
-                FROM ' . prefixTable('misc') . '
+                FROM ' . prefixTable('misc').'
                 WHERE type  = %s',
                 'folder_deleted'
             );
@@ -126,10 +126,10 @@ 
                 'SELECT u.login as login, u.name as name, u.lastname as lastname,
                 i.id as id, i.label as label,
                 i.id_tree as id_tree, l.date as date, n.title as folder_title
-                FROM ' . prefixTable('log_items') . ' as l
-                INNER JOIN ' . prefixTable('items') . ' as i ON (l.id_item=i.id)
-                LEFT JOIN ' . prefixTable('users') . ' as u ON (l.id_user=u.id)
-                LEFT JOIN ' . prefixTable('nested_tree') . ' as n ON (i.id_tree=n.id)
+                FROM ' . prefixTable('log_items').' as l
+                INNER JOIN ' . prefixTable('items').' as i ON (l.id_item=i.id)
+                LEFT JOIN ' . prefixTable('users').' as u ON (l.id_user=u.id)
+                LEFT JOIN ' . prefixTable('nested_tree').' as n ON (i.id_tree=n.id)
                 WHERE i.inactif = %i
                 AND l.action = %s',
                 1,
@@ -151,7 +151,7 @@ 
                             'label' => $record['label'],
                             'date' => date($SETTINGS['date_format'], (int) $record['date']),
                             'login' => $record['login'],
-                            'name' => $record['name'] . ' ' . $record['lastname'],
+                            'name' => $record['name'].' '.$record['lastname'],
                             'folder_label' => $record['folder_title'],
                             'folder_deleted' => $thisFolder,
                         )
@@ -213,10 +213,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -243,7 +243,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderId
+                        'f'.$folderId
                     );
 
                     // Restore all items in this folder
@@ -259,7 +259,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderId
                     );
@@ -352,10 +352,10 @@ 
             foreach ($post_folders as $folderId) {
                 $data = DB::queryfirstrow(
                     'SELECT valeur
-                    FROM ' . prefixTable('misc') . "
+                    FROM ' . prefixTable('misc')."
                     WHERE type = 'folder_deleted'
                     AND intitule = %s",
-                    'f' . $folderId
+                    'f'.$folderId
                 );
                 if ((int) $data['valeur'] !== 0) {
                     $folderData = explode(', ', $data['valeur']);
@@ -388,7 +388,7 @@ 
                         prefixTable('misc'),
                         'type = %s AND intitule = %s',
                         'folder_deleted',
-                        'f' . $folderData[0]
+                        'f'.$folderData[0]
                     );
 
                     // Delete all items in this folder
@@ -402,7 +402,7 @@ 
                     // Get list of all items in thos folder
                     $items = DB::query(
                         'SELECT id
-                        FROM ' . prefixTable('items') . '
+                        FROM ' . prefixTable('items').'
                         WHERE id_tree = %i',
                         $folderData[0]
                     );
@@ -505,7 +505,7 @@ 
             ) {
                 if ($post_log_type === 'items') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . '
+                        'SELECT * FROM '.prefixTable('log_items').'
                         WHERE (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = "'.$post_filter_action.'"')
                         . ((int) $post_filter_user === -1 ? '' : ' AND id_user = '.(int) $post_filter_user),
@@ -525,7 +525,7 @@ 
                 } elseif ($post_log_type === 'connections') {
                     //db::debugmode(true);
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . '
+                        'SELECT * FROM '.prefixTable('log_system').'
                         WHERE type=%s '
                         . 'AND (date BETWEEN %i AND %i)'
                         . ($post_filter_action === 'all' ? '' : ' AND action = '.$post_filter_action)
@@ -548,7 +548,7 @@ 
                     );
                 } elseif ($post_log_type === 'errors') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'error',
                         $post_date_from,
@@ -565,7 +565,7 @@ 
                     );
                 } elseif ($post_log_type === 'copy') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_items') . ' WHERE action=%s ' .
+                        'SELECT * FROM '.prefixTable('log_items').' WHERE action=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'at_copy',
                         $post_date_from,
@@ -582,7 +582,7 @@ 
                     );
                 } elseif ($post_log_type === 'admin') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'admin_action',
                         $post_date_from,
@@ -599,7 +599,7 @@ 
                     );
                 } elseif ($post_log_type === 'failed') {
                     DB::query(
-                        'SELECT * FROM ' . prefixTable('log_system') . ' WHERE type=%s ' .
+                        'SELECT * FROM '.prefixTable('log_system').' WHERE type=%s '.
                             'AND (date BETWEEN %i AND %i)',
                         'failed_auth',
                         $post_date_from,
@@ -673,7 +673,7 @@ 
 
             $tasks = DB::query(
                 'SELECT *
-                FROM ' . prefixTable('processes_tasks') . '
+                FROM ' . prefixTable('processes_tasks').'
                 WHERE process_id = %i',
                 $post_id
             );
@@ -681,37 +681,37 @@ 
             // Get some values
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('items') . '
+                FROM ' . prefixTable('items').'
                 WHERE perso = 0'
             );
             $items_number = DB::count();
 
             DB::query(
                 'SELECT increment_id
-                FROM ' . prefixTable('log_items') . '
+                FROM ' . prefixTable('log_items').'
                 WHERE raison LIKE "at_pw :%" AND encryption_type = "teampass_aes"'
             );
             $logs_number = DB::count();
 
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('categories_items') . '
+                FROM ' . prefixTable('categories_items').'
                 WHERE encryption_type = "teampass_aes"'
             );
-            $items_categories= DB::count();
+            $items_categories = DB::count();
 
             DB::query(
                 'SELECT id
                 FROM ' . prefixTable('suggestion')
             );
-            $items_suggestions= DB::count();
+            $items_suggestions = DB::count();
 
             DB::query(
                 'SELECT id
-                FROM ' . prefixTable('files') . '
-                WHERE status = "' . TP_ENCRYPTION_NAME . '"'
+                FROM ' . prefixTable('files').'
+                WHERE status = "' . TP_ENCRYPTION_NAME.'"'
             );
-            $items_files= DB::count();
+            $items_files = DB::count();
 
 
             // get list
@@ -726,26 +726,26 @@ 
                     if ($detail['step'] === 'step0' || (int) $detail['index'] === 0) {
                         $task_progress = '0%';
                     } elseif ($detail['step'] === 'step1') {
-                        $task_progress = pourcentage($detail['index'], $items_number, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_number, 100).'%';
                     } elseif ($detail['step'] === 'step2') {
-                        $task_progress = pourcentage($detail['index'], $logs_number, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $logs_number, 100).'%';
                     } elseif ($detail['step'] === 'step3') {
-                        $task_progress = pourcentage($detail['index'], $items_categories, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_categories, 100).'%';
                     } elseif ($detail['step'] === 'step4') {
-                        $task_progress = pourcentage($detail['index'], $items_suggestions, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_suggestions, 100).'%';
                     } elseif ($detail['step'] === 'step5') {
-                        $task_progress = pourcentage($detail['index'], $items_files, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_files, 100).'%';
                     } elseif ($detail['step'] === 'step6') {
-                        $task_progress = pourcentage($detail['index'], $items_number, 100) .'%';
+                        $task_progress = pourcentage($detail['index'], $items_number, 100).'%';
                     }
                 }
 
                 array_push(
                     $ret,
                     [
-                        'created_at' => date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['created_at']),
-                        'updated_at' => is_null($task['updated_at']) === false ? date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['updated_at']) : '',
-                        'finished_at' => is_null($task['finished_at']) === false ? date($SETTINGS['date_format'] . ' ' . $SETTINGS['time_format'], (int) $task['finished_at']) : '',
+                        'created_at' => date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['created_at']),
+                        'updated_at' => is_null($task['updated_at']) === false ? date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['updated_at']) : '',
+                        'finished_at' => is_null($task['finished_at']) === false ? date($SETTINGS['date_format'].' '.$SETTINGS['time_format'], (int) $task['finished_at']) : '',
                         'progress' => $task['finished_at'] !== null ? '100%' : $task_progress,
                         'is_in_progress' => (int) $task['is_in_progress'],
                         'step' => 'step'.$i,