- 
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- $class$: pkey = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- $class$: pkey = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- $class$: pkey = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
-$class_name$: $name$
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- $class$: pkey = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- $class$: pkey = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- SELECT $class$ WHERE id = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-
- $class$: pkey = $pkey$
+ SELECT $class$ WHERE id = $id$
SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'
+ SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'
$class_name$: $name$
-
-\n"; + $sRet .= "Set (".$this->m_oFilter->ToOQL().")
\n"; $sRet .= "Query:
".MetaModel::MakeSelectQuery($this->m_oFilter, array()).")\n"; $sRet .= $this->Count()." records
\n"; diff --git a/core/metamodel.class.php b/core/metamodel.class.php index deca1f5ee..ca5660238 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -1432,7 +1432,7 @@ abstract class MetaModel $aClassAliases = array_merge($aClassAliases, $oFilter->GetJoinedClasses()); } - self::DbgTrace("Entering: ".$oFilter->ToSibuSQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY").", expectedatts=".count($aExpectedAtts).": ".implode(",", array_keys($aExpectedAtts))); + self::DbgTrace("Entering: ".$oFilter->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY").", expectedatts=".count($aExpectedAtts).": ".implode(",", array_keys($aExpectedAtts))); $sRootClass = self::GetRootClass($sClass); $sKeyField = self::DBGetKey($sClass); @@ -1515,7 +1515,7 @@ abstract class MetaModel self::DbgTrace("Referenced by foreign key: $sForeignKeyAttCode... let's call MakeQuery()"); //self::DbgTrace($oForeignFilter); - //self::DbgTrace($oForeignFilter->ToSibuSQL()); + //self::DbgTrace($oForeignFilter->ToOQL()); //self::DbgTrace($oSelectForeign); //self::DbgTrace($oSelectForeign->RenderSelect(array())); $oSelectForeign = self::MakeQuery($aSelectedClasses, $oConditionTree, $aClassAliases, $aTableAliases, $aTranslation, $oForeignFilter, $aExpAtts); @@ -1589,7 +1589,7 @@ abstract class MetaModel $bIsOnQueriedClass = array_key_exists($sTargetAlias, $aSelectedClasses); - self::DbgTrace("Entering: tableclass=$sTableClass, filter=".$oFilter->ToSibuSQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY").", expectedatts=".count($aExpectedAtts).": ".implode(",", array_keys($aExpectedAtts))); + self::DbgTrace("Entering: tableclass=$sTableClass, filter=".$oFilter->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY").", expectedatts=".count($aExpectedAtts).": ".implode(",", array_keys($aExpectedAtts))); // 1 - SELECT and UPDATE // diff --git a/core/oql/oqlinterpreter.class.inc.php b/core/oql/oqlinterpreter.class.inc.php index 2a8ffe359..90fd60c1f 100644 --- a/core/oql/oqlinterpreter.class.inc.php +++ b/core/oql/oqlinterpreter.class.inc.php @@ -41,7 +41,7 @@ class OqlInterpreter $oRes = $this->Parse(); if (!$oRes instanceof OqlObjectQuery) { - throw new OqlException('Expecting an OQL query', $this->m_sQuery, 0, 0, get_class($oRes), array('OqlObjectQuery')); + throw new OQLException('Expecting an OQL query', $this->m_sQuery, 0, 0, get_class($oRes)); } return $oRes; } @@ -51,7 +51,7 @@ class OqlInterpreter $oRes = $this->Parse(); if (!$oRes instanceof Expression) { - throw new OqlException('Expecting an OQL expression', $this->m_sQuery, 0, 0, get_class($oRes), array('Expression')); + throw new OQLException('Expecting an OQL expression', $this->m_sQuery, 0, 0, get_class($oRes), array('Expression')); } return $oRes; } diff --git a/core/test.class.inc.php b/core/test.class.inc.php index 1b1a6cdf0..9924b11f9 100644 --- a/core/test.class.inc.php +++ b/core/test.class.inc.php @@ -492,10 +492,10 @@ abstract class TestBizModel extends TestHandler self::show_list($oObjSet); } - static protected function search_and_show_list_from_sibusql($sSibuSQL) + static protected function search_and_show_list_from_oql($sOQL) { - echo $sSibuSQL."...
\n"; - $oNewFilter = DBObjectSearch::FromSibuSQL($sSibuSQL); + echo $sOQL."...
\n"; + $oNewFilter = DBObjectSearch::FromOQL($sOQL); self::search_and_show_list($oNewFilter); } } @@ -544,14 +544,14 @@ abstract class TestBizModelGeneric extends TestBizModel $oBaby = new $sClassName; $oFilter = new DBObjectSearch($sClassName); - // Challenge reversibility of SibusQL / filter object + // Challenge reversibility of OQL / filter object // - $sExpr1 = $oFilter->ToSibuSQL(); - $oNewFilter = DBObjectSearch::FromSibuSQL($sExpr1); - $sExpr2 = $oNewFilter->ToSibuSQL(); + $sExpr1 = $oFilter->ToOQL(); + $oNewFilter = DBObjectSearch::FromOQL($sExpr1); + $sExpr2 = $oNewFilter->ToOQL(); if ($sExpr1 != $sExpr2) { - $this->ReportError("Found two different SibuSQL expression out of the (same?) filter: $sExpr1 != $sExpr2"); + $this->ReportError("Found two different OQL expression out of the (same?) filter: $sExpr1 != $sExpr2"); } // Use the filter (perform the query) diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php index a96ffaeae..1d7868763 100644 --- a/core/valuesetdef.class.inc.php +++ b/core/valuesetdef.class.inc.php @@ -78,7 +78,7 @@ abstract class ValueSetDefinition */ class ValueSetObjects extends ValueSetDefinition { - protected $m_sFilterExpr; // in SibuSQL + protected $m_sFilterExpr; // in OQL protected $m_sValueAttCode; protected $m_aOrderBy; @@ -93,7 +93,7 @@ class ValueSetObjects extends ValueSetDefinition { $this->m_aValues = array(); - $oFilter = DBObjectSearch::FromSibusQL($this->m_sFilterExpr, $aArgs); + $oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr, $aArgs); if (!$oFilter) return false; $oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs); @@ -102,9 +102,9 @@ class ValueSetObjects extends ValueSetDefinition if (empty($this->m_sValueAttCode)) { $this->m_aValues[$oObject->GetKey()] = $oObject->GetName(); - } - else - { + } + else + { $this->m_aValues[$oObject->GetKey()] = $oObject->GetAsHTML($this->m_sValueAttCode); } } diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index 5b66f7388..f35517eb0 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -57,7 +57,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:AuditCategory/Attribute:description' => 'Audit Category Description', 'Class:AuditCategory/Attribute:description+' => 'Long description for this audit category', 'Class:AuditCategory/Attribute:definition_set' => 'Definition Set', - 'Class:AuditCategory/Attribute:definition_set+' => 'SibusQL expression defining the set of objects to audit', + 'Class:AuditCategory/Attribute:definition_set+' => 'OQL expression defining the set of objects to audit', )); // @@ -72,7 +72,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:AuditRule/Attribute:description' => 'Audit Rule Description', 'Class:AuditRule/Attribute:description+' => 'Long description for this audit rule', 'Class:AuditRule/Attribute:query' => 'Query to Run', - 'Class:AuditRule/Attribute:query+' => 'The SibusQL expression to run', + 'Class:AuditRule/Attribute:query+' => 'The OQL expression to run', 'Class:AuditRule/Attribute:valid_flag' => 'Valid objects?', 'Class:AuditRule/Attribute:valid_flag+' => 'True if the rule returns the valid objects, false otherwise', 'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true', diff --git a/js/wizard.utils.js b/js/wizard.utils.js index 02a7d00c4..70cdf4cbb 100644 --- a/js/wizard.utils.js +++ b/js/wizard.utils.js @@ -8,8 +8,8 @@ function UpdateObjectList(sClass, sId, sExtKeyToRemote) { aRelatedObjectIds[0] = 0; } - var sibusql = sClass+": pkey IN {" + aRelatedObjectIds.join(", ") + "}"; - $.get("ajax.render.php?filter=" + sibusql + "&style=list&encoding=sibusql", + var oql = "SELECT "+sClass+" AS c WHERE c.id IN (" + aRelatedObjectIds.join(", ") + ")"; + $.get("ajax.render.php?filter=" + oql + "&style=list&encoding=oql", { operation: "ajax" }, function(data){ $("#related_objects_"+sId).empty(); diff --git a/pages/UI.php b/pages/UI.php index 967e6c8fb..23ccf0124 100644 --- a/pages/UI.php +++ b/pages/UI.php @@ -230,7 +230,7 @@ try $oP->add("
\n");
$oP->add("
\n");
- $oLeafsFilter->AddCondition('pkey', $aLeafs, 'IN');
+ $oLeafsFilter->AddCondition('id', $aLeafs, 'IN');
$oBlock = new DisplayBlock($oLeafsFilter, 'list', false);
$oBlock->Display($oP, $iBlock++);
}
@@ -261,7 +261,7 @@ try
{
// Check if the user can modify this object
$oSearch = new DBObjectSearch($sClass);
- $oSearch->AddCondition('pkey', $id, '=');
+ $oSearch->AddCondition('id', $id, '=');
$oSet = new CMDBObjectSet($oSearch);
if ($oSet->Count() > 0)
{
@@ -301,7 +301,7 @@ try
{
// Check if the user can modify this object
$oSearch = new DBObjectSearch($sClass);
- $oSearch->AddCondition('pkey', $id, '=');
+ $oSearch->AddCondition('id', $id, '=');
$oSet = new CMDBObjectSet($oSearch);
if ($oSet->Count() > 0)
{
diff --git a/pages/advanced_search.php b/pages/advanced_search.php
index 5629973d8..cb2a4ec6b 100644
--- a/pages/advanced_search.php
+++ b/pages/advanced_search.php
@@ -68,7 +68,7 @@ function Page2_ConfigFilters($oPage, $oFilter)
$sValue = "";
foreach($oFilter->GetCriteria() as $aCritInfo)
{
- if ($aCritInfo["filtercode"] == "pkey")
+ if ($aCritInfo["filtercode"] == "id")
{
// ???
}
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 665377360..ba95c5ea1 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -107,9 +107,9 @@ switch($operation)
{
$aExtraParams = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
}
- if ($sEncoding == 'sibusql')
+ if ($sEncoding == 'oql')
{
- $oFilter = CMDBSearchFilter::FromSibusQL($sFilter);
+ $oFilter = CMDBSearchFilter::FromOQL($sFilter);
}
else
{
@@ -127,7 +127,7 @@ switch($operation)
case 'details':
$key = utils::ReadParam('id', 0);
$oFilter = $oContext->NewFilter($sClass);
- $oFilter->AddCondition('pkey', $key, '=');
+ $oFilter->AddCondition('id', $key, '=');
$oDisplayBlock = new DisplayBlock($oFilter, 'details', false);
$oDisplayBlock->RenderContent($oPage);
break;
@@ -135,7 +135,7 @@ switch($operation)
case 'preview':
$key = utils::ReadParam('id', 0);
$oFilter = $oContext->NewFilter($sClass);
- $oFilter->AddCondition('pkey', $key, '=');
+ $oFilter->AddCondition('id', $key, '=');
$oDisplayBlock = new DisplayBlock($oFilter, 'preview', false);
$oDisplayBlock->RenderContent($oPage);
break;
@@ -187,7 +187,7 @@ switch($operation)
case 'modal_details':
$key = utils::ReadParam('id', 0);
$oFilter = $oContext->NewFilter($sClass);
- $oFilter->AddCondition('pkey', $key, '=');
+ $oFilter->AddCondition('id', $key, '=');
$oPage->Add("".Metamodel::GetName($sClassName).": ".count($aLeafs)." object(s) found.
\n"); $oP->add("Object Details
\n"); $oDisplayBlock = new DisplayBlock($oFilter, 'details', false); $oDisplayBlock->RenderContent($oPage); diff --git a/pages/audit.php b/pages/audit.php index 5219c4d3b..aadc4f8f3 100644 --- a/pages/audit.php +++ b/pages/audit.php @@ -17,8 +17,8 @@ function GetRuleResultSet($iRuleId, $oDefinitionFilter) $oContext = new UserContext(); $oRule = $oContext->GetObject('AuditRule', $iRuleId); - $sSibusql = $oRule->Get('query'); - $oRuleFilter = DBObjectSearch::FromSibusQL($sSibusql); + $sOql = $oRule->Get('query'); + $oRuleFilter = DBObjectSearch::FromOQL($sOql); if ($oRule->Get('valid_flag') == 'false') { // The query returns directly the invalid elements @@ -37,7 +37,7 @@ function GetRuleResultSet($iRuleId, $oDefinitionFilter) $aValidIds[] = $oObj->GetKey(); } $oFilter = $oDefinitionFilter; - $oFilter->AddCondition('pkey', $aValidIds, 'NOTIN'); + $oFilter->AddCondition('id', $aValidIds, 'NOTIN'); $oErrorObjectSet = new CMDBObjectSet($oFilter); } return $oErrorObjectSet; @@ -65,7 +65,7 @@ switch($operation) $oContext = new UserContext(); $oAuditCategory = $oContext->GetObject('AuditCategory', $iCategory); - $oDefinitionFilter = DBObjectSearch::FromSibusQL($oAuditCategory->Get('definition_set')); + $oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set')); if (!empty($currentOrganization)) { $oDefinitionFilter->AddCondition('org_id', $currentOrganization); @@ -94,13 +94,13 @@ switch($operation) $oP->add("\n"); while($oAuditCategory = $oCategoriesSet->fetch()) { - $oDefinitionFilter = DBObjectSearch::FromSibusQL($oAuditCategory->Get('definition_set')); + $oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set')); $aObjectsWithErrors = array(); if (!empty($currentOrganization)) - { - if (MetaModel::IsValidFilterCode($oDefinitionFilter->GetClass(), 'org_id')) + { + if (MetaModel::IsValidFilterCode($oDefinitionFilter->GetClass(), 'org_id')) { - $oDefinitionFilter->AddCondition('org_id', $currentOrganization); + $oDefinitionFilter->AddCondition('org_id', $currentOrganization); } } $aResults = array(); @@ -122,7 +122,7 @@ switch($operation) } else { - $oRuleFilter = DBObjectSearch::FromSibusQL($oAuditRule->Get('query')); + $oRuleFilter = DBObjectSearch::FromOQL($oAuditRule->Get('query')); $oErrorObjectSet = GetRuleResultSet($oAuditRule->GetKey(), $oDefinitionFilter); $iErrorsCount = $oErrorObjectSet->Count(); while($oObj = $oErrorObjectSet->Fetch()) diff --git a/pages/incident.php b/pages/incident.php deleted file mode 100644 index 8024cd77b..000000000 --- a/pages/incident.php +++ /dev/null @@ -1,761 +0,0 @@ -m_sCurrentStep = $sStep; - } - - protected function GetFields($sStep = '') - { - if ($sStep == '') - { - $sStep = $this->m_sCurrentStep; - } - return $this->m_aSteps[$sStep]; - } - - protected function AddContextToForm(WebPage $oPage) - { - // Store as hidden fields in the page all the variables from the previous steps - foreach($this->m_aSteps as $sStep => $aFields) - { - if ($sStep == $this->m_sCurrentStep) continue; - foreach($aFields as $sAttName => $sFieldName) - { - $oPage->add("\n"); - } - } - } - - function GetObjectPicker(WebPage $oPage, $sTitle, $sFieldName, $sClass) - { - $sScript = -<<Selected Objects
-|
- Selected objects: - - - |
- - - - | -
- Available objects: - - - |
-
| - - | -||
'.$sManageObjectsDlg.'
';
- $oPage->add_script($sScript);
- $oPage->add_ready_script("\$('#current_object_id').autocomplete('./ajax.render.php', { minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#ac_current_object_id', extraParams:{operation:'link', sclass:'$sClass', attCode:'name'}});");
- $oPage->add_ready_script("$('#ManageObjectsDlg').jqm({overlay:70, modal:true, toTop:true});"); // jqModal Window
- $oPage->add_ready_script("UpdateObjectList('$sClass');");
- return $sHTML;
- }
-
- function DisplayObjectPickerList(WebPage $oPage, $sClass)
- {
- $oFilter = new CMDBSearchFilter($sClass);
- $oFilter->AddCondition('pkey', array(0), 'IN');
- //$oPage->p($oFilter->__DescribeHTML());
- $oBlock = new DisplayBlock($oFilter, 'list', true /* Asynchronous */);
- $oBlock->Display($oPage, 'related_objects');
- }
-}
-
-class IncidentCreationWizard extends DialogWizard
-{
- public function __construct($sStep)
- {
- parent::__construct($sStep);
- $this->m_aSteps =
- array(
- '1' => array('title' => 'attr_title', 'customer_id' => 'attr_customer_id', 'initial_situation' => 'attr_initial_situation', 'severity' => 'attr_severity', 'impact' => 'attr_impact', 'workgroup_id' => 'attr_workgroup_id', 'action_log' => 'attr_action_log'),
- '2' => array('impacted_infra_ids' => 'impacted_infra_ids'),
- '3' => array('additional_impacted_object_ids' => 'additional_impacted_object_ids'),
- '4' => array('related_incident_ids' => 'related_incident_ids'),
- '5' => array('contact_ids' => 'contact_ids'),
- );
- }
-
- protected function AddContextToForm($oPage)
- {
- parent::AddContextToForm($oPage);
- $oPage->add("\n");
- $oPage->add("m_sNextStep."\" />\n");
- }
-
- public function DisplayNewTicketForm(WebPage $oPage)
- {
- assert($this->m_sCurrentStep == '1');
- $this->m_sNextStep = '2';
- $aFields = $this->GetFields();
-
- $oPage->add('');
- }
-
- public function DisplayImpactedInfraForm(WebPage $oPage)
- {
- assert($this->m_sCurrentStep == '2');
- $this->m_sNextStep = '3';
- $oPage->add('');
- }
-
- public function DisplayAdditionalImpactedObjectForm(WebPage $oPage)
- {
- assert($this->m_sCurrentStep == '3');
- $this->m_sNextStep = '4';
- $sImpactedInfraIds = Utils::ReadParam('impacted_infra_ids');
-
- $sImpactedInfraIds = Utils::ReadParam('impacted_infra_ids', '');
- if (!empty($sImpactedInfraIds))
- {
- $oPage->p('Impacted Infrastructure:');
- $oFilter = new CMDBSearchFilter('logRealObject');
- $oFilter->AddCondition('pkey', explode(' ', $sImpactedInfraIds), 'IN');
- $oBlock = new DisplayBlock($oFilter, 'list', false /* Synchronous */);
- $oBlock->Display($oPage, 'impacted_infra');
- }
-
- $aImpactedInfraIds = explode(' ', $sImpactedInfraIds);
- $oInfraSet = CMDBObjectSet::FromScratch('logRealObject');
- foreach($aImpactedInfraIds as $id)
- {
- $oObj = MetaModel::GetObject('logRealObject', $id);
- $oInfraSet->AddObject($oObj);
- }
- $aImpactedObject = $oInfraSet->GetRelatedObjects('impacts');
- $aAdditionalIds = array();
- foreach($aImpactedObject as $sRootClass => $aObjects)
- {
- foreach($aObjects as $oObj)
- {
- $aAdditionalIds[] = $oObj->GetKey();
- }
- }
- $sAdditionalIds = implode(' ', $aAdditionalIds);
- $oPage->add_ready_script('$("#related_object_ids").val("'.$sAdditionalIds.'");');
-
- $oPage->p('Additional Impact Computed:');
- $this->DisplayObjectPickerList($oPage, 'logRealObject');
- $oPage->add('');
- }
-
- public function DisplayRelatedTicketsForm(WebPage $oPage)
- {
- assert($this->m_sCurrentStep == '4');
- $this->m_sNextStep = '5';
- $oRelatedTicketsFilter = new DBObjectSearch('bizIncidentTicket');
- $sImpactedInfraIds = Utils::ReadParam('impacted_infra_ids', '');
- $sAdditionalImpactedObjectIds = Utils::ReadParam('additional_impacted_object_ids', '');
- $sIds = trim($sImpactedInfraIds.' '.$sAdditionalImpactedObjectIds);
- $aTicketIds = array();
- if (!empty($sIds))
- {
- $aIds = explode(' ', $sIds);
- $sSibusQL = "bizIncidentTicket: PKEY IS ticket_id IN (lnkInfraTicket: infra_id IN (logRealObject: pkey IN {".implode(',', $aIds)."}))";
- $oTicketSearch = DBObjectSearch::FromSibusQL($sSibusQL);
- $oRelatedTicketSet = new DBObjectSet($oTicketSearch);
- while ($oTicket = $oRelatedTicketSet->Fetch())
- {
- $aTicketIds[] = $oTicket->GetKey();
- }
- }
-
- $sTicketIds = implode(' ', $aTicketIds);
- $oPage->add_ready_script('$("#related_object_ids").val("'.$sTicketIds.'");');
- $oPage->p('Potentially related incidents:');
- $this->DisplayObjectPickerList($oPage, 'bizIncidentTicket');
-
- $oPage->add('');
- }
-
- public function DisplayContactsToNotifyForm(WebPage $oPage)
- {
- assert($this->m_sCurrentStep == '5');
- $this->m_sNextStep = '6';
- $oPage->add('');
- }
-
- function DisplayFinalForm(WebPage $oPage)
- {
- $oAppContext = new ApplicationContext();
- assert($this->m_sCurrentStep == '6');
- $this->m_sNextStep = '7';
-
- $aDetails = array();
- $aAttributesDef = MetaModel::ListAttributeDefs('bizIncidentTicket');
- $aFields = $this->GetFields('1');
- foreach($aFields as $sAttCode => $sFieldName)
- {
- $oAttDef = $aAttributesDef[$sAttCode];
- $sValue = Utils::ReadParam($sFieldName, '');
- if ($oAttDef->IsExternalKey() && isset($sValue) && ($sValue != 0))
- {
- $oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $sValue);
- if (!is_object($oTargetObj))
- {
- trigger_error("Houston: could not find ".$oAttDef->GetTargetClass()."::$sValue");
- }
- $sPage = cmdbAbstractObject::ComputeUIPage($oAttDef->GetTargetClass());
- $sHint = htmlentities($oAttDef->GetTargetClass()."::".$sValue);
- $sHTMLValue = "GetTargetClass()."&id=$sValue&".$oAppContext->GetForLink()."\" title=\"$sHint\">".$oTargetObj->GetName()."";
- }
- else
- {
- $sHTMLValue = $oAttDef->GetAsHTML($sValue);
- }
- $aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $sHTMLValue);
- }
- $oPage->details($aDetails);
-
- $oPage->AddTabContainer('LinkedObjects');
- $oPage->SetCurrentTabContainer('LinkedObjects');
-
- $sImpactedInfraIds = Utils::ReadParam('impacted_infra_ids', '');
- $sImpactedInfraIds .= ' '.Utils::ReadParam('additional_impacted_object_ids', '');
- $sImpactedInfraIds = trim($sImpactedInfraIds);
- $oPage->SetCurrentTab("Infrastructure impacted");
- if (!empty($sImpactedInfraIds))
- {
- $oFilter = new CMDBSearchFilter('logRealObject');
- $oFilter->AddCondition('pkey', explode(' ', $sImpactedInfraIds), 'IN');
- $oBlock = new DisplayBlock($oFilter, 'list', false /* Synchronous */);
- $oBlock->Display($oPage, 'related_objects');
- }
- else
- {
- $oPage->p("There is no infrastructure impacted by this incident");
- }
-
- $sRelatedIncidentIds = Utils::ReadParam('related_incident_ids', '');
- $oPage->SetCurrentTab("Related tickets");
- if (!empty($sRelatedIncidentIds))
- {
- $oFilter = new CMDBSearchFilter('bizIncidentTicket');
- $oFilter->AddCondition('pkey', explode(' ', $sRelatedIncidentIds), 'IN');
- $oBlock = new DisplayBlock($oFilter, 'list', false /* Synchronous */);
- $oBlock->Display($oPage, 'related_incidents');
- }
- else
- {
- $oPage->p("There is no other incident related to this one");
- }
-
- $oPage->SetCurrentTab("Contacts to notify");
- $sContactIds = Utils::ReadParam('contact_ids', '');
- if (!empty($sContactIds))
- {
- $oFilter = new CMDBSearchFilter('bizContact');
- $oFilter->AddCondition('pkey', explode(' ', $sContactIds), 'IN');
- $oBlock = new DisplayBlock($oFilter, 'list', false /* Synchronous */);
- $oBlock->Display($oPage, 'contacts');
- }
- else
- {
- $oPage->p("There is no contact to notify");
- }
- $oPage->SetCurrentTab();
-
- $oPage->add('');
- }
-
- public function CreateIncident(WebPage $oPage)
- {
- $oAppContext = new ApplicationContext();
- assert($this->m_sCurrentStep == '7');
- $this->m_sNextStep = '1';
-
- $oIncident = MetaModel::NewObject('bizIncidentTicket');
- $oPage->p("Creation of Incident Ticket.");
-
- $aFields = $this->GetFields('1');
- foreach($aFields as $sAttCode => $sFieldName)
- {
- $sValue = Utils::ReadPostedParam($sFieldName, '');
- $oIncident->Set($sAttCode, $sValue);
- }
- $oIncident->Set('ticket_status', 'New');
- $oIncident->Set('start_date', time());
- $oIncident->Set('name', 'ID not set');
-
- if ($oIncident->CheckToInsert())
- {
- // Create the ticket itself
- $oMyChange = MetaModel::NewObject("CMDBChange");
- $oMyChange->Set("date", time());
- $oMyChange->Set("userinfo", "Administrator");
- $iChangeId = $oMyChange->DBInsert();
- $oIncident->DBInsertTracked($oMyChange);
-
- $sName = sprintf('I-%06d', $oIncident->GetKey());
- $oIncident->Set('name', $sName);
- $oIncident->DBUpdateTracked($oMyChange);
- $oPage->p("Incident $sName created.\n");
-
- // Now link the objects to the Incident:
- // 1) the impacted infra
- $sImpactedInfraIds = Utils::ReadParam('impacted_infra_ids', '');
- $sImpactedInfraIds .= ' '.Utils::ReadParam('additional_impacted_object_ids', '');
- $sImpactedInfraIds = trim($sImpactedInfraIds);
- if (!empty($sImpactedInfraIds))
- {
- $aImpactedInfra = explode(' ', $sImpactedInfraIds);
- foreach($aImpactedInfra as $iInfraId)
- {
- $oLink = MetaModel::NewObject('lnkInfraTicket');
- $oLink->Set('infra_id', $iInfraId);
- $oLink->Set('ticket_id', $oIncident->GetKey());
- $oLink->Set('impact', 'automatic');
- $oLink->DBInsertTracked($oMyChange);
- }
- }
- // 2) the related incidents
- $sRelatedIncidentsIds = Utils::ReadPostedParam('related_incident_ids');
- if (!empty($sRelatedIncidentsIds))
- {
- $aRelatedIncidents = explode(' ', $sRelatedIncidentsIds);
- foreach($aRelatedIncidents as $iIncidentId)
- {
- $oLink = MetaModel::NewObject('lnkRelatedTicket');
- $oLink->Set('rel_ticket_id', $iIncidentId);
- $oLink->Set('ticket_id', $oIncident->GetKey());
- $oLink->Set('impact', 'automatic');
- $oLink->DBInsertTracked($oMyChange);
- }
- }
- // 3) the contacts to notify
- $sContactsIds = Utils::ReadPostedParam('contact_ids');
- if (!empty($sContactsIds))
- {
- $aContactsToNotify = explode(' ', $sContactsIds);
- foreach($aContactsToNotify as $iContactId)
- {
- $oLink = MetaModel::NewObject('lnkContactRealObject');
- $oLink->Set('contact_id', $iContactId);
- $oLink->Set('object_id', $oIncident->GetKey());
- $oLink->Set('role', 'notification');
- $oLink->DBInsertTracked($oMyChange);
- }
- }
- $oIncident->DisplayDetails($oPage, 'bizIncidentTicket', $oIncident->GetKey());
- }
- else
- {
- $oPage->p("Error: object can not be created!\n");
- }
- }
-}
-
-
-$oContext = new UserContext();
-$oAppContext = new ApplicationContext();
-$currentOrganization = utils::ReadParam('org_id', '');
-$operation = utils::ReadParam('operation', '');
-$oP = new iTopWebPage("ITop - Incident Management", $currentOrganization);
-
-switch($operation)
-{
- case 'details':
- $sClass = utils::ReadParam('class', '');
- $id = utils::ReadParam('id', '');
- if ( empty($sClass) || empty($id)) // TO DO: check that the class name is valid !
- {
- $oP->add("'class' and 'id' parameters must be specifed for this operation.
\n"); - } - else - { - $oObj = $oContext->GetObject($sClass, $id); - if ($oObj != null) - { - $oP->set_title("iTop - ".$oObj->GetName()." - $sClass details"); - $oObj->DisplayDetails($oP); - } - else - { - $oP->set_title("iTop - Error"); - $oP->add("Sorry this object does not exist (or you are not allowed to view it).
\n"); - } - } - break; - - case 'new': - $step = utils::ReadParam('step', '1'); - $aSteps = array( - 'Ticket Information', - 'Impacted Infrastructure', - 'Additional Impact', - 'Related Tickets', - 'Contacts to Notify', - 'Confirmation', - 'Ticket Creation' - ); - $oWizard = new IncidentCreationWizard($step); - $oP = new iTopWizardWebPage("ITop - Incident Management", $currentOrganization, $step, $aSteps); - - switch($step) - { - case 1: - default: - //$oP->add('New incident
New ticket: Select the Impacted Infrastructure
New ticket: Additional Impacted Objects
New ticket: Select Related Incidents
New ticket: Select the Contacts to Notify
New ticket: Confirm and Create the Ticket
'class' and 'id' parameters must be specifed for this operation.
\n"); - } - else - { - $oObj = $oContext->GetObject($sClass, $id); - if ($oObj != null) - { - $oP->set_title("iTop - ".$oObj->GetName()." - $sClass modification"); - $oP->add("".$oObj->GetName()." - $sClass modification
\n"); - $oObj->DisplayModifyForm($oP); - } - else - { - $oP->set_title("iTop - Error"); - $oP->add("Sorry this object does not exist (or you are not allowed to view it).
\n"); - } - } - break; - - case 'apply_modify': - $sClass = utils::ReadPostedParam('class', ''); - $id = utils::ReadPostedParam('id', ''); - $sTransactionId = utils::ReadPostedParam('transaction_id', ''); - if ( empty($sClass) || empty($id)) // TO DO: check that the class name is valid ! - { - $oP->add("'class' and 'id' parameters must be specifed for this operation.
\n"); - } - else if (!utils::IsTransactionValid($sTransactionId)) - { - $oP->p("Error: object has already be updated!\n"); - } - else - { - $oObj = $oContext->GetObject($sClass, $id); - if ($oObj != null) - { - $oP->set_title("iTop - ".$oObj->GetName()." - $sClass modification"); - $oP->add("".$oObj->GetName()." - $sClass modification
\n"); - $bObjectModified = false; - foreach(MetaModel::ListAttributeDefs(get_class($oObj)) as $sAttCode=>$oAttDef) - { - $iFlags = $oObj->GetAttributeFlags($sAttCode); - if ($iFlags & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)) - { - // Non-visible, or read-only attribute, do nothing - } - else if ($sAttCode == 'finalclass') - { - // This very specific field is read-only - } - else if (!$oAttDef->IsExternalField()) - { - $aAttributes[$sAttCode] = trim(utils::ReadPostedParam("attr_$sAttCode", null)); - $previousValue = $oObj->Get($sAttCode); - if (!is_null($aAttributes[$sAttCode]) && ($previousValue != $aAttributes[$sAttCode])) - { - $oObj->Set($sAttCode, $aAttributes[$sAttCode]); - $bObjectModified = true; - } - } - } - if (!$bObjectModified) - { - $oP->p("No modification detected. ".get_class($oObj)." has not been updated.\n"); - } - else if ($oObj->CheckToUpdate()) - { - $oMyChange = MetaModel::NewObject("CMDBChange"); - $oMyChange->Set("date", time()); - $oMyChange->Set("userinfo", "Made by somebody"); // TO DO put the correct user info here - $iChangeId = $oMyChange->DBInsert(); - $oObj->DBUpdateTracked($oMyChange); - - $oP->p(get_class($oObj)." updated.\n"); - } - else - { - $oP->p("Error: object can not be updated!\n"); - //$oObj->Reload(); // restore default values! - } - } - else - { - $oP->set_title("iTop - Error"); - $oP->add("Sorry this object does not exist (or you are not allowed to edit it).
\n"); - } - } - $oP->add("Alors ça roule ?
"); - $oObj->DisplayDetails($oP); - break; -} -$oP->output(); -?> diff --git a/pages/index.php b/pages/index.php deleted file mode 100644 index 01297ed74..000000000 --- a/pages/index.php +++ /dev/null @@ -1,667 +0,0 @@ -no_cache(); - - - -MetaModel::CheckDefinitions(); -// new API - MetaModel::DBCheckFormat(); -// not necessary, and time consuming! -// MetaModel::DBCheckIntegrity(); - - -// Comment by Rom: MetaModel::GetSubclasses("logRealObject") retourne la totale -// utiliser IsRootClass pour savoir si une classe obtenue est une classe feuille ou non -$aTopLevelClasses = array('bizService', 'bizLocation', 'bizContact', 'logInfra', 'bizDocument', 'bizObject'); - -function ReadParam($sName, $defaultValue = "") -{ - return isset($_REQUEST[$sName]) ? $_REQUEST[$sName] : $defaultValue; -} - -function DisplaySelectOrg($oPage, $sCurrentOrganization, $iContext) -{ - global $oContext; - - //$oSearchFilter = new CMDBSearchFilter("bizOrganization"); - $oSearchFilter = $oContext->NewFilter("bizOrganization"); - $oPage->p($oSearchFilter->serialize()); - $oSet = new CMDBObjectSet($oSearchFilter); - if ($oSet->Count() == 0) - { - $oPage->add("\n");
- $oPage->add("
\n");
- }
- else
- {
- $oCurrentOrganization = null;
- $oPage->add("\n");
- $oPage->p("No organization found.\n");
- $oPage->p($oSearchFilter->__DescribeHTML());
- $oPage->add("
\n");
- $oPage->add("\n");
- $oPage->add("
\n");
- }
-}
-
-function DisplayDetails(WebPage $oPage, $sClassName, $sKey)
-{
- global $oContext;
- //$oObj = MetaModel::GetObject($sClassName, $sKey);
- $oObj = $oContext->GetObject($sClassName, $sKey);
- $oPage->p("Details of ".MetaModel::GetName($sClassName)." - $sKey");
-
- $oObj->DisplayDetails($oPage);
-
- // Modified by rom
- $aLinks = array();
- $aLinks[] = "View changes log";
- $aLinks[] = "Edit this object";
- $aLinks[] = "Delete this object (no confirmation!)";
- // By rom
- foreach (MetaModel::EnumLinkingClasses($sClassName) as $sLinkClass => $aRemoteClasses)
- {
- foreach($aRemoteClasses as $sExtKeyAttCode => $sRemoteClass)
- {
- // #@# quick and dirty: guess the extkey attcode from link to current class
- // later, this information should be part of the biz model
- $sExtKeyToMe = "";
- foreach(MetaModel::ListAttributeDefs($sLinkClass) as $sAttCode=>$oAttDef)
- {
- if ($oAttDef->IsExternalKey() && $oAttDef->GetTargetClass() == $sClassName)
- {
- $sExtKeyToMe = $sAttCode;
- break;
- }
- }
- if (empty($sExtKeyToMe))
- {
- $oPage->p("Houston... could not find the external key for $sClassName in $sLinkClass");
- }
- else
- {
- $oFilter = new CMDBSearchFilter($sRemoteClass); // just a dummy empty one for edition
-
- $sButton = "\n");
- $oPage->add("\n");
- if ($oCurrentOrganization != null)
- {
- $oCurrentOrganization->DisplayDetails($oPage);
- }
- $oPage->add("
\n");
- $oPage->add("\n";
- $sButton .= "\n";
- $sButton .= "
\n";
- $aLinks[] = $sButton;
- }
- }
- }
- $sLinks = implode(" / ", $aLinks);
- $oPage->p($sLinks);
-}
-
-// By Rom
-function DisplayChangesLog(WebPage $oPage, $sClassName, $sKey)
-{
- global $oContext;
- //$oObj = MetaModel::GetObject($sClassName, $sKey);
- $oObj = $oContext->GetObject($sClassName, $sKey);
- $oPage->p("Changes log for ".MetaModel::GetName($sClassName)." - $sKey");
-
- $oObj->DisplayChangesLog($oPage);
-
- $oPage->p("View details");
- $oPage->p("Edit this object");
- $oPage->p("Delete this object (no confirmation!)");
-}
-
-function DumpObjects(WebPage $oPage, $sClassName, CMDBSearchFilter $oSearchFilter = null)
-{
- global $oContext;
-
- if ($oSearchFilter == null)
- {
- //$oSearchFilter = new CMDBSearchFilter($sClassName);
- $oSearchFilter = $oContext->NewFilter($sClassName);
- }
- $aAttribs = array();
- foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode=>$oAttDef)
- {
- $aAttribs['key'] = array('label' => 'key', 'description' => 'Primary Key');
- $aAttribs[$sAttCode] = array('label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
- }
- $oObjectSet = new CMDBObjectSet($oSearchFilter);
-
- $aValues = array();
- while ($oObj = $oObjectSet->Fetch())
- {
- $aRow['key'] = "GetKey()."\">".$oObj->GetKey()."";
- foreach($oObj->GetAttributesList($sClassName) as $sAttCode)
- {
- $aRow[$sAttCode] = $oObj->GetAsHTML($sAttCode);
- }
- $aValues[] = $aRow;
- }
- $oPage->table($aAttribs, $aValues);
-}
-
-function DisplayEditForm(WebPage $oPage, $sClassName, $sKey)
-{
- global $oContext;
- //$oObj = MetaModel::GetObject($sClassName, $sKey);
- $oObj = $oContext->GetObject($sClassName, $sKey);
- if ($oObj == null)
- {
- $oPage->p("You are not allowed to edit this object.");
- return;
- }
- $oPage->p("Edition of ".MetaModel::GetName($sClassName)." - $sKey\n");
-
- $aDetails = array();
- $oPage->add("