3.0.10

Working on #3937
nilsteampassnet · Nov 14, 2023 · f64bca3 · f64bca3
1 parent ab4baaa
commit f64bca3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/includes/config/include.php b/includes/config/include.php
@@ -17,7 +17,7 @@
  */
 define('TP_VERSION', '3.0.10');
 define("UPGRADE_MIN_DATE", "1697990713");
-define('TP_VERSION_MINOR', '131');
+define('TP_VERSION_MINOR', '133');
 define('TP_TOOL_NAME', 'Teampass');
 define('TP_ONE_DAY_SECONDS', 86400);
 define('TP_ONE_WEEK_SECONDS', 604800);

diff --git a/install/install.js b/install/install.js
@@ -75,7 +75,7 @@ function checkPage()
         } else {
             jsonValues = {"absolute_path":$("#absolute_path").val(), "url_path":$("#url_path").val()};
             dataToUse = JSON.stringify(jsonValues);
-            tasks = ["folder*install", "folder*includes", "folder*includes/config", "folder*includes/avatars", "folder*includes/libraries/csrfp/libs", "folder*includes/libraries/csrfp/js", "folder*includes/libraries/csrfp/log",  "extension*mbstring", "extension*openssl", "extension*bcmath", "extension*iconv", "extension*gd", "extension*xml", "extension*curl", "version*php", "ini*max_execution_time", "extension*gmp", "folder*files", "folder*upload", "misc*settings_creation"];
+            tasks = ["misc*settings_creation", "folder*install", "folder*includes", "folder*includes/config", "folder*includes/avatars", "folder*includes/libraries/csrfp/libs", "folder*includes/libraries/csrfp/js", "folder*includes/libraries/csrfp/log",  "extension*mbstring", "extension*openssl", "extension*bcmath", "extension*iconv", "extension*gd", "extension*xml", "extension*curl", "version*php", "ini*max_execution_time", "extension*gmp", "folder*files", "folder*upload"];
             multiple = true;
             $("#hid_absolute_path").val($("#absolute_path").val());
             $("#hid_url_path").val($("#url_path").val());
@@ -297,7 +297,7 @@ function doGetJson(task)
                     }
                 } else {
                     $("#res"+step+"_check"+data[0].index).html('<i class="fas fa-check text-success"></i>');
-                    $("#res"+step+"_check19").html('<i class="fas fa-check text-success"></i>');
+                    $("#res"+step+"_check99").html('<i class="fas fa-check text-success"></i>');
                 }
 
                 if (data[0].result !== undefined && data[0].result !== "" ) {

diff --git a/install/install.php b/install/install.php
@@ -186,27 +186,6 @@
 		</div>
 	</div>';
 
-	// copy settings.sample.php to settings.php
-	$settings_sample = '../includes/config/settings.sample.php';
-	$settings = '../includes/config/settings.php';
-	if (file_exists($settings) === false) {
-		if (copy($settings_sample, $settings) === false) {
-			echo '
-	<div class="row">
-		<div class="col-12">
-			<div class="card card-warning">
-				<div class="card-header">
-					<h5>Your attention</h5>
-				</div>
-				<div class="card-body">
-					File ' . $settings . ' could not be copied from '.$settings_sample.'. Please do it on your own and refresh the page!
-				</div>
-			</div>
-		</div>
-	</div>';
-		}
-	}
-
 	echo '
 	<div class="row">
 		<div class="col-12">
@@ -217,6 +196,7 @@
 				<div class="card-body">
 
 					<ul>
+					<li>File "/includes/config/settings.php is available"&nbsp;<span id="res2_check99"></span></li>
 					<li>Directory "/install/" is writable&nbsp;<span id="res2_check0"></span></li>
 					<li>Directory "/includes/" is writable&nbsp;<span id="res2_check1"></span></li>
 					<li>Directory "/includes/config/" is writable&nbsp;<span id="res2_check2"></span></li>

diff --git a/install/install.queries.php b/install/install.queries.php
@@ -31,8 +31,8 @@
     $settings_sample = 'includes/config/settings.sample.php';
     $settings = 'includes/config/settings.php';
     if (copy('../'.$settings_sample, '../'.$settings) === false) {
-        echo '[{"error" : "File <i>' . $settings . '</i> could not be created from <i>'.$settings_sample.'</i>. Please do it on your own and refresh the page!", "index" : "19", "multiple" : "' . $post_multiple . '"}]';
-        die();
+        echo '[{"error" : "File <i>' . $settings . '</i> could not be copied from <i>'.$settings_sample.'</i>.<br>Please do it on your own or change folder rights, and refresh the page!", "index" : "99", "multiple" : "' . $post_multiple . '"}]';
+        exit();
     }
 }