composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

New placeholders in templates: this->html(attcode) and this->label(attcode)

Browse Source 
SVN:trunk[735]
This commit is contained in:
Romain Quetiez
2010-09-01 09:07:01 +00:00
parent 77159e8766
commit 4894dd2b4c
6 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/ajax.dataloader.php
View File

@@ -100,6 +100,8 @@ define('TMP_CONFIG_FILE', '../tmp-config-itop.php');
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Expires: Fri, 17 Jul 1970 05:00:00 GMT"); // Date in the past
Utils::SpecifyConfigFile(TMP_CONFIG_FILE);
/**
* Main program
*/

4
setup/index.php
View File

@@ -1082,6 +1082,8 @@ function SetupFinished(SetupWebPage $oP, $aParamValues, $iCurrentStep, Config $o
clearstatcache(); // Make sure we know what we are doing !
if (file_exists(FINAL_CONFIG_FILE))
{
Utils::SpecifyConfigFile(FINAL_CONFIG_FILE);
// The configuration file already exists
if (is_writable(FINAL_CONFIG_FILE))
{
@@ -1099,6 +1101,8 @@ if (file_exists(FINAL_CONFIG_FILE))
}
else
{
Utils::SpecifyConfigFile(TMP_CONFIG_FILE);
// 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)))