3.1.2

Merged PRs by @corentin-soriano: #4293 #4286 #4285 #4282 #4280 #4268 #4262 #4257 #4256 #4255 #4254 #4240 #4239 #4238 #4237 #4236 #4235 #4234 #4231 #4230 #4228 #4223 #4222 #4206 #4206 Merged PR by @rokx: #4220 Merge PR by @simonpoess: #4185
nilsteampassnet · Aug 25, 2024 · a78b846 · a78b846
1 parent fb9f5aa
commit a78b846
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 19 deletions.
diff --git a/includes/config/include.php b/includes/config/include.php
@@ -27,8 +27,8 @@
  */
 
 define('TP_VERSION', '3.1.2');
-define("UPGRADE_MIN_DATE", "1705123921");
-define('TP_VERSION_MINOR', '47');
+define("UPGRADE_MIN_DATE", "1724605220");
+define('TP_VERSION_MINOR', '51');
 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
@@ -13,11 +13,11 @@
     },
     {
         "table_name": "background_tasks",
-        "structure_hash": "e5b4f85a38e5e24f4eeafcbc01a17808f9301a76b918d4774f267f56ceec214e"
+        "structure_hash": "1ea5ceabaead323f0ab3d09a2dd1b0702609739773c55b9bab11fa9a1995bdda"
     },
     {
         "table_name": "background_tasks_logs",
-        "structure_hash": "ba98e1d5df107bcba95fc9b967d348ed91b37cfcec563f5ed134d211ec2ad802"
+        "structure_hash": "a57c18b891a3003ef444ad2d953437750c3ed4b8b86faa6f05e233e10d126e2e"
     },
     {
         "table_name": "cache",
@@ -57,7 +57,7 @@
     },
     {
         "table_name": "items",
-        "structure_hash": "7cbfdc99e60ef45c5007fd59b236c07b74c859710e926e756614a224e412a18a"
+        "structure_hash": "1da6d3517984be863421b51b51901df89651166759a760796c342017cef8350c"
     },
     {
         "table_name": "items_change",
@@ -93,19 +93,19 @@
     },
     {
         "table_name": "ldap_groups_roles",
-        "structure_hash": "876249365fe8f5a992e392e84b46f8fdfada965ce01ee4db8c70f73f3568a4a1"
+        "structure_hash": "d635b77e6ef1f92bb9c2e68c1caa85defb310973be3af8c3fd01f9c155614fa7"
     },
     {
         "table_name": "log_items",
-        "structure_hash": "4b816b75e42b8e3f38bcaac03ebc8a61051c228c58429366d3c0245db375b07a"
+        "structure_hash": "029a2f73cd42f51ec01415224fb1086d7966b869c17112079312f32034256601"
     },
     {
         "table_name": "log_system",
-        "structure_hash": "cbaceb6c0ac51db9e6e76bb67c79281582102bbba7a014c474ef057278b9ae8d"
+        "structure_hash": "dd5eb14116409bb914a335311ba4ca1e2cfbfec17958bac154b8fb5fb8bb850e"
     },
     {
         "table_name": "misc",
-        "structure_hash": "eaaa979b373349965c71907f4a97da971f762387dff20bbdca1ab7069092810f"
+        "structure_hash": "a75679378d7cc280172f8519e064d1b8b97c9fa8671f670d56c2feabd495613f"
     },
     {
         "table_name": "nested_tree",
@@ -169,7 +169,7 @@
     },
     {
         "table_name": "sharekeys_items",
-        "structure_hash": "32e7dbe0e2c96f5803964b7dc2913140cd9c97d3a94a1aeb1df1ec4fdafc1676"
+        "structure_hash": "30e520fafbd38f659d16a7797ef6f21f0e8eb18001087c8355675248d3292796"
     },
     {
         "table_name": "sharekeys_logs",

diff --git a/index.php b/index.php
@@ -241,7 +241,7 @@
     <!-- favicon -->
     <link rel="shortcut icon" type="image/png" href="<?php echo isset($SETTINGS['favicon']) === true ? $SETTINGS['favicon'] : '';?>"/>
     <!-- manifest -->
-    <link rel="manifest" href="includes/manifest.json?v=<?php echo TP_VERSION; ?>">
+    <!-- <link rel="manifest" href="includes/manifest.json?v=<?php echo TP_VERSION; ?>"> -->
     <!-- Custom style -->
     <?php
     if (file_exists(__DIR__ . '/includes/css/custom.css') === true) {?>
@@ -1148,7 +1148,7 @@ function(teampassSettings) {}
     <link href="plugins/fontawesome-free-6/css/v5-font-face.min.css?v=<?php echo TP_VERSION; ?>" rel="stylesheet" /> 
     <!-- jQuery -->
     <script src="plugins/jquery/jquery.min.js?v=<?php echo TP_VERSION; ?>"></script>
-    <script src="plugins/jquery/jquery.cookie.js?v=<?php echo TP_VERSION; ?>" type="text/javascript"></script>
+    <script src="plugins/jstree/jquery.cookie.js?v=<?php echo TP_VERSION; ?>" type="text/javascript"></script>
     <!-- jQuery UI -->
     <script src="plugins/jqueryUI/jquery-ui.min.js?v=<?php echo TP_VERSION; ?>"></script>
     <link rel="stylesheet" href="plugins/jqueryUI/jquery-ui.min.css?v=<?php echo TP_VERSION; ?>">

diff --git a/install/upgrade_run_3.1.php b/install/upgrade_run_3.1.php
@@ -414,11 +414,6 @@
     );
 }
 
-//---<END 3.1.2
-
-
-//--->BEGIN 3.1.2
-
 // Add index and change created/updated/finished_at type.
 try {
     $alter_table_query = "
@@ -478,7 +473,7 @@
     mysqli_rollback($db_link);
 }
 
-//---<END 3.1.3
+//---<END 3.1.2
 
 //---------------------------------------------------------------------
 

diff --git a/pages/admin.php b/pages/admin.php
@@ -300,7 +300,7 @@
                         }
 
                         // Test internet access
-                        $connected = @fsockopen("api-123456.duo.com", 443, $errno, $errstr, 1); // API Duo API (MFA).
+                        $connected = @fsockopen("www.cloudflare.com", 443, $errno, $errstr, 1); // API Duo API (MFA).
                         if ($connected){
                             fclose($connected);
                             $internetAccess = '