diff --git a/application/utils.inc.php b/application/utils.inc.php
index 5268e6c41..68c7d40b6 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -39,6 +39,7 @@ class FileUploadException extends Exception
*/
class utils
{
+ private static $m_sConfigFile = ITOP_CONFIG_FILE;
private static $m_oConfig = null;
public static function ReadParam($sName, $defaultValue = "")
@@ -136,6 +137,15 @@ class utils
return file_get_contents($sFileName);
}
+ /**
+ * Specify the application config file
+ * @param string path to the config file
+ * @return void
+ */
+ public static function SpecifyConfigFile($sFilePath)
+ {
+ self::$m_sConfigFile = $sFilePath;
+ }
/**
* Get access to the application config file
* @param none
@@ -145,7 +155,7 @@ class utils
{
if (self::$m_oConfig == null)
{
- self::$m_oConfig = new Config(ITOP_CONFIG_FILE);
+ self::$m_oConfig = new Config(self::$m_sConfigFile);
}
return self::$m_oConfig;
}
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 331a0e933..932823bf4 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -1096,6 +1096,10 @@ abstract class DBObject
}
// Make standard context arguments
+ // Note: Needs to be reviewed because it is currently called once per attribute when an object is written (CheckToWrite / CheckValue)
+ // Several options here:
+ // 1) cache the result
+ // 2) set only the object ref and resolve the values iif needed from contextual templates and queries (easy for the queries, not for the templates)
public function ToArgs($sArgName = 'this')
{
$aScalarArgs = array();
@@ -1109,6 +1113,11 @@ abstract class DBObject
foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
{
$aScalarArgs[$sArgName.'->'.$sAttCode] = $this->Get($sAttCode);
+ if ($oAttDef->IsScalar())
+ {
+ $aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = $this->GetAsHtml($sAttCode);
+ $aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = strip_tags($this->GetAsHtml($sAttCode));
+ }
}
return $aScalarArgs;
}
diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml b/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
index 3d776a69f..e42d0557b 100644
--- a/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
+++ b/modules/itop-tickets-1.0.0/data.struct.ta-actions.xml
@@ -10,7 +10,7 @@
SELECT Team WHERE id=:this->workgroup_id
-The ticket $this->name()$, priority $this->priority$ has been assigned to the workgroup $this->workgroup_name$
+The ticket $this->name()$, priority $this->label(priority)$ has been assigned to the workgroup $this->workgroup_name$
<html>
<body>
<p>The incident ticket $this->name()$ has been assigned to the workgroup $this->workgroup_name$.</p>
@@ -32,7 +32,7 @@
SELECT Person WHERE id=:this->agent_id
-The ticket $this->name()$, priority $this->priority$ has been assigned to you
+The ticket $this->name()$, priority $this->label(priority)$ has been assigned to you
<html>
<body>
<p>The incident ticket $this->name()$ has been assigned to you.</p>
@@ -54,7 +54,7 @@
SELECT Person WHERE id=:this->caller_id
-Ticket $this->name()$, priority $this->priority$ - $this->ticket_status$
+Ticket $this->name()$, priority $this->label(priority)$ - $this->ticket_status$
<html>
<body>
<p>The incident ticket $this->name()$ has changed to status $this->ticket_status$</p>
diff --git a/modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml b/modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml
index eda86b24d..249cbe1ed 100644
--- a/modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml
+++ b/modules/itop-tickets-1.0.0/data.struct.ta-triggers.xml
@@ -8,12 +8,12 @@
Incident ticket assigned to agent
Incident
-Assigned
+assigned
Incident ticket resolved
Incident
-Resolved
+resolved
diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php
index 6ddf3b35d..fa01e9037 100644
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -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
*/
diff --git a/setup/index.php b/setup/index.php
index d3782551a..589da15e4 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -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)))