3.1.2

Merged PR #4341
nilsteampassnet · Sep 20, 2024 · 9a57084 · 9a57084
1 parent d6baac5
commit 9a57084
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/includes/config/include.php b/includes/config/include.php
@@ -28,7 +28,7 @@
 
 define('TP_VERSION', '3.1.2');
 define("UPGRADE_MIN_DATE", "1724862801");
-define('TP_VERSION_MINOR', '86');
+define('TP_VERSION_MINOR', '87');
 define('TP_TOOL_NAME', 'Teampass');
 define('TP_ONE_DAY_SECONDS', 86400);
 define('TP_ONE_WEEK_SECONDS', 604800);

diff --git a/includes/tables_integrity.json b/includes/tables_integrity.json
@@ -9,23 +9,23 @@
     },
     {
         "table_name": "background_subtasks",
-        "structure_hash": "f1e4792ca0704feb8292a112fb4a35762ffa797973a67a6c75aa67ceb93e516f"
+        "structure_hash": "1fc6ba6bdf2931bf1d8a4d236fe2f3c992e6953cbbc127a71ae5487e2387c0f5"
     },
     {
         "table_name": "background_tasks",
-        "structure_hash": "b952bc9f1956fb18918befd7dbb5c79606bfcb8889566944e7f25046fbbdf888"
+        "structure_hash": "f54ed10c32d8ece51c6c1dd80501494dce783704ac294e715031aa460a7c22e4"
     },
     {
         "table_name": "background_tasks_logs",
-        "structure_hash": "e457f756189772b8d7949518be364fc17d9fefea22a5da08c4f8a8a9f5358a4f"
+        "structure_hash": "8eb5125b4bca94d47e159bd25613e75395a308f8c3b944f7ce7da16bfdf37fd0"
     },
     {
         "table_name": "cache",
         "structure_hash": "d3bf3f986a7f461a7abc1c2b1acf2e51823a7fc359d9d0a6df8e6a8609ca0213"
     },
     {
         "table_name": "cache_tree",
-        "structure_hash": "b2d0d82a31aa7b0b9d9d3b504f8ecd613770d1886f542e718df167528dcdc79d"
+        "structure_hash": "9cb1357266f10259f435cdb3eadc74adf5e93a875657fe2d9320037a132aae58"
     },
     {
         "table_name": "categories",
@@ -65,7 +65,7 @@
     },
     {
         "table_name": "items_edition",
-        "structure_hash": "91a4f29fd1f242b4d2ad9c1ad5bf0b62cfb9bc3a8dcecca4a2a8210aef01208f"
+        "structure_hash": "6c847ce65c286c1f292161f4159e468e825ed14623513979f297713e614ce1f4"
     },
     {
         "table_name": "items_otp",
@@ -97,11 +97,11 @@
     },
     {
         "table_name": "log_items",
-        "structure_hash": "b00ea541a3886f1702d6cd53b3a9c4b78a39ed09f8709e49fe1019288beddaba"
+        "structure_hash": "6546702567f8dcdd81894304cd1602f5d04ec9af52e7abe2d4d7b99365e15e66"
     },
     {
         "table_name": "log_system",
-        "structure_hash": "43b5b053eb26d61551949585107abb57d4c0cd55aabbdc3b9870cfa9ea83d799"
+        "structure_hash": "cc006a2c8103e056a09321d952742d93b707dc247dd53f97d352c2df94fca56a"
     },
     {
         "table_name": "misc",
@@ -169,7 +169,7 @@
     },
     {
         "table_name": "sharekeys_items",
-        "structure_hash": "f4cfd22fa7cc4a9a352a5d61ec5122d216163bf9d1885708e43851e3ffe73f28"
+        "structure_hash": "538fd4d6d3733e0fadc84d3be76e8e7a07027f2b9679204de7c27ffdecd71c1c"
     },
     {
         "table_name": "sharekeys_logs",

diff --git a/index.php b/index.php
@@ -596,20 +596,16 @@
                         </ul>
                     </li>';
 
-                    if (isset($SETTINGS['enable_tasks_manager']) && (int) $SETTINGS['enable_tasks_manager'] === 1) {
-                        echo '
+        if (isset($SETTINGS['enable_tasks_manager']) && (int) $SETTINGS['enable_tasks_manager'] === 1) {
+            echo '
                     <li class="nav-item">
                         <a href="#" data-name="tasks" class="nav-link', $get['page'] === 'tasks' ? ' active' : '', '">
                         <i class="fa-solid fa-tasks nav-icon"></i>
                         <p>' . $lang->get('tasks') . '</p>
                         </a>
                     </li>';
-                    }
-    }
-
-    if (
-        $session_user_admin === 1
-    ) {
+        }
+
         if (WIP === true) {
             echo '
                     <li class="nav-item">
@@ -621,6 +617,13 @@
                         </a>
                     </li>';
         }
+    }
+
+    if (
+        $session_user_admin === 1
+        || $session_user_manager === 1
+        || $session_user_human_resources === 1
+    ) {
         echo '
                     <li class="nav-item">
                         <a href="#" data-name="folders" class="nav-link', $get['page'] === 'folders' ? ' active' : '', '">
@@ -798,7 +801,7 @@
                                     </div>
                                     <input type="password" class="form-control" id="dialog-ldap-user-change-password-old">
                                 </div>
-                                <div class="input-group mb-3" id="new-password-field">
+                                <div class="input-group mb-3">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><?php echo $lang->get('provide_your_current_password'); ?></span>
                                     </div>
@@ -1068,6 +1071,7 @@
 
     <?php
         /* MAIN PAGE */
+
         echo '
 <input type="hidden" id="temps_restant" value="', $session->get('user-session_duration') ?? '', '" />';
 // display an item in the context of OTV link

diff --git a/pages/items.js.php b/pages/items.js.php
@@ -3969,6 +3969,8 @@ function(teampassItem) {
                                 // Send query and get password
                                 var result = '',
                                     error = false;
+
+                                    console.log("COUCOU")
 
                                 $.ajax({
                                     type: "POST",

diff --git a/sources/identify.php b/sources/identify.php
@@ -47,7 +47,7 @@
 use TeampassClasses\LdapExtra\LdapExtra;
 use TeampassClasses\LdapExtra\OpenLdapExtra;
 use TeampassClasses\LdapExtra\ActiveDirectoryExtra;
-use TeampassClasses\AzureAuthController\AzureAuthController;
+use TeampassClasses\OAuth2Controller\OAuth2Controller;
 
 // Load functions
 require_once 'main.functions.php';