diff --git a/api/Controller/Api/AuthController.php b/api/Controller/Api/AuthController.php index 14409e0dc..de10e9e9d 100755 --- a/api/Controller/Api/AuthController.php +++ b/api/Controller/Api/AuthController.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file AuthControler.php * --- diff --git a/api/Controller/Api/BaseController.php b/api/Controller/Api/BaseController.php index 42f2c6569..982f78ac1 100755 --- a/api/Controller/Api/BaseController.php +++ b/api/Controller/Api/BaseController.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file BaseController.php * --- diff --git a/api/Controller/Api/FolderController.php b/api/Controller/Api/FolderController.php index 89b2ec419..91cf811a1 100755 --- a/api/Controller/Api/FolderController.php +++ b/api/Controller/Api/FolderController.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file FolderControler.php * --- diff --git a/api/Controller/Api/ItemController.php b/api/Controller/Api/ItemController.php index 227b00f76..0fa97a785 100755 --- a/api/Controller/Api/ItemController.php +++ b/api/Controller/Api/ItemController.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file ItemControler.php * --- diff --git a/api/Controller/Api/UserController.php b/api/Controller/Api/UserController.php index 27abc8f4b..0088ae6f5 100755 --- a/api/Controller/Api/UserController.php +++ b/api/Controller/Api/UserController.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file UserControler.php * --- diff --git a/api/Model/AuthModel.php b/api/Model/AuthModel.php index 5a129c632..ec7cbefd0 100755 --- a/api/Model/AuthModel.php +++ b/api/Model/AuthModel.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file AuthModel.php * --- diff --git a/api/Model/Database.php b/api/Model/Database.php index 628318aab..57a8fe863 100755 --- a/api/Model/Database.php +++ b/api/Model/Database.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file Database.php * --- diff --git a/api/Model/FolderModel.php b/api/Model/FolderModel.php index eb77cecc5..c3c55a48b 100755 --- a/api/Model/FolderModel.php +++ b/api/Model/FolderModel.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file folderModel.php * --- diff --git a/api/Model/ItemModel.php b/api/Model/ItemModel.php index 1eca02d75..e04206300 100755 --- a/api/Model/ItemModel.php +++ b/api/Model/ItemModel.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file ItemModel.php * --- diff --git a/api/Model/Operation.php b/api/Model/Operation.php index 17d0e250a..0cdec18dc 100755 --- a/api/Model/Operation.php +++ b/api/Model/Operation.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file Operation.php * --- diff --git a/api/Model/UserModel.php b/api/Model/UserModel.php index 8ec1a784b..4c8aba155 100755 --- a/api/Model/UserModel.php +++ b/api/Model/UserModel.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file UserModel.php * --- diff --git a/api/inc/bootstrap.php b/api/inc/bootstrap.php index 50fd91623..b7c40976e 100755 --- a/api/inc/bootstrap.php +++ b/api/inc/bootstrap.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file bootstrap.php * --- diff --git a/api/inc/jwt_utils.php b/api/inc/jwt_utils.php index 73117844f..4dd44a62a 100755 --- a/api/inc/jwt_utils.php +++ b/api/inc/jwt_utils.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file jwt_utils.php * --- diff --git a/api/index.php b/api/index.php index bafb348dd..a56487078 100755 --- a/api/index.php +++ b/api/index.php @@ -7,7 +7,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * - * @project Teampass API + * @project Teampass + * @version API * * @file index.php * --- diff --git a/changelog.txt b/changelog.txt index 73a76ba35..04ed6f682 100755 --- a/changelog.txt +++ b/changelog.txt @@ -6,6 +6,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file changelog.txt * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/error.php b/error.php index d259e5a10..8d4f245db 100755 --- a/error.php +++ b/error.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version * @file error.php * --- * diff --git a/includes/config/include.php b/includes/config/include.php index f0a0680cd..1453747f2 100755 --- a/includes/config/include.php +++ b/includes/config/include.php @@ -12,7 +12,7 @@ * @copyright 2009-2022 Nils Laumaillé * @license https://spdx.org/licenses/GPL-3.0-only.html#licenseText GPL-3.0 * - * @version GIT: + * @version 3.0.0.20 * * @see http://www.teampass.net */ diff --git a/includes/core/load.js.php b/includes/core/load.js.php index 4015f764d..2ad9c6011 100755 --- a/includes/core/load.js.php +++ b/includes/core/load.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file load.js.php * --- * diff --git a/includes/core/login.js.php b/includes/core/login.js.php index 1bad5b3a4..f3b63bae3 100755 --- a/includes/core/login.js.php +++ b/includes/core/login.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file login.js.php * --- * diff --git a/includes/core/login.php b/includes/core/login.php index a7b3a7f6d..7ea6f208e 100755 --- a/includes/core/login.php +++ b/includes/core/login.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file login.php * --- * diff --git a/includes/core/logout.php b/includes/core/logout.php index bf94036f4..cd1d75508 100755 --- a/includes/core/logout.php +++ b/includes/core/logout.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file logout.php * --- * diff --git a/includes/core/otv.php b/includes/core/otv.php index 3073f258c..05ec3eaa2 100755 --- a/includes/core/otv.php +++ b/includes/core/otv.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file otv.php * --- * diff --git a/includes/js/functions.js b/includes/js/functions.js index a55f98bd6..4d996e37b 100755 --- a/includes/js/functions.js +++ b/includes/js/functions.js @@ -6,6 +6,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file functions.js * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/index.php b/index.php index a91bbd206..57bd7bff7 100755 --- a/index.php +++ b/index.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file index.php * --- * diff --git a/install/install.js b/install/install.js index 58c8f388d..f896dc0b2 100755 --- a/install/install.js +++ b/install/install.js @@ -6,6 +6,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file install.js * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/install.php b/install/install.php index a4ba36234..85b61c5aa 100755 --- a/install/install.php +++ b/install/install.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file install.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/install.queries.php b/install/install.queries.php index ea6d8b460..8b30d81cd 100755 --- a/install/install.queries.php +++ b/install/install.queries.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file install.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/migrate_users_to_v3.php b/install/migrate_users_to_v3.php index 72a1f9a2f..4eb93b0b1 100755 --- a/install/migrate_users_to_v3.php +++ b/install/migrate_users_to_v3.php @@ -8,6 +8,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file migrate_users_to_v3.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade.php b/install/upgrade.php index 426f14971..768f5dffc 100755 --- a/install/upgrade.php +++ b/install/upgrade.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_ajax.php b/install/upgrade_ajax.php index 69570ac13..5a4b824d1 100755 --- a/install/upgrade_ajax.php +++ b/install/upgrade_ajax.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_ajax.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0.php b/install/upgrade_run_3.0.0.php index 6789ac5f5..16f28a380 100755 --- a/install/upgrade_run_3.0.0.php +++ b/install/upgrade_run_3.0.0.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0_fields.php b/install/upgrade_run_3.0.0_fields.php index 821d818bb..58936ee86 100755 --- a/install/upgrade_run_3.0.0_fields.php +++ b/install/upgrade_run_3.0.0_fields.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0_fields.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0_files.php b/install/upgrade_run_3.0.0_files.php index 9c2ddeff7..0f742fe8b 100755 --- a/install/upgrade_run_3.0.0_files.php +++ b/install/upgrade_run_3.0.0_files.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0_files.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0_logs.php b/install/upgrade_run_3.0.0_logs.php index 0f8432b0f..ba03e4d63 100755 --- a/install/upgrade_run_3.0.0_logs.php +++ b/install/upgrade_run_3.0.0_logs.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0_logs.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0_passwords.php b/install/upgrade_run_3.0.0_passwords.php index 6b6441ea5..d6d4bf9c1 100755 --- a/install/upgrade_run_3.0.0_passwords.php +++ b/install/upgrade_run_3.0.0_passwords.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0_passwords.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0_suggestions.php b/install/upgrade_run_3.0.0_suggestions.php index 7000ae77e..04f8bd3d1 100755 --- a/install/upgrade_run_3.0.0_suggestions.php +++ b/install/upgrade_run_3.0.0_suggestions.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0_suggestions.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_run_3.0.0_users.php b/install/upgrade_run_3.0.0_users.php index 10c9cf05b..43b712214 100755 --- a/install/upgrade_run_3.0.0_users.php +++ b/install/upgrade_run_3.0.0_users.php @@ -8,6 +8,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_run_3.0.0_users.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/install/upgrade_scripts_manager.php b/install/upgrade_scripts_manager.php index 5ae1d2c73..69c5e3166 100755 --- a/install/upgrade_scripts_manager.php +++ b/install/upgrade_scripts_manager.php @@ -7,6 +7,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version * @file upgrade_scripts_manager.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/pages/2fa.js.php b/pages/2fa.js.php index e10f94292..ea7ecb6fc 100755 --- a/pages/2fa.js.php +++ b/pages/2fa.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file 2fa.js.php * --- * diff --git a/pages/2fa.php b/pages/2fa.php index 658265eb4..5737fefbd 100755 --- a/pages/2fa.php +++ b/pages/2fa.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file 2fa.php * --- * diff --git a/pages/actions.js.php b/pages/actions.js.php index 4cec07aa6..a37a889a1 100755 --- a/pages/actions.js.php +++ b/pages/actions.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file actions.js.php * --- * diff --git a/pages/actions.php b/pages/actions.php index 328439973..47b8e5524 100755 --- a/pages/actions.php +++ b/pages/actions.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file actions.php * --- * diff --git a/pages/admin.js.php b/pages/admin.js.php index ebc0ad3ba..c6c1e4e24 100755 --- a/pages/admin.js.php +++ b/pages/admin.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file admin.js.php * --- * diff --git a/pages/admin.php b/pages/admin.php index 078430928..c329d2d51 100755 --- a/pages/admin.php +++ b/pages/admin.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file admin.php * --- * diff --git a/pages/api.js.php b/pages/api.js.php index 7340a7fa9..b7ccec848 100755 --- a/pages/api.js.php +++ b/pages/api.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file api.js.php * --- * diff --git a/pages/api.php b/pages/api.php index 993a6e926..acd57185b 100755 --- a/pages/api.php +++ b/pages/api.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file api.php * --- * diff --git a/pages/backups.js.php b/pages/backups.js.php index c79e52cd6..072e1fcfb 100755 --- a/pages/backups.js.php +++ b/pages/backups.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file backups.js.php * --- * diff --git a/pages/backups.php b/pages/backups.php index ff7dde822..34905ba94 100755 --- a/pages/backups.php +++ b/pages/backups.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file backups.php * --- * diff --git a/pages/emails.js.php b/pages/emails.js.php index 44008f4e7..ed088417f 100755 --- a/pages/emails.js.php +++ b/pages/emails.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file emails.js.php * --- * diff --git a/pages/emails.php b/pages/emails.php index f6d3cb33c..60ed11a39 100755 --- a/pages/emails.php +++ b/pages/emails.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file emails.php * --- * diff --git a/pages/export.js.php b/pages/export.js.php index e0e086ef4..921ccf374 100755 --- a/pages/export.js.php +++ b/pages/export.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file export.js.php * --- * diff --git a/pages/export.php b/pages/export.php index 70dbeb6c6..e6b88fc88 100755 --- a/pages/export.php +++ b/pages/export.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file export.php * --- * diff --git a/pages/favorites.js.php b/pages/favorites.js.php index 2a2fb92b0..e16da6ff4 100755 --- a/pages/favorites.js.php +++ b/pages/favorites.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file favorites.js.php * --- * diff --git a/pages/favourites.php b/pages/favourites.php index 8a3cd08fb..f314cc0c3 100755 --- a/pages/favourites.php +++ b/pages/favourites.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file favourites.php * --- * diff --git a/pages/fields.js.php b/pages/fields.js.php index f14e73597..2f28988bc 100755 --- a/pages/fields.js.php +++ b/pages/fields.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file fields.js.php * --- * diff --git a/pages/fields.php b/pages/fields.php index 983c5b23c..8400bdb86 100755 --- a/pages/fields.php +++ b/pages/fields.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file fields.php * --- * diff --git a/pages/folders.js.php b/pages/folders.js.php index 80a68419b..90d8ad4b7 100755 --- a/pages/folders.js.php +++ b/pages/folders.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file folders.js.php * --- * diff --git a/pages/folders.php b/pages/folders.php index aeabde39c..8e5feaf03 100755 --- a/pages/folders.php +++ b/pages/folders.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file folders.php * --- * diff --git a/pages/import.js.php b/pages/import.js.php index c3812f22e..d974ab43d 100755 --- a/pages/import.js.php +++ b/pages/import.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file import.js.php * --- * diff --git a/pages/import.php b/pages/import.php index a921509f2..a00f50fec 100755 --- a/pages/import.php +++ b/pages/import.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file import.php * --- * diff --git a/pages/items.js.php b/pages/items.js.php index 45a18f7d0..6ccbf8082 100755 --- a/pages/items.js.php +++ b/pages/items.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file items.js.php * --- * @@ -4182,8 +4182,10 @@ function(data) { //decrypt data data = decodeQueryReturn(data, '', 'items.queries.php', 'show_details_item'); requestRunning = true; - if (debugJavascript === true) console.log("RECEIVED"); - if (debugJavascript === true) console.log(data); + if (debugJavascript === true) { + console.log("RECEIVED"); + console.log(data); + } // remove any track-change class on item form //$('.form-item-control').removeClass('track-change'); diff --git a/pages/items.php b/pages/items.php index 97736d81b..c41744b9b 100755 --- a/pages/items.php +++ b/pages/items.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file items.php * --- * diff --git a/pages/kb.php b/pages/kb.php index 8c1456a04..089420fc9 100755 --- a/pages/kb.php +++ b/pages/kb.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file kb.php * --- * diff --git a/pages/ldap.js.php b/pages/ldap.js.php index c7fd8e2de..e70ab3974 100755 --- a/pages/ldap.js.php +++ b/pages/ldap.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file ldap.js.php * --- * diff --git a/pages/ldap.php b/pages/ldap.php index 7339d50e6..a545553cc 100755 --- a/pages/ldap.php +++ b/pages/ldap.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file ldap.php * --- * diff --git a/pages/offline.js.php b/pages/offline.js.php index afef6c299..4227385f5 100755 --- a/pages/offline.js.php +++ b/pages/offline.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file offline.js.php * --- * diff --git a/pages/offline.php b/pages/offline.php index b6d73baae..71c0cdec3 100755 --- a/pages/offline.php +++ b/pages/offline.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file offline.php * --- * diff --git a/pages/options.js.php b/pages/options.js.php index cb9d44507..ca80f5253 100755 --- a/pages/options.js.php +++ b/pages/options.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file options.js.php * --- * diff --git a/pages/options.php b/pages/options.php index c5836ad72..44700c110 100755 --- a/pages/options.php +++ b/pages/options.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file options.php * --- * diff --git a/pages/profile.js.php b/pages/profile.js.php index b422365c6..fa580d97c 100755 --- a/pages/profile.js.php +++ b/pages/profile.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file profile.js.php * --- * diff --git a/pages/profile.php b/pages/profile.php index c1af34de9..a1d3c7421 100755 --- a/pages/profile.php +++ b/pages/profile.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file profile.php * --- * diff --git a/pages/roles.js.php b/pages/roles.js.php index c2d49e7b3..29f95685b 100755 --- a/pages/roles.js.php +++ b/pages/roles.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file roles.js.php * --- * diff --git a/pages/roles.php b/pages/roles.php index d4abe2256..a5c4582f8 100755 --- a/pages/roles.php +++ b/pages/roles.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file roles.php * --- * diff --git a/pages/search.js.php b/pages/search.js.php index 78248739b..1b06e9d7e 100755 --- a/pages/search.js.php +++ b/pages/search.js.php @@ -11,6 +11,7 @@ * --- * * @project Teampass + * @version 3.0.0.20 * * @file search.js.php * --- diff --git a/pages/search.php b/pages/search.php index 7493018e0..c149b54e3 100755 --- a/pages/search.php +++ b/pages/search.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file search.php * --- * diff --git a/pages/special.php b/pages/special.php index 7f737b2cf..1460c7e2f 100755 --- a/pages/special.php +++ b/pages/special.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file special.php * --- * diff --git a/pages/statistics.js.php b/pages/statistics.js.php index bfd020da4..564d56223 100755 --- a/pages/statistics.js.php +++ b/pages/statistics.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file statistics.js.php * --- * diff --git a/pages/statistics.php b/pages/statistics.php index 827bbec76..05443d0b8 100755 --- a/pages/statistics.php +++ b/pages/statistics.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file statistics.php * --- * diff --git a/pages/suggestion.php b/pages/suggestion.php index 71f67d960..f7c83a69c 100755 --- a/pages/suggestion.php +++ b/pages/suggestion.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file suggestion.php * --- * diff --git a/pages/tasks.js.php b/pages/tasks.js.php index bb7adec7a..ff5fce566 100755 --- a/pages/tasks.js.php +++ b/pages/tasks.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file tasks.js.php * --- * diff --git a/pages/tasks.php b/pages/tasks.php index e4a41b57c..84a5b8375 100755 --- a/pages/tasks.php +++ b/pages/tasks.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file tasks.php * --- * diff --git a/pages/uploads.js.php b/pages/uploads.js.php index 830478e24..7c7e88aa1 100755 --- a/pages/uploads.js.php +++ b/pages/uploads.js.php @@ -8,6 +8,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file uploads.js.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/pages/uploads.php b/pages/uploads.php index e2d9bc39d..e74c21076 100755 --- a/pages/uploads.php +++ b/pages/uploads.php @@ -8,6 +8,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file uploads.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/pages/users.js.php b/pages/users.js.php index dfd8381fc..40f3bc639 100755 --- a/pages/users.js.php +++ b/pages/users.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file users.js.php * --- * diff --git a/pages/users.php b/pages/users.php index 843c2e580..66813c1bd 100755 --- a/pages/users.php +++ b/pages/users.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file users.php * --- * diff --git a/pages/utilities.database.js.php b/pages/utilities.database.js.php index 78f6da7b6..13e1ccc96 100755 --- a/pages/utilities.database.js.php +++ b/pages/utilities.database.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.database.js.php * --- * diff --git a/pages/utilities.database.php b/pages/utilities.database.php index 356b4086b..61da06f0b 100755 --- a/pages/utilities.database.php +++ b/pages/utilities.database.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.database.php * --- * diff --git a/pages/utilities.deletion.js.php b/pages/utilities.deletion.js.php index 0dba158d4..bfe78b653 100755 --- a/pages/utilities.deletion.js.php +++ b/pages/utilities.deletion.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.deletion.js.php * --- * diff --git a/pages/utilities.deletion.php b/pages/utilities.deletion.php index 31bf5a076..f1d490957 100755 --- a/pages/utilities.deletion.php +++ b/pages/utilities.deletion.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.deletion.php * --- * diff --git a/pages/utilities.logs.js.php b/pages/utilities.logs.js.php index dcfde59e4..e055291d9 100755 --- a/pages/utilities.logs.js.php +++ b/pages/utilities.logs.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.logs.js.php * --- * diff --git a/pages/utilities.logs.php b/pages/utilities.logs.php index 3dd17b9fc..7064c1e89 100755 --- a/pages/utilities.logs.php +++ b/pages/utilities.logs.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.logs.php * --- * diff --git a/pages/utilities.php b/pages/utilities.php index 0fdea375e..9ecdbc58e 100755 --- a/pages/utilities.php +++ b/pages/utilities.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.php * --- * diff --git a/pages/utilities.renewal.js.php b/pages/utilities.renewal.js.php index aa0f4f1cd..223f37357 100755 --- a/pages/utilities.renewal.js.php +++ b/pages/utilities.renewal.js.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.renewal.js.php * --- * diff --git a/pages/utilities.renewal.php b/pages/utilities.renewal.php index 4bc7e59e4..cc7390740 100755 --- a/pages/utilities.renewal.php +++ b/pages/utilities.renewal.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file utilities.renewal.php * --- * diff --git a/scripts/background_tasks___sending_emails.php b/scripts/background_tasks___sending_emails.php index ba0999927..02f2a9d78 100755 --- a/scripts/background_tasks___sending_emails.php +++ b/scripts/background_tasks___sending_emails.php @@ -8,7 +8,7 @@ * --- * * @project Teampass - * + * @version * @file background_tasks___sending_emails.php * --- * diff --git a/scripts/background_tasks___user_keys_creation.php b/scripts/background_tasks___user_keys_creation.php index 0845f1f84..7729bafdf 100755 --- a/scripts/background_tasks___user_keys_creation.php +++ b/scripts/background_tasks___user_keys_creation.php @@ -8,7 +8,7 @@ * --- * * @project Teampass - * + * @version * @file background_tasks___user_keys_creation.php * --- * @@ -633,43 +633,45 @@ function cronContinueReEncryptingUserSharekeysStep3( $extra_arguments['owner_id'] ); - // Decrypt itemkey with admin key - $itemKey = decryptUserObjectKey($currentUserKey['share_key'], $ownerInfo['private_key']); + if (isset($currentUserKey['share_key']) === true) { + // Decrypt itemkey with admin key + $itemKey = decryptUserObjectKey($currentUserKey['share_key'], $ownerInfo['private_key']); - // Encrypt Item key - $share_key_for_item = encryptUserObjectKey($itemKey, $user_public_key); + // Encrypt Item key + $share_key_for_item = encryptUserObjectKey($itemKey, $user_public_key); - // Save the key in DB - if ($post_self_change === false) { - DB::insert( - prefixTable('sharekeys_fields'), - array( - 'object_id' => (int) $record['id'], - 'user_id' => (int) $post_user_id, - 'share_key' => $share_key_for_item, - ) - ); - } else { - // Get itemIncrement from selected user - if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) { - $currentUserKey = DB::queryFirstRow( - 'SELECT increment_id - FROM ' . prefixTable('sharekeys_items') . ' - WHERE object_id = %i AND user_id = %i', - $record['id'], - $post_user_id + // Save the key in DB + if ($post_self_change === false) { + DB::insert( + prefixTable('sharekeys_fields'), + array( + 'object_id' => (int) $record['id'], + 'user_id' => (int) $post_user_id, + 'share_key' => $share_key_for_item, + ) ); - } + } else { + // Get itemIncrement from selected user + if ((int) $post_user_id !== (int) $extra_arguments['owner_id']) { + $currentUserKey = DB::queryFirstRow( + 'SELECT increment_id + FROM ' . prefixTable('sharekeys_items') . ' + WHERE object_id = %i AND user_id = %i', + $record['id'], + $post_user_id + ); + } - // NOw update - DB::update( - prefixTable('sharekeys_fields'), - array( - 'share_key' => $share_key_for_item, - ), - 'increment_id = %i', - $currentUserKey['increment_id'] - ); + // NOw update + DB::update( + prefixTable('sharekeys_fields'), + array( + 'share_key' => $share_key_for_item, + ), + 'increment_id = %i', + $currentUserKey['increment_id'] + ); + } } } diff --git a/sources/admin.queries.php b/sources/admin.queries.php index c0822ed7e..d515393d2 100755 --- a/sources/admin.queries.php +++ b/sources/admin.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file admin.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/aes.functions.php b/sources/aes.functions.php index 960e2caca..66e668603 100755 --- a/sources/aes.functions.php +++ b/sources/aes.functions.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file aes.functions.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/background.php b/sources/background.php index 9fdf69074..d75ea9033 100755 --- a/sources/background.php +++ b/sources/background.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file users.background.php * --- * diff --git a/sources/backups.queries.php b/sources/backups.queries.php index 970b4a80e..8f6fe8893 100755 --- a/sources/backups.queries.php +++ b/sources/backups.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file backups.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/checks.php b/sources/checks.php index 4346e286c..f24f22cc7 100755 --- a/sources/checks.php +++ b/sources/checks.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file checks.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/core.php b/sources/core.php index 1d8fb06fb..81a514397 100755 --- a/sources/core.php +++ b/sources/core.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file core.php * --- * diff --git a/sources/downloadFile.php b/sources/downloadFile.php index d053f7042..41af7b2b9 100755 --- a/sources/downloadFile.php +++ b/sources/downloadFile.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file downloadFile.php * --- * diff --git a/sources/expired.datatables.php b/sources/expired.datatables.php index df7444fdc..293888b56 100755 --- a/sources/expired.datatables.php +++ b/sources/expired.datatables.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file expired.datatables.php * --- * diff --git a/sources/export.queries.php b/sources/export.queries.php index 04250bd8e..6d1ec8474 100755 --- a/sources/export.queries.php +++ b/sources/export.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file export.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/favourites.queries.php b/sources/favourites.queries.php index 6f6bbd4a6..2ef7301ac 100755 --- a/sources/favourites.queries.php +++ b/sources/favourites.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file favourites.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/fields.queries.php b/sources/fields.queries.php index 7e6b06360..e18f82936 100755 --- a/sources/fields.queries.php +++ b/sources/fields.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file fields.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/find.queries.php b/sources/find.queries.php index ad8d1d33d..ede9764e0 100755 --- a/sources/find.queries.php +++ b/sources/find.queries.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file find.queries.php * --- * diff --git a/sources/folders.datatable.php b/sources/folders.datatable.php index 77872c302..deb9d5e7f 100755 --- a/sources/folders.datatable.php +++ b/sources/folders.datatable.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file folders.datatable.php * --- * diff --git a/sources/folders.queries.php b/sources/folders.queries.php index 36f3b1200..ef81fb0fc 100755 --- a/sources/folders.queries.php +++ b/sources/folders.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file folders.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/identify.php b/sources/identify.php index 98adebb6c..405abf83c 100755 --- a/sources/identify.php +++ b/sources/identify.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file identify.php * --- * diff --git a/sources/import.queries.php b/sources/import.queries.php index c8951dc80..994293058 100755 --- a/sources/import.queries.php +++ b/sources/import.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file import.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/items.logs.php b/sources/items.logs.php index 133c15ea2..fa7ba74ee 100755 --- a/sources/items.logs.php +++ b/sources/items.logs.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file items.logs.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/items.queries.php b/sources/items.queries.php index bf9e14329..a9f1f049c 100755 --- a/sources/items.queries.php +++ b/sources/items.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file items.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) @@ -6244,7 +6245,7 @@ } // imported via API - if (empty($record['login'])) { + if (empty($record['login']) === true) { $record['login'] = langHdl('imported_via_api') . ' [' . $record['raison'] . ']'; } diff --git a/sources/ldap.queries.php b/sources/ldap.queries.php index 64e7433b9..8d4455762 100755 --- a/sources/ldap.queries.php +++ b/sources/ldap.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file ldap.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/logs.datatables.php b/sources/logs.datatables.php index 48b471d7e..c5074d973 100755 --- a/sources/logs.datatables.php +++ b/sources/logs.datatables.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file logs.datatables.php * --- * diff --git a/sources/main.functions.php b/sources/main.functions.php index 00447421e..4103a5455 100755 --- a/sources/main.functions.php +++ b/sources/main.functions.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file main.functions.php * --- * diff --git a/sources/main.queries.php b/sources/main.queries.php index 875fd09c9..392cae5bb 100755 --- a/sources/main.queries.php +++ b/sources/main.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file main.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/roles.queries.php b/sources/roles.queries.php index 85bdf0745..05e25ac86 100755 --- a/sources/roles.queries.php +++ b/sources/roles.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file roles.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/scheduler.php b/sources/scheduler.php index af18baea8..0c66b8bad 100755 --- a/sources/scheduler.php +++ b/sources/scheduler.php @@ -8,7 +8,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file scheduler.php * --- * diff --git a/sources/tree.php b/sources/tree.php index 104bc3775..903f50b3e 100755 --- a/sources/tree.php +++ b/sources/tree.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * * @project Teampass + * @version 3.0.0.20 * @file tree.php * * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/upload.attachments.php b/sources/upload.attachments.php index 92cdce7a5..5be1ff1ff 100755 --- a/sources/upload.attachments.php +++ b/sources/upload.attachments.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file upload.attachments.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/upload.files.php b/sources/upload.files.php index 81dee0adf..af2a6512e 100755 --- a/sources/upload.files.php +++ b/sources/upload.files.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file upload.files.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/user.logs.datatables.php b/sources/user.logs.datatables.php index 29f92ba26..4db4b0a00 100755 --- a/sources/user.logs.datatables.php +++ b/sources/user.logs.datatables.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file user.logs.datatables.php * --- * diff --git a/sources/users.datatable.php b/sources/users.datatable.php index 80d538f48..1247f14c8 100755 --- a/sources/users.datatable.php +++ b/sources/users.datatable.php @@ -11,7 +11,7 @@ * --- * * @project Teampass - * + * @version 3.0.0.20 * @file users.datatable.php * --- * diff --git a/sources/users.queries.php b/sources/users.queries.php index 068cef5e9..4f87a6249 100755 --- a/sources/users.queries.php +++ b/sources/users.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file users.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/utilities.queries.php b/sources/utilities.queries.php index 4f99f6d64..08c5f6acb 100755 --- a/sources/utilities.queries.php +++ b/sources/utilities.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file utilities.queries.php * --- * @author Nils Laumaillé (nils@teampass.net) diff --git a/sources/utils.queries.php b/sources/utils.queries.php index 86fdd1ff3..ea3e0b094 100755 --- a/sources/utils.queries.php +++ b/sources/utils.queries.php @@ -10,6 +10,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * --- * @project Teampass + * @version 3.0.0.20 * @file utils.queries.php * --- * @author Nils Laumaillé (nils@teampass.net)