3.0.0.8

Improved CSV import
Fix user profil update
Updated readme file removing beta status

.gitignore

@@ -14,4 +14,9 @@ test.html
 /includes/config/tp.config.php
 /includes/config/settings.php
 includes/libraries/csrfp/libs/csrfp.config.php
-/includes/config/tp.config.php.*
+/includes/config/tp.config.php.*
+gcommit.sh
+gdev.sh
+gpush.sh
+/.vscode/*
+/_tools/*

includes/language/english.php

@@ -25,7 +25,6 @@
     'send_by_email' => 'Send by email',
     'filters' => 'Filters',
     'show_user_password' => 'Show user password',
-    'by' => 'by',
     'open_website' => 'Open website',
     'mfa_for_roles' => 'MFA is requested for users in Roles',
     'mfa_for_roles_tip' => 'By default, once an MFA method is selected, it is enabled for all users. Nevertheless, you might select the roles for which it is expected.<br>NOT YET IMPLEMENTED',

index.php

@@ -698,7 +698,7 @@
                         </ul>
                     </nav>
                     <!-- /.sidebar-menu -->
-                <div class="menu-footer" style="">
+                <div class="menu-footer">
                     <div class="" id="sidebar-footer">
                         <i class="fas fa-clock-o mr-2 infotip text-info pointer" title="<?php echo langHdl('server_time') . ' ' .
                                                                                                 @date($SETTINGS['date_format'], (string) $_SERVER['REQUEST_TIME']) . ' - ' .

pages/import.js.php

@@ -353,7 +353,7 @@ function launchCSVItemsImport() {
                 if ($(this).attr('id') !== undefined) {
                     var elem = $(this).attr("id").split("-");
                     // Exclude previously imported items
-                    if ($("#importcsv-" + elem[1]).iCheck("disabled") !== true) {
+                    if ($("#importcsv-" + elem[1]).parent().closest('.icheckbox_flat-blue').hasClass('disabled') !== true) {
                         arrItems.push({
                             label: $(this).data('label'),
                             login: $(this).data('login'),
@@ -412,18 +412,20 @@ function(data) {
                     $('#import-feedback').removeClass('hidden');
                     $('#import-feedback div').html('');
                 } else {
+                    var counter_treated_items = 0;
                     // after inserted, disable the checkbox in order to prevent against new insert
                     $.each(data.items, function(i, value) {
-                        $("#importcsv-" + value).parent().closest('.form-group').remove();
+                        $("#importcsv-" + value).parent().closest('.icheckbox_flat-blue').addClass('disabled');
                         $('#csv-items-number').html(parseInt($('#csv-items-number').text()) - 1);
+                        counter_treated_items++;
                     });
 
                     // Show
                     toastr.remove();
                     toastr.success(
-                        '<?php echo langHdl('done'); ?>',
+                        '<?php echo langHdl('number_of_items_imported'); ?> : ' + counter_treated_items,
                         data.message, {
-                            timeOut: 2000,
+                            timeOut: 5000,
                             progressBar: true
                         }
                     );

pages/users.js.php

@@ -776,7 +776,7 @@ function(data) {
                                     progressBar: true
                                 }
                             );
-                        } else {
+                        } else if (data.post_action !== "") {
                             // Case where we need to encrypt new keys for the user
                             // Process is: 
                             // 1/ generate encryption key (to be shared by email)
@@ -803,7 +803,7 @@ function(data) {
                             }
 
                             // If expected to create new encryption key
-                            if (store.get('teampassApplication').formUserAction === 'store_user_changes' && data.post_action === 'encrypt_keys') {
+                            if (data.post_action === 'encrypt_keys') {
                                 var data = {
                                     'user_id': formUserId,
                                 };
@@ -850,6 +850,22 @@ function(data) {
                                 callRecursiveUserDataEncryption(formUserId, 'step0', 0); 
                             }
                             // ---
+                        } else {
+                            // Inform user
+                            toastr.remove();
+                            toastr.success(
+                                '<?php echo langHdl('done'); ?>',
+                                '', {
+                                    timeOut: 2000
+                                }
+                            );
+
+                            // Reload list of users
+                            oTable.ajax.reload();
+
+                            // Prepare UI
+                            $('#row-list, #group-create-special-folder, #group-delete-user').removeClass('hidden');
+                            $('#row-form').addClass('hidden');
                         }
 
                         // Remove action from store

readme.md

@@ -1,14 +1,16 @@
 # Teampass 3
 
-**This release is a beta version. It is recommended for new users to start from using this version. Currently update from latest 2.X is not finalized.**
+**Teampass 3.x is a totally different version compared to Teampass 2.x. As a consequence :**
+- For new users, you should start using this version to take benefit of the new UI (several features compared to Teampass 2.x are not yet implemented)
+- For "older users" that currently are relying on Teampass 2.x, you should remain on the 2.x branch as currently no update process has been finalized.
 
 **Only English language is available. Don't change the language!**
 
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nilsteampassnet/TeamPass/badges/quality-score.png?b=teampass_3.0)](https://scrutinizer-ci.com/g/nilsteampassnet/TeamPass/?branch=teampass_3.0)
 
 Teampass is a Collaborative Passwords Manager
 
-> Copyright © 2009-2020, [Nils Laumaillé]([email protected])
+> Copyright © 2009-2021, [Nils Laumaillé]([email protected])
 
 <!-- MDTOC maxdepth:2 firsth1:0 numbering:0 flatten:0 bullets:1 updateOnSave:1 -->
 
@@ -28,7 +30,7 @@ Teampass is a Collaborative Passwords Manager
 ## Requirements
 
 * MySQL 5.1 or higher,
-* PHP 7.2 or higher,
+* PHP 7.4 or higher,
 * PHP extensions:
   * mcrypt
   * openssl