Path-adjustments

int2001 · int2001 · commit e774be426d8e · 2024-04-14T19:15:20.000+02:00
diff --git a/install/includes/core_class.php b/install/includes/core_class.php
@@ -112,7 +112,6 @@ function write_config($data) {
 		$template_path 	= 'config/database.php';
 		$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/database.php';
 		if (isset($_ENV['CI_ENV'])) {
-			$template_path  = 'config/'.$_ENV['CI_ENV'].'/database.php';
 			$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/'.$_ENV['CI_ENV'].'/database.php';
 		}
 
@@ -154,7 +153,6 @@ function write_configfile($data) {
 		$template_path 	= 'config/config.php';
 		$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/config.php';
 		if (isset($_ENV['CI_ENV'])) {
-			$template_path  = 'config/'.$_ENV['CI_ENV'].'/config.php';
 			$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/'.$_ENV['CI_ENV'].'/config.php';
 		}
 
diff --git a/install/index.php b/install/index.php
@@ -25,7 +25,7 @@
 // Config Paths
 $db_config_path = '../application/config/';
 if (isset($_ENV['CI_ENV'])) {
-	$db_config_path ='../application/config/'.$_ENV['CI_ENV'].'/';
+	$db_config_path ='../application/'.$_ENV['CI_ENV'].'/';
 }
 $db_file_path = $db_config_path . "database.php";
 
@@ -115,11 +115,11 @@ function delDir($dir)
 			} elseif ($database->create_tables($_POST) == false) {
 				$message = $core->show_message('error', "The database tables could not be created, please verify your settings.");
 			} elseif ($core->write_config($_POST) == false) {
-				$message = $core->show_message('error', "The database configuration file could not be written, please chmod /application/config/database.php file to 777");
+				$message = $core->show_message('error', "The database configuration file could not be written, please chmod ".$db_config_path."/database.php file to 777");
 			}
 
 			if ($core->write_configfile($_POST) == false) {
-				$message = $core->show_message('error', "The config configuration file could not be written, please chmod /application/config/config.php file to 777");
+				$message = $core->show_message('error', "The config configuration file could not be written, please chmod ".$db_config_path."/config.php file to 777");
 			}
 
 			// If no errors, redirect to registration page
@@ -1458,7 +1458,7 @@ function prevTab() {
 	<body>
 		<div class="container mt-4 p-2" style="max-width: 600px; ">
 			<div class="card p-2 justify-content-center" style="min-height: 200px; margin-top: 200px;">
-				<p class="error text-center">Please make the /application/config/ folder writable. <strong>Example</strong>:<br /><br /><code>chmod -R 777 application/config/</code><br /><br /><i>Don't forget to restore the permissions afterwards.</i></p>
+				<p class="error text-center">Please make the /application/config/ folder writable. <strong>Example</strong>:<br /><br /><code>chmod -R 777 <php echo $db_config_path ?></code><br /><br /><i>Don't forget to restore the permissions afterwards.</i></p>
 			</div>
 		</div>
 	</body>

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,6 @@ function write_config($data) {`
`112`	`112`	`$template_path = 'config/database.php';`
`113`	`113`	`$output_path = $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/database.php';`
`114`	`114`	`if (isset($_ENV['CI_ENV'])) {`
`115`		`- $template_path = 'config/'.$_ENV['CI_ENV'].'/database.php';`
`116`	`115`	`$output_path = $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/'.$_ENV['CI_ENV'].'/database.php';`
`117`	`116`	`}`
`118`	`117`
`@@ -154,7 +153,6 @@ function write_configfile($data) {`
`154`	`153`	`$template_path = 'config/config.php';`
`155`	`154`	`$output_path = $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/config.php';`
`156`	`155`	`if (isset($_ENV['CI_ENV'])) {`
`157`		`- $template_path = 'config/'.$_ENV['CI_ENV'].'/config.php';`
`158`	`156`	`$output_path = $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/'.$_ENV['CI_ENV'].'/config.php';`
`159`	`157`	`}`
`160`	`158`