소스 검색

Fix Trac #336: verification of the directory of the temporary config file was wrong... however the script still assumes that the temporary config file and the final one are stored in the same place... at the root of the iTop installation.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1116 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 14 년 전
부모
커밋
c6e3f43512
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      setup/index.php

+ 4 - 4
setup/index.php

@@ -1214,21 +1214,21 @@ else
 {
 	// No configuration file yet
 	// Check that the wizard can write into the root dir to create the configuration file
-	if (!is_writable(dirname(FINAL_CONFIG_FILE)))
+	if (!is_writable(dirname(TMP_CONFIG_FILE)))
 	{
 		$oP->add("<h1>iTop configuration wizard</h1>\n");
 		$oP->add("<h2>Fatal error</h2>\n");
 		$oP->error("<b>Error:</b> the directory where to store the configuration file is not writable.");
-		$oP->p("The wizard cannot create the configuration file for you. Please make sure that the directory '<b>".realpath(dirname(FINAL_CONFIG_FILE))."</b>' is writable for the web server.");
+		$oP->p("The wizard cannot create the configuration file for you. Please make sure that the directory '<b>".realpath(dirname(TMP_CONFIG_FILE))."</b>' is writable for the web server.");
 		$oP->output();
 		exit;
 	}
-	if (!is_writable(dirname(FINAL_CONFIG_FILE).'/setup'))
+	if (!is_writable(dirname(TMP_CONFIG_FILE).'/setup'))
 	{
 		$oP->add("<h1>iTop configuration wizard</h1>\n");
 		$oP->add("<h2>Fatal error</h2>\n");
 		$oP->error("<b>Error:</b> the directory where to store temporary setup files is not writable.");
-		$oP->p("The wizard cannot create operate. Please make sure that the directory '<b>".realpath(dirname(FINAL_CONFIG_FILE))."/setup</b>' is writable for the web server.");
+		$oP->p("The wizard cannot create operate. Please make sure that the directory '<b>".realpath(dirname(TMP_CONFIG_FILE))."/setup</b>' is writable for the web server.");
 		$oP->output();
 		exit;
 	}