Releasing 2.1.0-beta

SVN:2.1.0-beta[3417]

addons/userrights/userrightsprofile.class.inc.php

@@ -210,6 +210,25 @@ class URP_Profiles extends UserRightsBaseClassGUI
 			$oLnk->DBDelete();
 		}
 	}
+
+	/**
+	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
+	 * for the given attribute in the current state of the object
+	 * @param $sAttCode string $sAttCode The code of the attribute
+	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
+	 * @return integer Flags: the binary combination of the flags applicable to this attribute
+	 */	 	  	 	
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			$aReasons[] = 'Sorry, profiles are read-only in the demonstration mode!';
+			$iFlags |= OPT_ATT_READONLY;
+		}
+		return $iFlags;
+	}
 }
 
 

addons/userrights/userrightsprofile.db.class.inc.php

@@ -430,7 +430,7 @@ class URP_ActionGrant extends UserRightsBaseClass
 		//MetaModel::Init_InheritAttributes();
 
 		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
 		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
@@ -467,7 +467,7 @@ class URP_StimulusGrant extends UserRightsBaseClass
 		//MetaModel::Init_InheritAttributes();
 
 		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
 		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
@@ -503,7 +503,7 @@ class URP_AttributeGrant extends UserRightsBaseClass
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists

application/ajaxwebpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -26,16 +26,14 @@
 
 require_once(APPROOT."/application/webpage.class.inc.php");
  
-class ajax_page extends WebPage
+class ajax_page extends WebPage implements iTabbedPage
 {
     /**
      * Jquery style ready script
      * @var Hash     
      */	  
 	protected $m_sReadyScript;
-	protected $m_sCurrentTab;
-	protected $m_sCurrentTabContainer;
-	protected $m_aTabs;
+	protected $m_oTabs;
 	private $m_sMenu; // If set, then the menu will be updated
 	
     /**
@@ -48,9 +46,7 @@ class ajax_page extends WebPage
         $this->m_sReadyScript = "";
 		//$this->add_header("Content-type: text/html; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
-		$this->m_sCurrentTabContainer = '';
-        $this->m_sCurrentTab = '';
-		$this->m_aTabs = array();
+		$this->m_oTabs = new TabManager();
 		$this->sContentType = 'text/html';
 		$this->sContentDisposition = 'inline';
 		$this->m_sMenu = "";
@@ -58,41 +54,69 @@ class ajax_page extends WebPage
 
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
 	{
-		$this->m_aTabs[$sTabContainer] = array('content' =>'', 'prefix' => $sPrefix);
-		$this->add("\$Tabs:$sTabContainer\$");
+		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
 	}
-	
+
 	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
 	{
-		if (!isset($this->m_aTabs[$sTabContainer]['content'][$sTabLabel]))
-		{
-			// Set the content of the tab
-			$this->m_aTabs[$sTabContainer]['content'][$sTabLabel] = $sHtml;
-		}
-		else
-		{
-			// Append to the content of the tab
-			$this->m_aTabs[$sTabContainer]['content'][$sTabLabel] .= $sHtml;
-		}
+		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
 	}
 
 	public function SetCurrentTabContainer($sTabContainer = '')
 	{
-		$sPreviousTabContainer = $this->m_sCurrentTabContainer;
-		$this->m_sCurrentTabContainer = $sTabContainer;
-		return $sPreviousTabContainer;
+		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
 	}
 
 	public function SetCurrentTab($sTabLabel = '')
 	{
-		$sPreviousTab = $this->m_sCurrentTab;
-		$this->m_sCurrentTab = $sTabLabel;
-		return $sPreviousTab;
+		return $this->m_oTabs->SetCurrentTab($sTabLabel);
+	}
+	
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 * 
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+	 * Static content cannot be added inside such tabs.
+	 * 
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	{
+		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
 	}
 	
 	public function GetCurrentTab()
 	{
-		return $this->m_sCurrentTab;
+		return $this->m_oTabs->GetCurrentTab();
+	}
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	{
+		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
+	}
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 * @return mixed The name of the tab as a string or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null)
+	{
+		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
+	}
+
+	/**
+	 * Make the given tab the active one, as if it were clicked
+	 * DOES NOT WORK: apparently in the *old* version of jquery
+	 * that we are using this is not supported... TO DO upgrade
+	 * the whole jquery bundle...
+	 */
+	public function SelectTab($sTabContainer, $sTabLabel)
+	{
+		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
 	}
 	
 	public function AddToMenu($sHtml)
@@ -118,7 +142,7 @@ class ajax_page extends WebPage
         {
             header($s_header);
         }
-		if (count($this->m_aTabs) > 0)
+		if ($this->m_oTabs->TabsContainerCount() > 0)
 		{
 			$this->add_ready_script(
 <<<EOF
@@ -173,36 +197,7 @@ EOF
 );
 		}
 		// Render the tabs in the page (if any)
-		foreach($this->m_aTabs as $sTabContainerName => $aTabContainer)
-		{
-			$sTabs = '';
-			$m_aTabs = $aTabContainer['content'];
-			$sPrefix = $aTabContainer['prefix'];
-			$container_index = 0;
-			if (count($m_aTabs) > 0)
-			{
-			  $sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$sPrefix}{$sTabContainerName}\" class=\"light\">\n";
-			  $sTabs .= "<ul>\n";
-			  // Display the unordered list that will be rendered as the tabs
-	          $i = 0;
-			  foreach($m_aTabs as $sTabName => $sTabContent)
-			  {
-			      $sTabs .= "<li><a href=\"#tab_{$sPrefix}{$sTabContainerName}$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
-			      $i++;
-	          }
-			  $sTabs .= "</ul>\n";
-			  // Now add the content of the tabs themselves
-			  $i = 0;
-			  foreach($m_aTabs as $sTabName => $sTabContent)
-			  {
-			      $sTabs .= "<div id=\"tab_{$sPrefix}{$sTabContainerName}$i\">".$sTabContent."</div>\n";
-			      $i++;
-	          }
-			  $sTabs .= "</div>\n<!-- end of tabs-->\n";
-	        }
-			$this->s_content = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $this->s_content);
-			$container_index++;
-		}
+		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content);
 		
 		// Additional UI widgets to be activated inside the ajax fragment ??
     	if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content)) )
@@ -230,9 +225,8 @@ EOF
 EOF
 			);
 		}	
-        $s_captured_output = ob_get_contents();
-        ob_end_clean();
-        if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
+        $s_captured_output = $this->ob_get_clean_safe();
+		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
         {
         	// inline content != attachment && html => filter all scripts for malicious XSS scripts
         	echo self::FilterXSS($this->s_content);
@@ -302,9 +296,9 @@ EOF
 
     public function add($sHtml)
     {
-        if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_sCurrentTab))
+        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
         {
-            $this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
+            $this->m_oTabs->AddToTab($this->m_oTabs->GetCurrentTabContainer(), $this->m_oTabs->GetCurrentTab(), $sHtml);
         }
         else
         {
@@ -318,15 +312,18 @@ EOF
 	 */    
     public function start_capture()
     {
-        if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_sCurrentTab))
-        {
-        	$iOffset = isset($this->m_aTabs[$this->m_sCurrentTabContainer]['content'][$this->m_sCurrentTab]) ? strlen($this->m_aTabs[$this->m_sCurrentTabContainer]['content'][$this->m_sCurrentTab]): 0;
-            return array('tc' => $this->m_sCurrentTabContainer, 'tab' => $this->m_sCurrentTab, 'offset' => $iOffset);
-        }
-        else
-        {
-            return parent::start_capture();
-        }
+    	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
+		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
+		
+		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
+		{
+			$iOffset = $this->m_oTabs->GetCurrentTabLength();
+			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
+		}
+		else
+		{
+			return parent::start_capture();
+		}
     }
 
     /**
@@ -337,23 +334,22 @@ EOF
      */    
     public function end_capture($offset)
     {
-    	if (is_array($offset))
-    	{
-    		if (isset($this->m_aTabs[$offset['tc']]['content'][$offset['tab']]))
-    		{
-		    	$sCaptured = substr($this->m_aTabs[$offset['tc']]['content'][$offset['tab']], $offset['offset']);
-		    	$this->m_aTabs[$offset['tc']]['content'][$offset['tab']] = substr($this->m_aTabs[$offset['tc']]['content'][$offset['tab']], 0, $offset['offset']);
-    		}
-    		else
-    		{
-    			$sCaptured = '';
-    		}
-    	}
-    	else
-    	{
-    		$sCaptured = parent::end_capture($offset);
-    	}
-    	return $sCaptured;
+		if (is_array($offset))
+		{
+			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
+			{
+				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
+			}
+			else
+			{
+				$sCaptured = '';
+			}
+		}
+		else
+		{
+			$sCaptured = parent::end_capture($offset);
+		}
+		return $sCaptured;
     }
 
 	/**
@@ -396,4 +392,3 @@ EOF
 	}
 }
 
-?>

application/applicationextension.inc.php

@@ -450,7 +450,8 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 	/** @ignore */
 	public function GetMenuItem()
 	{
-		return array ('label' => $this->GetLabel(), 'onclick' => $this->sJSCode, 'url' => '#');
+		// Note: the semicolumn is a must here!
+		return array ('label' => $this->GetLabel(), 'onclick' => $this->sJSCode.'; return false;', 'url' => '#');
 	}
 	
 	/** @ignore */
@@ -580,6 +581,14 @@ class RestResult
 	 * Result: the input structure is not a valid JSON string
 	 */
 	const INVALID_JSON = 4;
+	/**
+	 * Result: the parameter 'auth_user' is missing, authentication aborted
+	 */
+	const MISSING_AUTH_USER = 5;
+	/**
+	 * Result: the parameter 'auth_pwd' is missing, authentication aborted
+	 */
+	const MISSING_AUTH_PWD = 6;
 	/**
 	 * Result: no operation is available for the specified version
 	 */
@@ -706,7 +715,7 @@ class RestUtils
 	 * @param string $sClass Name of the class
 	 * @param StdClass $oData Structured input data.
 	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @return void
+	 * @return An array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
 	 * @throws Exception
 	 * @api
 	 */
@@ -718,7 +727,17 @@ class RestUtils
 		{
 			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 			{
-				$aShowFields[] = $sAttCode;
+				$aShowFields[$sClass][] = $sAttCode;
+			}
+		}
+		elseif ($sFields == '*+')
+		{
+			foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass)
+			{
+				foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef)
+				{
+					$aShowFields[$sRefClass][] = $sAttCode;
+				}
 			}
 		}
 		else
@@ -730,7 +749,7 @@ class RestUtils
 				{
 					throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
 				}
-				$aShowFields[] = $sAttCode;
+				$aShowFields[$sClass][] = $sAttCode;
 			}
 		}
 		return $aShowFields;
@@ -749,11 +768,15 @@ class RestUtils
 		$aCriteriaReport = array();
 		if (isset($oCriteria->finalclass))
 		{
-			$sClass = $oCriteria->finalclass;
-			if (!MetaModel::IsValidClass($sClass))
+			if (!MetaModel::IsValidClass($oCriteria->finalclass))
 			{
-				throw new Exception("finalclass: Unknown class '$sClass'");
+				throw new Exception("finalclass: Unknown class '".$oCriteria->finalclass."'");
 			}
+			if (!MetaModel::IsParentClass($sClass, $oCriteria->finalclass))
+			{
+				throw new Exception("finalclass: '".$oCriteria->finalclass."' is not a child class of '$sClass'");
+			}
+			$sClass = $oCriteria->finalclass;
 		}
 		$oSearch = new DBObjectSearch($sClass);
 		foreach ($oCriteria as $sAttCode => $value)
@@ -944,7 +967,14 @@ class RestUtils
 		foreach ($aFields as $sAttCode => $value)
 		{
 			$realValue = self::MakeValue($sClass, $sAttCode, $value);
-			$oObject->Set($sAttCode, $realValue);
+			try
+			{
+				$oObject->Set($sAttCode, $realValue);
+			}
+			catch (Exception $e)
+			{
+				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
+			}
 		}
 		return $oObject;
 	}
@@ -964,7 +994,14 @@ class RestUtils
 		foreach ($aFields as $sAttCode => $value)
 		{
 			$realValue = self::MakeValue($sClass, $sAttCode, $value);
-			$oObject->Set($sAttCode, $realValue);
+			try
+			{
+				$oObject->Set($sAttCode, $realValue);
+			}
+			catch (Exception $e)
+			{
+				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
+			}
 		}
 		return $oObject;
 	}

application/clipage.class.inc.php

@@ -39,6 +39,10 @@ class CLIPage implements Page
         {
             MetaModel::RecordQueryTrace();
         }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
     }
 
 	public function add($sText)

application/cmdbabstract.class.inc.php

@@ -43,39 +43,6 @@ require_once(APPROOT.'/application/ui.extkeywidget.class.inc.php');
 require_once(APPROOT.'/application/ui.htmleditorwidget.class.inc.php');
 require_once(APPROOT.'/application/datatable.class.inc.php');
 
-/**
- * All objects to be displayed in the application (either as a list or as details)
- * must implement this interface.
- */
-interface iDisplay
-{
-
-	/**
-	 * Maps the given context parameter name to the appropriate filter/search code for this class
-	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
-	 * @return string Filter code, i.e. 'customer_id'
-	 */
-	public static function MapContextParam($sContextParam);
-	/**
-	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
-	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
-	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
-	 * To Be overridden by derived classes
-	 * @param void
-	 * @return String The desired higlight class for the object/row
-	 */
-	public function GetHilightClass();
-	/**
-	 * Returns the relative path to the page that handles the display of the object
-	 * @return string
-	 */
-	public static function GetUIPage();
-	/**
-	 * Displays the details of the object
-	 */
-	public function DisplayDetails(WebPage $oPage, $bEditMode = false);
-}
-
 abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 {
 	protected $m_iFormId; // The ID of the form used to edit the object (when in edition mode !)
@@ -158,27 +125,29 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	
 		// Master data sources
 		$sSynchroIcon = '';
-		$oReplicaSet = $this->GetMasterReplica();
 		$bSynchronized = false;
 		$oCreatorTask = null;
 		$bCanBeDeletedByTask = false;
 		$bCanBeDeletedByUser = true;
 		$aMasterSources = array();
-		if ($oReplicaSet->Count() > 0)
+		$aSyncData = $this->GetSynchroData();
+		if (count($aSyncData) > 0)
 		{
 			$bSynchronized = true;
-			while($aData = $oReplicaSet->FetchAssoc())
+			foreach ($aSyncData as $iSourceId => $aSourceData)
 			{
-				// Assumption: $aData['datasource'] will not be null because the data source id is always set...
-				$sApplicationURL = $aData['datasource']->GetApplicationUrl($this, $aData['replica']);
-				$sLink = $aData['datasource']->GetName();
+				$oDataSource = $aSourceData['source'];
+				$oReplica = reset($aSourceData['replica']); // Take the first one!
+
+				$sApplicationURL = $oDataSource->GetApplicationUrl($this, $oReplica);
+				$sLink = $oDataSource->GetName();
 				if (!empty($sApplicationURL))
 				{
-					$sLink = "<a href=\"$sApplicationURL\" target=\"_blank\">".$aData['datasource']->GetName()."</a>";
+					$sLink = "<a href=\"$sApplicationURL\" target=\"_blank\">".$oDataSource->GetName()."</a>";
 				}
-				if ($aData['replica']->Get('status_dest_creator') == 1)
+				if ($oReplica->Get('status_dest_creator') == 1)
 				{
-					$oCreatorTask = $aData['datasource'];
+					$oCreatorTask = $oDataSource;
 					$bCreatedByTask = true;
 				}
 				else
@@ -187,12 +156,12 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				}
 				if ($bCreatedByTask)
 				{
-					$sDeletePolicy = $aData['datasource']->Get('delete_policy');
+					$sDeletePolicy = $oDataSource->Get('delete_policy');
 					if (($sDeletePolicy == 'delete') || ($sDeletePolicy == 'update_then_delete'))
 					{
 						$bCanBeDeletedByTask = true;
 					}
-					$sUserDeletePolicy = $aData['datasource']->Get('user_delete_policy');
+					$sUserDeletePolicy = $oDataSource->Get('user_delete_policy');
 					if ($sUserDeletePolicy == 'nobody')
 					{
 						$bCanBeDeletedByUser = false;
@@ -205,9 +174,9 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 					{
 					}
 				}
-				$aMasterSources[$aData['datasource']->GetKey()]['datasource'] = $aData['datasource'];
-				$aMasterSources[$aData['datasource']->GetKey()]['url'] = $sLink;
-				$aMasterSources[$aData['datasource']->GetKey()]['last_synchro'] = $aData['replica']->Get('status_last_seen');
+				$aMasterSources[$iSourceId]['datasource'] = $oDataSource;
+				$aMasterSources[$iSourceId]['url'] = $sLink;
+				$aMasterSources[$iSourceId]['last_synchro'] = $oReplica->Get('status_last_seen');
 			}
 
 			if (is_object($oCreatorTask))
@@ -255,14 +224,15 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		
 	}
 
-	function DisplayBareHistory(WebPage $oPage, $bEditMode = false)
+	function DisplayBareHistory(WebPage $oPage, $bEditMode = false, $iLimitCount = 0, $iLimitStart = 0)
 	{
 		// history block (with as a tab)
 		$oHistoryFilter = new DBObjectSearch('CMDBChangeOp');
 		$oHistoryFilter->AddCondition('objkey', $this->GetKey(), '=');
 		$oHistoryFilter->AddCondition('objclass', get_class($this), '=');
 		$oBlock = new HistoryBlock($oHistoryFilter, 'table', false);
-		$oBlock->Display($oPage, -1);
+		$oBlock->SetLimit($iLimitCount, $iLimitStart);
+		$oBlock->Display($oPage, 'history');
 	}
 
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
@@ -286,6 +256,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 			{
 				$sComment = (isset($aExtraParams['fieldsComments'][$sAttCode])) ? $aExtraParams['fieldsComments'][$sAttCode] : '';
 				$this->DisplayCaseLog($oPage, $sAttCode, $sComment, $sPrefix, $bEditMode);
+				$aFieldsMap[$sAttCode] = $this->m_iFormId.'_'.$sAttCode;
 			}
 		}
 
@@ -336,6 +307,39 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 			{
 				$iFlags = $this->GetAttributeFlags($sAttCode);
 			}
+			// Adjust the flags according to user rights
+			if ($oAttDef->IsIndirect())
+			{
+				$sLinkedClass = $oAttDef->GetLinkedClass();
+				$oLinkingAttDef = 	MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
+				$sTargetClass = $oLinkingAttDef->GetTargetClass();
+				// n:n links => must be allowed to modify the linking class AND  read the target class in order to edit the linkedset
+				if (!UserRights::IsActionAllowed($sLinkedClass, UR_ACTION_MODIFY) || !UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ))
+				{
+					$iFlags |= OPT_ATT_READONLY;
+				}
+				// n:n links => must be allowed to read the linking class AND  the target class in order to display the linkedset
+				if (!UserRights::IsActionAllowed($sLinkedClass, UR_ACTION_READ) || !UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ))
+				{
+					$iFlags |= OPT_ATT_HIDDEN;
+				}
+			}
+			else
+			{
+				// 1:n links => must be allowed to modify the linked class in order to edit the linkedset
+				if (!UserRights::IsActionAllowed($oAttDef->GetLinkedClass(), UR_ACTION_MODIFY))
+				{
+					$iFlags |= OPT_ATT_READONLY;
+				}
+				// 1:n links => must be allowed to read the linked class in order to display the linkedset
+				if (!UserRights::IsActionAllowed($oAttDef->GetLinkedClass(), UR_ACTION_READ))
+				{
+					$iFlags |= OPT_ATT_HIDDEN;
+				}
+			}
+			// Non-readable/hidden linkedset... don't display anything
+			if ($iFlags & OPT_ATT_HIDDEN) continue;
+			
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly))
 			{
@@ -543,6 +547,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 						if ( (!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0))
 						{
+							$sInputId = $this->m_iFormId.'_'.$sAttCode;
 							if ($oAttDef->IsWritable())
 							{
 								if ($sStateAttCode == $sAttCode)
@@ -553,7 +558,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 								}
 								else
 								{				
-									$sInputId = $this->m_iFormId.'_'.$sAttCode;
 									if ($iFlags & OPT_ATT_HIDDEN)
 									{
 										// Attribute is hidden, add a hidden input
@@ -602,7 +606,8 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 							}
 							else
 							{
-								$val = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().'</span>', 'value' => $this->GetAsHTML($sAttCode), 'comments' => $sComments, 'infos' => $sInfos);			
+								$val = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().'</span>', 'value' => "<span id=\"field_{$sInputId}\">".$this->GetAsHTML($sAttCode)."</span>", 'comments' => $sComments, 'infos' => $sInfos);
+								$aFieldsMap[$sAttCode] = $sInputId;			
 							}
 						}
 						else
@@ -666,8 +671,9 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 			$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
 			$this->DisplayBareProperties($oPage, $bEditMode);
 			$this->DisplayBareRelations($oPage, $bEditMode);
-			$oPage->SetCurrentTab(Dict::S('UI:HistoryTab'));
-			$this->DisplayBareHistory($oPage, $bEditMode);
+			//$oPage->SetCurrentTab(Dict::S('UI:HistoryTab'));
+			//$this->DisplayBareHistory($oPage, $bEditMode);
+			$oPage->AddAjaxTab(Dict::S('UI:HistoryTab'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=history&class='.get_class($this).'&id='.$this->GetKey());
 		}
 	}
 	
@@ -937,12 +943,12 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		return $oDataTable->Display($oPage, $oSettings, $bDisplayMenu, $sSelectMode, $bViewLink, $aExtraParams);
 	}
 	
-	static function DisplaySetAsCSV(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array())
+	static function DisplaySetAsCSV(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array(), $sCharset = 'UTF-8')
 	{
-		$oPage->add(self::GetSetAsCSV($oSet, $aParams));
+		$oPage->add(self::GetSetAsCSV($oSet, $aParams, $sCharset));
 	}
 	
-	static function GetSetAsCSV(DBObjectSet $oSet, $aParams = array())
+	static function GetSetAsCSV(DBObjectSet $oSet, $aParams = array(), $sCharset = 'UTF-8')
 	{
 		$sSeparator = isset($aParams['separator']) ? $aParams['separator'] : ','; // default separator is comma
 		$sTextQualifier = isset($aParams['text_qualifier']) ? $aParams['text_qualifier'] : '"'; // default text qualifier is double quote
@@ -1060,7 +1066,8 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 					else
 					{
 						$value = $oObj->Get($sAttCodeEx);
-						$aRow[] = $oAttDef->GetAsCSV($value, $sSeparator, $sTextQualifier, $oObj, $bLocalize);
+						$sCSVValue = $oAttDef->GetAsCSV($value, $sSeparator, $sTextQualifier, $oObj, $bLocalize);
+						$aRow[] = iconv('UTF-8', $sCharset.'//IGNORE//TRANSLIT', $sCSVValue);
 					}
 				}
 			}
@@ -1225,6 +1232,8 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 						else
 						{
 							$rawValue = $oObj->Get($sAttCodeEx);
+							// Due to custom formatting rules, empty friendlynames may be rendered as non-empty strings
+							// let's fix this and make sure we render an empty string if the key == 0
 							if ($oAttDef instanceof AttributeFriendlyName)
 							{
 								$sKeyAttCode = $oAttDef->GetKeyAttCode();
@@ -1395,6 +1404,8 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		$sHtml .= "<p>\n";
 		$aFilterCriteria = $oSet->GetFilter()->GetCriteria();
 		$aMapCriteria = array();
+		// Todo: Investigate... The search criteria is an expression, i.e. a tree!
+		//     I wonder if that code could work... cleanup required/recommended
 		foreach($aFilterCriteria as $aCriteria)
 		{
 			$aMapCriteria[$aCriteria['filtercode']][] = array('value' => $aCriteria['value'], 'opcode' => $aCriteria['opcode']);
@@ -1422,6 +1433,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 						$sFilterValue = $aMapCriteria[$sFilterCode][0]['value'];
 						$sFilterOpCode = $aMapCriteria[$sFilterCode][0]['opcode'];
 					}
+					// Todo: Investigate...
 					if ($sFilterCode != 'company')
 					{
 						$oUnlimitedFilter->AddCondition($sFilterCode, $sFilterValue, $sFilterOpCode);
@@ -1430,20 +1442,24 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 			}
 
 			$oAttDef = MetaModel::GetAttributeDef($sClassName, $sFilterCode);
-			if ($oAttDef->IsExternalKey())
+			if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
 			{
-				$sTargetClass = $oAttDef->GetTargetClass();
+				$oKeyAttDef = $oAttDef->GetFinalAttDef();
+				$sKeyAttClass = $oKeyAttDef->GetHostClass();
+				$sKeyAttCode = $oKeyAttDef->GetCode();
+
+				$sTargetClass = $oKeyAttDef->GetTargetClass();
 				$oSearch = new DBObjectSearch($sTargetClass);
 				$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 				$oAllowedValues = new DBObjectSet($oSearch);
 
-				$iFieldSize = $oAttDef->GetMaxSize();
-				$iMaxComboLength = $oAttDef->GetMaximumComboLength();
-				$sHtml .= "<label>".MetaModel::GetFilterLabel($sClassName, $sFilterCode).":</label>&nbsp;";
+				$iFieldSize = $oKeyAttDef->GetMaxSize();
+				$iMaxComboLength = $oKeyAttDef->GetMaximumComboLength();
+				$sHtml .= "<label>".MetaModel::GetFilterLabel($sKeyAttClass, $sKeyAttCode).":</label>&nbsp;";
 				$aExtKeyParams = $aExtraParams;
-				$aExtKeyParams['iFieldSize'] = $oAttDef->GetMaxSize();
-				$aExtKeyParams['iMinChars'] = $oAttDef->GetMinAutoCompleteChars();
-				$sHtml .= UIExtKeyWidget::DisplayFromAttCode($oPage, $sFilterCode, $sClassName, $oAttDef->GetLabel(), $oAllowedValues, $sFilterValue, $sSearchFormId.'search_'.$sFilterCode, false, $sFilterCode, '', $aExtKeyParams, true);
+				$aExtKeyParams['iFieldSize'] = $oKeyAttDef->GetMaxSize();
+				$aExtKeyParams['iMinChars'] = $oKeyAttDef->GetMinAutoCompleteChars();
+				$sHtml .= UIExtKeyWidget::DisplayFromAttCode($oPage, $sKeyAttCode, $sKeyAttClass, $oAttDef->GetLabel(), $oAllowedValues, $sFilterValue, $sSearchFormId.'search_'.$sFilterCode, false, $sFilterCode, '', $aExtKeyParams, true);
 			}
 			else
 			{
@@ -1599,7 +1615,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				$bMandatory = 'true';
 			}
 			$sValidationField = "<span class=\"form_validation\" id=\"v_{$iId}\"></span>";
-			$sHelpText = $oAttDef->GetHelpOnEdition();
+			$sHelpText = htmlentities($oAttDef->GetHelpOnEdition(), ENT_QUOTES, 'UTF-8');
 			$aEventsList = array();
 			switch($oAttDef->GetEditClass())
 			{
@@ -1838,14 +1854,19 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				{
 					$sNullValue = "'$sNullValue'"; // Add quotes to turn this into a JS string if it's not a number
 				}
-				$oPage->add_ready_script("$('#$iId').bind('".implode(' ', $aEventsList)."', function(evt, sFormId) { return ValidateField('$iId', '$sPattern', $bMandatory, sFormId, $sNullValue) } );\n"); // Bind to a custom event: validate
+				$sOriginalValue = ($iFlags & OPT_ATT_MUSTCHANGE) ? "'".addslashes($value)."'" : 'undefined';
+				$oPage->add_ready_script("$('#$iId').bind('".implode(' ', $aEventsList)."', function(evt, sFormId) { return ValidateField('$iId', '$sPattern', $bMandatory, sFormId, $sNullValue, $sOriginalValue) } );\n"); // Bind to a custom event: validate
 			}
 			$aDependencies = MetaModel::GetDependentAttributes($sClass, $sAttCode); // List of attributes that depend on the current one
 			if (count($aDependencies) > 0)
 			{
-				$oPage->add_ready_script("$('#$iId').bind('change', function(evt, sFormId) { return oWizardHelper{$sFormPrefix}.UpdateDependentFields(['".implode("','", $aDependencies)."']) } );\n"); // Bind to a custom event: validate
+				// Unbind first to avoid duplicate event handlers in case of reload of the whole (or part of the) form
+				$oPage->add_ready_script("$('#$iId').unbind('change.dependencies').bind('change.dependencies', function(evt, sFormId) { return oWizardHelper{$sFormPrefix}.UpdateDependentFields(['".implode("','", $aDependencies)."']) } );\n"); // Bind to a custom event: validate
 			}
 		}
+		$oPage->add_dict_entry('UI:ValueMustBeSet');
+		$oPage->add_dict_entry('UI:ValueMustBeChanged');
+		$oPage->add_dict_entry('UI:ValueInvalidFormat');
 		return "<div>{$sHTMLValue}</div>";
 	}
 
@@ -2118,6 +2139,138 @@ EOF
 		}
 		return $oObj->DisplayModifyForm( $oPage, $aExtraParams);
 	}
+	
+	public function DisplayStimulusForm(WebPage $oPage, $sStimulus)
+	{
+		$sClass = get_class($this);
+		$aTransitions = $this->EnumTransitions();
+		$aStimuli = MetaModel::EnumStimuli($sClass);
+		if (!isset($aTransitions[$sStimulus]))
+		{
+			// Invalid stimulus
+			throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus, $this->GetName(), $this->GetStateLabel()));
+		}
+		$sActionLabel = $aStimuli[$sStimulus]->GetLabel();
+		$sActionDetails = $aStimuli[$sStimulus]->GetDescription();
+		$aTransition = $aTransitions[$sStimulus];
+		$sTargetState = $aTransition['target_state'];
+		$aTargetStates = MetaModel::EnumStates($sClass);
+		$oPage->add("<div class=\"page_header\">\n");
+		$oPage->add("<h1>$sActionLabel - <span class=\"hilite\">{$this->GetName()}</span></h1>\n");
+		$oPage->set_title($sActionLabel);
+		$oPage->add("</div>\n");
+		$aTargetState = $aTargetStates[$sTargetState];
+		$aExpectedAttributes = $aTargetState['attribute_list'];
+		$oPage->add("<h1>$sActionDetails</h1>\n");
+		$sButtonsPosition = MetaModel::GetConfig()->Get('buttons_position');
+		if ($sButtonsPosition == 'bottom')
+		{
+			// bottom: Displays the ticket details BEFORE the actions
+			$oPage->add('<div class="ui-widget-content">');
+			$this->DisplayBareProperties($oPage);
+			$oPage->add('</div>');
+		}
+		$oPage->add("<div class=\"wizContainer\">\n");
+		$oPage->add("<form id=\"apply_stimulus\" method=\"post\" onSubmit=\"return OnSubmit('apply_stimulus');\">\n");
+		$aDetails = array();
+		$iFieldIndex = 0;
+		$aFieldsMap = array();
+
+		$aDetailsList =$this->FlattenZList(MetaModel::GetZListItems($sClass, 'details'));
+		// Order the fields based on their dependencies, set the fields for which there is only one possible value
+		// and perform this in the order of dependencies to avoid dead-ends
+		$aDeps = array();
+		foreach($aDetailsList as $sAttCode)
+		{
+			$aDeps[$sAttCode] = MetaModel::GetPrequisiteAttributes($sClass, $sAttCode);
+		}
+		$aList =$this->OrderDependentFields($aDeps);
+
+		foreach($aList as $sAttCode)
+		{
+			// Consider only the "expected" fields for the target state
+			if (array_key_exists($sAttCode, $aExpectedAttributes))
+			{
+				$iExpectCode = $aExpectedAttributes[$sAttCode];
+				// Prompt for an attribute if
+				// - the attribute must be changed or must be displayed to the user for confirmation
+				// - or the field is mandatory and currently empty
+				if ( ($iExpectCode & (OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) ||
+					 (($iExpectCode & OPT_ATT_MANDATORY) && ($this->Get($sAttCode) == '')) ) 
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+					$aArgs = array('this' => $this);
+					// If the field is mandatory, set it to the only possible value
+					if ((!$oAttDef->IsNullAllowed()) || ($iExpectCode & OPT_ATT_MANDATORY))
+					{
+						if ($oAttDef->IsExternalKey())
+						{
+							$oAllowedValues = MetaModel::GetAllowedValuesAsObjectSet($sClass, $sAttCode, $aArgs);
+							if ($oAllowedValues->Count() == 1)
+							{
+								$oRemoteObj = $oAllowedValues->Fetch();
+								$this->Set($sAttCode, $oRemoteObj->GetKey());
+							}
+						}
+						else
+						{
+							$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, $aArgs);
+							if (count($aAllowedValues) == 1)
+							{
+								$aValues = array_keys($aAllowedValues);
+								$this->Set($sAttCode, $aValues[0]);
+							}
+						}
+					}
+					$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,$this->Get($sAttCode),$this->GetEditValue($sAttCode), 'att_'.$iFieldIndex, '', $iExpectCode, $aArgs);
+					$aDetails[] = array('label' => '<span>'.$oAttDef->GetLabel().'</span>', 'value' => "<span id=\"field_att_$iFieldIndex\">$sHTMLValue</span>");
+					$aFieldsMap[$sAttCode] = 'att_'.$iFieldIndex;
+					$iFieldIndex++;
+				}
+			}
+		}
+
+		$oPage->add('<table><tr><td>');
+		$oPage->details($aDetails);
+		$oPage->add('</td></tr></table>');
+		$oPage->add("<input type=\"hidden\" name=\"id\" value=\"".$this->GetKey()."\" id=\"id\">\n");
+		$aFieldsMap['id'] = 'id';
+		$oPage->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">\n");
+		$oPage->add("<input type=\"hidden\" name=\"operation\" value=\"apply_stimulus\">\n");
+		$oPage->add("<input type=\"hidden\" name=\"stimulus\" value=\"$sStimulus\">\n");
+		$oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\">\n");
+		$oAppContext = new ApplicationContext();
+		$oPage->add($oAppContext->GetForForm());
+		$oPage->add("<button type=\"button\" class=\"action\" onClick=\"BackToDetails('$sClass', ".$this->GetKey().")\"><span>".Dict::S('UI:Button:Cancel')."</span></button>&nbsp;&nbsp;&nbsp;&nbsp;\n");
+		$oPage->add("<button type=\"submit\" class=\"action\"><span>$sActionLabel</span></button>\n");
+		$oPage->add("</form>\n");
+		$oPage->add("</div>\n");
+		if ($sButtonsPosition != 'top')
+		{
+			// bottom or both: Displays the ticket details AFTER the actions
+			$oPage->add('<div class="ui-widget-content">');
+			$this->DisplayBareProperties($oPage);
+			$oPage->add('</div>');
+		}
+
+		$iFieldsCount = count($aFieldsMap);
+		$sJsonFieldsMap = json_encode($aFieldsMap);
+
+		$oPage->add_script(
+<<<EOF
+		// Initializes the object once at the beginning of the page...
+		var oWizardHelper = new WizardHelper('$sClass', '', '$sTargetState');
+		oWizardHelper.SetFieldsMap($sJsonFieldsMap);
+		oWizardHelper.SetFieldsCount($iFieldsCount);
+EOF
+		);
+		$oPage->add_ready_script(
+<<<EOF
+		// Starts the validation when the page is ready
+		CheckFields('apply_stimulus', false);
+EOF
+		);		
+	}
 
 	public static function ProcessZlist($aList, $aDetails, $sCurrentTab, $sCurrentCol, $sCurrentSet)
 	{
@@ -2322,7 +2475,7 @@ EOF
 	{
 		// Possible return values are:
 		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
-		$current = HILIGHT_CLASS_NONE; // Not hilighted by default
+		$current = parent::GetHilightClass(); // Default computation
 
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
 		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
@@ -2356,6 +2509,12 @@ EOF
 						// Dependency is resolved, remove it
 						unset($aFields[$sFieldCode][$key]);
 					}
+					else if (!array_key_exists($sDependency, $aFields))
+					{
+						// The current fields depends on a field not present in the form
+						// let's ignore it (since it cannot change)
+						unset($aFields[$sFieldCode][$key]);						
+					}
 				}
 				if (count($aFields[$sFieldCode]) == 0)
 				{
@@ -2370,7 +2529,7 @@ EOF
 		
 		if (count($aFields) > 0)
 		{
-			$sMessage =  "Error: Circular dependencies between the fields (or field missing in ZList) ! <pre>".print_r($aFields, true)."</pre>";
+			$sMessage =  "Error: Circular dependencies between the fields! <pre>".print_r($aFields, true)."</pre>";
 			throw(new Exception($sMessage));
 		}
 		return $aResult;
@@ -2709,7 +2868,7 @@ EOF
 			$aFinalValues[$sAttCode] = $aValues[$sAttCode];
 		}
 		$this->UpdateObjectFromArray($aFinalValues);
-
+		
 		// Invoke extensions after the update of the object from the form
 		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
 		{
@@ -2930,7 +3089,7 @@ EOF
 
 				// Attribute is read-only
 				$sHTMLValue = $this->GetAsHTML($sAttCode);
-				$sHTMLValue .= '<input type="hidden" id="'.$sInputId.'" name="attr_'.$sPrefix.$sAttCode.'" value="'.htmlentities($this->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/>';
+				$sHTMLValue .= '<input type="hidden" id="'.$sInputId.'" name="attr_'.$sPrefix.$sAttCode.'" value="'.htmlentities($this->GetEditValue($sAttCode), ENT_QUOTES, 'UTF-8').'"/>';
 				$aFieldsMap[$sAttCode] = $sInputId;
 				$sComment .= $sSynchroIcon;
 			}
@@ -2962,7 +3121,7 @@ EOF
 		if (!isset($aTransitions[$sStimulus]))
 		{
 			// Invalid stimulus
-			throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus, $oObj->GetName(), $oObj->GetStateLabel()));
+			throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus,$this->GetName(),$this->GetStateLabel()));
 		}
 		$aTransition = $aTransitions[$sStimulus];
 		$sTargetState = $aTransition['target_state'];
@@ -3107,7 +3266,11 @@ EOF
 							$currValue = $aKeys[0]; // The only value is the first key
 							//echo "<p>current value for $sAttCode : $currValue</p>";
 							$oDummyObj->Set($sAttCode, $currValue);
-							$aComments[$sAttCode] = '<input type="checkbox" checked id="enable_'.$iFormId.'_'.$sAttCode.'"  onClick="ToogleField(this.checked, \''.$iFormId.'_'.$sAttCode.'\')"/>';
+							$aComments[$sAttCode] = '';
+							if ($sAttCode != MetaModel::GetStateAttributeCode($sClass))
+							{
+								$aComments[$sAttCode] .= '<input type="checkbox" checked id="enable_'.$iFormId.'_'.$sAttCode.'"  onClick="ToogleField(this.checked, \''.$iFormId.'_'.$sAttCode.'\')"/>';
+							}
 							$aComments[$sAttCode] .= '<div class="mono_value">1</div>';
 						}
 						else
@@ -3134,7 +3297,11 @@ EOF
 							$sReadyScript .= "$('#multi_values_$sAttCode').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );";
 	
 							$oDummyObj->Set($sAttCode, null);
-							$aComments[$sAttCode] = '<input type="checkbox" id="enable_'.$iFormId.'_'.$sAttCode.'" onClick="ToogleField(this.checked, \''.$iFormId.'_'.$sAttCode.'\')"/>';
+							$aComments[$sAttCode] = '';
+							if ($sAttCode != MetaModel::GetStateAttributeCode($sClass))
+							{
+								$aComments[$sAttCode] .= '<input type="checkbox" id="enable_'.$iFormId.'_'.$sAttCode.'" onClick="ToogleField(this.checked, \''.$iFormId.'_'.$sAttCode.'\')"/>';
+							}
 							$aComments[$sAttCode] .= '<div class="multi_values" id="multi_values_'.$sAttCode.'">'.$iCount.'</div>';
 						}
 						$sReadyScript .=  'ToogleField('.(($iCount == 1) ? 'true': 'false').', \''.$iFormId.'_'.$sAttCode.'\');'."\n";
@@ -3222,9 +3389,10 @@ EOF
 			utils::RemoveTransaction($sTransactionId);
 		}
 		$iPreviousTimeLimit = ini_get('max_execution_time');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		foreach($aSelectedObj as $iId)
 		{
-			set_time_limit(5);
+			set_time_limit($iLoopTimeLimit);
 			$oObj = MetaModel::GetObject($sClass, $iId);
 			$aErrors = $oObj->UpdateObjectFromPostedForm('');
 			$bResult = (count($aErrors) == 0);
@@ -3284,12 +3452,12 @@ EOF
 					{
 						foreach($value as $vKey => $vValue)
 						{
-							$oP->add("<input type=\"hidden\" name=\"{$sKey}[$vKey]\" value=\"$vValue\">\n");
+							$oP->add("<input type=\"hidden\" name=\"{$sKey}[$vKey]\" value=\"".htmlentities($vValue, ENT_QUOTES, 'UTF-8')."\">\n");
 						}
 					}
 					else
 					{
-						$oP->add("<input type=\"hidden\" name=\"$sKey\" value=\"$value\">\n");
+						$oP->add("<input type=\"hidden\" name=\"$sKey\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\">\n");
 					}
 				}
 			}

application/csvpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -39,7 +39,11 @@ class CSVPage extends WebPage
 
     public function output()
     {
-		$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
+			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
+
+			// Get the unexpected output but do nothing with it
+			$sTrash = $this->ob_get_clean_safe();
+
         foreach($this->a_headers as $s_header)
         {
             header($s_header);
@@ -51,6 +55,10 @@ class CSVPage extends WebPage
         {
             MetaModel::RecordQueryTrace();
         }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
     }
 
 	public function small_p($sText)
@@ -101,4 +109,3 @@ class CSVPage extends WebPage
 	}
 }
 
-?>

application/dashlet.class.inc.php

@@ -506,11 +506,19 @@ abstract class DashletGroupBy extends Dashlet
 		$sGroupBy = $this->aProperties['group_by'];
 		$sStyle = $this->aProperties['style'];
 
-		// First perform the query - if the OQL is not ok, it will generate an exception : no need to go further 
-		$oQuery = $this->oModelReflection->GetQuery($sQuery);
-		$sClass = $oQuery->GetClass();
-		$sClassAlias = $oQuery->GetClassAlias();
-
+		// First perform the query - if the OQL is not ok, it will generate an exception : no need to go further
+		try
+		{
+			$oQuery = $this->oModelReflection->GetQuery($sQuery);
+			$sClass = $oQuery->GetClass();
+			$sClassAlias = $oQuery->GetClassAlias();
+		}
+		catch(Exception $e)
+		{
+			// Invalid query, let the user edit the dashlet/dashboard anyhow
+			$sClass = '';
+			$sClassAlias = '';
+		}
 		// Check groupby... it can be wrong at this stage
 		if (preg_match('/^(.*):(.*)$/', $sGroupBy, $aMatches))
 		{

application/datatable.class.inc.php

@@ -551,6 +551,7 @@ EOF;
 		$oPage->add_ready_script(
 <<<EOF
 var oTable = $('#{$this->iListId} table.listResults');
+oTable.tableHover();
 oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
 EOF
 		);

application/displayblock.class.inc.php

@@ -783,7 +783,9 @@ class DisplayBlock
 				$sLinkToToggle = $sLinkToToggle.'&advanced=1';
 				$sChecked = '';
 			}
-
+			$sAjaxLink = $sDownloadLink.'&charset=UTF-8'; // Includes &fields_advanced=1 if in advanced mode
+				
+/*
 			$sCSVData = cmdbAbstractObject::GetSetAsCSV($this->m_oSet, array('fields_advanced' => $bAdvancedMode));
 			$sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset');
 			if ($sCharset == 'UTF-8')
@@ -812,6 +814,8 @@ class DisplayBlock
 				$sCharsetNotice = '';
 			}
 
+*/
+			$sCharsetNotice = false;
 			$sHtml .= "<div>";
 			$sHtml .= '<table style="width:100%" class="transparent">';
 			$sHtml .= '<tr>';
@@ -827,9 +831,10 @@ class DisplayBlock
 			}
 			$sHtml .= "</div>";
 
-			$sHtml .= "<textarea style=\"width:95%;height:98%\">\n";
-			$sHtml .= htmlentities($sCSVData, ENT_QUOTES, 'UTF-8');
+			$sHtml .= "<div id=\"csv_content_loading\"><div style=\"width: 250px; height: 20px; background: url(../setup/orange-progress.gif); border: 1px #999 solid; margin-left:auto; margin-right: auto; text-align: center;\">".Dict::S('UI:Loading')."</div></div><textarea id=\"csv_content\" style=\"display:none;\">\n";
+			//$sHtml .= htmlentities($sCSVData, ENT_QUOTES, 'UTF-8');
 			$sHtml .= "</textarea>\n";
+			$oPage->add_ready_script("$.post('$sAjaxLink', {}, function(data) { $('#csv_content').html(data); $('#csv_content_loading').hide(); $('#csv_content').show();} );");
 			break;
 
 			case 'modify':
@@ -1206,10 +1211,35 @@ EOF
  */
 class HistoryBlock extends DisplayBlock
 {
+	protected $iLimitCount;
+	protected $iLimitStart;
+	
+	public function __construct(DBObjectSearch $oFilter, $sStyle = 'list', $bAsynchronous = false, $aParams = array(), $oSet = null)
+	{
+		parent::__construct($oFilter, $sStyle, $bAsynchronous, $aParams, $oSet);
+		$this->iLimitStart = 0;
+		$this->iLimitCount = 0;
+	}
+	
+	public function SetLimit($iCount, $iStart = 0)
+	{
+		$this->iLimitStart = $iStart;
+		$this->iLimitCount = $iCount;
+	}
+	
 	public function GetRenderContent(WebPage $oPage, $aExtraParams = array(), $sId)
 	{
 		$sHtml = '';
+		$bTruncated = false;
 		$oSet = new CMDBObjectSet($this->m_oFilter, array('date'=>false));
+		if (($this->iLimitStart > 0) || ($this->iLimitCount > 0))
+		{
+			$oSet->SetLimit($this->iLimitCount, $this->iLimitStart);
+			if (($this->iLimitCount - $this->iLimitStart) < $oSet->Count())
+			{
+				$bTruncated = true;
+			}
+		}
 		$sHtml .= "<!-- filter: ".($this->m_oFilter->ToOQL())."-->\n";
 		switch($this->m_sStyle)
 		{
@@ -1235,7 +1265,21 @@ class HistoryBlock extends DisplayBlock
 
 			case 'table':
 			default:
-			$sHtml .= $this->GetHistoryTable($oPage, $oSet);		
+			if ($bTruncated)
+			{
+				$sFilter = $this->m_oFilter->serialize();
+				$sHtml .= '<div id="history_container"><p>';
+				$sHtml .= Dict::Format('UI:TruncatedResults', $this->iLimitCount, $oSet->Count());
+				$sHtml .= ' ';
+				$sHtml .= '<a href="#" onclick="DisplayHistory(\'#history_container\', \''.$sFilter.'\', 0, 0); return false;">'.Dict::S('UI:DisplayAll').'</a>';
+				$sHtml .= $this->GetHistoryTable($oPage, $oSet);
+				$sHtml .= '</p></div>';
+				$oPage->add_ready_script("$('#{$sId} table.listResults tr:last td').addClass('truncated');");
+			}
+			else
+			{
+				$sHtml .= $this->GetHistoryTable($oPage, $oSet);
+			}	
 
 		}
 		return $sHtml;
@@ -1307,6 +1351,7 @@ class MenuBlock extends DisplayBlock
 			$sContext = '&'.$sContext;
 		}
 		$sClass = $this->m_oFilter->GetClass();
+		$oReflectionClass = new ReflectionClass($sClass);
 		$oSet = new CMDBObjectSet($this->m_oFilter);
 		$sFilter = $this->m_oFilter->serialize();
 		$sFilterDesc = $this->m_oFilter->ToOql(true);
@@ -1326,7 +1371,7 @@ class MenuBlock extends DisplayBlock
 				$sDefault.= "&default[$sKey]=$sValue";
 			}
 		}
-		$bIsCreationAllowed =  (UserRights::IsActionAllowed($sClass, UR_ACTION_CREATE) == UR_ALLOWED_YES);
+		$bIsCreationAllowed =  (UserRights::IsActionAllowed($sClass, UR_ACTION_CREATE) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
 		switch($oSet->Count())
 		{
 			case 0:
@@ -1337,10 +1382,8 @@ class MenuBlock extends DisplayBlock
 			case 1:
 			$oObj = $oSet->Fetch();
 			$id = $oObj->GetKey();
-			$bIsModifyAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES);
+			$bIsModifyAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
 			$bIsDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
-			$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet);
-			$bIsBulkDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_DELETE, $oSet);
 			// Just one object in the set, possible actions are "new / clone / modify and delete"
 			if (!isset($aExtraParams['link_attr']))
 			{
@@ -1406,8 +1449,8 @@ class MenuBlock extends DisplayBlock
 			default:
 			// Check rights
 			// New / Modify
-			$bIsModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet);
-			$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet);
+			$bIsModifyAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, $oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+			$bIsBulkModifyAllowed = (!MetaModel::IsAbstract($sClass)) && UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY, $oSet) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
 			$bIsBulkDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_DELETE, $oSet);
 			if (isset($aExtraParams['link_attr']))
 			{

application/excelexporter.class.inc.php

@@ -0,0 +1,536 @@
+<?php
+require_once('xlsxwriter.class.php');
+
+class ExcelExporter
+{
+	protected $sToken;
+	protected $aStatistics;
+	protected $sState;
+	protected $fStartTime;
+	protected $oSearch;
+	protected $aObjectsIDs;
+	protected $aTableHeaders;
+	protected $aAuthorizedClasses;
+	protected $iChunkSize = 1000;
+	protected $iPosition;
+	protected $sOutputFilePath;
+	protected $bAdvancedMode;
+	
+	public function __construct($sToken = null)
+	{
+		$this->aStatistics = array(
+			'objects_count' => 0,
+			'total_duration' => 0,
+			'data_retrieval_duration' => 0,
+			'excel_build_duration' => 0,
+			'excel_write_duration' => 0,
+			'peak_memory_usage' => 0,		
+		);
+		$this->fStartTime = microtime(true);
+		$this->oSearch = null;
+		
+		$this->sState = 'new';
+		$this->aObjectsIDs = array();
+		$this->iPosition = 0;
+		$this->aAuthorizedClasses = null;
+		$this->aTableHeaders = null;
+		$this->sOutputFilePath = null;
+		$this->bAdvancedMode = false;
+		$this->CheckDataDir();
+		if ($sToken == null)
+		{
+			$this->sToken = $this->GetNewToken();
+		}
+		else
+		{
+			$this->sToken = $sToken;
+			$this->ReloadState();
+		}
+	}
+	
+	public function __destruct()
+	{
+		if (($this->sState != 'done') && ($this->sState != 'error') && ($this->sToken != null))
+		{
+			// Operation in progress, save the state
+			$this->SaveState();
+		}
+		else
+		{
+			// Operation completed, cleanup the temp files
+			@unlink($this->GetStateFile());
+			@unlink($this->GetDataFile());
+		}
+		self::CleanupOldFiles();	
+	}
+	
+	public function SetChunkSize($iChunkSize)
+	{
+		$this->iChunkSize = $iChunkSize;	
+	}
+	
+	public function SetOutputFilePath($sDestFilePath)
+	{
+		$this->sOutputFilePath = $sDestFilePath;
+	}
+	
+	public function SetAdvancedMode($bAdvanced)
+	{
+		$this->bAdvancedMode = $bAdvanced;
+	}
+	
+	public function SaveState()
+	{
+		$aState = array(
+			'state' => $this->sState,
+			'statistics' => $this->aStatistics,
+			'filter' => $this->oSearch->serialize(),
+			'position' => $this->iPosition,
+			'chunk_size' => $this->iChunkSize,
+			'object_ids' => $this->aObjectsIDs,
+			'output_file_path' => $this->sOutputFilePath,
+			'advanced_mode' => $this->bAdvancedMode,
+		);
+		
+		file_put_contents($this->GetStateFile(), json_encode($aState));
+		
+		return $this->sToken;
+	}
+	
+	public function ReloadState()
+	{
+		if ($this->sToken == null)
+		{
+			throw new Exception('ExcelExporter not initialized with a token, cannot reload state');
+		}
+		
+		if (!file_exists($this->GetStateFile()))
+		{
+			throw new Exception("ExcelExporter: missing status file '".$this->GetStateFile()."', cannot reload state.");
+		}
+		$sJson = file_get_contents($this->GetStateFile());
+		$aState = json_decode($sJson, true);
+		if ($aState === null)
+		{
+			throw new Exception("ExcelExporter:corrupted status file '".$this->GetStateFile()."', not a JSON, cannot reload state.");
+		}
+		
+		$this->sState = $aState['state'];
+		$this->aStatistics = $aState['statistics'];
+		$this->oSearch = DBObjectSearch::unserialize($aState['filter']);
+		$this->iPosition = $aState['position'];
+		$this->iChunkSize = $aState['chunk_size'];
+		$this->aObjectsIDs = $aState['object_ids'];
+		$this->sOutputFilePath  = $aState['output_file_path'];
+		$this->bAdvancedMode = $aState['advanced_mode'];
+	}
+	
+	public function SetObjectList($oSearch)
+	{
+		$this->oSearch = $oSearch;
+	}
+	
+	public function Run()
+	{
+		$sCode = 'error';
+		$iPercentage = 100;
+		$sMessage = Dict::Format('ExcelExporter:ErrorUnexpected_State', $this->sState);
+		$fTime = microtime(true);
+		
+		try
+		{
+			switch($this->sState)
+			{
+				case 'new':
+				$oIDSet = new DBObjectSet($this->oSearch);
+				$oIDSet->OptimizeColumnLoad(array('id'));
+				$this->aObjectsIDs = array();
+				while($oObj = $oIDSet->Fetch())
+				{
+					$this->aObjectsIDs[] = $oObj->GetKey();
+				}		
+				$sCode = 'retrieving-data';
+				$iPercentage = 5;
+				$sMessage = Dict::S('ExcelExporter:RetrievingData');
+				$this->iPosition = 0;
+				$this->aStatistics['objects_count'] = count($this->aObjectsIDs);
+				$this->aStatistics['data_retrieval_duration'] += microtime(true) - $fTime;
+				
+				// The first line of the file is the "headers" specifying the label and the type of each column
+				$this->GetFieldsList($oIDSet, $this->bAdvancedMode);
+				$sRow = json_encode($this->aTableHeaders);
+				$hFile = @fopen($this->GetDataFile(), 'ab');
+				if ($hFile === false)
+				{
+					throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
+				}
+				fwrite($hFile, $sRow."\n");
+				fclose($hFile);	
+				
+				// Next state
+				$this->sState = 'retrieving-data';
+				break;
+				
+				case 'retrieving-data':
+				$oCurrentSearch = clone $this->oSearch;
+				$aIDs = array_slice($this->aObjectsIDs, $this->iPosition, $this->iChunkSize);
+				
+				$oCurrentSearch->AddCondition('id', $aIDs, 'IN');
+				$hFile = @fopen($this->GetDataFile(), 'ab');
+				if ($hFile === false)
+				{
+					throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
+				}
+				$oSet = new DBObjectSet($oCurrentSearch);
+				$this->GetFieldsList($oSet, $this->bAdvancedMode);
+				while($aObjects = $oSet->FetchAssoc())
+				{
+					$aRow = array();
+					foreach($this->aAuthorizedClasses as $sAlias => $sClassName)
+					{
+						$oObj = $aObjects[$sAlias];
+						if ($this->bAdvancedMode)
+						{
+							$aRow[] = $oObj->GetKey();
+						}
+						foreach($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef)
+						{
+							$value = $oObj->Get($sAttCodeEx);
+							if ($value instanceOf ormCaseLog)
+							{
+								// Extract the case log as text and remove the "===" which make Excel think that the cell contains a formula the next time you edit it!
+								$sExcelVal = trim(preg_replace('/========== ([^=]+) ============/', '********** $1 ************', $value->GetText()));
+							}
+							else
+							{
+								$sExcelVal =  $oAttDef->GetEditValue($value, $oObj);					
+							}
+							$aRow[] = $sExcelVal;				
+						}
+					}
+					$sRow = json_encode($aRow);
+					fwrite($hFile, $sRow."\n");
+				}
+				fclose($hFile);
+				
+				if (($this->iPosition + $this->iChunkSize) > count($this->aObjectsIDs))
+				{
+					// Next state
+					$this->sState = 'building-excel';
+					$sCode = 'building-excel';
+					$iPercentage = 80;
+					$sMessage = Dict::S('ExcelExporter:BuildingExcelFile');
+				}
+				else
+				{
+					$sCode = 'retrieving-data';
+					$this->iPosition += $this->iChunkSize;
+					$iPercentage = 5 + round(75 * ($this->iPosition / count($this->aObjectsIDs)));
+					$sMessage = Dict::S('ExcelExporter:RetrievingData');			
+				}
+				break;
+				
+				case 'building-excel':
+				$hFile = @fopen($this->GetDataFile(), 'rb');
+				if ($hFile === false)
+				{
+					throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for reading.');
+				}
+				$sHeaders = fgets($hFile);
+				$aHeaders = json_decode($sHeaders, true);
+				
+				$aData = array();
+				while($sLine = fgets($hFile))
+				{
+					$aRow = json_decode($sLine);
+					$aData[] = $aRow;
+				}
+				fclose($hFile);
+				@unlink($this->GetDataFile());
+					
+				$fStartExcel = microtime(true);
+				$writer = new XLSXWriter();
+				$writer->setAuthor(UserRights::GetUserFriendlyName());
+				$writer->writeSheet($aData,'Sheet1', $aHeaders);
+				$fExcelTime = microtime(true) - $fStartExcel;
+				$this->aStatistics['excel_build_duration'] = $fExcelTime;
+				
+				$fTime = microtime(true);
+				$writer->writeToFile($this->GetExcelFilePath());
+				$fExcelSaveTime = microtime(true) - $fTime;
+				$this->aStatistics['excel_write_duration'] = $fExcelSaveTime;
+				
+				// Next state
+				$this->sState = 'done';
+				$sCode = 'done';
+				$iPercentage = 100;
+				$sMessage = Dict::S('ExcelExporter:Done');
+				break;
+				
+				case 'done':
+				$this->sState = 'done';
+				$sCode = 'done';
+				$iPercentage = 100;
+				$sMessage = Dict::S('ExcelExporter:Done');
+				break;
+			}
+		}
+		catch(Exception $e)
+		{
+			$sCode = 'error';
+			$sMessage = $e->getMessage();
+		}
+		
+		$this->aStatistics['total_duration'] += microtime(true) - $fTime;
+		$peak_memory = memory_get_peak_usage(true);
+		if ($peak_memory > $this->aStatistics['peak_memory_usage'])
+		{
+			$this->aStatistics['peak_memory_usage'] = $peak_memory;
+		}
+		
+		return array(
+			'code' => $sCode,
+			'message' => $sMessage,
+			'percentage' => $iPercentage,
+		);
+	}
+	
+	public function GetExcelFilePath()
+	{
+		if ($this->sOutputFilePath == null)
+		{
+			return APPROOT.'data/bulk_export/'.$this->sToken.'.xlsx';
+		}
+		else
+		{
+			return $this->sOutputFilePath;
+		}
+	}
+	
+	public static function GetExcelFileFromToken($sToken)
+	{
+		return @file_get_contents(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
+	}
+	
+	public static function CleanupFromToken($sToken)
+	{
+		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.status');
+		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.data');
+		@unlink(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
+	}
+	
+	public function Cleanup()
+	{
+		self::CleanupFromToken($this->sToken);
+	}
+	
+	/**
+	 * Delete all files in the data/bulk_export directory which are older than 1 day
+	 * unless a different delay is configured.
+	 */
+	public static function CleanupOldFiles()
+	{
+		$aFiles = glob(APPROOT.'data/bulk_export/*.*');
+		$iDelay = MetaModel::GetConfig()->Get('xlsx_exporter_cleanup_old_files_delay');
+		
+		if($iDelay > 0)
+		{
+			foreach($aFiles as $sFile)
+			{
+				$iModificationTime = filemtime($sFile);
+				
+				if($iModificationTime < (time() - $iDelay))
+				{
+					// Temporary files older than one day are deleted
+					//echo "Supposed to delete: '".$sFile." (Unix Modification Time: $iModificationTime)'\n";
+					@unlink($sFile);
+				}
+			}
+		}
+	}
+	
+	public function DisplayStatistics(Page $oPage)
+	{
+		$aStats = array(
+				'Number of objects exported' => $this->aStatistics['objects_count'],
+				'Total export duration' => sprintf('%.3f s', $this->aStatistics['total_duration']),
+				'Data retrieval duration' => sprintf('%.3f s', $this->aStatistics['data_retrieval_duration']),
+				'Excel build duration' => sprintf('%.3f s', $this->aStatistics['excel_build_duration']),
+				'Excel write duration' => sprintf('%.3f s', $this->aStatistics['excel_write_duration']),
+				'Peak memory usage' => self::HumanDisplay($this->aStatistics['peak_memory_usage']),
+		);
+		
+		if ($oPage instanceof CLIPage)
+		{
+			$oPage->add($this->GetStatistics('text'));
+		}
+		else
+		{
+			$oPage->add($this->GetStatistics('html'));
+		}
+	}
+	
+	public function GetStatistics($sFormat = 'html')
+	{
+		$sStats = '';
+		$aStats = array(
+				'Number of objects exported' => $this->aStatistics['objects_count'],
+				'Total export duration' => sprintf('%.3f s', $this->aStatistics['total_duration']),
+				'Data retrieval duration' => sprintf('%.3f s', $this->aStatistics['data_retrieval_duration']),
+				'Excel build duration' => sprintf('%.3f s', $this->aStatistics['excel_build_duration']),
+				'Excel write duration' => sprintf('%.3f s', $this->aStatistics['excel_write_duration']),
+				'Peak memory usage' => self::HumanDisplay($this->aStatistics['peak_memory_usage']),
+		);
+		
+		if ($sFormat == 'text')
+		{
+			foreach($aStats as $sLabel => $sValue)
+			{
+				$sStats .= "+------------------------------+----------+\n";
+				$sStats .= sprintf("|%-30s|%10s|\n", $sLabel, $sValue);
+			}
+			$sStats .= "+------------------------------+----------+";
+		}
+		else
+		{
+			$sStats .= '<table><tbody>';
+			foreach($aStats as $sLabel => $sValue)
+			{
+				$sStats .= "<tr><td>$sLabel</td><td>$sValue</td></tr>";
+			}
+			$sStats .= '</tbody></table>';
+			
+		}
+		return $sStats;
+	}
+	
+	public static function HumanDisplay($iSize)
+	{
+		$aUnits = array('B','KB','MB','GB','TB','PB');
+		return @round($iSize/pow(1024,($i=floor(log($iSize,1024)))),2).' '.$aUnits[$i];
+	}
+	
+	protected function CheckDataDir()
+	{
+		if(!is_dir(APPROOT."data/bulk_export"))
+		{
+			@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
+			clearstatcache();
+		}
+		if (!is_writable(APPROOT."data/bulk_export"))
+		{
+			throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
+		}
+	}
+	
+	protected function GetStateFile($sToken = null)
+	{
+		if ($sToken == null)
+		{
+			$sToken = $this->sToken;
+		}
+		return APPROOT."data/bulk_export/$sToken.status";
+	}
+	
+	protected function GetDataFile()
+	{
+		return APPROOT.'data/bulk_export/'.$this->sToken.'.data';
+	}
+	
+	protected function GetNewToken()
+	{
+		$iNum = rand();
+		do
+		{
+			$iNum++;
+			$sToken = sprintf("%08x", $iNum);
+			$sFileName = $this->GetStateFile($sToken);
+			$hFile = @fopen($sFileName, 'x');
+		}
+		while($hFile === false);
+		
+		fclose($hFile);
+		return $sToken;
+	}
+	
+	protected function GetFieldsList($oSet, $bFieldsAdvanced = false, $bLocalize = true, $aFields = null)
+	{
+		$this->aFieldsList = array();
+	
+		$oAppContext = new ApplicationContext();
+		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
+		$this->aAuthorizedClasses = array();
+		foreach($aClasses as $sAlias => $sClassName)
+		{
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
+			{
+				$this->aAuthorizedClasses[$sAlias] = $sClassName;
+			}
+		}
+		$aAttribs = array();
+		$this->aTableHeaders = array();
+		foreach($this->aAuthorizedClasses as $sAlias => $sClassName)
+		{
+			$aList[$sAlias] = array();
+	
+			foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef)
+			{
+				if (is_null($aFields) || (count($aFields) == 0))
+				{
+					// Standard list of attributes (no link sets)
+					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField()))
+					{
+						$sAttCodeEx = $oAttDef->IsExternalField() ? $oAttDef->GetKeyAttCode().'->'.$oAttDef->GetExtAttCode() : $sAttCode;
+						
+						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+						{
+							if ($bFieldsAdvanced)
+							{
+								$aList[$sAlias][$sAttCodeEx] = $oAttDef;
+	
+								if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE))
+								{
+							  		$sRemoteClass = $oAttDef->GetTargetClass();
+									foreach(MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode)
+								  	{
+										$this->aFieldsList[$sAlias][$sAttCode.'->'.$sRemoteAttCode] = MetaModel::GetAttributeDef($sRemoteClass, $sRemoteAttCode);
+								  	}
+								}
+							}
+						}
+						else
+						{
+							// Any other attribute
+							$this->aFieldsList[$sAlias][$sAttCodeEx] = $oAttDef;
+						}
+					}
+				}
+				else
+				{
+					// User defined list of attributes
+					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields))
+					{
+						$this->aFieldsList[$sAlias][$sAttCode] = $oAttDef;
+					}
+				}
+			}
+			if ($bFieldsAdvanced)
+			{
+				$this->aTableHeaders['id'] = '0';
+			}
+			foreach($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef)
+			{
+				$sLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx, isset($aParams['showMandatoryFields'])) : $sAttCodeEx;
+				if($oAttDef instanceof AttributeDateTime)
+				{
+					$this->aTableHeaders[$sLabel] = 'datetime';
+				}
+				else
+				{
+					$this->aTableHeaders[$sLabel] = 'string';
+				}
+			}
+		}
+	}
+}
+

application/forms.class.inc.php

@@ -36,8 +36,12 @@ class DesignerForm
 	protected $aSubmitParams;
 	protected $sSubmitTo;
 	protected $bReadOnly;
-	protected $sSelectorClass;
+	protected $sHierarchyPath;   // Needed to manage the visibility of nested subform
+	protected $sHierarchyParent; // Needed to manage the visibility of nested subform
+	protected $sHierarchySelector; // Needed to manage the visibility of nested subform
 	protected $bDisplayed;
+	protected $aDefaultValues;
+	protected $sFieldsSuffix;
 	
 	public function __construct()
 	{
@@ -46,13 +50,17 @@ class DesignerForm
 		$this->sScript = '';
 		$this->sReadyScript = '';
 		$this->sFormPrefix = '';
+		$this->sFieldsSuffix = '';
 		$this->sParamsContainer = '';
 		$this->sFormId = 'form_'.rand();
 		$this->oParentForm = null;
 		$this->bReadOnly = false;
-		$this->sSelectorClass = '';
+		$this->sHierarchyPath = '';
+		$this->sHierarchyParent = '';
+		$this->sHierarchySelector = '';
 		$this->StartFieldSet($this->sCurrentFieldSet);
 		$this->bDisplayed = true;
+		$this->aDefaultvalues = array();
 	}
 	
 	public function AddField(DesignerFormField $oField)
@@ -138,6 +146,11 @@ class DesignerForm
 			$oP->add($sReturn);
 		}
 	}
+	
+	public function GetFieldSets()
+	{
+		return $this->aFieldSets;
+	}
 
 	public function SetSubmitParams($sSubmitToUrl, $aSubmitParams)
 	{
@@ -151,14 +164,41 @@ class DesignerForm
 		$this->aSubmitParams = $oParentForm->aSubmitParams;
 	}
 	
-	public function SetSelectorClass($sSelectorClass)
+	public function GetSubmitParams()
 	{
-		$this->sSelectorClass = $sSelectorClass;
+		return array( 'url' => $this->sSubmitTo, 'params' => $this->aSubmitParams);
 	}
 	
-	public function GetSelectorClass()
+	/**
+	 * Helper to handle subforms hide/show	
+	 */	
+	public function SetHierarchyPath($sHierarchy)
 	{
-		return $this->sSelectorClass;
+		$this->sHierarchyPath = $sHierarchy;
+	}
+	
+	/**
+	 * Helper to handle subforms hide/show	
+	 */	
+	public function GetHierarchyPath()
+	{
+		return $this->sHierarchyPath;
+	}
+		
+	/**
+	 * Helper to handle subforms hide/show	
+	 */	
+	public function SetHierarchyParent($sHierarchy)
+	{
+		$this->sHierarchyParent = $sHierarchy;
+	}
+	
+	/**
+	 * Helper to handle subforms hide/show	
+	 */	
+	public function GetHierarchyParent()
+	{
+		return $this->sHierarchyParent;
 	}
 	
 	
@@ -184,7 +224,7 @@ class DesignerForm
 			$aDetails = array();
 			if ($sLabel != '')
 			{
-				$sReturn .= '<tr><th colspan="4">'.$sLabel.'</th></tr>';
+				$sReturn .= $this->StartRow().'<th colspan="4">'.$sLabel.'</th>'.$this->EndRow();
 			}
 
 
@@ -195,17 +235,29 @@ class DesignerForm
 				{
 					$sFieldId = $this->GetFieldId($oField->GetCode());
 					$sValidation = $this->GetValidationArea($oField->GetCode(), '<span title="Apply" class="ui-icon ui-icon-circle-check"/>');
-					$sValidationFields = '</td><td class="prop_icon prop_apply">'.$sValidation.'</td><td  class="prop_icon prop_cancel"><span title="Revert" class="ui-icon ui-icon-circle-close"/></td></tr>';
-					$sReturn .= '<tr id="row_'.$sFieldId.'"><td class="prop_label">'.$aRow['label'].'</td><td class="prop_value">'.$aRow['value'];
-					if (!($oField instanceof DesignerFormSelectorField))
+					$sValidationFields = '</td><td class="prop_icon prop_apply">'.$sValidation.'</td><td  class="prop_icon prop_cancel"><span title="Revert" class="ui-icon ui-icon-circle-close"/></td>'.$this->EndRow();
+					
+					$sPath = $this->GetHierarchyPath().'/'.$oField->GetCode();
+					
+					if (is_null($aRow['label']))
+					{
+						$sReturn .= $this->StartRow($sFieldId).'<td class="prop_value" colspan="2">'.$aRow['value'];
+					}
+					else
+					{
+						$sReturn .= $this->StartRow($sFieldId).'<td class="prop_label">'.$aRow['label'].'</td><td class="prop_value">'.$aRow['value'];
+					}
+					if (!($oField instanceof DesignerFormSelectorField) && !($oField instanceof DesignerMultipleSubFormField))
 					{
 						$sReturn .= $sValidationFields;
 					}
 					$sNotifyParentSelectorJS = is_null($sNotifyParentSelector) ? 'null' : "'".addslashes($sNotifyParentSelector)."'";
 					$sAutoApply = $oField->IsAutoApply() ? 'true' : 'false';
+					$sHandlerEquals = $oField->GetHandlerEquals();
+					$sHandlerGetValue = $oField->GetHandlerGetValue();
 					$this->AddReadyScript(
 <<<EOF
-$('#row_$sFieldId').property_field({parent_selector: $sNotifyParentSelectorJS, field_id: '$sFieldId', auto_apply: $sAutoApply, value: '', submit_to: '$sActionUrl', submit_parameters: $sJSSubmitParams });
+$('#row_$sFieldId').property_field({parent_selector: $sNotifyParentSelectorJS, field_id: '$sFieldId', equals: $sHandlerEquals, get_field_value: $sHandlerGetValue, auto_apply: $sAutoApply, value: '', submit_to: '$sActionUrl', submit_parameters: $sJSSubmitParams });
 EOF
 					);
 				}
@@ -223,7 +275,7 @@ EOF
 			$sReturn .= '</table>';
 			$sReturn .= $sHiddenFields;
 			$sReturn .= '</form>';
-			$sReturn .= '<div id="prop_submit_result"/>'; // for the return of the submit operation
+			$sReturn .= '<div id="prop_submit_result"></div>'; // for the return of the submit operation
 		}
 		else
 		{
@@ -263,9 +315,26 @@ EOF
 		{
 			$oP->add($sReturn);
 		}
-	}	
+	}
+	
+	public function StartRow($sFieldId = null)
+	{
+		if ($sFieldId != null)
+		{
+			return '<tr id="row_'.$sFieldId.'" data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'">';
+		}
+		return '<tr data-path="'.$this->GetHierarchyPath().'" data-selector="'.$this->GetHierarchyParent().'">';
+	}
+	
+	public function EndRow()
+	{
+		return '</tr>';
+	}
+	
 	public function RenderAsDialog($oPage, $sDialogId, $sDialogTitle, $iDialogWidth, $sOkButtonLabel, $sIntroduction = null)
 	{
+		$this->SetPrefix('dlg_'); // To make sure that the controls have different IDs that the property sheet which may be displayed at the same time
+		
 		$sDialogTitle = addslashes($sDialogTitle);
 		$sOkButtonLabel = addslashes($sOkButtonLabel);
 		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
@@ -282,7 +351,7 @@ EOF
 <<<EOF
 $('#$sDialogId').dialog({
 		height: 'auto',
-		width: 500,
+		width: $iDialogWidth,
 		modal: true,
 		title: '$sDialogTitle',
 		buttons: [
@@ -320,9 +389,29 @@ EOF
 	
 	public function GetPrefix()
 	{
-		return $this->sFormPrefix;
+		$sPrefix = '';	
+		if ($this->oParentForm != null)
+		{
+			$sPrefix = $this->oParentForm->GetPrefix();
+		}
+		return $sPrefix.$this->sFormPrefix;
+	}
+
+	public function SetSuffix($sSuffix)
+	{
+		$this->sFieldsSuffix = $sSuffix;
 	}
 	
+	public function GetSuffix()
+	{
+		$sSuffix = '';
+		if ($this->oParentForm != null)
+		{
+			$sSuffix = $this->oParentForm->GetSuffix();
+		}
+		return $sSuffix.$this->sFieldsSuffix;
+	}
+		
 	public function SetReadOnly($bReadOnly = true)
 	{
 		$this->bReadOnly = $bReadOnly;
@@ -362,6 +451,25 @@ EOF
 		$this->oParentForm = $oParentForm;
 	}
 	
+	public function SetDefaultValues($aDefaultValues)
+	{
+		if (!is_array($aDefaultValues)) return;
+		
+		foreach($this->aFieldSets as $sLabel => $aFields)
+		{
+			foreach($aFields as $oField)
+			{
+				$oField->SetDefaultValueFrom($aDefaultValues);
+			}
+		}
+	}
+	
+	public function GetDefaultValues()
+	{
+		return $this->aDefaultValues;
+	}
+	
+	
 	public function GetParentForm()
 	{
 		return $this->oParentForm;
@@ -396,17 +504,17 @@ EOF
 	
 	public function GetFieldId($sCode)
 	{
-		return $this->sFormPrefix.'attr_'.$sCode;
+		return $this->GetPrefix().'attr_'.$sCode;
 	}
 	
 	public function GetFieldName($sCode)
 	{
-		return 'attr_'.$sCode;
+		return 'attr_'.$sCode.$this->GetSuffix();
 	}
 	
 	public function GetParamName($sCode)
 	{
-		return 'attr_'.$sCode;
+		return 'attr_'.$sCode.$this->GetSuffix();
 	}
 	
 	public function GetValidationArea($sCode, $sContent = '')
@@ -417,6 +525,21 @@ EOF
 	{
 		return $this->sAsyncActionClass;
 	}
+	
+	public function FindField($sFieldCode)
+	{
+		$oFoundField = false;
+		foreach($this->aFieldSets as $sLabel => $aFields)
+		{
+			foreach($aFields as $oField)
+			{
+				$oFoundField = $oField->FindField($sFieldCode);
+				if ($oFoundField !== false) break;
+			}
+			if ($oFoundField !== false) break;
+		}
+		return $oFoundField;		
+	}
 }
 
 class DesignerTabularForm extends DesignerForm
@@ -432,6 +555,11 @@ class DesignerTabularForm extends DesignerForm
 	{
 		$this->aTable[] = $aRow;
 	}
+
+	public function RenderAsPropertySheet($oP, $bReturnHTML = false, $sNotifyParentSelector = null)
+	{
+		return $this->Render($oP, $bReturnHTML);
+	}
 	
 	public function Render($oP, $bReturnHTML = false)
 	{
@@ -591,6 +719,11 @@ class DesignerFormField
 		return $this->bDisplayed;
 	}
 
+	public function GetFieldId()
+	{
+		return $this->oForm->GetFieldId($this->sCode);
+	}
+	
 	public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
@@ -634,6 +767,36 @@ class DesignerFormField
 	{
 		$this->aCSSClasses[] = $sCSSClass;
 	}
+	
+	/**
+	 * A way to set/change the default value after constructing the field
+	 */
+	public function SetDefaultValueFrom($aAllDefaultValue)
+	{
+		if (array_key_exists($this->GetCode(), $aAllDefaultValue))
+		{
+			$this->defaultValue = $aAllDefaultValue[$this->GetCode()];
+		}
+	}
+	
+	public function FindField($sFieldCode)
+	{
+		if ($this->sCode == $sFieldCode)
+		{
+			return $this;
+		}
+		return false;
+	}
+
+	public function GetHandlerEquals()
+	{
+		return 'null';
+	}
+
+	public function GetHandlerGetValue()
+	{
+		return 'null';
+	}
 }
 
 class DesignerLabelField extends DesignerFormField
@@ -650,7 +813,7 @@ class DesignerLabelField extends DesignerFormField
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
-		return array('label' => $this->sLabel, 'value' => $sDescription);
+		return array('label' => $this->sLabel, 'value' => $this->sDescription);
 	}
 	
 	public function ReadParam(&$aValues)
@@ -699,6 +862,7 @@ class DesignerTextField extends DesignerFormField
 	public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')
 	{
 		$sId = $this->oForm->GetFieldId($this->sCode);
+		
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		if ($this->IsReadOnly())
 		{
@@ -795,6 +959,7 @@ class DesignerComboField extends DesignerFormField
 	protected $aAllowedValues;
 	protected $bMultipleSelection;
 	protected $bOtherChoices;
+	protected $sNullLabel;
 	
 	public function __construct($sCode, $sLabel = '', $defaultValue = '')
 	{
@@ -802,6 +967,7 @@ class DesignerComboField extends DesignerFormField
 		$this->aAllowedValues = array();
 		$this->bMultipleSelection = false;
 		$this->bOtherChoices = false;
+		$this->sNullLabel = Dict::S('UI:SelectOne');
 
 		$this->bAutoApply = true;
 	}
@@ -820,11 +986,17 @@ class DesignerComboField extends DesignerFormField
 	{
 		$this->bOtherChoices = $bOtherChoices;
 	}
-	
+
+	/**
+	 * An empty label will disable the default empty value
+	 */	 	
+	public function SetNullLabel($sLabel)
+	{
+		$this->sNullLabel = $sLabel;
+	}
 	
 	public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')
 	{
-
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		$sChecked = $this->defaultValue ? 'checked' : '';
@@ -869,7 +1041,10 @@ class DesignerComboField extends DesignerFormField
 			else
 			{
 				$sHtml = "<select $sCSSClasses id=\"$sId\" name=\"$sName\">";
-				$sHtml .= "<option value=\"\">".Dict::S('UI:SelectOne')."</option>";
+				if ($this->sNullLabel != '')
+				{
+					$sHtml .= "<option value=\"\">".$this->sNullLabel."</option>";
+				}
 			}
 			foreach($this->aAllowedValues as $sKey => $sDisplayValue)
 			{
@@ -969,7 +1144,6 @@ class DesignerBooleanField extends DesignerFormField
 	}
 }
 
-
 class DesignerHiddenField extends DesignerFormField
 {
 	public function __construct($sCode, $sLabel = '', $defaultValue = '')
@@ -1168,6 +1342,8 @@ class DesignerFormSelectorField extends DesignerFormField
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		$sReadOnly = $this->IsReadOnly() ? 'disabled="disabled"' :  '';
 		
+		$this->aCSSClasses[] = 'formSelector';
+		
 		$sCSSClasses = '';
 		if (count($this->aCSSClasses) > 0)
 		{
@@ -1181,12 +1357,12 @@ class DesignerFormSelectorField extends DesignerFormField
 			$aHiddenValues = array();
 			$sDisplayValue = '';
 			$sHiddenValue = '';
-			foreach($this->aSubForms as $sKey => $aFormData)
+			foreach($this->aSubForms as $iKey => $aFormData)
 			{
-				if ($sKey == $this->defaultValue)
+				if ($iKey == $this->defaultValue) // Default value is actually the index
 				{
 					$sDisplayValue = htmlentities($aFormData['label'], ENT_QUOTES, 'UTF-8');
-					$sHiddenValue = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\"/>";
+					$sHiddenValue = "<input type=\"hidden\" id=\"$sId\" name=\"$sName\" value=\"".htmlentities($iKey, ENT_QUOTES, 'UTF-8')."\"/>";
 					break;
 				}
 			}
@@ -1197,11 +1373,11 @@ class DesignerFormSelectorField extends DesignerFormField
 			
 			
 			$sHtml = "<select $sCSSClasses id=\"$sId\" name=\"$sName\" $sReadOnly>";
-			foreach($this->aSubForms as $sKey => $aFormData)
+			foreach($this->aSubForms as $iKey => $aFormData)
 			{
 				$sDisplayValue = htmlentities($aFormData['label'], ENT_QUOTES, 'UTF-8');;
-				$sSelected = ($sKey == $this->defaultValue) ? 'selected' : '';
-				$sHtml .= "<option value=\"".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."\" $sSelected>".$sDisplayValue."</option>";
+				$sSelected = ($iKey == $this->defaultValue) ? 'selected' : '';
+				$sHtml .= "<option value=\"$iKey\" $sSelected>".$sDisplayValue."</option>";
 			}
 			$sHtml .= "</select>";
 		}
@@ -1219,22 +1395,42 @@ class DesignerFormSelectorField extends DesignerFormField
 			$oSubForm->SetParentForm($this->oForm);
 			$oSubForm->CopySubmitParams($this->oForm);
 			$oSubForm->SetPrefix($this->oForm->GetPrefix().$sKey.'_');
-			$oSubForm->SetSelectorClass("subform_{$sId} {$sId}_{$sKey}");
 			
 			if ($sRenderMode == 'property')
 			{
+				// Note: Managing the visibility of nested subforms had several implications
+				// 1) Attributes are displayed in a table and we have to group them in as many tbodys as necessary to hide/show the various options depending on the current selection
+				// 2) It is not possible to nest tbody tags. Therefore, it is not possible to manage the visibility the same way as it is done for the dialog mode (using nested divs).
+				// The div hierarchy has been emulated by adding attributes to the tbody tags:
+				// - data-selector : uniquely identifies the DesignerFormSelectorField that has an impact on the visibility of the node
+				// - data-path : uniquely identifies the combination of users choices that must be made to show the node
+				// - data-state : records the state, depending on the user choice on the FormSelectorField just above the node, but indepentantly from the visibility in the page (can be visible in the form itself being in a hidden form)
+				// Then a series of actions are performed to hide and show the relevant nodes, depending on the user choice
+				$sSelector = $this->oForm->GetHierarchyPath().'/'.$this->sCode.$this->oForm->GetSuffix();
+				$oSubForm->SetHierarchyParent($sSelector);
+				$sPath = $this->oForm->GetHierarchyPath().'/'.$this->sCode.$this->oForm->GetSuffix().'-'.$sKey;
+				$oSubForm->SetHierarchyPath($sPath);
+
 				$oSubForm->SetDisplayed($sKey == $this->defaultValue);
-				$sHtml .= "</tbody><tbody class=\"subform_{$sId} {$sId}_{$sKey}\" $sStyle>";
-				$sHtml .= $oSubForm->RenderAsPropertySheet($oP, true);	
-				$oParentForm = $this->oForm->GetParentForm();
-				if($oParentForm)
+				$sState = ($sKey == $this->defaultValue) ? 'visible' : 'hidden';
+				//$sHtml .= "</tbody><tbody data-selector=\"$sSelector\" data-path=\"$sPath\" data-state=\"$sState\" $sStyle>";
+				$sHtml .= $oSubForm->RenderAsPropertySheet($oP, true);
+
+				$sState = $this->oForm->IsDisplayed() ? 'visible' : 'hidden';
+				$sParentStyle = '';
+				if ($oParent = $this->oForm->GetParentForm())
 				{
-					$sHtml .= "</tbody><tbody class=\"".$oParentForm->GetSelectorClass()."\">";
+					$sParentStyle = ($oParent->IsDisplayed()) ? '' : 'style="display:none"';
+					$sParentSelector = $oParent->GetHierarchyParent();
+					$sParentPath = $oParent->GetHierarchyPath();
 				}
 				else
 				{
-					$sHtml .= "</tbody><tbody>";
+					$sParentSelector = '';
+					$sParentPath = '';
 				}
+				
+				//$sHtml .= "</tbody><tbody data-selector=\"$sParentSelector\" data-path=\"$sParentPath\" data-state=\"$sState\" $sParentStyle>";
 			}
 			else
 			{
@@ -1244,11 +1440,19 @@ class DesignerFormSelectorField extends DesignerFormField
 			}
 		}
 
-		$oP->add_ready_script(
+		if ($sRenderMode == 'property')
+		{
+			$sSelector = $this->oForm->GetHierarchyPath().'/'.$this->sCode.$this->oForm->GetSuffix();
+			$oP->add_ready_script("InitFormSelectorField('$sId', '$sSelector');");
+		}
+		else
+		{
+			$oP->add_ready_script(
 <<<EOF
 $('#$sId').bind('change reverted', function() {	$('.subform_{$sId}').hide(); $('.{$sId}_'+this.value).show(); } );
 EOF
-);
+			);
+		}
 		return array('label' => $this->sLabel, 'value' => $sHtml);
 	}
 
@@ -1262,6 +1466,44 @@ EOF
 		$this->aSubForms[$sKey]['form']->SetParentForm($this->oForm);
 		$this->aSubForms[$sKey]['form']->ReadParams($aValues);
 	}
+	
+	public function SetDefaultValueFrom($aAllDefaultValues)
+	{
+		if (array_key_exists($this->GetCode(), $aAllDefaultValues))
+		{
+			$selectedValue = $aAllDefaultValues[$this->GetCode()];
+			foreach($this->aSubForms as $iKey => $aFormData)
+			{
+				$sId = $this->oForm->GetFieldId($this->sCode);
+				if ($selectedValue == $aFormData['value'])
+				{
+					$this->defaultValue =$iKey;
+					$aDefaultValues = $this->oForm->GetDefaultValues();
+					$oSubForm = $aFormData['form'];
+					$oSubForm->SetDefaultValues($aAllDefaultValues);
+				}
+			}		
+		}
+	}
+	
+	public function FindField($sFieldCode)
+	{
+		$oField = parent::FindField($sFieldCode);
+		if ($oField === false)
+		{
+			// Look in the subforms
+			foreach($this->aSubForms as $sKey => $aFormData)
+			{
+				$oSubForm = $aFormData['form'];
+				$oField = $oSubForm->FindField($sFieldCode);
+				if ($oField !== false)
+				{
+					break;
+				}
+			}
+		}
+		return $oField;
+	}
 }
 
 class DesignerSubFormField extends DesignerFormField
@@ -1294,6 +1536,31 @@ class DesignerSubFormField extends DesignerFormField
 		$this->oSubForm->SetParentForm($this->oForm);
 		$this->oSubForm->ReadParams($aValues);
 	}
+	
+	public function FindField($sFieldCode)
+	{
+		$oField = parent::FindField($sFieldCode);
+		if ($oField === false)
+		{
+			// Look in the subform
+			$oField = $this->oSubForm->FindField($sFieldCode);
+		}
+		return $oField;
+	}
+}
+
+
+
+class DesignerStaticTextField extends DesignerFormField
+{
+	public function __construct($sCode, $sLabel = '', $defaultValue = '')
+	{
+		parent::__construct($sCode, $sLabel, $defaultValue);
+	}
+
+	public function Render(WebPage $oP, $sFormId, $sRenderMode='dialog')
+	{
+		return array('label' => $this->sLabel, 'value' => $this->defaultValue);
+	}
 }
 
-?>

application/itopwebpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -30,25 +30,21 @@ require_once(APPROOT."/application/user.preferences.class.inc.php");
 /**
  * Web page with some associated CSS and scripts (jquery) for a fancier display
  */
-class iTopWebPage extends NiceWebPage
+class iTopWebPage extends NiceWebPage implements iTabbedPage
 {
 	private $m_sMenu;
 	//	private $m_currentOrganization;
-	private $m_aTabs;
-	private $m_sCurrentTabContainer;
-	private $m_sCurrentTab;
 	private $m_sMessage;
 	private $m_sInitScript;
+	protected $m_oTabs;
 
 	public function __construct($sTitle)
 	{
 		parent::__construct($sTitle);
+		$this->m_oTabs = new TabManager();
 
 		ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
 
-		$this->m_sCurrentTabContainer = '';
-		$this->m_sCurrentTab = '';
-		$this->m_aTabs = array();
 		$this->m_sMenu = "";
 		$this->m_sMessage = '';
 		$this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
@@ -111,6 +107,23 @@ function ShowAboutBox()
 }
 EOF
 		);
+
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			// Leave the pane opened
+			$sConfigureWestPane = '';
+		}
+		else
+		{
+			$sConfigureWestPane =
+<<<EOF
+				if (GetUserPreference('menu_pane', 'open') == 'closed')
+				{
+					myLayout.close('west');
+				}
+				myLayout.addPinBtn( "#tPinMenu", "west" );
+EOF;
+		}
 		
 		$this->m_sInitScript =
 <<< EOF
@@ -163,13 +176,9 @@ EOF
 					}
 		});
 		window.clearTimeout(iPaneVisWatchDog);
-		myLayout.addPinBtn( "#tPinMenu", "west" );
 		//myLayout.open( "west" );
 		$('.ui-layout-resizer-west .ui-layout-toggler').css({background: 'transparent'});
-		if (GetUserPreference('menu_pane', 'open') == 'closed')
-		{
-			myLayout.close('west');
-		}
+		$sConfigureWestPane
 		
 		$('#left-pane').layout({ resizable: false, spacing_open: 0, south: { size: 94 }, enableCursorHotkey: false });
 	
@@ -190,16 +199,31 @@ EOF
 		// unless their URL is equal to the URL of the page...
 		$('div[id^=tabbedContent] > ul > li > a').each(function() {
 			var sHash = location.hash;
-			var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
-	    	$(this).attr("href", sCleanLocation+$(this).attr("href"));
+			var sHref = $(this).attr("href");
+			if (sHref.match(/^#/))
+			{
+				var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
+				$(this).attr("href", sCleanLocation+$(this).attr("href"));
+			}
 		});
 
 		// Enable tabs on all tab widgets. The `event` property must be overridden so
 		// that the tabs aren't changed on click, and any custom event name can be
 		// specified. Note that if you define a callback for the 'select' event, it
 		// will be executed for the selected tab whenever the hash changes.
-		tabs.tabs({ event: 'change', 'show': function(event, ui) {
+		tabs.tabs({
+			event: 'change', 'show': function(event, ui) {
 				$('.resizable', ui.panel).resizable(); // Make resizable everything that claims to be resizable !
+			},
+			beforeLoad: function( event, ui ) {
+				if ( ui.tab.data('loaded') && (ui.tab.attr('data-cache') == 'true')) {
+					event.preventDefault();
+					return;
+				}
+				ui.panel.html('<div><img src="../images/indicator.gif"></div>');
+				ui.jqXHR.success(function() {
+					ui.tab.data( "loaded", true );
+				});
 			}
 		});
 		
@@ -214,6 +238,7 @@ EOF
 	}
 EOF
 		;
+
 		$this->add_ready_script(
 <<< EOF
 	
@@ -537,6 +562,7 @@ EOF
 			$sNorthPane .= '<div id="admin-banner"><span style="padding:5px;">'.ExecutionKPI::GetDescription().'<span></div>';
 		}
 		
+		//$sSouthPane = '<p>Peak memory Usage: '.sprintf('%.3f MB', memory_get_peak_usage(true) / (1024*1024)).'</p>';
 		$sSouthPane = '';
 		foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance)
 		{
@@ -561,8 +587,7 @@ EOF
 				header($s_header);
 			}
 		}
-		$s_captured_output = ob_get_contents();
-		ob_end_clean();
+		$s_captured_output = $this->ob_get_clean_safe();
 		$sHtml = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
 		$sHtml .= "<html>\n";
 		$sHtml .= "<head>\n";
@@ -660,34 +685,7 @@ EOF
 			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
 		}
 		// Render the tabs in the page (if any)
-		foreach($this->m_aTabs as $sTabContainerName => $m_aTabs)
-		{
-			$sTabs = '';
-			$container_index = 0;
-			if (count($m_aTabs) > 0)
-			{
-				$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$container_index}\" class=\"light\">\n";
-				$sTabs .= "<ul>\n";
-				// Display the unordered list that will be rendered as the tabs
-				$i = 0;
-				foreach($m_aTabs as $sTabName => $sTabContent)
-				{
-					$sTabs .= "<li><a href=\"#tab_{$container_index}$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
-					$i++;
-				}
-				$sTabs .= "</ul>\n";
-				// Now add the content of the tabs themselves
-				$i = 0;
-				foreach($m_aTabs as $sTabName => $sTabContent)
-				{
-					$sTabs .= "<div id=\"tab_{$container_index}$i\">".$sTabContent."</div>\n";
-					$i++;
-				}
-				$sTabs .= "</div>\n<!-- end of tabs-->\n";
-			}
-			$this->s_content = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $this->s_content);
-			$container_index++;
-		}
+		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content);
 
 		if ($this->GetOutputFormat() == 'html')
 		{
@@ -790,7 +788,10 @@ EOF
 			$sHtml .= ' <div id="top-left"></div><div id="logo"><a href="'.htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8').'"><img src="'.$sDisplayIcon.'" title="'.htmlentities($sVersionString, ENT_QUOTES, 'UTF-8').'" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
 			$sHtml .= ' </div>';
 			$sHtml .= ' <div class="header-menu">';
-			$sHtml .= '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
+			if (!MetaModel::GetConfig()->Get('demo_mode'))
+			{
+				$sHtml .= '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
+			}
 			$sHtml .= '		<div style="text-align:center;">'.self::FilterXSS($sForm).'</div>';
 			$sHtml .= ' </div>';
 			$sHtml .= ' </div>';
@@ -875,62 +876,51 @@ EOF
 		ExecutionKPI::ReportStats();
 	}
 
-	public function AddTabContainer($sTabContainer)
+	public function AddTabContainer($sTabContainer, $sPrefix = '')
 	{
-		$this->m_aTabs[$sTabContainer] = array();
-		$this->add("\$Tabs:$sTabContainer\$");
+		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
 	}
 
 	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
 	{
-		if (!isset($this->m_aTabs[$sTabContainer][$sTabLabel]))
-		{
-			// Set the content of the tab
-			$this->m_aTabs[$sTabContainer][$sTabLabel] = $sHtml;
-		}
-		else
-		{
-			// Append to the content of the tab
-			$this->m_aTabs[$sTabContainer][$sTabLabel] .= $sHtml;
-		}
+		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
 	}
 
 	public function SetCurrentTabContainer($sTabContainer = '')
 	{
-		$sPreviousTabContainer = $this->m_sCurrentTabContainer;
-		$this->m_sCurrentTabContainer = $sTabContainer;
-		return $sPreviousTabContainer;
+		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
 	}
 
 	public function SetCurrentTab($sTabLabel = '')
 	{
-		$sPreviousTab = $this->m_sCurrentTab;
-		$this->m_sCurrentTab = $sTabLabel;
-		return $sPreviousTab;
+		return $this->m_oTabs->SetCurrentTab($sTabLabel);
 	}
-
+	
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 * 
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+	 * Static content cannot be added inside such tabs.
+	 * 
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	{
+		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
+	}
+	
 	public function GetCurrentTab()
 	{
-		return $this->m_sCurrentTab;
+		return $this->m_oTabs->GetCurrentTab();
 	}
 
 	public function RemoveTab($sTabLabel, $sTabContainer = null)
 	{
-		if ($sTabContainer == null)
-		{
-			$sTabContainer = $this->m_sCurrentTabContainer;
-		}
-		if (isset($this->m_aTabs[$sTabContainer][$sTabLabel]))
-		{
-			// Delete the content of the tab
-			unset($this->m_aTabs[$sTabContainer][$sTabLabel]);
-				
-			// If we just removed the active tab, let's reset the active tab
-			if (($this->m_sCurrentTabContainer == $sTabContainer) &&  ($this->m_sCurrentTab == $sTabLabel))
-			{
-				$this->m_sCurrentTab = '';
-			}
-		}
+		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
 	}
 
 	/**
@@ -939,20 +929,7 @@ EOF
 	 */
 	public function FindTab($sPattern, $sTabContainer = null)
 	{
-		$return = false;
-		if ($sTabContainer == null)
-		{
-			$sTabContainer = $this->m_sCurrentTabContainer;
-		}
-		foreach($this->m_aTabs[$sTabContainer] as $sTabLabel => $void)
-		{
-			if (preg_match($sPattern, $sTabLabel))
-			{
-				$result = $sTabLabel;
-				break;
-			}
-		}
-		return $result;
+		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
 	}
 
 	/**
@@ -963,26 +940,7 @@ EOF
 	 */
 	public function SelectTab($sTabContainer, $sTabLabel)
 	{
-		$container_index = 0;
-		$tab_index = 0;
-		foreach($this->m_aTabs as $sCurrentTabContainerName => $aTabs)
-		{
-			if ($sTabContainer == $sCurrentTabContainerName)
-			{
-				foreach($aTabs as $sCurrentTabLabel => $void)
-				{
-					if ($sCurrentTabLabel == $sTabLabel)
-					{
-						break;
-					}
-					$tab_index++;
-				}
-				break;
-			}
-			$container_index++;
-		}
-		$sSelector = '#tabbedContent_'.$container_index.' > ul';
-		$this->add_ready_script("window.setTimeout(\"$('$sSelector').tabs('select', $tab_index);\", 100);"); // Let the time to the tabs widget to initialize
+		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
 	}
 
 	public function StartCollapsibleSection($sSectionLabel, $bOpen = false)
@@ -1016,9 +974,9 @@ EOF
 
 	public function add($sHtml)
 	{
-		if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_sCurrentTab))
+		if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
 		{
-			$this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
+			$this->m_oTabs->AddToCurrentTab($sHtml);
 		}
 		else
 		{
@@ -1032,10 +990,13 @@ EOF
 	 */
 	public function start_capture()
 	{
-		if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_sCurrentTab))
+		$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
+		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
+		
+		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
 		{
-			$iOffset = isset($this->m_aTabs[$this->m_sCurrentTabContainer][$this->m_sCurrentTab]) ? strlen($this->m_aTabs[$this->m_sCurrentTabContainer][$this->m_sCurrentTab]): 0;
-			return array('tc' => $this->m_sCurrentTabContainer, 'tab' => $this->m_sCurrentTab, 'offset' => $iOffset);
+			$iOffset = $this->m_oTabs->GetCurrentTabLength();
+			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
 		}
 		else
 		{
@@ -1053,10 +1014,9 @@ EOF
 	{
 		if (is_array($offset))
 		{
-			if (isset($this->m_aTabs[$offset['tc']][$offset['tab']]))
+			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
 			{
-				$sCaptured = substr($this->m_aTabs[$offset['tc']][$offset['tab']], $offset['offset']);
-				$this->m_aTabs[$offset['tc']][$offset['tab']] = substr($this->m_aTabs[$offset['tc']][$offset['tab']], 0, $offset['offset']);
+				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
 			}
 			else
 			{
@@ -1078,4 +1038,3 @@ EOF
 			$this->m_sMessage = $sMessage;
 	}
 }
-?>

application/loginwebpage.class.inc.php

@@ -33,7 +33,15 @@ class LoginWebPage extends NiceWebPage
 {
 	const EXIT_PROMPT = 0;
 	const EXIT_HTTP_401 = 1;
-
+	const EXIT_RETURN = 2;
+	
+	const EXIT_CODE_OK = 0;
+	const EXIT_CODE_MISSINGLOGIN = 1;
+	const EXIT_CODE_MISSINGPASSWORD = 2;
+	const EXIT_CODE_WRONGCREDENTIALS = 3;
+	const EXIT_CODE_MUSTBEADMIN = 4;
+	const EXIT_CODE_PORTALUSERNOTAUTHORIZED = 5;
+	
 	protected static $sHandlerClass = __class__;
 	public static function RegisterHandler($sClass)
 	{
@@ -105,6 +113,7 @@ class LoginWebPage extends NiceWebPage
 			case 'url':
 			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
 			$this->add_header('HTTP/1.0 401 Unauthorized');
+			$this->add_header('Content-type: text/html; charset=iso-8859-1');
 			// Note: displayed when the user will click on Cancel
 			$this->add('<p><strong>'.Dict::S('UI:Login:Error:AccessRestricted').'</strong></p>');
 			break;
@@ -145,6 +154,8 @@ class LoginWebPage extends NiceWebPage
 			}
 			$this->add("</table>\n");
 			$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
+
+			$this->add_ready_script('$("#user").focus();');
 						
 			// Keep the OTHER parameters posted
 			foreach($_POST as $sPostedKey => $postedValue)
@@ -190,7 +201,7 @@ class LoginWebPage extends NiceWebPage
 		$this->add("<p>".Dict::S('UI:Login:ForgotPwdForm+')."</p>\n");
 		if ($bFailedToReset)
 		{
-			$this->add("<p class=\"hilite\">".Dict::Format('UI:Login:ResetPwdFailed', $sFailureReason)."</p>\n");
+			$this->add("<p class=\"hilite\">".Dict::Format('UI:Login:ResetPwdFailed', htmlentities($sFailureReason, ENT_QUOTES, 'UTF-8'))."</p>\n");
 		}
 		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
 		$this->add("<form method=\"post\">\n");
@@ -201,6 +212,8 @@ class LoginWebPage extends NiceWebPage
 		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"forgot_pwd_go\" />\n");
 		$this->add("</form>\n");
 		$this->add("</div>\n");
+
+		$this->add_ready_script('$("#user").focus();');
 	}
 
 	protected function ForgotPwdGo()
@@ -238,7 +251,12 @@ class LoginWebPage extends NiceWebPage
 
 			$oEmail = new Email();
 			$oEmail->SetRecipientTO($sTo);
-			$oEmail->SetRecipientFrom($sTo);
+			$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
+			if ($sFrom == '')
+			{
+				$sFrom = $sTo;
+			}
+			$oEmail->SetRecipientFrom($sFrom);
 			$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject'));
 			$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
 			$oEmail->SetBody(Dict::Format('UI:ResetPwd-EmailBody', $sResetUrl));
@@ -419,10 +437,29 @@ EOF
 		return MetaModel::GetConfig()->GetSecureConnectionRequired();
 	}
 
+	/**
+	 * Guess if a string looks like an UTF-8 string based on some ranges of multi-bytes encoding
+	 * @param string $sString
+	 * @return bool True if the string contains some typical UTF-8 multi-byte sequences
+	 */
+	static function LooksLikeUTF8($sString)
+	{
+		return preg_match('%(?:
+        			[\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+        			|\xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+        			|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
+        			|\xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+        			|\xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+        			|[\xF1-\xF3][\x80-\xBF]{3}         # planes 4-15
+        			|\xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+        	)+%xs', $sString);
+	}
+
 	/**
 	 * Attempt a login
 	 * 	 	
 	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
+	 * @return int One of the class constants EXIT_CODE_...
 	 */	
 	protected static function Login($iOnExit)
 	{
@@ -439,7 +476,7 @@ EOF
 			//echo "User: ".$_SESSION['auth_user']."\n";
 			// Already authentified
 			UserRights::Login($_SESSION['auth_user']); // Login & set the user's language
-			return true;
+			return self::EXIT_CODE_OK;
 		}
 		else
 		{
@@ -466,8 +503,8 @@ EOF
 					case 'form':
 					// iTop standard mode: form based authentication
 					$sAuthUser = utils::ReadPostedParam('auth_user', '', false, 'raw_data');
-					$sAuthPwd = utils::ReadPostedParam('auth_pwd', '', false, 'raw_data');
-					if ($sAuthUser != '')
+					$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, false, 'raw_data');
+					if (($sAuthUser != '') && ($sAuthPwd !== null))
 					{
 						$sLoginMode = 'form';
 					}
@@ -484,7 +521,22 @@ EOF
 					else if (isset($_SERVER['PHP_AUTH_USER']))
 					{
 						$sAuthUser = $_SERVER['PHP_AUTH_USER'];
+						// Unfortunately, the RFC is not clear about the encoding...
+						// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
+						// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
+						if (!self::LooksLikeUTF8($sAuthUser))
+						{
+							// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
+							// Supposed to be harmless in case of a plain ASCII string...
+							$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
+						}
 						$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
+						if (!self::LooksLikeUTF8($sAuthPwd))
+						{
+							// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
+							// Supposed to be harmless in case of a plain ASCII string...
+							$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
+						}
 						$sLoginMode = 'basic';
 					}
 					break;
@@ -506,7 +558,7 @@ EOF
 					// Credentials passed directly in the url
 					$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 					$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-					if (($sAuthUser != '') && ($sAuthPwd != null))
+					if (($sAuthUser != '') && ($sAuthPwd !== null))
 					{
 						$sLoginMode = 'url';
 					}		
@@ -527,11 +579,24 @@ EOF
 				{
 					$sLoginMode = $aAllowedLoginTypes[0]; // First in the list...
 				}
-				if ($iOnExit == self::EXIT_HTTP_401)
+				if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
 				{
-					header("HTTP/1.0 401 Unauthorized");
+					header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
+					header('HTTP/1.0 401 Unauthorized');
+					header('Content-type: text/html; charset=iso-8859-1');
 					exit;
 				}
+				else if($iOnExit == self::EXIT_RETURN)
+				{
+					if (($sAuthUser !== '') && ($sAuthPwd === null))
+					{
+						return self::EXIT_CODE_MISSINGPASSWORD;
+					}
+					else
+					{
+						return self::EXIT_CODE_MISSINGLOGIN;
+					}
+				}
 				else
 				{
 					$oPage = self::NewLoginWebPage();
@@ -546,11 +611,17 @@ EOF
 				{
 					//echo "Check Credentials returned false for user $sAuthUser!";
 					self::ResetSession();
-					if ($iOnExit == self::EXIT_HTTP_401)
+					if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
 					{
-						header("HTTP/1.0 401 Unauthorized");
+						header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
+						header('HTTP/1.0 401 Unauthorized');
+						header('Content-type: text/html; charset=iso-8859-1');
 						exit;
 					}
+					else if($iOnExit == self::EXIT_RETURN)
+					{
+						return self::EXIT_CODE_WRONGCREDENTIALS;
+					}
 					else
 					{
 						$oPage = self::NewLoginWebPage();
@@ -578,18 +649,31 @@ EOF
 				}
 			}
 		}
+		return self::EXIT_CODE_OK;
 	}
 	
 	/**
 	 * Overridable: depending on the user, head toward a dedicated portal
 	 * @param bool $bIsAllowedToPortalUsers Whether or not the current page is considered as part of the portal
+	 * @param int $iOnExit How to complete the call: redirect or return a code
 	 */	 
-	protected static function ChangeLocation($bIsAllowedToPortalUsers)
+	protected static function ChangeLocation($bIsAllowedToPortalUsers, $iOnExit = self::EXIT_PROMPT)
 	{
 		if ( (!$bIsAllowedToPortalUsers) && (UserRights::IsPortalUser()))
 		{
-			// No rights to be here, redirect to the portal
-			header('Location: '.utils::GetAbsoluteUrlAppRoot().'portal/index.php');
+			if ($iOnExit == self::EXIT_RETURN)
+			{
+				return self::EXIT_CODE_PORTALUSERNOTAUTHORIZED;
+			}
+			else
+			{
+				// No rights to be here, redirect to the portal
+				header('Location: '.utils::GetAbsoluteUrlAppRoot().'portal/index.php');
+			}
+		}
+		else
+		{
+			return self::EXIT_CODE_OK;
 		}
 	}
 
@@ -684,18 +768,35 @@ EOF
 			$sMessage = Dict::S('UI:Login:PasswordChanged');
 		}
 		
-		self::Login($iOnExit);
+		$iRet = self::Login($iOnExit);
 
-		if ($bMustBeAdmin && !UserRights::IsAdministrator())
-		{	
-			require_once(APPROOT.'/setup/setuppage.class.inc.php');
-			$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");	
-			$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
-			$oP->output();
-			exit;
+		if ($iRet == self::EXIT_CODE_OK)
+		{
+			if ($bMustBeAdmin && !UserRights::IsAdministrator())
+			{
+				if ($iOnExit == self::EXIT_RETURN)
+				{
+					return self::EXIT_CODE_MUSTBEADMIN;
+				}
+				else
+				{
+					require_once(APPROOT.'/setup/setuppage.class.inc.php');
+					$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+					$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");	
+					$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
+					$oP->output();
+					exit;
+				}
+			}
+			$iRet = call_user_func(array(self::$sHandlerClass, 'ChangeLocation'), $bIsAllowedToPortalUsers, $iOnExit);
+		}
+		if ($iOnExit == self::EXIT_RETURN)
+		{
+			return $iRet;
+		}
+		else
+		{
+			return $sMessage;
 		}
-		call_user_func(array(self::$sHandlerClass, 'ChangeLocation'), $bIsAllowedToPortalUsers);
-		return $sMessage;
 	}	
 } // End of class

application/portalwebpage.class.inc.php

@@ -324,7 +324,7 @@ EOF
 
 				$sUniqueId = $sClass.$this->GetUniqueId();
 				$this->add("<div id=\"$sUniqueId\">\n"); // The id here MUST be the same as currentId, otherwise the pagination will be broken
-				cmdbAbstractObject::DisplaySet($this, $oSet, array('currentId' => $sUniqueId, 'menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList)));
+				cmdbAbstractObject::DisplaySet($this, $oSet, array('currentId' => $sUniqueId, 'menu' => false, 'toolkit_menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList)));
 				$this->add("</div>\n");
 			}
 			else
@@ -420,7 +420,7 @@ EOF
 			}
 			$oObjSearch->AddCondition_ReferencedBy($oLinkSet->GetFilter(), $sRemoteAttCode);
 
-			$aExtraParams = array('menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList));
+			$aExtraParams = array('menu' => false, 'toolkit_menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList));
 			$oBlock = new DisplayBlock($oObjSearch, 'list', false);
 			$oBlock->Display($this, 1, $aExtraParams);
 		}
@@ -480,7 +480,9 @@ EOF
 				{
 					try
 					{
-						$oAllowedValues = new DBObjectSet(DBObjectSearch::FromOQL(constant($sFilterDefName)), array(), $aFilterParams);
+						$oFitlerWithParams = DBObjectSearch::FromOQL(constant($sFilterDefName));
+						$sFilterOQL = $oFitlerWithParams->ToOQL(true, $aFilterParams);
+						$oAllowedValues = new DBObjectSet(DBObjectSearch::FromOQL($sFilterOQL), array(), $aFilterParams);
 					}
 					catch(OQLException $e)
 					{
@@ -510,7 +512,8 @@ EOF
 				if (is_null($aAllowedValues))
 				{
 					// Any value is possible, display an input box
-					$this->add("<label>".MetaModel::GetFilterLabel($sClass, $sAttSpec).":</label>&nbsp;<input class=\"textSearch\" name=\"$sPrefix$sFieldName\" value=\"$sFilterValue\"/>\n");
+					$sSanitizedValue = htmlentities($sFilterValue, ENT_QUOTES, 'UTF-8');
+					$this->add("<label>".MetaModel::GetFilterLabel($sClass, $sAttSpec).":</label>&nbsp;<input class=\"textSearch\" name=\"$sPrefix$sFieldName\" value=\"$sSanitizedValue\"/>\n");
 				}
 				else
 				{
@@ -793,24 +796,7 @@ EOF
 			}
 		}
 
-		$sOQL = "SELECT $sClass WHERE org_id = :org_id";
-		$oSearch = DBObjectSearch::FromOQL($sOQL);
-		$iUser = UserRights::GetContactId();
-		if ($iUser > 0 && !IsPowerUser())
-		{
-			$oSearch->AddCondition('caller_id', $iUser);
-		}
-		$oSearch->AddCondition('id', $iId);
-		
-		$oContact = MetaModel::GetObject('Contact', $iUser, false); // false => Can fail
-		if (!is_object($oContact))
-		{
-			throw new Exception(Dict::S('Portal:ErrorNoContactForThisUser'));
-		}
-		
-		$oSet = new DBObjectSet($oSearch, array(), array('org_id' => $oContact->Get('org_id')));
-		
-		$oObj = $oSet->Fetch();
+		$oObj = MetaModel::GetObject($sClass, $iId, false);		
 		if (!is_object($oObj))
 		{
 			throw new Exception("Could not find the object $sClass/$iId");

application/query.class.inc.php

@@ -53,7 +53,7 @@ abstract class Query extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }
@@ -82,7 +82,7 @@ class QueryOQL extends Query
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 

application/ui.extkeywidget.class.inc.php

@@ -453,7 +453,7 @@ EOF
 	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true));	
 		$oPage->add('</div></div></div>');
 //		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: $(window).width()*0.8, height: 'auto', autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
-		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
+		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
 		$oPage->add_ready_script("$('#dcr_{$this->iId} form').removeAttr('onsubmit');");
 		$oPage->add_ready_script("$('#dcr_{$this->iId} form').bind('submit.uilinksWizard', oACWidget_{$this->iId}.DoCreateObject);");
 	}
@@ -557,6 +557,7 @@ EOF
 			$aSortedRoots = $aTree[$iRootId];
 			asort($aSortedRoots);
 			$oP->add("<ul>\n");
+			$fUniqueId = microtime(true);
 			foreach($aSortedRoots as $id => $sName)
 			{
 				if ($bSelect)
@@ -564,14 +565,14 @@ EOF
 					$sChecked = ($aNodes[$id]->GetKey() == $currValue) ? 'checked' : '';
 					if ($bMultiple)
 					{
-						$sSelect = '<input type="checkbox" value="'.$aNodes[$id]->GetKey().'" name="selectObject[]" '.$sChecked.'>&nbsp;';
+						$sSelect = '<input id="input_'.$fUniqueId.'_'.$aNodes[$id]->GetKey().'" type="checkbox" value="'.$aNodes[$id]->GetKey().'" name="selectObject[]" '.$sChecked.'>&nbsp;';
 					}
 					else
 					{
-						$sSelect = '<input type="radio" value="'.$aNodes[$id]->GetKey().'" name="selectObject" '.$sChecked.'>&nbsp;';
+						$sSelect = '<input id="input_'.$fUniqueId.'_'.$aNodes[$id]->GetKey().'" type="radio" value="'.$aNodes[$id]->GetKey().'" name="selectObject" '.$sChecked.'>&nbsp;';
 					}
 				}
-				$oP->add('<li>'.$sSelect.$aNodes[$id]->GetHyperlink());
+				$oP->add('<li>'.$sSelect.'<label for="input_'.$fUniqueId.'_'.$aNodes[$id]->GetKey().'">'.$aNodes[$id]->GetName().'</label>');
 				$this->DumpNodes($oP, $id, $aTree, $aNodes, $currValue);
 				$oP->add("</li>\n");
 			}

application/ui.linksdirectwidget.class.inc.php

@@ -318,12 +318,11 @@ class UILinksWidgetDirect
 		{
 			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
-		$aArgs = array();
 		if ($oCurrentObj != null)
 		{
-			$aArgs = $oCurrentObj->ToArgs('this');
+			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
+			$oFilter->SetInternalParams($aArgs);
 		}
-		$oFilter->SetInternalParams($aArgs);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
 		$oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", array('menu' => false, 'cssCount'=> '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid)); // Don't display the 'Actions' menu on the results
 	}

application/ui.linkswidget.class.inc.php

@@ -239,7 +239,7 @@ EOF
 	 */
 	protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
 	{
-		$sHtml = '';
+		$sHtml = "<input type=\"hidden\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\">";
 		$sHtml .= "<table class=\"listResults\">\n";
 		// Header
 		$sHtml .= "<thead>\n";
@@ -259,11 +259,11 @@ EOF
 			$sEmptyRowStyle = 'style="display:none;"';
 		}
 
-		$sHtml .= "<tr $sEmptyRowStyle id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."<input type=\"hidden\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\"></td></td>";
 		foreach($aData as $iRowId => $aRow)
 		{
 			$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
 		}		
+		$sHtml .= "<tr $sEmptyRowStyle id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."</td></tr>";
 		$sHtml .= "</tbody>\n";
 		
 		// Footer

application/utils.inc.php

@@ -783,11 +783,16 @@ class utils
 			$sOQL = addslashes($param->GetFilter()->ToOQL(true));
 			$sFilter = urlencode($param->GetFilter()->serialize());
 			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/xlsx-export.js');
+			$sXlsxFilter = $param->GetFilter()->serialize();
+			$sXlsxJSFilter = addslashes($sXlsxFilter);
+			
 			$aResult = array(
 				new SeparatorPopupMenuItem(),
 				// Static menus: Email this page, CSV Export & Add to Dashboard
 				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
 				new URLPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), $sUrl."&format=csv"),
+				new JSPopupMenuItem('xlsx-export', Dict::S('ExcelExporter:ExportMenu'), "XlsxExportDialog('$sXlsxJSFilter');", array()),
 				new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL')"),
 				new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')"),
 			);
@@ -802,11 +807,14 @@ class utils
 			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage(get_class($oObj));
 			$oAppContext = new ApplicationContext();
 			$sContext = $oAppContext->GetForLink();
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/xlsx-export.js');
+			$sXlsxJSFilter = addslashes($sFilter);
 			$aResult = array(
 				new SeparatorPopupMenuItem(),
 				// Static menus: Email this page & CSV Export
 				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?subject=".urlencode($oObj->GetRawName())."&body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
 				new URLPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".urlencode($sFilter)."&format=csv&{$sContext}"),
+				new JSPopupMenuItem('xlsx-export', Dict::S('ExcelExporter:ExportMenu'), "XlsxExportDialog('$sXlsxJSFilter');", array()),
 			);
 			break;
 

application/webpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -68,6 +68,7 @@ class WebPage implements Page
 	protected $sContentType;
 	protected $sContentDisposition;
 	protected $sContentFileName;
+	protected $bTrashUnexpectedOutput;
 	protected $s_sOutputFormat;
 	protected $a_OutputOptions;
 	    
@@ -88,6 +89,7 @@ class WebPage implements Page
         $this->sContentType = '';
         $this->sContentDisposition = '';
         $this->sContentFileName = '';
+		$this->bTrashUnexpectedOutput = false;
 		$this->s_OutputFormat = utils::ReadParam('output_format', 'html');
 		$this->a_OutputOptions = array();
         ob_start(); // Start capturing the output
@@ -392,22 +394,55 @@ class WebPage implements Page
 	}
 	
 	/**
-	 * Discard unexpected output data
+	 * Discard unexpected output data (such as PHP warnings)
 	 * This is a MUST when the Page output is DATA (download of a document, download CSV export, download ...)
 	 */	
 	public function TrashUnexpectedOutput()
 	{
-		// This protection is redundant with a protection implemented in MetaModel::IncludeModule
-		// which detects such issues while loading module files
-		// Here, the purpose is to detect and discard characters produced by the code execution (echo)
-		$sPreviousContent = ob_get_clean();
-		if (trim($sPreviousContent) != '')
+		$this->bTrashUnexpectedOutput = true;
+	}
+
+	/**
+	 * Read the output buffer and deal with its contents:
+	 * - trash unexpected output if the flag has been set
+	 * - report unexpected behaviors such as the output buffering being stopped
+	 * 
+	 * Possible improvement: I've noticed that several output buffers are stacked,
+	 * if they are not empty, the output will be corrupted. The solution would
+	 * consist in unstacking all of them (and concatenate the contents).	 	 
+	 */
+	protected function ob_get_clean_safe()
+	{
+		$sOutput = ob_get_contents();
+		if ($sOutput === false)
 		{
-			if (Utils::GetConfig() && Utils::GetConfig()->Get('debug_report_spurious_chars'))
+			$sMsg = "Design/integration issue: No output buffer. Some piece of code has called ob_get_clean() or ob_end_clean() without calling ob_start()";
+			if ($this->bTrashUnexpectedOutput)
 			{
-				IssueLog::Error("Output already started before downloading file:\nContent was:'$sPreviousContent'\n");
+				IssueLog::Error($sMsg);
+				$sOutput = '';
+			}
+			else
+			{
+				$sOutput = $sMsg;
 			}
 		}
+		else
+		{
+			ob_end_clean(); // on some versions of PHP doing so when the output buffering is stopped can cause a notice
+			if ($this->bTrashUnexpectedOutput)
+			{
+				if (trim($sOutput) != '')
+				{
+					if (Utils::GetConfig() && Utils::GetConfig()->Get('debug_report_spurious_chars'))
+					{
+						IssueLog::Error("Trashing unexpected output:'$s_captured_output'\n");
+					}
+				}
+				$sOutput = '';
+			}
+		}
+		return $sOutput;
 	}
 
 	/**
@@ -419,8 +454,8 @@ class WebPage implements Page
         {
             header($s_header);
         }
-        $s_captured_output = ob_get_contents();
-        ob_end_clean();
+
+        $s_captured_output = $this->ob_get_clean_safe();
         echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
         echo "<html>\n";
         echo "<head>\n";
@@ -492,6 +527,10 @@ class WebPage implements Page
         {
             MetaModel::RecordQueryTrace();
         }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
     }
 
 	/**
@@ -653,7 +692,7 @@ class WebPage implements Page
 		foreach ($aActions as $aAction)
 		{
 			$sClass = isset($aAction['class']) ? " class=\"{$aAction['class']}\"" : "";
-			$sOnClick = isset($aAction['onclick']) ? " onclick=\"{$aAction['onclick']}\"" : "";
+			$sOnClick = isset($aAction['onclick']) ? ' onclick="'.htmlspecialchars($aAction['onclick'], ENT_QUOTES, "UTF-8").'"' : '';
 			$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
 			if (empty($aAction['url']))
 			{
@@ -714,4 +753,291 @@ class WebPage implements Page
 		}
 	}
 }
-?>
+
+
+interface iTabbedPage
+{
+	public function AddTabContainer($sTabContainer, $sPrefix = '');
+
+	public function AddToTab($sTabContainer, $sTabLabel, $sHtml);
+
+	public function SetCurrentTabContainer($sTabContainer = '');
+
+	public function SetCurrentTab($sTabLabel = '');
+	
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 * 
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+	 * Static content cannot be added inside such tabs.
+	 * 
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true);
+	
+	public function GetCurrentTab();
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null);
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 * @return mixed The name of the tab as a string or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null);
+}
+
+/**
+ * Helper class to implement JQueryUI tabs inside a page
+ */
+class TabManager
+{
+	protected $m_aTabs;
+	protected $m_sCurrentTabContainer;
+	protected $m_sCurrentTab;
+	
+	public function __construct()
+	{
+		$this->m_aTabs = array();
+		$this->m_sCurrentTabContainer = '';
+		$this->m_sCurrentTab = '';
+	}
+	
+	public function AddTabContainer($sTabContainer, $sPrefix = '')
+	{
+		$this->m_aTabs[$sTabContainer] = array('prefix' => $sPrefix, 'tabs' => array());
+		return "\$Tabs:$sTabContainer\$";
+	}
+
+	public function AddToCurrentTab($sHtml)
+	{
+		$this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
+	}
+	
+	public function GetCurrentTabLength($sHtml)
+	{
+		$iLength = isset($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) ? strlen($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']): 0;
+		return $iLength;
+	}
+	
+	/**
+	 * Truncates the given tab to the specifed length and returns the truncated part
+	 * @param string $sTabContainer The tab container in which to truncate the tab
+	 * @param string $sTab The name/identifier of the tab to truncate
+	 * @param integer $iLength The length/offset at which to truncate the tab
+	 * @return string The truncated part
+	 */
+	public function TruncateTab($sTabContainer, $sTab, $iLength)
+	{
+		$sResult = substr($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'], $iLength);
+		$this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'] = substr($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'], 0, $iLength);
+		return $sResult;	
+	}
+	
+	public function TabExists($sTabContainer, $sTab)
+	{
+		return isset($this->m_aTabs[$sTabContainer]['tabs'][$sTab]);
+	}
+	
+	public function TabsContainerCount()
+	{
+		return count($this->m_aTabs);
+	}
+	
+	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+	{
+		if (!isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
+		{
+			// Set the content of the tab
+			$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel] = array(
+				'type' => 'html',
+				'html' => $sHtml,
+			);
+		}
+		else
+		{
+			if ($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['type'] != 'html')
+			{
+				throw new Exception("Cannot add HTML content to the tab '$sTabLabel' of type '{$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['type']}'");
+			}
+			// Append to the content of the tab
+			$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['html'] .= $sHtml;
+		}
+		return ''; // Nothing to add to the page for now
+	}
+
+	public function SetCurrentTabContainer($sTabContainer = '')
+	{
+		$sPreviousTabContainer = $this->m_sCurrentTabContainer;
+		$this->m_sCurrentTabContainer = $sTabContainer;
+		return $sPreviousTabContainer;
+	}
+
+	public function SetCurrentTab($sTabLabel = '')
+	{
+		$sPreviousTab = $this->m_sCurrentTab;
+		$this->m_sCurrentTab = $sTabLabel;
+		return $sPreviousTab;
+	}
+	
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 * 
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+	 * Static content cannot be added inside such tabs.
+	 * 
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	{
+		// Set the content of the tab
+		$this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$sTabLabel] = array(
+			'type' => 'ajax',
+			'url' => $sUrl,
+			'cache' => $bCache,
+		);
+		return ''; // Nothing to add to the page for now
+	}
+	
+	
+	public function GetCurrentTabContainer()
+	{
+		return $this->m_sCurrentTabContainer;
+	}
+	
+	public function GetCurrentTab()
+	{
+		return $this->m_sCurrentTab;
+	}
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	{
+		if ($sTabContainer == null)
+		{
+			$sTabContainer = $this->m_sCurrentTabContainer;
+		}
+		if (isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
+		{
+			// Delete the content of the tab
+			unset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]);
+				
+			// If we just removed the active tab, let's reset the active tab
+			if (($this->m_sCurrentTabContainer == $sTabContainer) &&  ($this->m_sCurrentTab == $sTabLabel))
+			{
+				$this->m_sCurrentTab = '';
+			}
+		}
+	}
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 * @return mixed The name of the tab as a string or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null)
+	{
+		$return = false;
+		if ($sTabContainer == null)
+		{
+			$sTabContainer = $this->m_sCurrentTabContainer;
+		}
+		foreach($this->m_aTabs[$sTabContainer]['tabs'] as $sTabLabel => $void)
+		{
+			if (preg_match($sPattern, $sTabLabel))
+			{
+				$result = $sTabLabel;
+				break;
+			}
+		}
+		return $result;
+	}
+
+	/**
+	 * Make the given tab the active one, as if it were clicked
+	 * DOES NOT WORK: apparently in the *old* version of jquery
+	 * that we are using this is not supported... TO DO upgrade
+	 * the whole jquery bundle...
+	 */
+	public function SelectTab($sTabContainer, $sTabLabel)
+	{
+		$container_index = 0;
+		$tab_index = 0;
+		foreach($this->m_aTabs as $sCurrentTabContainerName => $aTabs)
+		{
+			if ($sTabContainer == $sCurrentTabContainerName)
+			{
+				foreach($aTabs['tabs'] as $sCurrentTabLabel => $void)
+				{
+					if ($sCurrentTabLabel == $sTabLabel)
+					{
+						break;
+					}
+					$tab_index++;
+				}
+				break;
+			}
+			$container_index++;
+		}
+		$sSelector = '#tabbedContent_'.$container_index.' > ul';
+		return "window.setTimeout(\"$('$sSelector').tabs('select', $tab_index);\", 100);"; // Let the time to the tabs widget to initialize
+	}
+	
+	public function RenderIntoContent($sContent)
+	{
+		// Render the tabs in the page (if any)
+		foreach($this->m_aTabs as $sTabContainerName => $aTabs)
+		{
+			$sTabs = '';
+			$sPrefix = $aTabs['prefix'];
+			$container_index = 0;
+			if (count($aTabs['tabs']) > 0)
+			{
+				$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$sPrefix}{$container_index}\" class=\"light\">\n";
+				$sTabs .= "<ul>\n";
+				// Display the unordered list that will be rendered as the tabs
+				$i = 0;
+				foreach($aTabs['tabs'] as $sTabName => $aTabData)
+				{
+					switch($aTabData['type'])
+					{
+						case 'ajax':
+						$sTabs .= "<li data-cache=\"".($aTabData['cache'] ? 'true' : 'false')."\"><a href=\"{$aTabData['url']}\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
+						break;
+						
+						case 'html':
+						default:
+						$sTabs .= "<li><a href=\"#tab_{$sPrefix}{$container_index}$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";	
+					}
+					$i++;
+				}
+				$sTabs .= "</ul>\n";
+				// Now add the content of the tabs themselves
+				$i = 0;
+				foreach($aTabs['tabs'] as $sTabName => $aTabData)
+				{
+					switch($aTabData['type'])
+					{
+						case 'ajax':
+						// Nothing to add
+						break;
+						
+						case 'html':
+						default:
+						$sTabs .= "<div id=\"tab_{$sPrefix}{$container_index}$i\">".$aTabData['html']."</div>\n";	
+					}
+					$i++;
+				}
+				$sTabs .= "</div>\n<!-- end of tabs-->\n";
+			}
+			$sContent = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $sContent);
+			$container_index++;
+		}
+		return $sContent;
+	}
+}

application/xlsxwriter.class.php

@@ -0,0 +1,456 @@
+<?php
+/* @author Mark Jones
+ * @license MIT License
+ * */
+
+if (!class_exists('ZipArchive')) { throw new Exception('ZipArchive not found'); }
+
+Class XLSXWriter
+{
+	//------------------------------------------------------------------
+	protected $author ='Doc Author';
+	protected $sheets_meta = array();
+	protected $shared_strings = array();//unique set
+	protected $shared_string_count = 0;//count of non-unique references to the unique set
+	protected $temp_files = array();
+
+	public function __construct(){}
+	public function setAuthor($author='') { $this->author=$author; }
+
+	public function __destruct()
+	{
+		if (!empty($this->temp_files)) {
+			foreach($this->temp_files as $temp_file) {
+				@unlink($temp_file);
+			}
+		}
+	}
+	
+	protected function tempFilename()
+	{
+		$filename = tempnam("/tmp", "xlsx_writer_");
+		$this->temp_files[] = $filename;
+		return $filename;
+	}
+
+	public function writeToStdOut()
+	{
+		$temp_file = $this->tempFilename();
+		self::writeToFile($temp_file);
+		readfile($temp_file);
+	}
+
+	public function writeToString()
+	{
+		$temp_file = $this->tempFilename();
+		self::writeToFile($temp_file);
+		$string = file_get_contents($temp_file);
+		return $string;
+	}
+
+	public function writeToFile($filename)
+	{
+		@unlink($filename);//if the zip already exists, overwrite it
+		$zip = new ZipArchive();
+		if (empty($this->sheets_meta))                  { self::log("Error in ".__CLASS__."::".__FUNCTION__.", no worksheets defined."); return; }
+		if (!$zip->open($filename, ZipArchive::CREATE)) { self::log("Error in ".__CLASS__."::".__FUNCTION__.", unable to create zip."); return; }
+		
+		$zip->addEmptyDir("docProps/");
+		$zip->addFromString("docProps/app.xml" , self::buildAppXML() );
+		$zip->addFromString("docProps/core.xml", self::buildCoreXML());
+
+		$zip->addEmptyDir("_rels/");
+		$zip->addFromString("_rels/.rels", self::buildRelationshipsXML());
+
+		$zip->addEmptyDir("xl/worksheets/");
+		foreach($this->sheets_meta as $sheet_meta) {
+			$zip->addFile($sheet_meta['filename'], "xl/worksheets/".$sheet_meta['xmlname'] );
+		}
+		if (!empty($this->shared_strings)) {
+			$zip->addFile($this->writeSharedStringsXML(), "xl/sharedStrings.xml" );  //$zip->addFromString("xl/sharedStrings.xml",     self::buildSharedStringsXML() );
+		}
+		$zip->addFromString("xl/workbook.xml"         , self::buildWorkbookXML() );
+		$zip->addFile($this->writeStylesXML(), "xl/styles.xml" );  //$zip->addFromString("xl/styles.xml"           , self::buildStylesXML() );
+		$zip->addFromString("[Content_Types].xml"     , self::buildContentTypesXML() );
+
+		$zip->addEmptyDir("xl/_rels/");
+		$zip->addFromString("xl/_rels/workbook.xml.rels", self::buildWorkbookRelsXML() );
+		$zip->close();
+	}
+
+	
+	public function writeSheet(array $data, $sheet_name='', array $header_types=array() )
+	{
+		$data = empty($data) ? array( array('') ) : $data;
+		
+		$sheet_filename = $this->tempFilename();
+		$sheet_default = 'Sheet'.(count($this->sheets_meta)+1);
+		$sheet_name = !empty($sheet_name) ? $sheet_name : $sheet_default;
+		$this->sheets_meta[] = array('filename'=>$sheet_filename, 'sheetname'=>$sheet_name ,'xmlname'=>strtolower($sheet_default).".xml" );
+
+		$header_offset = empty($header_types) ? 0 : 1;
+		$row_count = count($data) + $header_offset;
+		$column_count = count($data[self::array_first_key($data)]);
+		$max_cell = self::xlsCell( $row_count-1, $column_count-1 );
+
+		$tabselected = count($this->sheets_meta)==1 ? 'true' : 'false';//only first sheet is selected
+		$cell_formats_arr = empty($header_types) ? array_fill(0, $column_count, 'string') : array_values($header_types);
+		$header_row = empty($header_types) ? array() : array_keys($header_types);
+
+		$fd = fopen($sheet_filename, "w+");
+		if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
+		
+		fwrite($fd,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
+		fwrite($fd,'<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">');
+		fwrite($fd,    '<sheetPr filterMode="false">');
+		fwrite($fd,        '<pageSetUpPr fitToPage="false"/>');
+		fwrite($fd,    '</sheetPr>');
+		fwrite($fd,    '<dimension ref="A1:'.$max_cell.'"/>');
+		fwrite($fd,    '<sheetViews>');
+		fwrite($fd,        '<sheetView colorId="64" defaultGridColor="true" rightToLeft="false" showFormulas="false" showGridLines="true" showOutlineSymbols="true" showRowColHeaders="true" showZeros="true" tabSelected="'.$tabselected.'" topLeftCell="A1" view="normal" windowProtection="false" workbookViewId="0" zoomScale="100" zoomScaleNormal="100" zoomScalePageLayoutView="100">');
+		fwrite($fd,            '<selection activeCell="A1" activeCellId="0" pane="topLeft" sqref="A1"/>');
+		fwrite($fd,        '</sheetView>');
+		fwrite($fd,    '</sheetViews>');
+		fwrite($fd,    '<cols>');
+		fwrite($fd,        '<col collapsed="false" hidden="false" max="1025" min="1" style="0" width="19"/>');
+		fwrite($fd,    '</cols>');
+		fwrite($fd,    '<sheetData>');
+		if (!empty($header_row))
+		{
+			fwrite($fd, '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.(1).'">');
+			foreach($header_row as $k=>$v)
+			{
+				$this->writeCell($fd, 0, $k, $v, $cell_format='string');
+			}
+			fwrite($fd, '</row>');
+		}
+		foreach($data as $i=>$row)
+		{
+			fwrite($fd, '<row collapsed="false" customFormat="false" customHeight="false" hidden="false" ht="12.1" outlineLevel="0" r="'.($i+$header_offset+1).'">');
+			foreach($row as $k=>$v)
+			{
+				$this->writeCell($fd, $i+$header_offset, $k, $v, $cell_formats_arr[$k]);
+			}
+			fwrite($fd, '</row>');
+		}
+		fwrite($fd,    '</sheetData>');
+		fwrite($fd,    '<printOptions headings="false" gridLines="false" gridLinesSet="true" horizontalCentered="false" verticalCentered="false"/>');
+		fwrite($fd,    '<pageMargins left="0.5" right="0.5" top="1.0" bottom="1.0" header="0.5" footer="0.5"/>');
+		fwrite($fd,    '<pageSetup blackAndWhite="false" cellComments="none" copies="1" draft="false" firstPageNumber="1" fitToHeight="1" fitToWidth="1" horizontalDpi="300" orientation="portrait" pageOrder="downThenOver" paperSize="1" scale="100" useFirstPageNumber="true" usePrinterDefaults="false" verticalDpi="300"/>');
+		fwrite($fd,    '<headerFooter differentFirst="false" differentOddEven="false">');
+		fwrite($fd,        '<oddHeader>&amp;C&amp;&quot;Times New Roman,Regular&quot;&amp;12&amp;A</oddHeader>');
+		fwrite($fd,        '<oddFooter>&amp;C&amp;&quot;Times New Roman,Regular&quot;&amp;12Page &amp;P</oddFooter>');
+		fwrite($fd,    '</headerFooter>');
+		fwrite($fd,'</worksheet>');
+		fclose($fd);
+	}
+
+	protected function writeCell($fd, $row_number, $column_number, $value, $cell_format)
+	{
+		static $styles = array('money'=>1,'dollar'=>1,'datetime'=>2,'date'=>3,'string'=>0);
+		$cell = self::xlsCell($row_number, $column_number);
+		$s = isset($styles[$cell_format]) ? $styles[$cell_format] : '0';
+		
+		if (is_numeric($value)) {
+			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.($value*1).'</v></c>');//int,float, etc
+		} else if ($cell_format=='date') {
+			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.intval(self::convert_date_time($value)).'</v></c>');
+		} else if ($cell_format=='datetime') {
+			if ($value === '') {
+				fwrite($fd,'<c r="'.$cell.'" s="0"/>');
+			} else {
+				fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="n"><v>'.self::convert_date_time($value).'</v></c>');
+			}			
+		} else if ($value==''){
+			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'"/>');
+		} else if ($value{0}=='='){
+			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="s"><f>'.self::xmlspecialchars($value).'</f></c>');
+		} else if ($value!==''){
+			fwrite($fd,'<c r="'.$cell.'" s="'.$s.'" t="s"><v>'.self::xmlspecialchars($this->setSharedString($value)).'</v></c>');
+		}
+	}
+
+	protected function writeStylesXML()
+	{
+		$tempfile = $this->tempFilename();
+		$fd = fopen($tempfile, "w+");
+		if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
+		fwrite($fd, '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
+		fwrite($fd, '<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
+		fwrite($fd, '<numFmts count="4">');
+		fwrite($fd, 		'<numFmt formatCode="GENERAL" numFmtId="164"/>');
+		fwrite($fd, 		'<numFmt formatCode="[$$-1009]#,##0.00;[RED]\-[$$-1009]#,##0.00" numFmtId="165"/>');
+		fwrite($fd, 		'<numFmt formatCode="YYYY-MM-DD\ HH:MM:SS" numFmtId="166"/>');
+		fwrite($fd, 		'<numFmt formatCode="YYYY-MM-DD" numFmtId="167"/>');
+		fwrite($fd, '</numFmts>');
+		fwrite($fd, '<fonts count="4">');
+		fwrite($fd, 		'<font><name val="Arial"/><charset val="1"/><family val="2"/><sz val="10"/></font>');
+		fwrite($fd, 		'<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
+		fwrite($fd, 		'<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
+		fwrite($fd, 		'<font><name val="Arial"/><family val="0"/><sz val="10"/></font>');
+		fwrite($fd, '</fonts>');
+		fwrite($fd, '<fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills>');
+		fwrite($fd, '<borders count="1"><border diagonalDown="false" diagonalUp="false"><left/><right/><top/><bottom/><diagonal/></border></borders>');
+		fwrite($fd, 	'<cellStyleXfs count="15">');
+		fwrite($fd, 		'<xf applyAlignment="true" applyBorder="true" applyFont="true" applyProtection="true" borderId="0" fillId="0" fontId="0" numFmtId="164">');
+		fwrite($fd, 		'<alignment horizontal="general" indent="0" shrinkToFit="false" textRotation="0" vertical="bottom" wrapText="false"/>');
+		fwrite($fd, 		'<protection hidden="false" locked="true"/>');
+		fwrite($fd, 		'</xf>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="2" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="2" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="0"/>');
+		//fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="43"/>');
+		//fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="41"/>');
+		//fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="44"/>');
+		//fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="42"/>');
+		//fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="true" applyProtection="false" borderId="0" fillId="0" fontId="1" numFmtId="9"/>');
+		fwrite($fd, 	'</cellStyleXfs>');
+		fwrite($fd, 	'<cellXfs count="4">');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="164" xfId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="165" xfId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="166" xfId="0"/>');
+		fwrite($fd, 		'<xf applyAlignment="false" applyBorder="false" applyFont="false" applyProtection="false" borderId="0" fillId="0" fontId="0" numFmtId="167" xfId="0"/>');
+		fwrite($fd, 	'</cellXfs>');
+		fwrite($fd, 	'<cellStyles count="1">');
+		fwrite($fd, 		'<cellStyle builtinId="0" customBuiltin="false" name="Normal" xfId="0"/>');
+		//fwrite($fd, 		'<cellStyle builtinId="3" customBuiltin="false" name="Comma" xfId="15"/>');
+		//fwrite($fd, 		'<cellStyle builtinId="6" customBuiltin="false" name="Comma [0]" xfId="16"/>');
+		//fwrite($fd, 		'<cellStyle builtinId="4" customBuiltin="false" name="Currency" xfId="17"/>');
+		//fwrite($fd, 		'<cellStyle builtinId="7" customBuiltin="false" name="Currency [0]" xfId="18"/>');
+		//fwrite($fd, 		'<cellStyle builtinId="5" customBuiltin="false" name="Percent" xfId="19"/>');
+		fwrite($fd, 	'</cellStyles>');
+		fwrite($fd, '</styleSheet>');
+		fclose($fd);
+		return $tempfile;
+	}
+
+	protected function setSharedString($v)
+	{
+		// Strip control characters which Excel does not seem to like...
+		$v = preg_replace('/[\x00-\x09\x0B\x0C\x0E-\x1F]/u', '', $v);
+		if (isset($this->shared_strings[$v]))
+		{
+			$string_value = $this->shared_strings[$v];
+		}
+		else
+		{
+			$string_value = count($this->shared_strings);
+			$this->shared_strings[$v] = $string_value;
+		}
+		$this->shared_string_count++;//non-unique count
+		return $string_value;
+	}
+
+	protected function writeSharedStringsXML()
+	{
+		$tempfile = $this->tempFilename();
+		$fd = fopen($tempfile, "w+");
+		if ($fd===false) { self::log("write failed in ".__CLASS__."::".__FUNCTION__."."); return; }
+		
+		fwrite($fd,'<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n");
+		fwrite($fd,'<sst count="'.($this->shared_string_count).'" uniqueCount="'.count($this->shared_strings).'" xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">');
+		foreach($this->shared_strings as $s=>$c)
+		{
+			fwrite($fd,'<si><t>'.self::xmlspecialchars($s).'</t></si>');
+		}
+		fwrite($fd, '</sst>');
+		fclose($fd);
+		return $tempfile;
+	}
+
+	protected function buildAppXML()
+	{
+		$app_xml="";
+		$app_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+		$app_xml.='<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><TotalTime>0</TotalTime></Properties>';
+		return $app_xml;
+	}
+
+	protected function buildCoreXML()
+	{
+		$core_xml="";
+		$core_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+		$core_xml.='<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">';
+		$core_xml.='<dcterms:created xsi:type="dcterms:W3CDTF">'.date("Y-m-d\TH:i:s.00\Z").'</dcterms:created>';//$date_time = '2013-07-25T15:54:37.00Z';
+		$core_xml.='<dc:creator>'.self::xmlspecialchars($this->author).'</dc:creator>';
+		$core_xml.='<cp:revision>0</cp:revision>';
+		$core_xml.='</cp:coreProperties>';
+		return $core_xml;
+	}
+
+	protected function buildRelationshipsXML()
+	{
+		$rels_xml="";
+		$rels_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
+		$rels_xml.='<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
+		$rels_xml.='<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/>';
+		$rels_xml.='<Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/>';
+		$rels_xml.='<Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/>';
+		$rels_xml.="\n";
+		$rels_xml.='</Relationships>';
+		return $rels_xml;
+	}
+
+	protected function buildWorkbookXML()
+	{
+		$workbook_xml="";
+		$workbook_xml.='<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'."\n";
+		$workbook_xml.='<workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">';
+		$workbook_xml.='<fileVersion appName="Calc"/><workbookPr backupFile="false" showObjects="all" date1904="false"/><workbookProtection/>';
+		$workbook_xml.='<bookViews><workbookView activeTab="0" firstSheet="0" showHorizontalScroll="true" showSheetTabs="true" showVerticalScroll="true" tabRatio="212" windowHeight="8192" windowWidth="16384" xWindow="0" yWindow="0"/></bookViews>';
+		$workbook_xml.='<sheets>';
+		foreach($this->sheets_meta as $i=>$sheet_meta) {
+			$workbook_xml.='<sheet name="'.self::xmlspecialchars($sheet_meta['sheetname']).'" sheetId="'.($i+1).'" state="visible" r:id="rId'.($i+2).'"/>';
+		}
+		$workbook_xml.='</sheets>';
+		$workbook_xml.='<calcPr iterateCount="100" refMode="A1" iterate="false" iterateDelta="0.001"/></workbook>';
+		return $workbook_xml;
+	}
+
+	protected function buildWorkbookRelsXML()
+	{
+		$wkbkrels_xml="";
+		$wkbkrels_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
+		$wkbkrels_xml.='<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">';
+		$wkbkrels_xml.='<Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/>';
+		foreach($this->sheets_meta as $i=>$sheet_meta) {
+			$wkbkrels_xml.='<Relationship Id="rId'.($i+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/'.($sheet_meta['xmlname']).'"/>';
+		}
+		if (!empty($this->shared_strings)) {
+			$wkbkrels_xml.='<Relationship Id="rId'.(count($this->sheets_meta)+2).'" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/>';
+		}
+		$wkbkrels_xml.="\n";
+		$wkbkrels_xml.='</Relationships>';
+		return $wkbkrels_xml;
+	}
+
+	protected function buildContentTypesXML()
+	{
+		$content_types_xml="";
+		$content_types_xml.='<?xml version="1.0" encoding="UTF-8"?>'."\n";
+		$content_types_xml.='<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">';
+		$content_types_xml.='<Override PartName="/_rels/.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+		$content_types_xml.='<Override PartName="/xl/_rels/workbook.xml.rels" ContentType="application/vnd.openxmlformats-package.relationships+xml"/>';
+		foreach($this->sheets_meta as $i=>$sheet_meta) {
+			$content_types_xml.='<Override PartName="/xl/worksheets/'.($sheet_meta['xmlname']).'" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml"/>';
+		}
+		if (!empty($this->shared_strings)) {
+			$content_types_xml.='<Override PartName="/xl/sharedStrings.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml"/>';
+		}
+		$content_types_xml.='<Override PartName="/xl/workbook.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml"/>';
+		$content_types_xml.='<Override PartName="/xl/styles.xml" ContentType="application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml"/>';
+		$content_types_xml.='<Override PartName="/docProps/app.xml" ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml"/>';
+		$content_types_xml.='<Override PartName="/docProps/core.xml" ContentType="application/vnd.openxmlformats-package.core-properties+xml"/>';
+		$content_types_xml.="\n";
+		$content_types_xml.='</Types>';
+		return $content_types_xml;
+	}
+
+	//------------------------------------------------------------------
+	/*
+	 * @param $row_number int, zero based
+	 * @param $column_number int, zero based
+	 * @return Cell label/coordinates, ex: A1, C3, AA42
+	 * */
+	public static function xlsCell($row_number, $column_number)
+	{
+		$n = $column_number;
+		for($r = ""; $n >= 0; $n = intval($n / 26) - 1) {
+			$r = chr($n%26 + 0x41) . $r;
+		}
+		return $r . ($row_number+1);
+	}
+	//------------------------------------------------------------------
+	public static function log($string)
+	{
+		file_put_contents("php://stderr", date("Y-m-d H:i:s:").rtrim(is_array($string) ? json_encode($string) : $string)."\n");
+	}
+	//------------------------------------------------------------------
+	public static function xmlspecialchars($val)
+	{
+		return str_replace("'", "&#39;", htmlspecialchars($val));
+	}
+	//------------------------------------------------------------------
+	public static function array_first_key(array $arr)
+	{
+		reset($arr);
+		$first_key = key($arr);
+		return $first_key;
+	}
+	//------------------------------------------------------------------
+	public static function convert_date_time($date_input) //thanks to Excel::Writer::XLSX::Worksheet.pm (perl)
+	{
+		$days    = 0;    # Number of days since epoch
+		$seconds = 0;    # Time expressed as fraction of 24h hours in seconds
+		$year=$month=$day=0;
+		$hour=$min  =$sec=0;
+
+		$date_time = $date_input;
+		if (preg_match("/(\d{4})\-(\d{2})\-(\d{2})/", $date_time, $matches))
+		{
+			list($junk,$year,$month,$day) = $matches;
+		}
+		if (preg_match("/(\d{2}):(\d{2}):(\d{2})/", $date_time, $matches))
+		{
+			list($junk,$hour,$min,$sec) = $matches;
+			$seconds = ( $hour * 60 * 60 + $min * 60 + $sec ) / ( 24 * 60 * 60 );
+		}
+
+		//using 1900 as epoch, not 1904, ignoring 1904 special case
+		
+		# Special cases for Excel.
+		if ("$year-$month-$day"=='1899-12-31')  return $seconds      ;    # Excel 1900 epoch
+		if ("$year-$month-$day"=='1900-01-00')  return $seconds      ;    # Excel 1900 epoch
+		if ("$year-$month-$day"=='1900-02-29')  return 60 + $seconds ;    # Excel false leapday
+
+		# We calculate the date by calculating the number of days since the epoch
+		# and adjust for the number of leap days. We calculate the number of leap
+		# days by normalising the year in relation to the epoch. Thus the year 2000
+		# becomes 100 for 4 and 100 year leapdays and 400 for 400 year leapdays.
+		$epoch  = 1900;
+		$offset = 0;
+		$norm   = 300;
+		$range  = $year - $epoch;
+
+		# Set month days and check for leap year.
+		$leap = (($year % 400 == 0) || (($year % 4 == 0) && ($year % 100)) ) ? 1 : 0;
+		$mdays = array( 31, ($leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 );
+
+		# Some boundary checks
+		if($year < $epoch || $year > 9999) return 0;
+		if($month < 1     || $month > 12)  return 0;
+		if($day < 1       || $day > $mdays[ $month - 1 ]) return 0;
+
+		# Accumulate the number of days since the epoch.
+		$days = $day;    # Add days for current month
+		$days += array_sum( array_slice($mdays, 0, $month-1 ) );    # Add days for past months
+		$days += $range * 365;                      # Add days for past years
+		$days += intval( ( $range ) / 4 );             # Add leapdays
+		$days -= intval( ( $range + $offset ) / 100 ); # Subtract 100 year leapdays
+		$days += intval( ( $range + $offset + $norm ) / 400 );  # Add 400 year leapdays
+		$days -= $leap;                                      # Already counted above
+
+		# Adjust for Excel erroneously treating 1900 as a leap year.
+		if ($days > 59) { $days++;}
+
+		return $days + $seconds;
+	}
+	//------------------------------------------------------------------
+}
+
+
+
+
+
+

application/xmlpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -51,6 +51,9 @@ class XMLPage extends WebPage
 	{
 		if (!$this->m_bPassThrough)
 		{
+			// Get the unexpected output but do nothing with it
+			$sTrash = $this->ob_get_clean_safe();
+					
 			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
 			$this->add_header("Content-Length: ".strlen($this->s_content));
 			foreach($this->a_headers as $s_header)
@@ -79,8 +82,7 @@ class XMLPage extends WebPage
 			}
 			else
 			{
-				$s_captured_output = ob_get_contents();
-				ob_end_clean();
+				$s_captured_output = $this->ob_get_clean_safe();
 				foreach($this->a_headers as $s_header)
 				{
 					header($s_header);
@@ -101,13 +103,4 @@ class XMLPage extends WebPage
 	public function table($aConfig, $aData, $aParams = array())
 	{
 	}
-
-	public function TrashUnexpectedOutput()
-	{
-		if (!$this->m_bPassThrough)
-		{
-			parent::TrashUnexpectedOutput();
-		}
-	}
 }
-?>

core/asynctask.class.inc.php

@@ -34,27 +34,27 @@ class ExecAsyncTask implements iBackgroundProcess
 
 	public function Process($iTimeLimit)
 	{
-		$sOQL = "SELECT AsyncTask WHERE ISNULL(started) AND (ISNULL(planned) OR (planned < NOW()))";
-		$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array());
+		$sNow = date('Y-m-d H:i:s');
+		// Criteria: planned, and expected to occur... ASAP or in the past
+		$sOQL = "SELECT AsyncTask WHERE (status = 'planned') AND (ISNULL(planned) OR (planned < '$sNow'))";
 		$iProcessed = 0;
-		while ((time() < $iTimeLimit) && ($oTask = $oSet->Fetch()))
+		while (time() < $iTimeLimit)
 		{
-			$oTask->Set('started', time());
-			$oTask->DBUpdate();
-
-			$oTask->Process();
+			// Next one ?
+			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array(), null, 1 /* limit count */);
+			$oTask = $oSet->Fetch();
+			if (is_null($oTask))
+			{
+				// Nothing to be done
+				break;
+			}
 			$iProcessed++;
-
-			$oTask->DBDelete();
-		}
-		if ($iProcessed == $oSet->Count())
-		{
-			return "processed $iProcessed tasks";
-		}
-		else
-		{
-			return "processed $iProcessed tasks (remaining: ".($oSet->Count() - $iProcessed).")";
+			if ($oTask->Process())
+			{
+				$oTask->DBDelete();
+			}
 		}
+		return "processed $iProcessed tasks";
 	}
 }
 
@@ -80,20 +80,101 @@ abstract class AsyncTask extends DBObject
 			"display_template" => "",
 		);
 		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-//		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Null is allowed to ease the migration from iTop 2.0.2 and earlier, when the status did not exist, and because the default value is not taken into account in the SQL definition
+		// The value is set from null to planned in the setup program
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('planned,running,idle,error'), "sql"=>"status", "default_value"=>"planned", "is_null_allowed"=>true, "depends_on"=>array())));
+
 		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeDateTime("started", array("allowed_values"=>null, "sql"=>"started", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		// planned... still not used - reserved for timer management
 		MetaModel::Init_AddAttribute(new AttributeDateTime("planned", array("allowed_values"=>null, "sql"=>"planned", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("event_id", array("targetclass"=>"Event", "jointype"=> "", "allowed_values"=>null, "sql"=>"event_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
 
-		// Display lists
-//		MetaModel::Init_SetZListItems('details', array()); // Attributes to be displayed for the complete details
-//		MetaModel::Init_SetZListItems('list', array()); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		MetaModel::Init_AddAttribute(new AttributeInteger("remaining_retries", array("allowed_values"=>null, "sql"=>"remaining_retries", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("last_error_code", array("allowed_values"=>null, "sql"=>"last_error_code", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("last_attempt", array("allowed_values"=>null, "sql"=>"last_attempt", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	/**
+	 * Every is fine
+	 */
+	const OK = 0;
+	/**
+	 * The task no longer exists
+	 */
+	const DELETED = 1;
+	/**
+	 * The task is already being executed
+	 */
+	const ALREADY_RUNNING = 2;
+
+	/**
+	 *	The current process requests the ownership on the task.
+	 *	In case the task can be accessed concurrently, this function can be overloaded to add a critical section.
+	 *	The function must not block the caller if another process is already owning the task	 
+	 *		 
+	 *	@return integer A code among OK/DELETED/ALREADY_RUNNING.	  	 
+	 */	
+	public function MarkAsRunning()
+	{
+		try
+		{
+			if ($this->Get('status') == 'running')
+			{
+				return self::ALREADY_RUNNING;
+			}
+			else
+			{
+				$this->Set('status', 'running');
+				$this->Set('started', time());
+				$this->DBUpdate();
+				return self::OK;
+			}
+		}
+		catch(Exception $e)
+		{
+			// Corrupted task !! (for example: "Failed to reload object")
+			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$e->getMessage().' - fatal error, deleting the task.');
+	   	if ($this->Get('event_id') != 0)
+	   	{
+	   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+	   		$oEventLog->Set('message', 'Failed, corrupted data: '.$e->getMessage());
+	   		$oEventLog->DBUpdate();
+			}
+			$this->DBDelete();
+			return self::DELETED;
+		}
+	}
+
+	public function GetRetryDelay($iErrorCode = null)
+	{
+		$iRetryDelay = 600;
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
+		{
+			$aConfig = $aRetries[get_class($this)];
+			$iRetryDelay = $aConfig['retry_delay'];
+		}
+		return $iRetryDelay;
+	}
+
+	public function GetMaxRetries($iErrorCode = null)
+	{
+		$iMaxRetries = 0;
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
+		{
+			$aConfig = $aRetries[get_class($this)];
+			$iMaxRetries = $aConfig['max_retries'];
+		}
+	}
+
+	/**
+	 * Override to notify people that a task cannot be performed
+	 */
+	protected function OnDefinitiveFailure()
+	{
 	}
 
   	protected function OnInsert()
@@ -101,18 +182,92 @@ abstract class AsyncTask extends DBObject
 		$this->Set('created', time());
 	}
 
-   public function Process()
+   /**
+    * @return boolean True if the task record can be deleted
+    */
+	public function Process()
    {
-   	$sStatus = $this->DoProcess();
-   	if ($this->Get('event_id') != 0)
-   	{
-   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-   		$oEventLog->Set('message', $sStatus);
-   		$oEventLog->DBUpdate();
+		// By default: consider that the task is not completed
+		$bRet = false;
+
+		// Attempt to take the ownership
+		$iStatus = $this->MarkAsRunning();
+		if ($iStatus == self::OK)
+		{
+			try
+			{
+		   	$sStatus = $this->DoProcess();
+		   	if ($this->Get('event_id') != 0)
+		   	{
+		   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+		   		$oEventLog->Set('message', $sStatus);
+		   		$oEventLog->DBUpdate();
+				}
+				$bRet = true;
+			}
+			catch(Exception $e)
+			{
+				$this->HandleError($e->getMessage(), $e->getCode());
+			}
 		}
+		else
+		{
+			// Already done or being handled by another process... skip...
+			$bRet = false;
+		}
+		return $bRet;
 	}
 
+	/**
+	 * Overridable to extend the behavior in case of error (logging)
+	 */
+	protected function HandleError($sErrorMessage, $iErrorCode)
+	{
+		if ($this->Get('last_attempt') == '')
+		{
+			// First attempt
+			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
+		}
+
+		$this->Set('last_error', $sErrorMessage);
+		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
+		$this->Set('last_attempt', time());
+
+		$iRemaining = $this->Get('remaining_retries');
+		if ($iRemaining > 0)
+		{
+			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
+			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
+
+			$this->Set('remaining_retries', $iRemaining - 1);
+			$this->Set('status', 'planned');
+			$this->Set('started', null);
+			$this->Set('planned', time() + $iRetryDelay);
+		}
+		else
+		{
+			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
+
+			$this->Set('status', 'error');
+			$this->Set('started', null);
+			$this->Set('planned', null);
+			$this->OnDefinitiveFailure();
+		}
+		$this->DBUpdate();
+	}
+
+	/**
+	 * Throws an exception (message and code)
+	 */	 	
 	abstract public function DoProcess();
+
+	/**
+	 * Describes the error codes that DoProcess can return by the mean of exceptions	
+	 */	
+	static public function EnumErrorCodes()
+	{
+		return array();
+	}
 }
 
 /**
@@ -140,7 +295,7 @@ class AsyncSendEmail extends AsyncTask
 		MetaModel::Init_InheritAttributes();
 
 		MetaModel::Init_AddAttribute(new AttributeInteger("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>Email::ORIGINAL_FORMAT, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLongText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 

core/attributedef.class.inc.php

@@ -621,7 +621,7 @@ class AttributeLinkedSet extends AttributeDefinition
 
 	public function GetTrackingLevel()
 	{
-		return $this->GetOptional('tracking_level', LINKSET_TRACKING_LIST);
+		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_default'));
 	}
 
 	public function GetEditMode()
@@ -919,7 +919,7 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
 
 	public function GetTrackingLevel()
 	{
-		return $this->GetOptional('tracking_level', LINKSET_TRACKING_ALL);
+		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_indirect_default'));
 	}
 }
 
@@ -1293,6 +1293,14 @@ class AttributeBoolean extends AttributeInteger
 	{
 		return $sValue ? '1' : '0';
 	}
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value ? '1' : '0';
+	}
 }
 
 /**
@@ -1915,7 +1923,12 @@ class AttributeCaseLog extends AttributeLongText
 	// Facilitate things: allow the user to Set the value from a string
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
-		if (!($proposedValue instanceof ormCaseLog))
+		if ($proposedValue instanceof ormCaseLog)
+		{
+			// Passthrough
+			$ret = $proposedValue;
+		}
+		else
 		{
 			// Append the new value if an instance of the object is supplied
 			//
@@ -1937,13 +1950,21 @@ class AttributeCaseLog extends AttributeLongText
 			{
 				$oCaseLog = new ormCaseLog();
 			}
-			if (strlen($proposedValue) > 0)
+
+			if ($proposedValue instanceof stdClass)
 			{
-				$oCaseLog->AddLogEntry(parent::MakeRealValue($proposedValue, $oHostObj));
+				$oCaseLog->AddLogEntryFromJSON($proposedValue);
 			}
-			return $oCaseLog;
+			else
+			{
+				if (strlen($proposedValue) > 0)
+				{
+					$oCaseLog->AddLogEntry(parent::MakeRealValue($proposedValue, $oHostObj));
+				}
+			}
+			$ret = $oCaseLog;
 		}
-		return $proposedValue;
+		return $ret;
 	}
 
 	public function GetSQLExpressions($sPrefix = '')
@@ -2061,6 +2082,45 @@ class AttributeCaseLog extends AttributeLongText
 			return '';
 		}
 	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value->GetForJSON();
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		if (is_string($json))
+		{
+			// Will be correctly handled in MakeRealValue
+			$ret = $json;
+		}
+		else
+		{
+			if (isset($json->add_item))
+			{
+				// Will be correctly handled in MakeRealValue
+				$ret = $json->add_item;
+				if (!isset($ret->message))
+				{
+					throw new Exception("Missing mandatory entry: 'message'");
+				}
+			}
+			else
+			{
+				$ret = ormCaseLog::FromJSON($json);
+			}
+		}
+		return $ret;
+	}
 }
 
 /**
@@ -2087,8 +2147,7 @@ class AttributeEmailAddress extends AttributeString
 {
 	public function GetValidationPattern()
 	{
-		// return "^([0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*@([0-9a-zA-Z][-\\w]*[0-9a-zA-Z]\\.)+[a-zA-Z]{2,9})$";
-		return "^[a-zA-Z0-9._&-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}$";
+		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('email_validation_pattern').'$');
 	}
 
 	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
@@ -2347,6 +2406,15 @@ class AttributeEnum extends AttributeString
 		}
 	}
 
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value;
+	}
+
 	public function GetAllowedValues($aArgs = array(), $sContains = '')
 	{
 		$aRawValues = parent::GetAllowedValues($aArgs, $sContains);
@@ -3185,6 +3253,12 @@ class AttributeExternalField extends AttributeDefinition
 			throw new CoreException("Unexpected value for argument iType: '$iType'");
 		}
 	}
+	
+	public function GetPrerequisiteAttributes()
+	{
+		return array($this->Get("extkey_attcode"));
+	} 
+	
 
 	public function GetExtAttDef()
 	{
@@ -3352,12 +3426,69 @@ class AttributeBlob extends AttributeDefinition
 	}
 
 
-	// Facilitate things: allow the user to Set the value from a string
+	// Facilitate things: allow administrators to upload a document
+	// from a CSV by specifying its path/URL
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
 		if (!is_object($proposedValue))
 		{
-			return new ormDocument($proposedValue, 'text/plain');
+			if (file_exists($proposedValue) && UserRights::IsAdministrator())
+			{
+				$sContent = file_get_contents($proposedValue);
+				$sExtension = strtolower(pathinfo($proposedValue, PATHINFO_EXTENSION));
+				$sMimeType = "application/x-octoet-stream";
+				$aKnownExtensions = array(
+						'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+						'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+						'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+						'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+						'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+						'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+						'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+						'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+						'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+						'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12.xlsx',
+						'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+						'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+						'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+						'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+						'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+						'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+						'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+						'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+						'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+						'jpg' => 'image/jpeg',
+						'jpeg' => 'image/jpeg',
+						'gif' => 'image/gif',
+						'png' => 'image/png',
+						'pdf' => 'application/pdf',
+						'doc' => 'application/msword',
+						'dot' => 'application/msword',
+						'xls' => 'application/vnd.ms-excel',
+						'ppt' => 'application/vnd.ms-powerpoint',
+						'vsd' => 'application/x-visio',
+						'vdx' => 'application/visio.drawing', 
+						'odt' => 'application/vnd.oasis.opendocument.text',
+						'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+						'odp' => 'application/vnd.oasis.opendocument.presentation',
+						'zip' => 'application/zip',
+						'txt' => 'text/plain',
+						'htm' => 'text/html',
+						'html' => 'text/html', 
+						'exe' => 'application/octet-stream'
+					);
+
+				if (!array_key_exists($sExtension, $aKnownExtensions) && extension_loaded('fileinfo'))
+				{
+					$finfo = new finfo(FILEINFO_MIME);
+					$sMimeType = $finfo->file($proposedValue);
+				}
+				return new ormDocument($sContent, $sMimeType);			
+			}
+			else
+			{
+				return new ormDocument($proposedValue, 'text/plain');
+			}
 		}
 		return $proposedValue;
 	}
@@ -3643,7 +3774,7 @@ class AttributeStopWatch extends AttributeDefinition
 		);
 
 		$aThresholds = array();
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		foreach ($this->ListThresholds() as $iThreshold => $aDefinition)
 		{
 			$sThPrefix = '_'.$iThreshold;
 			$value->DefineThreshold(
@@ -3651,7 +3782,8 @@ class AttributeStopWatch extends AttributeDefinition
 				self::DateToSeconds($aCols[$sPrefix.$sThPrefix.'_deadline']),
 				(bool)($aCols[$sPrefix.$sThPrefix.'_passed'] == 1),
 				(bool)($aCols[$sPrefix.$sThPrefix.'_triggered'] == 1),
-				$aCols[$sPrefix.$sThPrefix.'_overrun']
+				$aCols[$sPrefix.$sThPrefix.'_overrun'],
+				array_key_exists('highlight', $aDefinition) ? $aDefinition['highlight'] : null
 			);
 		}
 

core/bulkchange.class.inc.php

@@ -260,6 +260,7 @@ class BulkChange
 	protected $m_aOnDisappear; // array of attcode => value, values to be set when an object gets out of scope (ignored if no scope has been defined)
 	protected $m_sDateFormat; // Date format specification, see utils::StringToTime()
 	protected $m_bLocalizedValues; // Values in the data set are localized (see AttributeEnum)
+	protected $m_aExtKeysMappingCache; // Cache for resolving external keys based on the given search criterias
 
 	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null, $bLocalize = false)
 	{
@@ -272,6 +273,7 @@ class BulkChange
 		$this->m_aOnDisappear = $aOnDisappear;
 		$this->m_sDateFormat = $sDateFormat;
 		$this->m_bLocalizedValues = $bLocalize;
+		$this->m_aExtKeysMappingCache = array();
 	}
 
 	protected $m_bReportHtml = false;
@@ -365,6 +367,7 @@ class BulkChange
 			else
 			{
 				$oReconFilter = new CMDBSearchFilter($oExtKey->GetTargetClass());
+				$aCacheKeys = array();
 				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 				{
 					// The foreign attribute is one of our reconciliation key
@@ -377,24 +380,60 @@ class BulkChange
 						$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
 						$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
 					}
+					$aCacheKeys[] = $value;
 					$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
 					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
-				$oExtObjects = new CMDBObjectSet($oReconFilter);
-				switch($oExtObjects->Count())
+				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
+				$iCount = 0;
+				$iForeignKey = null;
+				$sOQL = '';
+				// TODO: check if *too long* keys can lead to collisions... and skip the cache in such a case...
+				if (!array_key_exists($sAttCode, $this->m_aExtKeysMappingCache))
 				{
-				case 0:
+					$this->m_aExtKeysMappingCache[$sAttCode] = array();
+				}
+				if (array_key_exists($sCacheKey, $this->m_aExtKeysMappingCache[$sAttCode]))
+				{
+					// Cache hit
+					$iCount = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['c'];
+					$iForeignKey = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['k'];
+					$sOQL = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['oql'];
+					// Record the hit
+					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['h']++;
+				}
+				else
+				{
+					// Cache miss, let's initialize it
+					$oExtObjects = new CMDBObjectSet($oReconFilter);
+					$iCount = $oExtObjects->Count();
+					if ($iCount == 1)
+					{
+						$oForeignObj = $oExtObjects->Fetch();
+						$iForeignKey = $oForeignObj->GetKey();
+					}
+					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
+						'c' => $iCount,
+						'k' => $iForeignKey,
+						'oql' => $oReconFilter->ToOql(),
+						'h' => 0, // number of hits on this cache entry
+					);
+				}
+				switch($iCount)
+				{
+					case 0:
 					$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-NotFound');
 					$aResults[$sAttCode]= new CellStatus_SearchIssue();
 					break;
-				case 1:
+					
+					case 1:
 					// Do change the external key attribute
-					$oForeignObj = $oExtObjects->Fetch();
-					$oTargetObj->Set($sAttCode, $oForeignObj->GetKey());
+					$oTargetObj->Set($sAttCode, $iForeignKey);
 					break;
-				default:
+					
+					default:
 					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-FoundMany', $oExtObjects->Count());
-					$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $oExtObjects->Count(), $oReconFilter->ToOql());
+					$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $iCount, $sOQL);
 				}
 			}
 
@@ -789,9 +828,10 @@ class BulkChange
 			$aVisited = array();
 		}
 		$iPreviousTimeLimit = ini_get('max_execution_time');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		foreach($this->m_aData as $iRow => $aRowData)
 		{
-			set_time_limit(5);
+			set_time_limit($iLoopTimeLimit);
 			if (isset($aResult[$iRow]["__STATUS__"]))
 			{
 				// An issue at the earlier steps - skip the rest
@@ -910,7 +950,7 @@ class BulkChange
 				$iObj = $oObj->GetKey();
 				if (!in_array($iObj, $aVisited))
 				{
-					set_time_limit(5);
+					set_time_limit($iLoopTimeLimit);
 					$iRow++;
 					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
 				}
@@ -960,17 +1000,17 @@ class BulkChange
 			$oPage->add('<div id="'.$sAjaxDivId.'">');
 		}
 
-		$oPage->p(Dict::S('UI:History:BulkImports+'));
+		$oPage->p(Dict::S('UI:History:BulkImports+').' <span id="csv_history_reload"></span>');
 
-		$oBulkChangeSearch = DBObjectSearch::FromOQL("SELECT CMDBChange WHERE userinfo LIKE '%(CSV)'");
+		$oBulkChangeSearch = DBObjectSearch::FromOQL("SELECT CMDBChange WHERE origin IN ('csv-interactive', 'csv-import.php')");
 
-		$iQueryLimit = $bShowAll ? 0 : MetaModel::GetConfig()->GetMaxDisplayLimit() + 1;
+		$iQueryLimit = $bShowAll ? 0 : appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
 		$oBulkChanges = new DBObjectSet($oBulkChangeSearch, array('date' => false), array(), null, $iQueryLimit);
 
 		$oAppContext = new ApplicationContext();
 
 		$bLimitExceeded = false;
-		if ($oBulkChanges->Count() > MetaModel::GetConfig()->GetMaxDisplayLimit())
+		if ($oBulkChanges->Count() > (appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit())))
 		{
 			$bLimitExceeded = true;
 			if (!$bShowAll)
@@ -1028,7 +1068,6 @@ class BulkChange
 			{
 				$aDetails[] = array('date' => $sDate, 'user' => $sUser, 'class' => $sClass, 'created' => $iCreated, 'modified' => $iModified);
 			}
-
 		}
 
 		$aConfig = array( 'date' => array('label' => Dict::S('UI:History:Date'), 'description' => Dict::S('UI:History:Date+')),
@@ -1048,7 +1087,7 @@ class BulkChange
 			else
 			{
 				// Truncated list
-				$iMinDisplayLimit = MetaModel::GetConfig()->GetMinDisplayLimit();
+				$iMinDisplayLimit = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
 				$sCollapsedLabel = Dict::Format('UI:TruncatedResults', $iMinDisplayLimit, $oBulkChanges->Count());
 				$sLinkLabel = Dict::S('UI:DisplayAll');
 				$oPage->add('<p>'.$sCollapsedLabel.'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(true);">'.$sLinkLabel.'</p>');
@@ -1066,6 +1105,7 @@ EOF
 <<<EOF
 	function OnTruncatedHistoryToggle(bShowAll)
 	{
+		$('#csv_history_reload').html('<img src="../images/indicator.gif"/>');
 		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
 			{
 				$('#$sAjaxDivId').html(data);

core/cmdbchange.class.inc.php

@@ -44,11 +44,15 @@ class CMDBChange extends DBObject
 			"db_table" => "priv_change",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
+			'indexes' => array(
+				array('origin'),
+			)
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
 		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum('interactive,csv-interactive,csv-import.php,webservice-soap,webservice-rest,synchro-data-source,email-processing,custom-extension'), "sql"=>"origin", "default_value"=>"interactive", "is_null_allowed"=>true, "depends_on"=>array())));
 	}
 
 	// Helper to keep track of the author of a given change,

core/cmdbobject.class.inc.php

@@ -93,7 +93,8 @@ abstract class CMDBObject extends DBObject
 	// Note: this value is static, but that could be changed because it is sometimes a real issue (see update of interfaces / connected_to
 	protected static $m_oCurrChange = null;
 	protected static $m_sInfo = null; // null => the information is built in a standard way
-
+	protected static $m_sOrigin = null; // null => the origin is 'interactive'
+	
 	/**
 	 * Specify another change (this is mainly for backward compatibility)
 	 */
@@ -134,6 +135,15 @@ abstract class CMDBObject extends DBObject
 		self::$m_sInfo = $sInfo;
 	}
 
+	/**
+	 * Provides information about the origin of the change
+	 * @param $sOrigin String: one of: interactive, csv-interactive, csv-import.php, webservice-soap, webservice-rest, syncho-data-source, email-processing, custom-extension
+	 */	 	
+	public static function SetTrackOrigin($sOrigin)
+	{
+		self::$m_sOrigin = $sOrigin;
+	}
+	
 	/**
 	 * Get the additional information (defaulting to user name)
 	 */	 	
@@ -148,7 +158,22 @@ abstract class CMDBObject extends DBObject
 			return self::$m_sInfo;
 		}
 	}
-
+	
+	/**
+	 * Get the 'origin' information (defaulting to 'interactive')
+	 */	 	
+	protected static function GetTrackOrigin()
+	{
+		if (is_null(self::$m_sOrigin))
+		{
+			return 'interactive';
+		}
+		else
+		{
+			return self::$m_sOrigin;
+		}
+	}
+	
 	/**
 	 * Create a standard change record (done here 99% of the time, and nearly once per page)
 	 */	 	
@@ -157,11 +182,27 @@ abstract class CMDBObject extends DBObject
 		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");
 		self::$m_oCurrChange->Set("date", time());
 		self::$m_oCurrChange->Set("userinfo", self::GetTrackInfo());
+		self::$m_oCurrChange->Set("origin", self::GetTrackOrigin());
 		self::$m_oCurrChange->DBInsert();
 	}
 
 	protected function RecordObjCreation()
 	{
+		// Delete any existing change tracking about the current object (IDs can be reused due to InnoDb bug; see TRAC #886)
+		//
+		// 1 - remove the deletion record(s)
+		// Note that objclass contain the ROOT class
+		$oFilter = new DBObjectSearch('CMDBChangeOpDelete');
+		$oFilter->AddCondition('objclass', MetaModel::GetRootClass(get_class($this)), '=');
+		$oFilter->AddCondition('objkey', $this->GetKey(), '=');
+		MetaModel::PurgeData($oFilter);
+		// 2 - any other change tracking information left prior to 2.0.3 (when the purge of the history has been implemented in RecordObjDeletion
+		// In that case, objclass is the final class of the object
+		$oFilter = new DBObjectSearch('CMDBChangeOp');
+		$oFilter->AddCondition('objclass', get_class($this), '=');
+		$oFilter->AddCondition('objkey', $this->GetKey(), '=');
+		MetaModel::PurgeData($oFilter);
+
 		parent::RecordObjCreation();
 		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpCreate");
 		$oMyChangeOp->Set("objclass", get_class($this));
@@ -171,6 +212,14 @@ abstract class CMDBObject extends DBObject
 
 	protected function RecordObjDeletion($objkey)
 	{
+		$sRootClass = MetaModel::GetRootClass(get_class($this));
+
+		// Delete any existing change tracking about the current object
+		$oFilter = new DBObjectSearch('CMDBChangeOp');
+		$oFilter->AddCondition('objclass', get_class($this), '=');
+		$oFilter->AddCondition('objkey', $objkey, '=');
+		MetaModel::PurgeData($oFilter);
+
 		parent::RecordObjDeletion($objkey);
 		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpDelete");
 		$oMyChangeOp->Set("objclass", MetaModel::GetRootClass(get_class($this)));
@@ -379,38 +428,38 @@ abstract class CMDBObject extends DBObject
 	}
 
 
-	public function DBInsert()
-	{
-		return $this->DBInsertTracked_Internal();
-	}
-
 	public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
 	{
 		self::SetCurrentChange($oChange);
 		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-
 		$ret = $this->DBInsertTracked_Internal();
 		return $ret;
 	}
-
+	
 	public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null)
 	{
 		self::SetCurrentChange($oChange);
 		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-
 		$ret = $this->DBInsertTracked_Internal(true);
 		return $ret;
 	}
-
+	
+	/**
+	 * To Be Obsoleted: DO NOT rely on an overload of this method since
+	 * DBInsertTracked (resp. DBInsertTrackedNoReload) may call directly
+	 * DBInsert (resp. DBInsertNoReload) in future versions of iTop.
+	 * @param bool $bDoNotReload
+	 * @return integer Identifier of the created object
+	 */
 	protected function DBInsertTracked_Internal($bDoNotReload = false)
 	{
 		if ($bDoNotReload)
 		{
-			$ret = parent::DBInsertNoReload();
+			$ret = $this->DBInsertNoReload();
 		}
 		else
 		{
-			$ret = parent::DBInsert();
+			$ret = $this->DBInsert();
 		}
 		return $ret;
 	}

core/cmdbsource.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -29,10 +29,18 @@ require_once(APPROOT.'core/kpi.class.inc.php');
 
 class MySQLException extends CoreException
 {
-	public function __construct($sIssue, $aContext)
+	public function __construct($sIssue, $aContext, $oException = null)
 	{
-		$aContext['mysql_error'] = CMDBSource::GetError();
-		$aContext['mysql_errno'] = CMDBSource::GetErrNo();;
+		if ($oException != null)
+		{
+			$aContext['mysql_error'] = $oException->getCode();
+			$aContext['mysql_errno'] = $oException->getMessage();
+		}
+		else
+		{
+			$aContext['mysql_error'] = CMDBSource::GetError();
+			$aContext['mysql_errno'] = CMDBSource::GetErrNo();
+		}
 		parent::__construct($sIssue, $aContext);
 	}
 }
@@ -50,7 +58,7 @@ class CMDBSource
 	protected static $m_sDBUser;
 	protected static $m_sDBPwd;
 	protected static $m_sDBName;
-	protected static $m_resDBLink;
+	protected static $m_oMysqli;
 
 	public static function Init($sServer, $sUser, $sPwd, $sSource = '')
 	{
@@ -58,29 +66,41 @@ class CMDBSource
 		self::$m_sDBUser = $sUser;
 		self::$m_sDBPwd = $sPwd;
 		self::$m_sDBName = $sSource;
+		self::$m_oMysqli = null;
 
-		$aConnectInfo = explode(':', self::$m_sDBHost);
-		if (count($aConnectInfo) > 1)
+		mysqli_report(MYSQLI_REPORT_STRICT); // *some* errors (like connection errors) will throw mysqli_sql_exception instead
+											 // of generating warnings printed to the output but some other errors will still
+											 // cause the query() method to return false !!!
+		try
 		{
-			// Override the default port
-			$sServer = $aConnectInfo[0];
-			$iPort = $aConnectInfo[1];
-			self::$m_resDBLink = @mysqli_connect($sServer, self::$m_sDBUser, self::$m_sDBPwd, '', $iPort);
+			$aConnectInfo = explode(':', self::$m_sDBHost);
+			if (count($aConnectInfo) > 1)
+			{
+				// Override the default port
+				$sServer = $aConnectInfo[0];
+				$iPort = (int)$aConnectInfo[1];
+				self::$m_oMysqli = new mysqli($sServer, self::$m_sDBUser, self::$m_sDBPwd, '', $iPort);
+			}
+			else
+			{
+				self::$m_oMysqli = new mysqli(self::$m_sDBHost, self::$m_sDBUser, self::$m_sDBPwd);
+			}
 		}
-		else
+		catch(mysqli_sql_exception $e)
 		{
-			self::$m_resDBLink = @mysqli_connect(self::$m_sDBHost, self::$m_sDBUser, self::$m_sDBPwd);
+			throw new MySQLException('Could not connect to the DB server', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser), $e);	
 		}
 
-		if (!self::$m_resDBLink)
-		{
-			throw new MySQLException('Could not connect to the DB server', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser));
-		}
 		if (!empty($sSource))
 		{
-			if (!((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`")))
+			try
 			{
-				throw new MySQLException('Could not select DB', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser, 'db_name'=>self::$m_sDBName));
+				mysqli_report(MYSQLI_REPORT_STRICT); // Errors, in the next query, will throw mysqli_sql_exception
+				self::$m_oMysqli->query("USE `$sSource`");
+			}
+			catch(mysqli_sql_exception $e)
+			{
+				throw new MySQLException('Could not select DB', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser, 'db_name'=>self::$m_sDBName), $e);
 			}
 		}
 	}
@@ -134,7 +154,7 @@ class CMDBSource
 		{
 			// In case we don't have rights to enumerate the databases
 			// Let's try to connect directly
-			return @((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`"));
+			return @((bool)self::$m_oMysqli->query("USE `$sSource`"));
 		}
 
 	}
@@ -147,7 +167,7 @@ class CMDBSource
 	
 	public static function SelectDB($sSource)
 	{
-		if (!((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`")))
+		if (!((bool)self::$m_oMysqli->query("USE `$sSource`")))
 		{
 			throw new MySQLException('Could not select DB', array('db_name'=>$sSource));
 		}
@@ -189,25 +209,25 @@ class CMDBSource
 
 	public static function GetErrNo()
 	{
-		if (self::$m_resDBLink)
+		if (self::$m_oMysqli->errno != 0)
 		{
-			return mysqli_errno(self::$m_resDBLink);
+			return self::$m_oMysqli->errno;
 		}
 		else
 		{
-			return mysqli_connect_errno();
+			return self::$m_oMysqli->connect_errno;
 		}
 	}
 
 	public static function GetError()
 	{
-		if (self::$m_resDBLink)
+		if (self::$m_oMysqli->error != '')
 		{
-			return mysqli_error(self::$m_resDBLink);
+			return self::$m_oMysqli->error;
 		}
 		else
 		{
-			return mysqli_connect_error();
+			return self::$m_oMysqli->connect_error;
 		}
 	}
 
@@ -248,7 +268,7 @@ class CMDBSource
 		// Quote if not a number or a numeric string
 		if ($bAlways || is_string($value))
 		{
-			$value = $cQuoteStyle . mysqli_real_escape_string(self::$m_resDBLink, $value) . $cQuoteStyle;
+			$value = $cQuoteStyle . self::$m_oMysqli->real_escape_string($value) . $cQuoteStyle;
 		}
 		return $value;
 	}
@@ -256,28 +276,35 @@ class CMDBSource
 	public static function Query($sSQLQuery)
 	{
 		$oKPI = new ExecutionKPI();
-		$result = mysqli_query(self::$m_resDBLink, $sSQLQuery);
-		if (!$result) 
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSQLQuery);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSQLQuery, $e));
+		}
+		$oKPI->ComputeStats('Query exec (mySQL)', $sSQLQuery);
+		if ($oResult === false)
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSQLQuery));
 		}
-		$oKPI->ComputeStats('Query exec (mySQL)', $sSQLQuery);
 	
-		return $result;
+		return $oResult;
 	}
 
 	public static function GetNextInsertId($sTable)
 	{
 		$sSQL = "SHOW TABLE STATUS LIKE '$sTable'";
-		$result = self::Query($sSQL);
-		$aRow = mysqli_fetch_assoc($result);
+		$oResult = self::Query($sSQL);
+		$aRow = $oResult->fetch_assoc();
 		$iNextInsertId = $aRow['Auto_increment'];
 		return $iNextInsertId;
 	}
 
 	public static function GetInsertId()
 	{
-		$iRes = mysqli_insert_id(self::$m_resDBLink);
+		$iRes = self::$m_oMysqli->insert_id;
 		if (is_null($iRes))
 		{
 			return 0;
@@ -302,22 +329,31 @@ class CMDBSource
 	public static function QueryToScalar($sSql)
 	{
 		$oKPI = new ExecutionKPI();
-		$result = mysqli_query(self::$m_resDBLink, $sSql);
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
+			MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
 		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-		if (!$result)
+		if ($oResult === false)
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-		if ($aRow = mysqli_fetch_array($result, MYSQLI_BOTH))
+		
+		if ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
 		{
 			$res = $aRow[0];
 		}
 		else
 		{
-			mysqli_free_result($result);
+			$oResult->free();
 			throw new MySQLException('Found no result for query', array('query' => $sSql));
 		}
-		mysqli_free_result($result);
+		$oResult->free();
 		return $res;
 	}
 
@@ -325,17 +361,26 @@ class CMDBSource
 	{
 		$aData = array();
 		$oKPI = new ExecutionKPI();
-		$result = mysqli_query(self::$m_resDBLink, $sSql);
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
+			MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
 		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-		if (!$result)
+		if ($oResult === false)
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-		while ($aRow = mysqli_fetch_array($result, MYSQLI_BOTH))
+				
+		while ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
 		{
 			$aData[] = $aRow;
 		}
-		mysqli_free_result($result);
+		$oResult->free();
 		return $aData;
 	}
 
@@ -353,56 +398,73 @@ class CMDBSource
 	public static function ExplainQuery($sSql)
 	{
 		$aData = array();
-		$result = mysqli_query(self::$m_resDBLink, "EXPLAIN $sSql");
-		if (!$result)
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
+		if ($oResult === false)
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
-		$aNames = self::GetColumns($result);
+		
+		$aNames = self::GetColumns($oResult);
 
 		$aData[] = $aNames;
-		while ($aRow = mysqli_fetch_array($result, MYSQLI_ASSOC))
+		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
 			$aData[] = $aRow;
 		}
-		mysqli_free_result($result);
+		$oResult->free();
 		return $aData;
 	}
 
 	public static function TestQuery($sSql)
 	{
-		$result = mysqli_query(self::$m_resDBLink, "EXPLAIN $sSql");
-		if (!$result)
+		try
 		{
-			return self::GetError();
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
+		if ($oResult === false)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
 
-		mysqli_free_result($result);
+		if (is_object($oResult))
+		{
+			$oResult->free();
+		}
 		return '';
 	}
 
-	public static function NbRows($result)
+	public static function NbRows($oResult)
 	{
-		return mysqli_num_rows($result);
+		return $oResult->num_rows;
 	}
 
 	public static function AffectedRows()
 	{
-		return mysqli_affected_rows(self::$m_resDBLink);
+		return self::$m_oMysqli->affected_rows;
 	}
 
-	public static function FetchArray($result)
+	public static function FetchArray($oResult)
 	{
-		return mysqli_fetch_array($result, MYSQLI_ASSOC);
+		return $oResult->fetch_array(MYSQLI_ASSOC);
 	}
 
-	public static function GetColumns($result)
+	public static function GetColumns($oResult)
 	{
 		$aNames = array();
-		for ($i = 0; $i < (($___mysqli_tmp = mysqli_num_fields($result)) ? $___mysqli_tmp : 0) ; $i++)
+		for ($i = 0; $i < (($___mysqli_tmp = $oResult->field_count) ? $___mysqli_tmp : 0) ; $i++)
 		{
-			$meta = mysqli_fetch_field_direct($result, $i);
+			$meta = $oResult->fetch_field_direct($i);
 			if (!$meta)
 			{
 				throw new MySQLException('mysql_fetch_field: No information available', array('query'=>$sSql, 'i'=>$i));
@@ -415,14 +477,15 @@ class CMDBSource
 		return $aNames;
 	}
 
-	public static function Seek($result, $iRow)
+	public static function Seek($oResult, $iRow)
 	{
-		return mysqli_data_seek($result, $iRow);
+		return $oResult->data_seek($iRow);
 	}
 
-	public static function FreeResult($result)
+	public static function FreeResult($oResult)
 	{
-		return ((mysqli_free_result($result) || (is_object($result) && (get_class($result) == "mysqli_result"))) ? true : false);
+		$oResult->free(); /* returns void */
+		return true;
 	}
 
 	public static function IsTable($sTable)
@@ -580,18 +643,25 @@ class CMDBSource
 	public static function DumpTable($sTable)
 	{
 		$sSql = "SELECT * FROM `$sTable`";
-		$result = mysqli_query(self::$m_resDBLink, $sSql);
-		if (!$result)
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql), $e);
+		}
+		if ($oResult === false)
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-
+		
 		$aRows = array();
-		while ($aRow = mysqli_fetch_array($result, MYSQLI_ASSOC))
+		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
 		{
 			$aRows[] = $aRow;
 		}
-		mysqli_free_result($result);
+		$oResult->free();
 		return $aRows;
 	}
 	
@@ -621,7 +691,7 @@ class CMDBSource
 	{
 		try
 		{
-			$result = self::Query('SHOW GRANTS'); // [ FOR CURRENT_USER()]
+			$oResult = self::Query('SHOW GRANTS'); // [ FOR CURRENT_USER()]
 		}
 		catch(MySQLException $e)
 		{
@@ -629,12 +699,12 @@ class CMDBSource
 		}
 
 		$aRes = array();
-		while ($aRow = mysqli_fetch_array($result, MYSQLI_NUM))
+		while ($aRow = $oResult->fetch_array(MYSQLI_NUM))
 		{
 			// so far, only one column...
 			$aRes[] = implode('/', $aRow);
 		}
-		mysqli_free_result($result);
+		$oResult->free();
 		// so far, only one line...
 		return implode(', ', $aRes);
 	}
@@ -647,21 +717,21 @@ class CMDBSource
 	{
 		try
 		{
-			$result = self::Query('SHOW SLAVE STATUS');
+			$oResult = self::Query('SHOW SLAVE STATUS');
 		}
 		catch(MySQLException $e)
 		{
 			throw new CoreException("Current user not allowed to check the status", array('mysql_error' => $e->getMessage()));
 		}
 
-		if (mysqli_num_rows($result) == 0)
+		if ($oResult->num_rows == 0)
 		{
 			return false;
 		}
 
 		// Returns one single row anytime
-		$aRow = mysqli_fetch_array($result, MYSQLI_ASSOC);
-		mysqli_free_result($result);
+		$aRow = $oResult->fetch_array(MYSQLI_ASSOC);
+		$oResult->free();
 
 		if (!isset($aRow['Slave_IO_Running']))
 		{
@@ -683,7 +753,4 @@ class CMDBSource
 		}
 		return false;
 	}
-}
-
-
-?>
+}

core/config.class.inc.php

@@ -35,6 +35,7 @@ define('ACCESS_READONLY', 0);
  */
 
 require_once('coreexception.class.inc.php');
+require_once('attributedef.class.inc.php'); // For the defines
 
 class ConfigException extends CoreException
 {
@@ -332,6 +333,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
+		'async_task_retries' => array(
+			'type' => 'array',
+			'description' => 'Automatic retries of asynchronous tasks in case of failure (per class)',
+			'default' => array('AsyncSendEmail' => array('max_retries' => 0, 'retry_delay' => 600)),
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
 		'email_asynchronous' => array(
 			'type' => 'bool',
 			'description' => 'If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode',
@@ -540,6 +549,15 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
+		'forgot_password_from' => array(
+			'type' => 'string',
+			'description' => 'Sender email address for the "forgot password" feature. If empty, defaults to the recipient\'s  email address.',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
 		'deadline_format' => array(
 			'type' => 'string',
 			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
@@ -624,14 +642,22 @@ class Config
 		'url_validation_pattern' => array(
 			'type' => 'string',
 			'description' => 'Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)',
-			'default' => '(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\$_.-]*)?',
-			//            SHEME.......... USER....................... PASSWORD.......................... HOST/IP........... PORT.......... PATH....................... GET......................................... ANCHOR............................
+			'default' => '(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\$_.-]*)?',
+			//            SHEME.......... USER....................... PASSWORD.......................... HOST/IP........... PORT.......... PATH........................ GET............................................ ANCHOR............................
 			// Example: http://User:passWord@127.0.0.1:8888/patH/Page.php?arrayArgument[2]=something:blah20#myAnchor
 			// Origin of this regexp: http://www.php.net/manual/fr/function.preg-match.php#93824
 			'value' => '',
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
+		'email_validation_pattern' => array(
+			'type' => 'string',
+			'description' => 'Regular expression to validate/detect the format of an eMail address',
+			'default' => "[a-zA-Z0-9._&'-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}",
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
 		'log_kpi_duration' => array(
 			'type' => 'integer',
 			'description' => 'Level of logging for troubleshooting performance issues (1 to enable, 2 +blame callers)',
@@ -684,6 +710,89 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
+		'max_execution_time_per_loop' => array(
+			'type' => 'integer',
+			'description' => 'Maximum execution time requested, per loop, during bulk operations. Zero means no limit.',
+			// examples... not used
+			'default' => 30,
+			'value' => 30,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'max_history_length' => array(
+			'type' => 'integer',
+			'description' => 'Maximum length of the history table (in the "History" tab on each object) before it gets truncated. Latest modifications are displayed first.',
+			// examples... not used
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'full_text_chunk_duration' => array(
+			'type' => 'integer',
+			'description' => 'Delay after which the results are displayed.',
+			// examples... not used
+			'default' => 2,
+			'value' => 2,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'full_text_accelerators' => array(
+			'type' => 'array',
+			'description' => 'Specifies classes to be searched at first (and the subset of data) when running the full text search.',
+			'default' => array(),
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'full_text_needle_min' => array(
+			'type' => 'integer',
+			'description' => 'Minimum size of the full text needle.',
+			'default' => 3,
+			'value' => 3,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'tracking_level_linked_set_default' => array(
+			'type' => 'integer',
+			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)',
+			'default' => LINKSET_TRACKING_LIST,
+			'value' => LINKSET_TRACKING_LIST,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'tracking_level_linked_set_indirect_default' => array(
+			'type' => 'integer',
+			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSetIndirect',
+			'default' => LINKSET_TRACKING_ALL,
+			'value' => LINKSET_TRACKING_ALL,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false, 
+		),
+		'user_rights_legacy' => array(
+			'type' => 'bool',
+			'description' => 'Set to true to restore the buggy algorithm for the computation of user rights (within the same profile, ALLOW on the class itself has precedence on DENY of a parent class)',
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'xlsx_exporter_cleanup_old_files_delay' => array(
+			'type' => 'int',
+			'description' => 'Delay (in seconds) for which to let the exported XLSX files on the server so that the user who initiated the export can download the result',
+			'default' => 86400,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'xlsx_exporter_memory_limit' => array(
+			'type' => 'string',
+			'description' => 'Memory limit to use when (interactively) exporting data to Excel',
+			'default' => '2048M', // Huuuuuuge 2GB!
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),		
 	);
 
 	public function IsProperty($sPropCode)
@@ -712,6 +821,8 @@ class Config
 		case 'float':
 			$value = (float) $value;
 			break;
+		case 'array':
+			break;
 		default:
 			throw new CoreException('Unknown type for setting', array('property' => $sPropCode, 'type' => $sType));
 		}
@@ -968,7 +1079,14 @@ class Config
 		{
 			if ($this->IsProperty($sPropCode))
 			{
-				$value = trim($rawvalue);
+				if (is_string($rawvalue))
+				{
+					$value = trim($rawvalue);
+				}
+				else
+				{
+					$value = $rawvalue;
+				}
 				$this->Set($sPropCode, $value, $sConfigFile);
 			}
 		}
@@ -1711,14 +1829,14 @@ class Config
 	/**
 	 * Pretty format a var_export'ed value so that (if possible) the identation is preserved on every line
 	 * @param mixed $value The value to export
-	 * @param string $sIdentation The string to use to indent the text
+	 * @param string $sIndentation The string to use to indent the text
 	 * @param bool $bForceIndentation Forces the identation (enven if it breaks/changes an eval, for example to ouput a value inside a comment)
 	 * @return string The indented export string
 	 */
-	protected static function PrettyVarExport($value, $sIdentation, $bForceIndentation = false)
+	protected static function PrettyVarExport($value, $sIndentation, $bForceIndentation = false)
 	{
 		$sExport = var_export($value, true);
-		$sNiceExport = trim(preg_replace("/^/m", "\t\t\t", $sExport));
+		$sNiceExport = str_replace(array("\r\n", "\n", "\r"), "\n".$sIndentation, trim($sExport));
 		if (!$bForceIndentation)
 		{
 			eval('$aImported='.$sNiceExport.';');

core/dbobject.class.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -16,6 +16,38 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
+/**
+ * All objects to be displayed in the application (either as a list or as details)
+ * must implement this interface.
+ */
+interface iDisplay
+{
+
+	/**
+	 * Maps the given context parameter name to the appropriate filter/search code for this class
+	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
+	 * @return string Filter code, i.e. 'customer_id'
+	 */
+	public static function MapContextParam($sContextParam);
+	/**
+	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
+	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
+	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+	 * To Be overridden by derived classes
+	 * @param void
+	 * @return String The desired higlight class for the object/row
+	 */
+	public function GetHilightClass();
+	/**
+	 * Returns the relative path to the page that handles the display of the object
+	 * @return string
+	 */
+	public static function GetUIPage();
+	/**
+	 * Displays the details of the object
+	 */
+	public function DisplayDetails(WebPage $oPage, $bEditMode = false);
+}
 
 /**
  * Class dbObject: the root of persistent classes
@@ -34,7 +66,7 @@ require_once('mutex.class.inc.php');
  *
  * @package     iTopORM
  */
-abstract class DBObject
+abstract class DBObject implements iDisplay
 {
 	private static $m_aMemoryObjectsByClass = array();
 
@@ -61,7 +93,9 @@ abstract class DBObject
 
 	private $m_bFullyLoaded = false; // Compound objects can be partially loaded
 	private $m_aLoadedAtt = array(); // Compound objects can be partially loaded, array of sAttCode
-	protected $m_oMasterReplicaSet = null; // Set of SynchroReplica related to this object
+	protected $m_aModifiedAtt = array(); // list of (potentially) modified sAttCodes
+	protected $m_aSynchroData = null; // Set of Synch data related to this object
+	protected $m_sHighlightCode = null;
 
 	// Use the MetaModel::NewObject to build an object (do we have to force it?)
 	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
@@ -70,6 +104,7 @@ abstract class DBObject
 		{
 			$this->FromRow($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
 			$this->m_bFullyLoaded = $this->IsFullyLoaded();
+			$this->m_aModifiedAtt = array();
 			return;
 		}
 		// Creation of a brand new object
@@ -194,6 +229,7 @@ abstract class DBObject
 		}
 
 		$this->m_bFullyLoaded = true;
+		$this->m_aModifiedAtt = array();
 	}
 
 	protected function FromRow($aRow, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
@@ -304,6 +340,7 @@ abstract class DBObject
 			// Ignore it - this attribute is set upon object creation and that's it
 			return;
 		}
+		
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 		if ($this->m_bIsInDB && !$this->m_bFullyLoaded && !$this->m_bDirty)
 		{
@@ -371,6 +408,7 @@ abstract class DBObject
 		$realvalue = $oAttDef->MakeRealValue($value, $this);
 
 		$this->m_aCurrValues[$sAttCode] = $realvalue;
+		$this->m_aModifiedAtt[$sAttCode] = true;
 
 		// The object has changed, reset caches
 		$this->m_bCheckStatus = null;
@@ -400,16 +438,25 @@ abstract class DBObject
 			{
 				throw new CoreException("Unknown external key '$sExtKeyAttCode' for the class ".get_class($this));
 			}
-			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
-			$sRemoteClass = $oKeyAttDef->GetTargetClass();
-			$oRemoteObj = MetaModel::GetObject($sRemoteClass, $this->GetStrict($sExtKeyAttCode), false);
-			if (is_null($oRemoteObj))
+
+			$oExtFieldAtt = MetaModel::FindExternalField(get_class($this), $sExtKeyAttCode, $sRemoteAttCode);
+			if (!is_null($oExtFieldAtt))
 			{
-				return '';
+				return $this->GetStrict($oExtFieldAtt->GetCode());
 			}
 			else
 			{
-				return $oRemoteObj->Get($sRemoteAttCode);
+				$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
+				$sRemoteClass = $oKeyAttDef->GetTargetClass();
+				$oRemoteObj = MetaModel::GetObject($sRemoteClass, $this->GetStrict($sExtKeyAttCode), false);
+				if (is_null($oRemoteObj))
+				{
+					return '';
+				}
+				else
+				{
+					return $oRemoteObj->Get($sRemoteAttCode);
+				}
 			}
 		}
 	}
@@ -511,6 +558,64 @@ abstract class DBObject
 	{
 		return $this->m_aExtendedData;
 	}
+	
+	/**
+	 * Set the HighlightCode if the given code has a greater rank than the current HilightCode
+	 * @param string $sCode
+	 * @return void
+	 */
+	protected function SetHighlightCode($sCode)
+	{
+		$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
+		$fCurrentRank = 0.0;
+		if (($this->m_sHighlightCode !== null) && array_key_exists($this->m_sHighlightCode, $aHighlightScale))
+		{
+			$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
+		}
+				
+		if (array_key_exists($sCode, $aHighlightScale))
+		{
+			$fRank = $aHighlightScale[$sCode]['rank'];
+			if ($fRank > $fCurrentRank)
+			{
+				$this->m_sHighlightCode = $sCode;
+			}
+		}
+	}
+	
+	/**
+	 * Get the current HighlightCode
+	 * @return string The Hightlight code (null if none set, meaning rank = 0)
+	 */
+	protected function GetHighlightCode()
+	{
+		return $this->m_sHighlightCode;
+	}
+	
+	protected function ComputeHighlightCode()
+	{
+		// First if the state defines a HiglightCode, apply it
+		$sState = $this->GetState();
+		if ($sState != '')
+		{
+			$sCode = MetaModel::GetHighlightCode(get_class($this), $sState);
+			$this->SetHighlightCode($sCode);
+		}
+		// The check for each StopWatch if a HighlightCode is effective
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeStopWatch)
+			{
+				$oStopWatch = $this->Get($sAttCode);
+				$sCode = $oStopWatch->GetHighlightCode();
+				if ($sCode !== '')
+				{
+					$this->SetHighlightCode($sCode);
+				}
+			}
+		}
+		return $this->GetHighlightCode();
+	}
 
 	/**
 	 * Updates the value of an external field by (re)loading the object
@@ -739,10 +844,27 @@ abstract class DBObject
 	/**
 	 * Get the icon representing this object
 	 * @param boolean $bImgTag If true the result is a full IMG tag (or an emtpy string if no icon is defined)
-	 * @return string Either the full IMG tag ($bImgTag == true) or just the path to the icon file
+	 * @return string Either the full IMG tag ($bImgTag == true) or just the URL to the icon file
 	 */
 	public function GetIcon($bImgTag = true)
 	{
+		$sCode = $this->ComputeHighlightCode();
+		if($sCode != '')
+		{
+			$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
+			if (array_key_exists($sCode, $aHighlightScale))
+			{
+				$sIconUrl = $aHighlightScale[$sCode]['icon'];
+				if($bImgTag)
+				{
+					return "<img src=\"$sIconUrl\" style=\"vertical-align:middle\"/>";
+				}
+				else
+				{
+					return $sIconUrl;
+				}
+			}
+		}		
 		return MetaModel::GetClassIcon(get_class($this), $bImgTag);
 	}
 
@@ -864,7 +986,11 @@ abstract class DBObject
 			}
 		}
 		$aReasons = array();
-		$iSynchroFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
+		$iSynchroFlags = 0;
+		if ($this->InSyncScope())
+		{
+			$iSynchroFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
+		}
 		return $iFlags | $iSynchroFlags; // Combine both sets of flags
 	}
 
@@ -1052,48 +1178,45 @@ abstract class DBObject
 
 		if ($this->InSyncScope())
 		{
-			$oReplicaSet = $this->GetMasterReplica();
-			if ($oReplicaSet->Count() > 0)
+
+			foreach ($this->GetSynchroData() as $iSourceId => $aSourceData)
 			{
-				while($aData = $oReplicaSet->FetchAssoc())
+				foreach ($aSourceData['replica'] as $oReplica)
 				{
-					$oDataSource = $aData['datasource'];
-					$oReplica = $aData['replica'];
-
 					$oDeletionPlan->AddToDelete($oReplica, DEL_SILENT);
+				}
+				$oDataSource = $aSourceData['source'];
+				if ($oDataSource->GetKey() == SynchroExecution::GetCurrentTaskId())
+				{
+					// The current task has the right to delete the object
+					continue;
+				}
+				$oReplica = reset($aSourceData['replica']); // Take the first one
+				if ($oReplica->Get('status_dest_creator') != 1)
+				{
+					// The object is not owned by the task
+					continue;
+				}
 
-					if ($oDataSource->GetKey() == SynchroExecution::GetCurrentTaskId())
-					{
-						// The current task has the right to delete the object
-						continue;
-					}
-					
-					if ($oReplica->Get('status_dest_creator') != 1)
-					{
-						// The object is not owned by the task
-						continue;
-					}
+				$sLink = $oDataSource->GetName();
+				$sUserDeletePolicy = $oDataSource->Get('user_delete_policy');
+				switch($sUserDeletePolicy)
+				{
+				case 'nobody':
+					$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
+					break;
 
-					$sLink = $oDataSource->GetName();
-					$sUserDeletePolicy = $oDataSource->Get('user_delete_policy');
-					switch($sUserDeletePolicy)
+				case 'administrators':
+					if (!UserRights::IsAdministrator())
 					{
-					case 'nobody':
 						$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
-						break;
-
-					case 'administrators':
-						if (!UserRights::IsAdministrator())
-						{
-							$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
-						}
-						break;
-
-					case 'everybody':
-					default:
-						// Ok
-						break;
 					}
+					break;
+
+				case 'everybody':
+				default:
+					// Ok
+					break;
 				}
 			}
 		}
@@ -1116,6 +1239,11 @@ abstract class DBObject
 				// The value was not set
 				$aDelta[$sAtt] = $proposedValue;
 			}
+			elseif(!array_key_exists($sAtt, $this->m_aModifiedAtt))
+			{
+				// This attCode was never set, canno tbe modified
+				continue;
+			}
 			elseif(is_object($proposedValue))
 			{
 				$oLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sAtt);
@@ -1597,142 +1725,161 @@ abstract class DBObject
 			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
 		}
 
-		// Stop watches
-		$sState = $this->GetState();
-		if ($sState != '')
+		// Protect against reentrance (e.g. cascading the update of ticket logs)
+		static $aUpdateReentrance = array();
+		$sKey = get_class($this).'::'.$this->GetKey();
+		if (array_key_exists($sKey, $aUpdateReentrance))
 		{
-			foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+			return;
+		}
+		$aUpdateReentrance[$sKey] = true;
+
+		try
+		{
+			// Stop watches
+			$sState = $this->GetState();
+			if ($sState != '')
 			{
-				if ($oAttDef instanceof AttributeStopWatch)
+				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
 				{
-					if (in_array($sState, $oAttDef->GetStates()))
+					if ($oAttDef instanceof AttributeStopWatch)
 					{
-						// Compute or recompute the deadlines
-						$oSW = $this->Get($sAttCode);
-						$oSW->ComputeDeadlines($this, $oAttDef);
-						$this->Set($sAttCode, $oSW);
+						if (in_array($sState, $oAttDef->GetStates()))
+						{
+							// Compute or recompute the deadlines
+							$oSW = $this->Get($sAttCode);
+							$oSW->ComputeDeadlines($this, $oAttDef);
+							$this->Set($sAttCode, $oSW);
+						}
 					}
 				}
 			}
-		}
 
-		$this->DoComputeValues();
-		$this->OnUpdate();
+			$this->DoComputeValues();
+			$this->OnUpdate();
 
-		$aChanges = $this->ListChanges();
-		if (count($aChanges) == 0)
-		{
-			// Attempting to update an unchanged object
-			return;
-		}
-
-		// Ultimate check - ensure DB integrity
-		list($bRes, $aIssues) = $this->CheckToWrite();
-		if (!$bRes)
-		{
-			$sIssues = implode(', ', $aIssues);
-			throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
-		}
-
-		// Save the original values (will be reset to the new values when the object get written to the DB)
-		$aOriginalValues = $this->m_aOrigValues;
-
-		$bHasANewExternalKeyValue = false;
-		$aHierarchicalKeys = array();
-		foreach($aChanges as $sAttCode => $valuecurr)
-		{
-			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-			if ($oAttDef->IsExternalKey()) $bHasANewExternalKeyValue = true;
-			if (!$oAttDef->IsDirectField()) unset($aChanges[$sAttCode]);
-			if ($oAttDef->IsHierarchicalKey())
+			$aChanges = $this->ListChanges();
+			if (count($aChanges) == 0)
 			{
-				$aHierarchicalKeys[$sAttCode] = $oAttDef;
+				// Attempting to update an unchanged object
+				unset($aUpdateReentrance[$sKey]);
+				return $this->m_iKey;
 			}
-		}
 
-		if (!MetaModel::DBIsReadOnly())
-		{
-			// Update the left & right indexes for each hierarchical key
-			foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
+			// Ultimate check - ensure DB integrity
+			list($bRes, $aIssues) = $this->CheckToWrite();
+			if (!$bRes)
 			{
-				$sTable = $sTable = MetaModel::DBGetTable(get_class($this), $sAttCode);
-				$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".$this->GetKey();
-				$aRes = CMDBSource::QueryToArray($sSQL);
-				$iMyLeft = $aRes[0]['left'];
-				$iMyRight = $aRes[0]['right'];
-				$iDelta =$iMyRight - $iMyLeft + 1;
-				MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
-				
-				if ($aChanges[$sAttCode] == 0)
+				$sIssues = implode(', ', $aIssues);
+				throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
+			}
+
+			// Save the original values (will be reset to the new values when the object get written to the DB)
+			$aOriginalValues = $this->m_aOrigValues;
+
+			$bHasANewExternalKeyValue = false;
+			$aHierarchicalKeys = array();
+			foreach($aChanges as $sAttCode => $valuecurr)
+			{
+				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+				if ($oAttDef->IsExternalKey()) $bHasANewExternalKeyValue = true;
+				if (!$oAttDef->IsDirectField()) unset($aChanges[$sAttCode]);
+				if ($oAttDef->IsHierarchicalKey())
 				{
-					// No new parent, insert completely at the right of the tree
-					$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
+					$aHierarchicalKeys[$sAttCode] = $oAttDef;
+				}
+			}
+
+			if (!MetaModel::DBIsReadOnly())
+			{
+				// Update the left & right indexes for each hierarchical key
+				foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
+				{
+					$sTable = $sTable = MetaModel::DBGetTable(get_class($this), $sAttCode);
+					$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".$this->GetKey();
 					$aRes = CMDBSource::QueryToArray($sSQL);
-					if (count($aRes) == 0)
+					$iMyLeft = $aRes[0]['left'];
+					$iMyRight = $aRes[0]['right'];
+					$iDelta =$iMyRight - $iMyLeft + 1;
+					MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
+					
+					if ($aChanges[$sAttCode] == 0)
 					{
-						$iNewLeft = 1;
+						// No new parent, insert completely at the right of the tree
+						$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
+						$aRes = CMDBSource::QueryToArray($sSQL);
+						if (count($aRes) == 0)
+						{
+							$iNewLeft = 1;
+						}
+						else
+						{
+							$iNewLeft = $aRes[0]['max']+1;
+						}
 					}
 					else
 					{
-						$iNewLeft = $aRes[0]['max']+1;
+						// Insert at the right of the specified parent
+						$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` FROM `$sTable` WHERE id=".((int)$aChanges[$sAttCode]);
+						$iNewLeft = CMDBSource::QueryToScalar($sSQL);
+					}
+
+					MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
+
+					$aHKChanges = array();
+					$aHKChanges[$sAttCode] = $aChanges[$sAttCode];
+					$aHKChanges[$oAttDef->GetSQLLeft()] = $iNewLeft;
+					$aHKChanges[$oAttDef->GetSQLRight()] = $iNewLeft + $iDelta - 1;
+					$aChanges[$sAttCode] = $aHKChanges; // the 3 values will be stored by MakeUpdateQuery below
+				}
+				
+				// Update scalar attributes
+				if (count($aChanges) != 0)
+				{
+					$oFilter = new DBObjectSearch(get_class($this));
+					$oFilter->AddCondition('id', $this->m_iKey, '=');
+			
+					$sSQL = MetaModel::MakeUpdateQuery($oFilter, $aChanges);
+					CMDBSource::Query($sSQL);
+				}
+			}
+
+			$this->DBWriteLinks();
+			$this->m_bDirty = false;
+
+			$this->AfterUpdate();
+
+			// Reload to get the external attributes
+			if ($bHasANewExternalKeyValue)
+			{
+				$this->Reload();
+			}
+			else
+			{
+				// Reset original values although the object has not been reloaded
+				foreach ($this->m_aLoadedAtt as $sAttCode => $bLoaded)
+				{
+					if ($bLoaded)
+					{
+						$value = $this->m_aCurrValues[$sAttCode];
+						$this->m_aOrigValues[$sAttCode] = is_object($value) ? clone $value : $value;
 					}
 				}
-				else
-				{
-					// Insert at the right of the specified parent
-					$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` FROM `$sTable` WHERE id=".((int)$aChanges[$sAttCode]);
-					$iNewLeft = CMDBSource::QueryToScalar($sSQL);
-				}
-
-				MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
-
-				$aHKChanges = array();
-				$aHKChanges[$sAttCode] = $aChanges[$sAttCode];
-				$aHKChanges[$oAttDef->GetSQLLeft()] = $iNewLeft;
-				$aHKChanges[$oAttDef->GetSQLRight()] = $iNewLeft + $iDelta - 1;
-				$aChanges[$sAttCode] = $aHKChanges; // the 3 values will be stored by MakeUpdateQuery below
-			}
 			
-			// Update scalar attributes
+			}
+
 			if (count($aChanges) != 0)
 			{
-				$oFilter = new DBObjectSearch(get_class($this));
-				$oFilter->AddCondition('id', $this->m_iKey, '=');
-		
-				$sSQL = MetaModel::MakeUpdateQuery($oFilter, $aChanges);
-				CMDBSource::Query($sSQL);
+				$this->RecordAttChanges($aChanges, $aOriginalValues);
 			}
 		}
-
-		$this->DBWriteLinks();
-		$this->m_bDirty = false;
-
-		$this->AfterUpdate();
-
-		// Reload to get the external attributes
-		if ($bHasANewExternalKeyValue)
+		catch (Exception $e)
 		{
-			$this->Reload();
-		}
-		else
-		{
-			// Reset original values although the object has not been reloaded
-			foreach ($this->m_aLoadedAtt as $sAttCode => $bLoaded)
-			{
-				if ($bLoaded)
-				{
-					$value = $this->m_aCurrValues[$sAttCode];
-					$this->m_aOrigValues[$sAttCode] = is_object($value) ? clone $value : $value;
-				}
-			}
-		
-		}
-
-		if (count($aChanges) != 0)
-		{
-			$this->RecordAttChanges($aChanges, $aOriginalValues);
+			unset($aUpdateReentrance[$sKey]);
+			throw $e;
 		}
 
+		unset($aUpdateReentrance[$sKey]);
 		return $this->m_iKey;
 	}
 	
@@ -1811,7 +1958,8 @@ abstract class DBObject
 			$this->AfterDelete();
 
 			$this->m_bIsInDB = false;
-			$this->m_iKey = null;
+			// Fix for #926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete objects, reported as bug #926)
+			// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
 		}
 	}
 
@@ -1819,6 +1967,11 @@ abstract class DBObject
 	//
 	public function DBDelete(&$oDeletionPlan = null)
 	{
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
 		if (is_null($oDeletionPlan))
 		{
 			$oDeletionPlan = new DeletionPlan();
@@ -1848,7 +2001,7 @@ abstract class DBObject
 					// As a temporary fix: delete only the objects that are still to be deleted...
 					if ($oToDelete->m_bIsInDB)
 					{
-						set_time_limit(5);
+						set_time_limit($iLoopTimeLimit);
 						$oToDelete->DBDeleteSingleObject();
 					}
 				}
@@ -1862,7 +2015,7 @@ abstract class DBObject
 					foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
 					{
 						$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-						set_time_limit(5);
+						set_time_limit($iLoopTimeLimit);
 						$oToUpdate->DBUpdate();
 					}
 				}
@@ -1918,17 +2071,55 @@ abstract class DBObject
 		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
 
 		$bSuccess = true;
-		foreach ($aTransitionDef['actions'] as $sActionHandler)
+		foreach ($aTransitionDef['actions'] as $actionHandler)
 		{
-			// std PHP spec
-			$aActionCallSpec = array($this, $sActionHandler);
-
-			if (!is_callable($aActionCallSpec))
+			if (is_string($actionHandler))
 			{
-				throw new CoreException("Unable to call action: ".get_class($this)."::$sActionHandler");
-				return;
+				// Old (pre-2.0.4) action definition without any parameter
+				$aActionCallSpec = array($this, $sActionHandler);
+	
+				if (!is_callable($aActionCallSpec))
+				{
+					throw new CoreException("Unable to call action: ".get_class($this)."::$sActionHandler");
+					return;
+				}
+				$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
+			}
+			else // if (is_array($actionHandler))
+			{
+				// New syntax: 'verb' and typed parameters
+				$sAction = $actionHandler['verb'];
+				$aParams = array();
+				foreach($actionHandler['params'] as $aDefinition)
+				{
+					$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
+					switch($sParamType)
+					{
+						case 'int':
+						$value = (int)$aDefinition['value'];
+						break;
+						
+						case 'float':
+						$value = (float)$aDefinition['value'];
+						break;
+						
+						case 'bool':
+						$value = (bool)$aDefinition['value'];
+						break;
+						
+						case 'reference':
+						$value = ${$aDefinition['value']};
+						break;
+						
+						case 'string':
+						default:
+						$value = (string)$aDefinition['value'];
+					}
+					$aParams[] = $value;
+				}
+				$aCallSpec = array($this, $sAction);
+				$bRet = call_user_func_array($aCallSpec, $aParams);
 			}
-			$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
 			// if one call fails, the whole is considered as failed
 			if (!$bRet) $bSuccess = false;
 		}
@@ -2028,7 +2219,10 @@ abstract class DBObject
 				{
 					$oCaseLog = $this->Get($sAttCode);
 					$aScalarArgs[$sArgName.'->'.$sAttCode] = $oCaseLog->GetText();
-					$aScalarArgs[$sArgName.'->head('.$sAttCode.')'] = $oCaseLog->GetLatestEntry();
+					$sHead = $oCaseLog->GetLatestEntry();
+					$aScalarArgs[$sArgName.'->head('.$sAttCode.')'] = $sHead;
+					$aScalarArgs[$sArgName.'->head_html('.$sAttCode.')'] = '<div class="caselog_entry">'.str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sHead, ENT_QUOTES, 'UTF-8')).'</div>';
+					$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = $oCaseLog->GetAsEmailHtml();
 				}
 				elseif ($oAttDef->IsScalar())
 				{
@@ -2042,7 +2236,7 @@ abstract class DBObject
 				{
 					$sRemoteName = $oAttDef->IsIndirect() ? $oAttDef->GetExtKeyToRemote().'_friendlyname' : 'friendlyname';
 
-					$oLinkSet = $this->Get($sAttCode);
+					$oLinkSet = clone $this->Get($sAttCode); // Workaround/Safety net for Trac #887
 					$iLimit = MetaModel::GetConfig()->Get('max_linkset_output');
 					if ($iLimit > 0)
 					{
@@ -2059,6 +2253,7 @@ abstract class DBObject
 					}
 					$sNames = implode("\n", $aNames);
 					$aScalarArgs[$sArgName.'->'.$sAttCode] = $sNames;
+					$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = '<ul><li>'.implode("</li><li>", $aNames).'</li></ul>';
 				}
 			}
 
@@ -2317,6 +2512,11 @@ abstract class DBObject
 
 	private function MakeDeletionPlan(&$oDeletionPlan, $aVisited = array(), $iDeleteOption = null)
 	{
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
 		$sClass = get_class($this);
 		$iThisId = $this->GetKey();
 
@@ -2350,7 +2550,7 @@ abstract class DBObject
 		{
 			foreach ($aPotentialDeletes as $sRemoteExtKey => $aData)
 			{
-				set_time_limit(5);
+				set_time_limit($iLoopTimeLimit);
 
 				$oAttDef = $aData['attribute'];
 				$iDeletePropagationOption = $oAttDef->GetDeletionPropagationOption();
@@ -2385,45 +2585,77 @@ abstract class DBObject
 	}
 
 	/**
+	 * WILL DEPRECATED SOON
+	 * Caching relying on an object set is not efficient since 2.0.3
+	 * Use GetSynchroData instead
+	 * 	 
 	 * Get all the synchro replica related to this object
 	 * @param none
 	 * @return DBObjectSet Set with two columns: R=SynchroReplica S=SynchroDataSource
 	 */
 	public function GetMasterReplica()
 	{
-		if ($this->m_oMasterReplicaSet == null)
+		$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
+		$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
+		return $oReplicaSet;
+	}
+
+	/**
+	 * Get all the synchro data related to this object
+	 * @param none
+	 * @return array of data_source_id => array
+	 * 	'source' => $oSource,
+	 * 	'attributes' => array of $oSynchroAttribute
+	 * 	'replica' => array of $oReplica (though only one should exist, misuse of the data sync can have this consequence)
+	 */
+	public function GetSynchroData()
+	{
+		if ($this->m_aSynchroData == null)
 		{
-			//$aParentClasses = MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL);
-			//$sClassesList = "'".implode("','", $aParentClasses)."'";
 			$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
 			$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
-			$this->m_oMasterReplicaSet = $oReplicaSet;
+			$this->m_aSynchroData = array();
+			while($aData = $oReplicaSet->FetchAssoc())
+			{
+				$iSourceId = $aData['datasource']->GetKey();
+				if (!array_key_exists($iSourceId, $this->m_aSynchroData))
+				{
+					$aAttributes = array();
+					$oAttrSet = $aData['datasource']->Get('attribute_list');
+					while($oSyncAttr = $oAttrSet->Fetch())
+					{
+						$aAttributes[$oSyncAttr->Get('attcode')] = $oSyncAttr;
+					}
+					$this->m_aSynchroData[$iSourceId] = array(
+						'source' => $aData['datasource'],
+						'attributes' => $aAttributes,
+						'replica' => array()
+					);
+				}
+				// Assumption: $aData['datasource'] will not be null because the data source id is always set...
+				$this->m_aSynchroData[$iSourceId]['replica'][] = $aData['replica'];
+			}
 		}
-		else
-		{
-			$this->m_oMasterReplicaSet->Rewind();		
-		}
-		return $this->m_oMasterReplicaSet;
+		return $this->m_aSynchroData;
 	}
 	
 	public function GetSynchroReplicaFlags($sAttCode, &$aReason)
 	{
 		$iFlags = OPT_ATT_NORMAL;
-		$oSet = $this->GetMasterReplica();
-		while($aData = $oSet->FetchAssoc())
+		foreach ($this->GetSynchroData() as $iSourceId => $aSourceData)
 		{
-			if ($aData['datasource']->GetKey() == SynchroExecution::GetCurrentTaskId())
+			if ($iSourceId == SynchroExecution::GetCurrentTaskId())
 			{
 				// Ignore the current task (check to write => ok)
 				continue;
 			}
-			// Assumption: $aData['datasource'] will not be null because the data source id is always set...
-			$oReplica = $aData['replica'];
-			$oSource = $aData['datasource'];
-			$oAttrSet = $oSource->Get('attribute_list');
-			while($oSyncAttr = $oAttrSet->Fetch())
+			// Assumption: one replica - take the first one!
+			$oReplica = reset($aSourceData['replica']);
+			$oSource = $aSourceData['source'];
+			if (array_key_exists($sAttCode, $aSourceData['attributes']))
 			{
-				if (($oSyncAttr->Get('attcode') == $sAttCode) && ($oSyncAttr->Get('update') == 1) && ($oSyncAttr->Get('update_policy') == 'master_locked'))
+				$oSyncAttr = $aSourceData['attributes'][$sAttCode];
+				if (($oSyncAttr->Get('update') == 1) && ($oSyncAttr->Get('update_policy') == 'master_locked'))
 				{
 					$iFlags |= OPT_ATT_SLAVE;
 					$sUrl = $oSource->GetApplicationUrl($this, $oReplica);
@@ -2436,9 +2668,6 @@ abstract class DBObject
 
 	public function InSyncScope()
 	{
-		return true;
-
-		// TODO - FINALIZE THIS OPTIMIZATION
 		//
 		// Optimization: cache the list of Data Sources and classes candidates for synchro
 		//
@@ -2451,12 +2680,59 @@ abstract class DBObject
 			while($oSource = $oSourceSet->Fetch())
 			{
 				$sTarget = $oSource->Get('scope_class');
-				$aSynchroClasses[] = $oSource;
+				$aSynchroClasses[] = $sTarget;
 			}
 		}
-		// to be continued...
+		
+		foreach($aSynchroClasses as $sClass)
+		{
+			if ($this instanceof $sClass)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	/////////////////////////////////////////////////////////////////////////
+	//
+	// Experimental iDisplay implementation
+	//
+	/////////////////////////////////////////////////////////////////////////
+	
+	public static function MapContextParam($sContextParam)
+	{
+		return null;
+	}
+	
+	public function GetHilightClass()
+	{
+		$sCode = $this->ComputeHighlightCode();
+		if($sCode != '')
+		{
+			$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
+			if (array_key_exists($sCode, $aHighlightScale))
+			{
+				return $aHighlightScale[$sCode]['color'];
+			}
+		}
+		return HILIGHT_CLASS_NONE;
 	}
 
+	public function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+		$oPage->add('<h1>'.MetaModel::GetName(get_class($this)).': '.$this->GetName().'</h1>');
+		$aValues = array();
+		$aList = MetaModel::FlattenZList(MetaModel::GetZListItems(get_class($this), 'details'));
+		if (empty($aList))
+		{
+			$aList = array_keys(MetaModel::ListAttributeDefs(get_class($this)));
+		}
+		foreach($aList as $sAttCode)
+		{
+			$aValues[$sAttCode] = array('label' => MetaModel::GetLabel(get_class($this), $sAttCode), 'value' => $this->GetAsHTML($sAttCode));
+		}
+		$oPage->details($aValues);
+	}
+	
 }
 
-?>

core/dbobjectsearch.class.php

@@ -72,11 +72,11 @@ class DBObjectSearch
 	}
 
 	/**
-	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects
+	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
 	 **/	 	
 	public function DeepClone()
 	{
-		return unserialize(serialize($this));
+		return unserialize(serialize($this)); // Beware this serializes/unserializes the search and its parameters as well
 	}
 
 	public function AllowAllData() {$this->m_bAllowAllData = true;}
@@ -972,6 +972,9 @@ class DBObjectSearch
 
 	// Alternative to object mapping: the data are transfered directly into an array
 	// This is 10 times faster than creating a set of objects, and makes sense when optimization is required
+	/**
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 */	
 	public function ToDataArray($aColumns = array(), $aOrderBy = array(), $aArgs = array())
 	{
 		$sSQL = MetaModel::MakeSelectQuery($this, $aOrderBy, $aArgs);

core/dbobjectset.class.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -26,20 +26,34 @@
 
 
 /**
- * A set of persistent objects, could be heterogeneous 
+ * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
  *
  * @package     iTopORM
  */
 class DBObjectSet
 {
-	private $m_oFilter;
-	private $m_aAddedIds; // Ids of objects added (discrete lists)
-	private $m_aOrderBy;
+	protected $m_aAddedIds; // Ids of objects added (discrete lists)
+	protected $m_aAddedObjects;
+	protected $m_aArgs;
+	protected $m_aAttToLoad;
+	protected $m_aOrderBy;
 	public $m_bLoaded;
-	private $m_aData;
-	private $m_aId2Row;
-	private $m_iCurrRow;
+	protected $m_iNumTotalDBRows;
+	protected $m_iNumLoadedDBRows;
+	protected $m_iCurrRow;
+	protected $m_oFilter;
+	protected $m_oSQLResult;
 
+	/**
+	 * Create a new set based on a Search definition.
+	 * 
+	 * @param DBObjectSearch $oFilter The search filter defining the objects which are part of the set (multiple columns/objects per row are supported)
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 * @param hash $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
+	 * @param hash $aExtendedDataSpec
+	 * @param int $iLimitCount Maximum number of rows to load (i.e. equivalent to MySQL's LIMIT start, count)
+	 * @param int $iLimitStart Index of the first row to load (i.e. equivalent to MySQL's LIMIT start, count)
+	 */
 	public function __construct(DBObjectSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0)
 	{
 		$this->m_oFilter = $oFilter->DeepClone();
@@ -51,15 +65,20 @@ class DBObjectSet
 		$this->m_iLimitCount = $iLimitCount;
 		$this->m_iLimitStart = $iLimitStart;
 
-		$this->m_iCount = null; // null if unknown yet
+		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
+		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
 		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
-		$this->m_aData = array(); // array of (row => array of (classalias) => object/null)
-		$this->m_aId2Row = array(); // array of (pkey => index in m_aData)
+		$this->m_aAddedObjects = array(); // array of (row => array of (classalias) => object/null) storing the objects added "in memory"
 		$this->m_iCurrRow = 0;
+		$this->m_oSQLResult = null;
 	}
 
 	public function __destruct()
 	{
+		if (is_object($this->m_oSQLResult))
+		{
+			$this->m_oSQLResult->free();
+		}
 	}
 
 	public function __toString()
@@ -82,6 +101,35 @@ class DBObjectSet
 		return $sRet;
 	}
 
+	public function __clone()
+	{
+		$this->m_oFilter = $this->m_oFilter->DeepClone();
+
+		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
+		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
+		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
+		$this->m_iCurrRow = 0;
+		$this->m_oSQLResult = null;
+	}
+
+	/**
+	 * Called when unserializing a DBObjectSet
+	 */
+	public function __wakeup()
+	{
+		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
+		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
+		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
+		$this->m_iCurrRow = 0;
+		$this->m_oSQLResult = null;
+	}
+	/**
+	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
+	 * 
+	 * @param hash $aAttToLoad Format: alias => array of attribute_codes
+	 * 
+	 * @return void
+	 */
 	public function OptimizeColumnLoad($aAttToLoad)
 	{
 		if (is_null($aAttToLoad))
@@ -125,6 +173,13 @@ class DBObjectSet
 		}
 	}
 
+	/**
+	 * Create a set (in-memory) containing just the given object
+	 * 
+	 * @param DBobject $oObject
+	 * 
+	 * @return DBObjectSet The singleton set
+	 */
 	static public function FromObject($oObject)
 	{
 		$oRetSet = self::FromScratch(get_class($oObject));
@@ -132,17 +187,31 @@ class DBObjectSet
 		return $oRetSet;
 	}
 
+	/**
+	 * Create an empty set (in-memory), for the given class (and its subclasses) of objects
+	 * 
+	 * @param string $sClass The class (or an ancestor) for the objects to be added in this set
+	 * 
+	 * @return DBObject The empty set
+	 */
 	static public function FromScratch($sClass)
 	{
 		$oFilter = new DBObjectSearch($sClass);
 		$oFilter->AddConditionExpression(new FalseExpression());
 		$oRetSet = new self($oFilter);
 		$oRetSet->m_bLoaded = true; // no DB load
+		$oRetSet->m_iNumTotalDBRows = 0; // Nothing from the DB
 		return $oRetSet;
 	} 
 
-	// create an object set ex nihilo
-	// input = array of objects
+	/**
+	 * Create a set (in-memory) with just one column (i.e. one object per row) and filled with the given array of objects
+	 * 
+	 * @param string $sClass The class of the objects (must be a common ancestor to all objects in the set)
+	 * @param array $aObjects The list of objects to add into the set
+	 * 
+	 * @return DBObjectSet
+	 */
 	static public function FromArray($sClass, $aObjects)
 	{
 		$oRetSet = self::FromScratch($sClass);
@@ -150,21 +219,30 @@ class DBObjectSet
 		return $oRetSet;
 	} 
 
-	// create an object set ex nihilo
-	// aClasses = array of (alias => class)
-	// input = array of (array of (classalias => object))
+	/**
+	 * Create a set in-memory with several classes of objects per row (with one alias per "column")
+	 * 
+	 * Limitation:
+	 * The filter/OQL query representing such a set can not be rebuilt (only the first column will be taken into account)
+	 * 
+	 * @param hash $aClasses Format: array of (alias => class)
+	 * @param hash $aObjects Format: array of (array of (classalias => object))
+	 * 
+	 * @return DBObjectSet
+	 */
 	static public function FromArrayAssoc($aClasses, $aObjects)
 	{
 		// In a perfect world, we should create a complete tree of DBObjectSearch,
 		// but as we lack most of the information related to the objects,
-		// let's create one search definition
+		// let's create one search definition corresponding only to the first column
 		$sClass = reset($aClasses);
 		$sAlias = key($aClasses);
 		$oFilter = new CMDBSearchFilter($sClass, $sAlias);
 
 		$oRetSet = new self($oFilter);
 		$oRetSet->m_bLoaded = true; // no DB load
-
+		$oRetSet->m_iNumTotalDBRows = 0; // Nothing from the DB
+		
 		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
 		{
 			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
@@ -209,11 +287,13 @@ class DBObjectSet
 	public function ToArrayOfValues()
 	{
 		if (!$this->m_bLoaded) $this->Load();
+		$this->Rewind();
 
 		$aSelectedClasses = $this->m_oFilter->GetSelectedClasses();
 
 		$aRet = array();
-		foreach($this->m_aData as $iRow => $aObjects)
+		$iRow = 0;
+		while($aObjects = $this->FetchAssoc())
 		{
 			foreach($aObjects as $sClassAlias => $oObject)
 			{
@@ -249,6 +329,7 @@ class DBObjectSet
 					}
 				}
 			}
+			$iRow++;
 		}
 		return $aRet;
 	} 
@@ -271,6 +352,14 @@ class DBObjectSet
 		return $aRet;
 	}
 
+	/**
+	 * Retrieve the DBObjectSearch corresponding to the objects present in this set
+	 * 
+	 * Limitation:
+	 * This method will NOT work for sets with several columns (i.e. several objects per row)
+	 * 
+	 * @return DBObjectSearch
+	 */
 	public function GetFilter()
 	{
 		// Make sure that we carry on the parameters of the set with the filter
@@ -293,37 +382,72 @@ class DBObjectSet
 		}
 	}
 
+	/**
+	 * The (common ancestor) class of the objects in the first column of this set
+	 * 
+	 * @return string The class of the objects in the first column
+	 */
 	public function GetClass()
 	{
 		return $this->m_oFilter->GetClass();
 	}
 
+	/**
+	 * The alias for the class of the objects in the first column of this set
+	 * 
+	 * @return string The alias of the class in the first column
+	 */
 	public function GetClassAlias()
 	{
 		return $this->m_oFilter->GetClassAlias();
 	}
 
+	/**
+	 * The list of all classes (one per column) which are part of this set
+	 * 
+	 * @return hash Format: alias => class
+	 */
 	public function GetSelectedClasses()
 	{
 		return $this->m_oFilter->GetSelectedClasses();
 	}
 
+	/**
+	 * The root class (i.e. highest ancestor in the MeaModel class hierarchy) for the first column on this set
+	 * 
+	 * @return string The root class for the objects in the first column of the set
+	 */
 	public function GetRootClass()
 	{
 		return MetaModel::GetRootClass($this->GetClass());
 	}
 
+	/**
+	 * The arguments used for building this set
+	 * 
+	 * @return hash Format: parameter_name => value
+	 */
 	public function GetArgs()
 	{
 		return $this->m_aArgs;
 	}
 
+	/**
+	 * Sets the limits for loading the rows from the DB. Equivalent to MySQL's LIMIT start,count clause.
+	 * @param int $iLimitCount The number of rows to load
+	 * @param int $iLimitStart The index of the first row to load
+	 */
 	public function SetLimit($iLimitCount, $iLimitStart = 0)
 	{
 		$this->m_iLimitCount = $iLimitCount;
 		$this->m_iLimitStart = $iLimitStart;
 	}
 
+	/**
+	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
+	 * 
+	 * @param hash $aOrderBy Format: field_code => boolean (true = ascending, false = descending)
+	 */
 	public function SetOrderBy($aOrderBy)
 	{
 		if ($this->m_aOrderBy != $aOrderBy)
@@ -337,16 +461,33 @@ class DBObjectSet
 		}
 	}
 
+	/**
+	 * Returns the 'count' limit for loading the rows from the DB
+	 * 
+	 * @return int
+	 */
 	public function GetLimitCount()
 	{
 		return $this->m_iLimitCount;
 	}
 
+	/**
+	 * Returns the 'start' limit for loading the rows from the DB
+	 * 
+	 * @return int
+	 */
 	public function GetLimitStart()
 	{
 		return $this->m_iLimitStart;
 	}
 
+	/**
+	 * Get the sort order used for loading this set from the database
+	 * 
+	 * Limitation: the sort order has no effect on objects added in-memory
+	 * 
+	 * @return hash Format: field_code => boolean (true = ascending, false = descending)
+	 */
 	public function GetRealSortOrder()
 	{
 		// Get the class default sort order if not specified with the API
@@ -361,6 +502,9 @@ class DBObjectSet
 		}
 	}
 
+	/**
+	 * Loads the set from the database. Actually performs the SQL query to retrieve the records from the DB. 
+	 */
 	public function Load()
 	{
 		if ($this->m_bLoaded) return;
@@ -375,87 +519,154 @@ class DBObjectSet
 		{
 			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->GetRealSortOrder(), $this->m_aArgs, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
 		}
-		$resQuery = CMDBSource::Query($sSQL);
-		if (!$resQuery) return;
-
-		$sClass = $this->m_oFilter->GetClass();
-		while ($aRow = CMDBSource::FetchArray($resQuery))
+		
+		if (is_object($this->m_oSQLResult))
 		{
-			$aObjects = array();
-			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				if (is_null($aRow[$sClassAlias.'id']))
-				{
-					$oObject = null;
-				}
-				else
-				{
-					$oObject = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
-				}
-
-				$aObjects[$sClassAlias] = $oObject;
-			}
-			$this->AddObjectExtended($aObjects, true /* internal load */);
+			// Free previous resultset if any
+			$this->m_oSQLResult->free();
+			$this->m_oSQLResult = null;
 		}
-		CMDBSource::FreeResult($resQuery);
+		$this->m_iNumTotalDBRows = null;
+		
+		$this->m_oSQLResult = CMDBSource::Query($sSQL);
+		if ($this->m_oSQLResult === false) return;
+		
+		if (($this->m_iLimitCount == 0) && ($this->m_iLimitStart == 0))
+		{
+			$this->m_iNumTotalDBRows = $this->m_oSQLResult->num_rows;
+		}
+		$this->m_iNumLoadedDBRows = $this->m_oSQLResult->num_rows;
 	}
 
+	/**
+	 * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into account the rows added in-memory.
+	 * 
+	 * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a SetLimit
+	 * 
+	 * @return int The total number of rows for this set.
+	 */
 	public function Count()
 	{
-		if ($this->m_bLoaded && ($this->m_iLimitCount == 0) && ($this->m_iLimitStart == 0))
+		if (is_null($this->m_iNumTotalDBRows))
 		{
-			return count($this->m_aData);
-		}
-		else
-		{
-			if (is_null($this->m_iCount))
-			{
-				$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, array(), $this->m_aArgs, null, null, 0, 0, true);
-				$resQuery = CMDBSource::Query($sSQL);
-				if (!$resQuery) return 0;
-		
-				$aRow = CMDBSource::FetchArray($resQuery);
-				CMDBSource::FreeResult($resQuery);
-				$this->m_iCount = $aRow['COUNT'];
-			}
-			return $this->m_iCount;
+			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, array(), $this->m_aArgs, null, null, 0, 0, true);
+			$resQuery = CMDBSource::Query($sSQL);
+			if (!$resQuery) return 0;
+	
+			$aRow = CMDBSource::FetchArray($resQuery);
+			CMDBSource::FreeResult($resQuery);
+			$this->m_iNumTotalDBRows = $aRow['COUNT'];
 		}
+		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
+	}
+	
+	/**
+	 * Number of rows available in memory (loaded from DB + added in memory)
+	 * 
+	 * @return number The number of rows available for Fetch'ing
+	 */
+	protected function CountLoaded()
+	{
+		return $this->m_iNumLoadedDBRows + count($this->m_aAddedObjects);
 	}
 
-	public function Fetch($sClassAlias = '')
+	/**
+	 * Fetch the object (with the given class alias) at the current position in the set and move the cursor to the next position.
+	 * 
+	 * @param string $sRequestedClassAlias The class alias to fetch (if there are several objects/classes per row)
+	 * @return DBObject The fetched object or null when at the end
+	 */
+	public function Fetch($sRequestedClassAlias = '')
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
-		if ($this->m_iCurrRow >= count($this->m_aData))
+		if ($this->m_iCurrRow >= $this->CountLoaded())
 		{
 			return null;
 		}
 	
-		if (strlen($sClassAlias) == 0)
+		if (strlen($sRequestedClassAlias) == 0)
 		{
-			$sClassAlias = $this->m_oFilter->GetClassAlias();
+			$sRequestedClassAlias = $this->m_oFilter->GetClassAlias();
+		}
+
+		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
+		{
+			// Pick the row from the database
+			$aRow = CMDBSource::FetchArray($this->m_oSQLResult);
+			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				if ($sRequestedClassAlias == $sClassAlias)
+				{
+					if (is_null($aRow[$sClassAlias.'id']))
+					{
+						$oRetObj = null;
+					}
+					else
+					{
+						$oRetObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
+					}
+					break;
+				}
+			}
+		}
+		else
+		{
+			// Pick the row from the objects added *in memory*
+			$oRetObj = $this->m_aAddedObjects[$this->m_iCurrRow - $this->m_iNumLoadedDBRows][$sRequestedClassAlias];
 		}
-		$oRetObj = $this->m_aData[$this->m_iCurrRow][$sClassAlias];
 		$this->m_iCurrRow++;
 		return $oRetObj;
 	}
 
-	// Return the whole line if several classes have been specified in the query
-	//
+	/**
+	 * Fetch the whole row of objects (if several classes have been specified in the query) and move the cursor to the next position
+	 * 
+	 * @return hash A hash with the format 'classAlias' => $oObj representing the current row of the set. Returns null when at the end.
+	 */
 	public function FetchAssoc()
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
-		if ($this->m_iCurrRow >= count($this->m_aData))
+		if ($this->m_iCurrRow >= $this->CountLoaded())
 		{
 			return null;
 		}
 	
-		$aRetObjects = $this->m_aData[$this->m_iCurrRow];
+		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
+		{
+			// Pick the row from the database
+			$aRow = CMDBSource::FetchArray($this->m_oSQLResult);
+			$aRetObjects = array();
+			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				if (is_null($aRow[$sClassAlias.'id']))
+				{
+					$oObj = null;
+				}
+				else
+				{
+					$oObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
+				}
+				$aRetObjects[$sClassAlias] = $oObj;
+			}
+		}
+		else
+		{
+			// Pick the row from the objects added *in memory*
+			$aRetObjects = array();
+			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				$aRetObjects[$sClassAlias] = $this->m_aAddedObjects[$this->m_iCurrRow - $this->m_iNumLoadedDBRows][$sClassAlias];
+			}
+		}
 		$this->m_iCurrRow++;
 		return $aRetObjects;
 	}
 
+	/**
+	 * Position the cursor (for iterating in the set) to the first position (equivalent to Seek(0))
+	 */
 	public function Rewind()
 	{
 		if ($this->m_bLoaded)
@@ -464,14 +675,32 @@ class DBObjectSet
 		}
 	}
 
+	/**
+	 * Position the cursor (for iterating in the set) to the given position
+	 * 
+	 * @param int $iRow
+	 */
 	public function Seek($iRow)
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
-		$this->m_iCurrRow = min($iRow, count($this->m_aData));
+		$this->m_iCurrRow = min($iRow, $this->Count());
+		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
+		{
+			$this->m_oSQLResult->data_seek($this->m_iCurrRow);
+		}
 		return $this->m_iCurrRow;
 	}
 
+	/**
+	 * Add an object to the current set (in-memory only, nothing is written to the database)
+	 * 
+	 * Limitation:
+	 * Sets with several objects per row are NOT supported
+	 * 
+	 * @param DBObject $oObject The object to add
+	 * @param string $sClassAlias The alias for the class of the object
+	 */
 	public function AddObject($oObject, $sClassAlias = '')
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -481,35 +710,52 @@ class DBObjectSet
 			$sClassAlias = $this->m_oFilter->GetClassAlias();
 		}
 
-		$iNextPos = count($this->m_aData);
-		$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
+		$iNextPos = count($this->m_aAddedObjects);
+		$this->m_aAddedObjects[$iNextPos][$sClassAlias] = $oObject;
 		if (!is_null($oObject))
 		{
-			$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
 			$this->m_aAddedIds[$oObject->GetKey()] = true;
 		}
 	}
 
-	protected function AddObjectExtended($aObjectArray, $bInternalLoad = false)
+	/**
+	 * Add a hash containig objects into the current set.
+	 * 
+	 * The expected format for the hash is: $aObjectArray[$idx][$sClassAlias] => $oObject
+	 * Limitation:
+	 * The aliases MUST match the ones used in the current set
+	 * Only the ID of the objects associated to the first alias (column) is remembered.. in case we have to rebuild a filter
+	 * 
+	 * @param hash $aObjectArray
+	 */
+	protected function AddObjectExtended($aObjectArray)
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
-		$iNextPos = count($this->m_aData);
+		$iNextPos = count($this->m_aAddedObjects);
+		
+		$sFirstAlias = $this->m_oFilter->GetClassAlias();
 
 		foreach ($aObjectArray as $sClassAlias => $oObject)
 		{
-			$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
-			if (!is_null($oObject))
+			$this->m_aAddedObjects[$iNextPos][$sClassAlias] = $oObject;
+			
+			if (!is_null($oObject) && ($sFirstAlias == $sClassAlias))
 			{
-				$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
-				if (!$bInternalLoad)
-				{
-					$this->m_aAddedIds[$oObject->GetKey()] = true;
-				}
+				$this->m_aAddedIds[$oObject->GetKey()] = true;
 			}
 		}
 	}
 
+	/**
+	 * Add an array of objects into the current set
+	 * 
+	 * Limitation:
+	 * Sets with several classes per row are not supported (use AddObjectExtended instead)
+	 * 
+	 * @param array $aObjects The array of objects to add
+	 * @param string $sClassAlias The Alias of the class for the added objects
+	 */
 	public function AddObjectArray($aObjects, $sClassAlias = '')
 	{
 		if (!$this->m_bLoaded) $this->Load();
@@ -521,7 +767,16 @@ class DBObjectSet
 		}
 	}
 
-	public function Merge($oObjectSet)
+	/**
+	 * Append a given set to the current object. (This method used to be named Merge)
+	 * 
+	 * Limitation:
+	 * The added objects are not checked for duplicates (i.e. one cann add several times the same object, or add an object already present in the set).
+	 * 
+	 * @param DBObjectSet $oObjectSet The set to append
+	 * @throws CoreException
+	 */
+	public function Append(DBObjectSet $oObjectSet)
 	{
 		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
 		{
@@ -536,7 +791,18 @@ class DBObjectSet
 		}
 	}
 
-	public function CreateIntersect($oObjectSet)
+	/**
+	 * Create a set containing the objects present in both the current set and another specified set
+	 * 
+	 * Limitations:
+	 * Will NOT work if only a subset of the sets was loaded with SetLimit.
+	 * Works only with sets made of objects loaded from the database since the comparison is based on the objects identifiers
+	 * 
+	 * @param DBObjectSet $oObjectSet The set to intersect with. The current position inside the set will be lost (= at the end)
+	 * @throws CoreException
+	 * @return DBObjectSet A new set of objects, containing the objects present in both sets (based on their identifier)
+	 */
+	public function CreateIntersect(DBObjectSet $oObjectSet)
 	{
 		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
 		{
@@ -544,58 +810,132 @@ class DBObjectSet
 		}
 		if (!$this->m_bLoaded) $this->Load();
 
+		$aId2Row = array();
+		$iCurrPos = $this->m_iCurrRow; // Save the cursor
+		$idx = 0;
+		while($oObj = $this->Fetch())
+		{
+			$aId2Row[$oObj->GetKey()] = $idx;
+			$idx++;
+		}
+		
 		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
 
-		$sClassAlias = $this->m_oFilter->GetClassAlias();
 		$oObjectSet->Seek(0);
 		while ($oObject = $oObjectSet->Fetch())
 		{
-			if (array_key_exists($oObject->GetKey(), $this->m_aId2Row[$sClassAlias]))
+			if (array_key_exists($oObject->GetKey(), $aId2Row))
 			{
 				$oNewSet->AddObject($oObject);
 			}
 		}
+		$this->Seek($iCurrPos); // Restore the cursor
 		return $oNewSet;
 	}
 
-	// Note: This verb works only with objects existing in the database
-	//
-	public function HasSameContents($oObjectSet)
+	/**
+	 * Compare two sets of objects to determine if their content is identical or not.
+	 * 
+	 * Limitation:
+	 * Works only on objects written to the DB, since we rely on their identifiers
+	 * 
+	 * @param DBObjectSet $oObjectSet
+	 * @return boolean True if the sets are identical, false otherwise
+	 */
+	public function HasSameContents(DBObjectSet $oObjectSet)
 	{
 		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
 		{
 			return false;
 		}
-		if (!$this->m_bLoaded) $this->Load();
-
 		if ($this->Count() != $oObjectSet->Count())
 		{
 			return false;
 		}
-		$sClassAlias = $this->m_oFilter->GetClassAlias();
+		
+		$aId2Row = array();
+		$bRet = true;
+		$iCurrPos = $this->m_iCurrRow; // Save the cursor
+		$idx = 0;
+		
+		// Optimization: we retain the first $iMaxObjects objects in memory
+		// to speed up the comparison of small sets (see below: $oObject->Equals($oSibling))
+		$iMaxObjects = 20;
+		$aCachedObjects = array();
+		while($oObj = $this->Fetch())
+		{
+			$aId2Row[$oObj->GetKey()] = $idx;
+			if ($idx <= $iMaxObjects)
+			{
+				$aCachedObjects[$idx] = $oObj;
+			}
+			$idx++;
+		}
+		
 		$oObjectSet->Rewind();
 		while ($oObject = $oObjectSet->Fetch())
 		{
 			$iObjectKey = $oObject->GetKey();
 			if ($iObjectKey < 0)
 			{
-				return false;
+				$bRet = false;
+				break;
 			}
-			if (!array_key_exists($iObjectKey, $this->m_aId2Row[$sClassAlias]))
+			if (!array_key_exists($iObjectKey, $aId2Row))
 			{
-				return false;
+				$bRet = false;
+				break;
+			}
+			$iRow = $aId2Row[$iObjectKey];
+			if (array_key_exists($iRow, $aCachedObjects))
+			{ 
+				// Cache hit
+				$oSibling = $aCachedObjects[$iRow];
+			}
+			else
+			{
+				// Go fetch it from the DB, unless it's an object added in-memory
+				$oSibling = $this->GetObjectAt($iRow);
 			}
-			$iRow = $this->m_aId2Row[$sClassAlias][$iObjectKey];
-			$oSibling = $this->m_aData[$iRow][$sClassAlias];
 			if (!$oObject->Equals($oSibling))
 			{
-				return false;
+				$bRet = false;
+				break;
 			}
 		}
-		return true;
+		$this->Seek($iCurrPos); // Restore the cursor
+		return $bRet;
 	}
 
-	public function CreateDelta($oObjectSet)
+	protected function GetObjectAt($iIndex)
+	{
+		if (!$this->m_bLoaded) $this->Load();
+		
+		// Save the current position for iteration
+		$iCurrPos = $this->m_iCurrRow;
+		
+		$this->Seek($iIndex);
+		$oObject = $this->Fetch();
+		
+		// Restore the current position for iteration
+		$this->Seek($this->m_iCurrRow);
+		
+		return $oObject;
+	}
+	
+	/**
+	 * Build a new set (in memory) made of objects of the given set which are NOT present in the current set
+	 * 
+	 * Limitations:
+	 * The objects inside the set must be written in the database since the comparison is based on their identifiers
+	 * Sets with several objects per row are NOT supported
+	 * 
+	 * @param DBObjectSet $oObjectSet
+	 * @throws CoreException
+	 * 
+	 * @return DBObjectSet The "delta" set.
+	 */
+	public function CreateDelta(DBObjectSet $oObjectSet)
 	{
 		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
 		{
@@ -603,20 +943,37 @@ class DBObjectSet
 		}
 		if (!$this->m_bLoaded) $this->Load();
 
+		$aId2Row = array();
+		$iCurrPos = $this->m_iCurrRow; // Save the cursor
+		$idx = 0;
+		while($oObj = $this->Fetch())
+		{
+			$aId2Row[$oObj->GetKey()] = $idx;
+			$idx++;
+		}
+
 		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
 
-		$sClassAlias = $this->m_oFilter->GetClassAlias();
 		$oObjectSet->Seek(0);
 		while ($oObject = $oObjectSet->Fetch())
 		{
-			if (!array_key_exists($oObject->GetKey(), $this->m_aId2Row[$sClassAlias]))
+			if (!array_key_exists($oObject->GetKey(), $aId2Row))
 			{
 				$oNewSet->AddObject($oObject);
 			}
 		}
+		$this->Seek($iCurrPos); // Restore the cursor
 		return $oNewSet;
 	}
 
+	/**
+	 * Compute the "RelatedObjects" (for the given relation, as defined by MetaModel::GetRelatedObjects) for a whole set of DBObjects
+	 * 
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Teh maximum recursion depth
+	 * 
+	 * @return Array An array containg all the "related" objects
+	 */
 	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
 	{
 		$aRelatedObjs = array();
@@ -645,7 +1002,7 @@ class DBObjectSet
 	 * in the set. If for a given attribute, objects in the set have various values
 	 * then the resulting object will contain null for this value.
 	 * @param $aValues Hash Output: the distribution of the values, in the set, for each attribute
-	 * @return Object
+	 * @return DBObject The object with the common values
 	 */
 	public function ComputeCommonObject(&$aValues)
 	{
@@ -741,8 +1098,11 @@ class DBObjectSet
 		{
 			foreach($aVals as $sCode => $oExpr)
 			{
-				$oScalarExpr = $oExpr->GetAsScalar($aScalarArgs);
-				$aConst[$sClassAlias][$sCode] = $oScalarExpr->GetValue();
+				if (is_object($oExpr)) // Array_merge_recursive creates an array when the same key is present multiple times... ignore them
+				{
+					$oScalarExpr = $oExpr->GetAsScalar($aScalarArgs);
+					$aConst[$sClassAlias][$sCode] = $oScalarExpr->GetValue();
+				}
 			}
 		}
 		return $aConst;		
@@ -768,7 +1128,10 @@ class DBObjectSet
 			}
 			else
 			{
-				$aScalarArgs[$sArgName] = (string) $value;
+				if (!is_array($value)) // Sometimes ExtraParams contains a mix (like defaults[]) so non scalar parameters are ignored
+				{
+					$aScalarArgs[$sArgName] = (string) $value;
+				}
 			}
 		}
 		$aScalarArgs['current_contact_id'] = UserRights::GetContactId();
@@ -793,5 +1156,3 @@ function HashCountComparison($a, $b) // Sort descending on 'count'
     }
     return ($a['count'] > $b['count']) ? -1 : 1;
 }
-
-?>

core/deletionplan.class.inc.php

@@ -110,12 +110,12 @@ class DeletionPlan
 		// Getting and setting time limit are not symetric:
 		// www.php.net/manual/fr/function.set-time-limit.php#72305
 		$iPreviousTimeLimit = ini_get('max_execution_time');
-
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
 		foreach($this->m_aToUpdate as $sClass => $aToUpdate)
 		{
 			foreach($aToUpdate as $iId => $aData)
 			{
-				set_time_limit(5);
+				set_time_limit($iLoopTimeLimit);
 				$this->m_iToUpdate++;
 
 				$oObject = $aData['to_reset'];

core/email.class.inc.php

@@ -177,6 +177,15 @@ class EMail
 			}
 			break;
 
+		case 'Null':
+			$oTransport = Swift_NullTransport::newInstance();
+			break;
+		
+		case 'LogFile':
+			$oTransport = Swift_LogFileTransport::newInstance();
+			$oTransport->setLogFile(APPROOT.'log/mail.log');
+			break;
+			
 		case 'PHPMail':
 		default:
 			$oTransport = Swift_MailTransport::newInstance();
@@ -184,10 +193,13 @@ class EMail
 
 		$oMailer = Swift_Mailer::newInstance($oTransport);
 
-		$iSent = $oMailer->send($this->m_oMessage);
+		$aFailedRecipients = array();
+		$iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients);
 		if ($iSent === 0)
 		{
-			$aIssues = array('No valid recipient for this message.');
+			// Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!!
+			IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients));
+			$aIssues = array('Some recipients were invalid.');
 			return EMAIL_SEND_ERROR;
 		}
 		else
@@ -321,6 +333,11 @@ class EMail
 	public function GetRecipientTO($bAsString = false)
 	{
 		$aRes = $this->m_oMessage->getTo();
+		if ($aRes === null)
+		{
+			// There is no "To" header field
+			$aRes = array();
+		}
 		if ($bAsString)
 		{
 			$aStrings = array();
@@ -388,4 +405,75 @@ class EMail
 
 }
 
-?>
+/////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Extension to SwiftMailer: "debug" transport that pretends messages have been sent,
+ * but just log them to a file.
+ *
+ * @package Swift
+ * @author  Denis Flaven
+ */
+class Swift_Transport_LogFileTransport extends Swift_Transport_NullTransport
+{
+	protected $sLogFile;
+	
+	/**
+	 * Sends the given message.
+	 *
+	 * @param Swift_Mime_Message $message
+	 * @param string[]           $failedRecipients An array of failures by-reference
+	 *
+	 * @return int     The number of sent emails
+	 */
+	public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+	{
+		$hFile = @fopen($this->sLogFile, 'a');
+		if ($hFile)
+		{
+			$sTxt = "================== ".date('Y-m-d H:i:s')." ==================\n";
+			$sTxt .= $message->toString()."\n";
+		
+			@fwrite($hFile, $sTxt);
+			@fclose($hFile);
+		}
+		
+		return parent::send($message, $failedRecipients);
+	}
+	
+	public function setLogFile($sFilename)
+	{
+		$this->sLogFile = $sFilename;
+	}
+}
+
+/**
+ * Pretends messages have been sent, but just log them to a file.
+ *
+ * @package Swift
+ * @author  Denis Flaven
+ */
+class Swift_LogFileTransport extends Swift_Transport_LogFileTransport
+{
+	/**
+	 * Create a new LogFileTransport.
+	 */
+	public function __construct()
+	{
+		call_user_func_array(
+		array($this, 'Swift_Transport_LogFileTransport::__construct'),
+		Swift_DependencyContainer::getInstance()
+		->createDependenciesFor('transport.null')
+		);
+	}
+
+	/**
+	 * Create a new LogFileTransport instance.
+	 *
+	 * @return Swift_LogFileTransport
+	 */
+	public static function newInstance()
+	{
+		return new self();
+	}
+}

core/event.class.inc.php

@@ -351,7 +351,7 @@ class EventLoginUsage extends Event
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
 		$aZList = array('date', 'user_id');
 		if (MetaModel::IsValidAttCode('Contact', 'name'))
 		{

core/expression.class.inc.php

@@ -299,14 +299,11 @@ class BinaryExpression extends Expression
 			{
 				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
 			}
-			else
-			{
-				$aResult = array_merge($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()) ;
-			}
 		}
-		else
+		else if ($this->m_sOperator == 'AND')
 		{
-			$aResult = array_merge($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()) ;
+			// Strictly, this should be done only for the AND operator
+			$aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields());
 		}
 		return $aResult;
 	}
@@ -1181,6 +1178,16 @@ class CharConcatWSExpression extends CharConcatExpression
 		$sSep = CMDBSource::Quote($this->m_separator);
 		return "CAST(CONCAT_WS($sSep, ".implode(', ', $aRes).") AS CHAR)";
 	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		return new CharConcatWSExpression($this->m_separator, $aRes);
+	}
 }
 
 

core/metamodel.class.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2014 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -279,6 +279,7 @@ abstract class MetaModel
 	private static $m_aChildClasses = array(); // array of ("classname" => array of "childclass")
 
 	private static $m_aClassParams = array(); // array of ("classname" => array of class information)
+	private static $m_aHighlightScales = array(); // array of ("classname" => array of highlightscale information)
 
 	static public function GetParentPersistentClass($sRefClass)
 	{
@@ -593,15 +594,10 @@ abstract class MetaModel
 		$oAtt = self::GetAttributeDef($sClass, $sAttCode);
 		// Temporary implementation: later, we might be able to compute
 		// the dependencies, based on the attributes definition
-		// (allowed values and default values) 
-		if ($oAtt->IsWritable())
-		{
-			return $oAtt->GetPrerequisiteAttributes();
-		}
-		else
-		{
-			return array();
-		}
+		// (allowed values and default values)
+		
+		// Even non-writable attributes (like ExternalFields) can now have Prerequisites
+		return $oAtt->GetPrerequisiteAttributes();
 	}
 	/**
 	 * Find all attributes that depend on the specified one (reverse of GetPrequisiteAttributes)
@@ -871,15 +867,32 @@ abstract class MetaModel
 
 	final static public function GetExternalFields($sClass, $sKeyAttCode)
 	{
-		$aExtFields = array();
-		foreach (self::ListAttributeDefs($sClass) as $sAttCode => $oAtt)
+		static $aExtFields = array();
+		if (!isset($aExtFields[$sClass][$sKeyAttCode]))
 		{
-			if ($oAtt->IsExternalField() && ($oAtt->GetKeyAttCode() == $sKeyAttCode))
+			$aExtFields[$sClass][$sKeyAttCode] = array();
+			foreach (self::ListAttributeDefs($sClass) as $sAttCode => $oAtt)
 			{
-				$aExtFields[] = $oAtt;
+				if ($oAtt->IsExternalField() && ($oAtt->GetKeyAttCode() == $sKeyAttCode))
+				{
+					$aExtFields[$sClass][$sKeyAttCode][$oAtt->GetExtAttCode()] = $oAtt;
+				}
 			}
 		}
-		return $aExtFields;
+		return $aExtFields[$sClass][$sKeyAttCode];
+	}
+
+	final static public function FindExternalField($sClass, $sKeyAttCode, $sRemoteAttCode)
+	{
+		$aExtFields = self::GetExternalFields($sClass, $sKeyAttCode);
+		if (isset($aExtFields[$sRemoteAttCode]))
+		{
+			return $aExtFields[$sRemoteAttCode];
+		}
+		else
+		{
+			return null;
+		}
 	}
 
 	final static public function GetExtKeyFriends($sClass, $sExtKeyAttCode)
@@ -1896,6 +1909,50 @@ abstract class MetaModel
 		self::$m_aTransitions[$sTargetClass][$sStateCode] = array();
 	}
 
+	public static function Init_DefineHighlightScale($aHighlightScale)
+	{
+		$sTargetClass = self::GetCallersPHPClass("Init");
+		self::$m_aHighlightScales[$sTargetClass] = $aHighlightScale;
+	}
+	
+	public static function GetHighlightScale($sTargetClass)
+	{
+		$aScale = array();
+		$aParentScale = array();
+		$sParentClass = self::GetParentPersistentClass($sTargetClass);
+		if (!empty($sParentClass))
+		{
+			// inherit the scale from the parent class
+			$aParentScale = self::GetHighlightScale($sParentClass);
+		}
+		if (array_key_exists($sTargetClass, self::$m_aHighlightScales))
+		{
+			$aScale = self::$m_aHighlightScales[$sTargetClass];
+		}
+		return array_merge($aParentScale, $aScale); // Merge both arrays, the values from the last one have precedence
+	}
+	
+	public static function GetHighlightCode($sTargetClass, $sStateCode)
+	{
+		$sCode = '';
+		if ( array_key_exists($sTargetClass, self::$m_aStates)
+			 && array_key_exists($sStateCode, self::$m_aStates[$sTargetClass])
+			 && array_key_exists('highlight', self::$m_aStates[$sTargetClass][$sStateCode]) )
+		{
+			$sCode = self::$m_aStates[$sTargetClass][$sStateCode]['highlight']['code'];
+		}
+		else
+		{
+			// Check the parent's definition
+			$sParentClass = self::GetParentPersistentClass($sTargetClass);
+			if (!empty($sParentClass))
+			{
+				$sCode = self::GetHighlightCode($sParentClass, $sStateCode);
+			}
+		}
+		return $sCode;
+	}
+	
 	public static function Init_OverloadStateAttribute($sStateCode, $sAttCode, $iFlags)
 	{
 		// Warning: this is not sufficient: the flags have to be copied to the states that are inheriting from this state
@@ -2110,6 +2167,10 @@ abstract class MetaModel
 				{
 					$aScalarArgs[$sArgName] = (string) $value;
 				}
+				elseif (is_null($value))
+				{
+					$aScalarArgs[$sArgName] = null;
+				}
 			}
 		}
 		// Add standard contextual arguments
@@ -2157,6 +2218,9 @@ abstract class MetaModel
 	}
 
 
+	/**
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 */	
 	public static function MakeSelectQuery(DBObjectSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aAttToLoad = null, $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false)
 	{
 		// Check the order by specification, and prefix with the class alias
@@ -2167,32 +2231,44 @@ abstract class MetaModel
 		$aOrderSpec = array();
 		foreach ($aOrderBy as $sFieldAlias => $bAscending)
 		{
-			if ($sFieldAlias != 'id')
-			{
-				MyHelpers::CheckValueInArray('field name in ORDER BY spec', $sFieldAlias, self::GetAttributesList($sClass));
-			}
 			if (!is_bool($bAscending))
 			{
 				throw new CoreException("Wrong direction in ORDER BY spec, found '$bAscending' and expecting a boolean value");
 			}
-			
-			if (self::IsValidAttCode($sClass, $sFieldAlias))
+
+			$iDotPos = strpos($sFieldAlias, '.');
+			if ($iDotPos === false)
 			{
-				$oAttDef = self::GetAttributeDef($sClass, $sFieldAlias);
-				foreach($oAttDef->GetOrderBySQLExpressions($sClassAlias) as $sSQLExpression)
+				$sAttClass = $sClass;
+				$sAttClassAlias = $sClassAlias;
+				$sAttCode = $sFieldAlias;
+			}
+			else
+			{
+				$sAttClassAlias = substr($sFieldAlias, 0, $iDotPos);
+				$sAttClass = $oFilter->GetClassName($sAttClassAlias);
+				$sAttCode = substr($sFieldAlias, $iDotPos + 1);
+			}
+
+			if ($sAttCode != 'id')
+			{
+				MyHelpers::CheckValueInArray('field name in ORDER BY spec', $sAttCode, self::GetAttributesList($sAttClass));
+
+				$oAttDef = self::GetAttributeDef($sAttClass, $sAttCode);
+				foreach($oAttDef->GetOrderBySQLExpressions($sAttClassAlias) as $sSQLExpression)
 				{
 					$aOrderSpec[$sSQLExpression] = $bAscending;
 				}
 			}
 			else
 			{
-				$aOrderSpec['`'.$sClassAlias.$sFieldAlias.'`'] = $bAscending;
+				$aOrderSpec['`'.$sAttClassAlias.$sAttCode.'`'] = $bAscending;
 			}
 
 			// Make sure that the columns used for sorting are present in the loaded columns
-			if (!is_null($aAttToLoad) && !isset($aAttToLoad[$sClassAlias][$sFieldAlias]))
+			if (!is_null($aAttToLoad) && !isset($aAttToLoad[$sAttClassAlias][$sAttCode]))
 			{
-				$aAttToLoad[$sClassAlias][$sFieldAlias] = MetaModel::GetAttributeDef($sClass, $sFieldAlias);
+				$aAttToLoad[$sAttClassAlias][$sAttCode] = MetaModel::GetAttributeDef($sAttClass, $sAttCode);
 			}			
 		}
 
@@ -3374,6 +3450,33 @@ abstract class MetaModel
 				{
 					// Do nothing...
 				}
+				else if ($oAttDef instanceof AttributeStopWatch)
+				{
+					$aThresholds = $oAttDef->ListThresholds();
+					if (is_array($aThresholds))
+					{
+						foreach($aThresholds as $iPercent => $aDef)
+						{
+							if (array_key_exists('highlight', $aDef))
+							{
+								if(!array_key_exists('code', $aDef['highlight']))
+								{
+									$aErrors[$sClass][] = "The 'code' element is missing for the 'highlight' property of the $iPercent% threshold in the attribute: '$sAttCode'.";
+									$aSugFix[$sClass][] = "Add a 'code' entry specifying the value of the highlight code for this threshold.";
+								}
+								else
+								{
+									$aScale = self::GetHighlightScale($sClass);
+									if (!array_key_exists($aDef['highlight']['code'], $aScale))
+									{
+										$aErrors[$sClass][] = "'{$aDef['highlight']['code']}' is not a valid value for the 'code' element of the $iPercent% threshold in the attribute: '$sAttCode'.";
+										$aSugFix[$sClass][] = "The possible highlight codes for this class are: ".implode(', ', array_keys($aScale)).".";
+									}
+								}
+							}
+						}						
+					}
+				}
 				else // standard attributes
 				{
 					// Check that the default values definition is a valid object!
@@ -3471,17 +3574,46 @@ abstract class MetaModel
 						}
 					}
 	
-					// Lifcycle - check that the action handlers are defined
+					// Lifecycle - check that the action handlers are defined
 					foreach (self::EnumStates($sClass) as $sStateCode => $aStateDef)
 					{
 						foreach(self::EnumTransitions($sClass, $sStateCode) as $sStimulusCode => $aTransitionDef)
 						{
-							foreach ($aTransitionDef['actions'] as $sActionHandler)
+							foreach ($aTransitionDef['actions'] as $actionHandler)
 							{
-								if (!method_exists($sClass, $sActionHandler))
+								if (is_string($actionHandler))
 								{
-									$aErrors[$sClass][] = "Unknown function '$sActionHandler' in transition [$sStateCode/$sStimulusCode] for state attribute '$sStateAttCode'";
-									$aSugFix[$sClass][] = "Specify a function which prototype is in the form [public function $sActionHandler(\$sStimulusCode){return true;}]";
+									if (!method_exists($sClass, $actionHandler))
+									{
+										$aErrors[$sClass][] = "Unknown function '$sActionHandler' in transition [$sStateCode/$sStimulusCode] for state attribute '$sStateAttCode'";
+										$aSugFix[$sClass][] = "Specify a function which prototype is in the form [public function $sActionHandler(\$sStimulusCode){return true;}]";
+									}
+								}
+								else // if(is_array($actionHandler))
+								{
+									$sActionHandler = $actionHandler['verb'];
+									if (!method_exists($sClass, $sActionHandler))
+									{
+										$aErrors[$sClass][] = "Unknown function '$sActionHandler' in transition [$sStateCode/$sStimulusCode] for state attribute '$sStateAttCode'";
+										$aSugFix[$sClass][] = "Specify a function which prototype is in the form [public function $sActionHandler(...){return true;}]";
+									}
+								}
+							}
+						}
+						if (array_key_exists('highlight', $aStateDef))
+						{
+							if(!array_key_exists('code', $aStateDef['highlight']))
+							{
+								$aErrors[$sClass][] = "The 'code' element is missing for the 'highlight' property of state: '$sStateCode'.";
+								$aSugFix[$sClass][] = "Add a 'code' entry specifying the value of the highlight code for this state.";
+							}
+							else
+							{
+								$aScale = self::GetHighlightScale($sClass);
+								if (!array_key_exists($aStateDef['highlight']['code'], $aScale))
+								{
+									$aErrors[$sClass][] = "'{$aStateDef['highlight']['code']}' is not a valid value for the 'code' element in the 'highlight' property of state: '$sStateCode'.";
+									$aSugFix[$sClass][] = "The possible highlight codes for this class are: ".implode(', ', array_keys($aScale)).".";
 								}
 							}
 						}
@@ -4706,6 +4838,7 @@ abstract class MetaModel
 				self::$m_aStates = $result['m_aStates'];
 				self::$m_aStimuli = $result['m_aStimuli'];
 				self::$m_aTransitions = $result['m_aTransitions'];
+				self::$m_aHighlightScales = $result['m_aHighlightScales'];
 			}
 			$oKPI->ComputeAndReport('Metamodel APC (fetch + read)');
 		}
@@ -4742,6 +4875,7 @@ abstract class MetaModel
 				$aCache['m_aStates'] = self::$m_aStates; // array of ("classname" => array of "statecode"=>array('label'=>..., attribute_inherit=> attribute_list=>...))
 				$aCache['m_aStimuli'] = self::$m_aStimuli; // array of ("classname" => array of ("stimuluscode"=>array('label'=>...)))
 				$aCache['m_aTransitions'] = self::$m_aTransitions; // array of ("classname" => array of ("statcode_from"=>array of ("stimuluscode" => array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD)))
+				$aCache['m_aHighlightScales'] = self::$m_aHighlightScales; // array of ("classname" => array of higlightcodes)))
 				apc_store($sOqlAPCCacheId, $aCache);
 				$oKPI->ComputeAndReport('Metamodel APC (store)');
 			}
@@ -4803,7 +4937,15 @@ abstract class MetaModel
 		if (!file_exists($sFile))
 		{
 			$sConfigFile = self::$m_oConfig->GetLoadedFile();
-			throw new CoreException('Wrong filename in configuration file', array('file' => $sConfigFile, 'module' => $sModuleType, 'filename' => $sFile));
+			if (strlen($sConfigFile) > 0)
+			{
+				throw new CoreException('Include: wrong file name in configuration file', array('config file' => $sConfigFile, 'section' => $sModuleType, 'filename' => $sFile));
+			}
+			else
+			{
+				// The configuration is in memory only
+				throw new CoreException('Include: wrong file name in configuration file (in memory)', array('section' => $sModuleType, 'filename' => $sFile));
+			}
 		}
 
 		// Note: We do not expect the modules to output characters while loading them.
@@ -5070,6 +5212,41 @@ abstract class MetaModel
 		}
 	}
 
+	/**
+	 * Helper to remove selected objects without calling any handler
+	 * Surpasses BulkDelete as it can handle abstract classes, but has the other limitation as it bypasses standard objects handlers 
+	 * 	 
+	 * @param string $oFilter Scope of objects to wipe out
+	 * @return The count of deleted objects
+	 */	 	
+	public static function PurgeData($oFilter)
+	{
+		$sTargetClass = $oFilter->GetClass();
+		$oSet = new DBObjectSet($oFilter);
+		$oSet->OptimizeColumnLoad(array($sTargetClass => array('finalclass')));
+		$aIdToClass = $oSet->GetColumnAsArray('finalclass', true);
+
+		$aIds = array_keys($aIdToClass);
+		if (count($aIds) > 0)
+		{
+			$aQuotedIds = CMDBSource::Quote($aIds);
+			$sIdList = implode(',', $aQuotedIds);
+			$aTargetClasses = array_merge(
+				self::EnumChildClasses($sTargetClass, ENUM_CHILD_CLASSES_ALL),
+				self::EnumParentClasses($sTargetClass, ENUM_PARENT_CLASSES_EXCLUDELEAF)
+			);
+			foreach ($aTargetClasses as $sSomeClass)
+			{
+				$sTable = MetaModel::DBGetTable($sSomeClass);
+				$sPKField = MetaModel::DBGetKey($sSomeClass);
+		
+				$sDeleteSQL = "DELETE FROM `$sTable` WHERE `$sPKField` IN ($sIdList)";
+				CMDBSource::DeleteFrom($sDeleteSQL);
+			}
+		}
+		return count($aIds);
+	}
+
 	// Links
 	//
 	//
@@ -5121,6 +5298,12 @@ abstract class MetaModel
 		}
 		return $aResult;
 	}
+
+	/**
+	 * It is not recommended to use this function: call GetLinkClasses instead
+	 * Return classes having at least to external keys (thus too many classes as compared to GetLinkClasses)	 
+	 * The only difference with EnumLinkingClasses is the output format
+	 */	 	
 	public static function EnumLinksClasses()
 	{
 		// Returns a flat array of classes having at least two external keys
@@ -5143,6 +5326,11 @@ abstract class MetaModel
 		}
 		return $aResult;
 	}
+	/**
+	 * It is not recommended to use this function: call GetLinkClasses instead
+	 * Return classes having at least to external keys (thus too many classes as compared to GetLinkClasses)	 
+	 * The only difference with EnumLinksClasses is the output format
+	 */	 	
 	public static function EnumLinkingClasses($sClass = "")
 	{
 		// N-N links, array of sLinkClass => (array of sAttCode=>sClass)
@@ -5179,6 +5367,38 @@ abstract class MetaModel
 		return $aResult;
 	}
 
+	/**
+	 * This function has two siblings that will be soon deprecated:
+	 * EnumLinkingClasses and EnumLinkClasses
+	 * 	 
+	 * Using GetLinkClasses is the recommended way to determine if a class is
+	 * actually an N-N relation because it is based on the decision made by the
+	 * designer the data model
+	 */	 	
+	public static function GetLinkClasses()
+	{
+		$aRet = array();
+		foreach(self::GetClasses() as $sClass)
+		{
+			if (isset(self::$m_aClassParams[$sClass]["is_link"]))
+			{
+				if (self::$m_aClassParams[$sClass]["is_link"])
+				{
+					$aExtKeys = array();
+					foreach (self::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+					{
+						if ($oAttDef->IsExternalKey())
+						{
+							$aExtKeys[$sAttCode] = $oAttDef->GetTargetClass();
+						}
+					}
+					$aRet[$sClass] = $aExtKeys;
+				}
+			}
+		}
+		return $aRet;
+	}
+
 	public static function GetLinkLabel($sLinkClass, $sAttCode)
 	{
 		self::_check_subclass($sLinkClass);	
@@ -5248,18 +5468,27 @@ abstract class MetaModel
 			$sEnvironment = MetaModel::GetEnvironmentId();
 		}
 		$aEntries = array();
-		$aCacheUserData = @apc_cache_info('user');
+		if (extension_loaded('apcu'))
+		{
+			// Beware: APCu behaves slightly differently from APC !!
+			$aCacheUserData = @apc_cache_info();
+		}
+		else
+		{
+			$aCacheUserData = @apc_cache_info('user');
+		}
 		if (is_array($aCacheUserData) && isset($aCacheUserData['cache_list']))
 		{ 
 			$sPrefix = 'itop-'.$sEnvironment.'-';
 	
 			foreach($aCacheUserData['cache_list'] as $i => $aEntry)
 			{
-				$sEntryKey = $aEntry['info'];
+				$sEntryKey = array_key_exists('info', $aEntry) ? $aEntry['info'] : $aEntry['key'];
 				if (strpos($sEntryKey, $sPrefix) === 0)
 				{
 					$sCleanKey = substr($sEntryKey, strlen($sPrefix));
 					$aEntries[$sCleanKey] = $aEntry;
+					$aEntries[$sCleanKey]['info'] = $sEntryKey;
 				}
 			}
 		}
@@ -5295,5 +5524,3 @@ MetaModel::RegisterZList("preview", array("description"=>"All attributes visible
 
 MetaModel::RegisterZList("standard_search", array("description"=>"List of criteria for the standard search", "type"=>"filters"));
 MetaModel::RegisterZList("advanced_search", array("description"=>"List of criteria for the advanced search", "type"=>"filters"));
-
-?>

core/modelreflection.class.inc.php

@@ -178,7 +178,7 @@ class ModelReflectionRuntime extends ModelReflection
 		$aClasses = MetaModel::GetClasses($sCategories);
 		if ($bExcludeLinks)
 		{
-			$aExcluded = ProfilesConfig::GetLinkClasses(); // table computed at compile time
+			$aExcluded = MetaModel::GetLinkClasses();
 			$aRes = array();
 			foreach ($aClasses as $sClass)
 			{

core/mutex.class.inc.php

@@ -31,22 +31,36 @@ class iTopMutex
 {
 	protected $sName;
 	protected $hDBLink;
+	protected $bLocked; // Whether or not this instance of the Mutex is locked
+	static protected $aAcquiredLocks = array(); // Number of instances of the Mutex, having the lock, in this page
 
-	public function __construct($sName)
+	public function __construct($sName, $sDBHost = null, $sDBUser = null, $sDBPwd = null)
 	{
 		// Compute the name of a lock for mysql
 		// Note: the name is server-wide!!!
 		$this->sName = 'itop.'.$sName;
+		$this->bLocked = false; // Not yet locked
+
+		if (!array_key_exists($this->sName, self::$aAcquiredLocks))
+		{
+			self::$aAcquiredLocks[$this->sName] = 0;
+		}
 
 		// It is a MUST to create a dedicated session each time a lock is required, because
 		// using GET_LOCK anytime on the same session will RELEASE the current and unique session lock (known issue)
 		$oConfig = utils::GetConfig();
-		$this->InitMySQLSession($oConfig->GetDBHost(), $oConfig->GetDBUser(), $oConfig->GetDBPwd());
+		$sDBHost = is_null($sDBHost) ? $oConfig->GetDBHost() : $sDBHost;
+		$sDBUser = is_null($sDBUser) ? $oConfig->GetDBUser() : $sDBUser;
+		$sDBPwd = is_null($sDBPwd) ? $oConfig->GetDBPwd() : $sDBPwd;
+		$this->InitMySQLSession($sDBHost, $sDBUser, $sDBPwd);
 	}
 
 	public function __destruct()
 	{
-		$this->Unlock();
+		if ($this->bLocked)
+		{
+			$this->Unlock();
+		}
 		mysqli_close($this->hDBLink);
 	}
 
@@ -55,17 +69,27 @@ class iTopMutex
 	 */	
 	public function Lock()
 	{
-		do
+		if ($this->bLocked)
 		{
-			$res = $this->QueryToScalar("SELECT GET_LOCK('".$this->sName."', 3600)");
-			if (is_null($res))
-			{
-				throw new Exception("Failed to acquire the lock '".$this->sName."'");
-			}
-			// $res === '1' means I hold the lock
-			// $res === '0' means it timed out
+			// Lock already acquired
+			return;
 		}
-		while ($res !== '1');
+		if (self::$aAcquiredLocks[$this->sName] == 0)
+		{
+			do
+			{
+				$res = $this->QueryToScalar("SELECT GET_LOCK('".$this->sName."', 3600)");
+				if (is_null($res))
+				{
+					throw new Exception("Failed to acquire the lock '".$this->sName."'");
+				}
+				// $res === '1' means I hold the lock
+				// $res === '0' means it timed out
+			}
+			while ($res !== '1');
+		}
+		$this->bLocked = true;
+		self::$aAcquiredLocks[$this->sName]++;
 	}
 
 	/**
@@ -74,6 +98,17 @@ class iTopMutex
 	 */	
 	public function TryLock()
 	{
+		if ($this->bLocked)
+		{
+			return true; // Already acquired
+		}
+		if (self::$aAcquiredLocks[$this->sName] > 0)
+		{
+			self::$aAcquiredLocks[$this->sName]++;
+			$this->bLocked = true;
+			return true;
+		}
+		
 		$res = $this->QueryToScalar("SELECT GET_LOCK('".$this->sName."', 0)");
 		if (is_null($res))
 		{
@@ -81,6 +116,11 @@ class iTopMutex
 		}
 		// $res === '1' means I hold the lock
 		// $res === '0' means it timed out
+		if ($res === '1')
+		{
+			$this->bLocked = true;
+			self::$aAcquiredLocks[$this->sName]++;
+		}
 		return ($res === '1');
 	}
 
@@ -89,7 +129,22 @@ class iTopMutex
 	 */	
 	public function Unlock()
 	{
-		$res = $this->QueryToScalar("SELECT RELEASE_LOCK('".$this->sName."')");
+		if (!$this->bLocked)
+		{
+			// ??? the lock is not acquired, exit
+	        return;	
+		}
+		if (self::$aAcquiredLocks[$this->sName] == 0)
+		{
+			return; // Safety net
+		}
+		
+		if (self::$aAcquiredLocks[$this->sName] == 1)
+		{
+			$res = $this->QueryToScalar("SELECT RELEASE_LOCK('".$this->sName."')");
+		}
+		$this->bLocked = false;
+		self::$aAcquiredLocks[$this->sName]--;
 	}
 
 

core/ormcaselog.class.inc.php

@@ -48,6 +48,80 @@ class ormCaseLog {
 		return $this->m_sLog;
 	}
 	
+	public static function FromJSON($oJson)
+	{
+		if (!isset($oJson->items))
+		{
+			throw new Exception("Missing 'items' elements");
+		}
+		$oCaseLog = new ormCaseLog();
+		foreach($oJson->items as $oItem)
+		{
+			$oCaseLog->AddLogEntryFromJSON($oItem);
+		}
+		return $oCaseLog;
+	}
+
+	/**
+	 * Return a value that will be further JSON encoded	
+	 */	
+	public function GetForJSON()
+	{
+		$aEntries = array();
+		$iPos = 0;
+		for($index=count($this->m_aIndex)-1 ; $index >= 0 ; $index--)
+		{
+			$iPos += $this->m_aIndex[$index]['separator_length'];
+			$sTextEntry = substr($this->m_sLog, $iPos, $this->m_aIndex[$index]['text_length']);
+			$iPos += $this->m_aIndex[$index]['text_length'];
+
+			// Workaround: PHP < 5.3 cannot unserialize correctly DateTime objects,
+			// therefore we have changed the format. To preserve the compatibility with existing
+			// installations of iTop, both format are allowed:
+			//     the 'date' item is either a DateTime object, or a unix timestamp
+			if (is_int($this->m_aIndex[$index]['date']))
+			{
+				// Unix timestamp
+				$sDate = date(Dict::S('UI:CaseLog:DateFormat'),$this->m_aIndex[$index]['date']);
+			}
+			elseif (is_object($this->m_aIndex[$index]['date']))
+			{
+				if (version_compare(phpversion(), '5.3.0', '>='))
+				{
+					// DateTime
+					$sDate = $this->m_aIndex[$index]['date']->format(Dict::S('UI:CaseLog:DateFormat'));
+				}
+				else
+				{
+					// No Warning... but the date is unknown
+					$sDate = '';
+				}
+			}
+			$aEntries[] = array(
+				'date' => $sDate,
+				'user_login' => $this->m_aIndex[$index]['user_name'],
+				'user_id' => $this->m_aIndex[$index]['user_id'],
+				'message' => $sTextEntry
+			);
+		}
+
+		// Process the case of an eventual remainder (quick migration of AttributeText fields)
+		if ($iPos < (strlen($this->m_sLog) - 1))
+		{
+			$sTextEntry = substr($this->m_sLog, $iPos);
+
+			$aEntries[] = array(
+				'date' => '',
+				'user_login' => '',
+				'message' => $sTextEntry
+			);
+		}
+
+		// Order by ascending date
+		$aRet = array('entries' => array_reverse($aEntries));
+		return $aRet;
+	}
+	
 	public function GetIndex()
 	{
 		return $this->m_aIndex;
@@ -62,7 +136,85 @@ class ormCaseLog {
 	{
 		$this->m_bModified = false;
 	}
+
+	/**
+	 * Produces an HTML representation, aimed at being used within an email
+	 */	 	
+	public function GetAsEmailHtml()
+	{
+		$sStyleCaseLogHeader = '';
+		$sStyleCaseLogEntry = '';
+
+		$sHtml = '<table style="width:100%;table-layout:fixed"><tr><td>'; // Use table-layout:fixed to force the with to be independent from the actual content
+		$iPos = 0;
+		$aIndex = $this->m_aIndex;
+		for($index=count($aIndex)-1 ; $index >= 0 ; $index--)
+		{
+			$iPos += $aIndex[$index]['separator_length'];
+			$sTextEntry = substr($this->m_sLog, $iPos, $aIndex[$index]['text_length']);
+			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
+			$iPos += $aIndex[$index]['text_length'];
+
+			$sEntry = '<div class="caselog_header" style="'.$sStyleCaseLogHeader.'">';
+			// Workaround: PHP < 5.3 cannot unserialize correctly DateTime objects,
+			// therefore we have changed the format. To preserve the compatibility with existing
+			// installations of iTop, both format are allowed:
+			//     the 'date' item is either a DateTime object, or a unix timestamp
+			if (is_int($aIndex[$index]['date']))
+			{
+				// Unix timestamp
+				$sDate = date(Dict::S('UI:CaseLog:DateFormat'),$aIndex[$index]['date']);
+			}
+			elseif (is_object($aIndex[$index]['date']))
+			{
+				if (version_compare(phpversion(), '5.3.0', '>='))
+				{
+					// DateTime
+					$sDate = $aIndex[$index]['date']->format(Dict::S('UI:CaseLog:DateFormat'));
+				}
+				else
+				{
+					// No Warning... but the date is unknown
+					$sDate = '';
+				}
+			}
+			$sEntry .= sprintf(Dict::S('UI:CaseLog:Header_Date_UserName'), '<span class="caselog_header_date">'.$sDate.'</span>', '<span class="caselog_header_user">'.$aIndex[$index]['user_name'].'</span>');
+			$sEntry .= '</div>';
+			$sEntry .= '<div class="caselog_entry" style="'.$sStyleCaseLogEntry.'">';
+			$sEntry .= $sTextEntry;
+			$sEntry .= '</div>';
+			$sHtml = $sHtml.$sEntry;
+		}
+
+		// Process the case of an eventual remainder (quick migration of AttributeText fields)
+		if ($iPos < (strlen($this->m_sLog) - 1))
+		{
+			$sTextEntry = substr($this->m_sLog, $iPos);
+			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
+
+			if (count($this->m_aIndex) == 0)
+			{
+				$sHtml .= '<div class="caselog_entry" style="'.$sStyleCaseLogEntry.'"">';
+				$sHtml .= $sTextEntry;
+				$sHtml .= '</div>';
+			}
+			else
+			{
+				$sHtml .= '<div class="caselog_header" style="'.$sStyleCaseLogHeader.'">';
+				$sHtml .= Dict::S('UI:CaseLog:InitialValue');
+				$sHtml .= '</div>';
+				$sHtml .= '<div class="caselog_entry" style="'.$sStyleCaseLogEntry.'">';
+				$sHtml .= $sTextEntry;
+				$sHtml .= '</div>';
+			}
+		}
+		$sHtml .= '</td></tr></table>';
+		return $sHtml;
+	}
 	
+	/**
+	 * Produces an HTML representation, aimed at being used within the iTop framework
+	 */	 	
 	public function GetAsHTML(WebPage $oP = null, $bEditMode = false, $aTransfoHandler = null)
 	{
 		$sHtml = '<table style="width:100%;table-layout:fixed"><tr><td>'; // Use table-layout:fixed to force the with to be independent from the actual content
@@ -230,7 +382,62 @@ class ormCaseLog {
 		}
 		$this->m_bModified = true;
 	}
-	
+
+
+	public function AddLogEntryFromJSON($oJson)
+	{
+		$sText = isset($oJson->message) ? $oJson->message : '';
+
+		if (isset($oJson->user_id))
+		{
+			if (!UserRights::IsAdministrator())
+			{
+				throw new Exception("Only administrators can set the user id", RestResult::UNAUTHORIZED);
+			}
+			try
+			{
+				$oUser = RestUtils::FindObjectFromKey('User', $oJson->user_id);
+			}
+			catch(Exception $e)
+			{
+				throw new Exception('user_id: '.$e->getMessage(), $e->getCode());
+			}
+			$iUserId = $oUser->GetKey();
+			$sOnBehalfOf = $oUser->GetFriendlyName();
+		}
+		else
+		{
+			$iUserId = UserRights::GetUserId();
+			$sOnBehalfOf = UserRights::GetUserFriendlyName();
+		}
+		
+		if (isset($oJson->date))
+		{
+			$oDate = new DateTime($oJson->date);
+			$iDate = (int) $oDate->format('U');
+		}
+		else
+		{
+			$iDate = time();
+		}
+		$sDate = date(Dict::S('UI:CaseLog:DateFormat'), $iDate);
+
+		$sSeparator = sprintf(CASELOG_SEPARATOR, $sDate, $sOnBehalfOf, $iUserId);
+		$iSepLength = strlen($sSeparator);
+		$iTextlength = strlen($sText);
+		$this->m_sLog = $sSeparator.$sText.$this->m_sLog; // Latest entry printed first
+		$this->m_aIndex[] = array(
+			'user_name' => $sOnBehalfOf,	
+			'user_id' => $iUserId,	
+			'date' => $iDate,	
+			'text_length' => $iTextlength,	
+			'separator_length' => $iSepLength,	
+		);
+
+		$this->m_bModified = true;
+	}
+
+
 	public function GetModifiedEntry()
 	{
 		$sModifiedEntry = '';

core/ormdocument.class.inc.php

@@ -117,7 +117,18 @@ class ormDocument
 	{
 		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode\">".$this->GetFileName()."</a>\n";
 	}
-	
+
+	/**
+	 * Returns an URL to download a document like an image (uses HTTP caching)
+	 * @return string
+	 */	 	 	
+	public function GetDownloadURL($sClass, $Id, $sAttCode)
+	{
+		// Compute a signature to reset the cache anytime the data changes (this is acceptable if used only with icon files)
+		$sSignature = md5($this->GetData());
+		return utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode&s=$sSignature&cache=86400";
+	}
+
 	
 	public function IsPreviewAvailable()
 	{

core/ormstopwatch.class.inc.php

@@ -62,12 +62,13 @@ class ormStopWatch
 		return (string) $this->iTimeSpent;
 	}
 
-	public function DefineThreshold($iPercent, $tDeadline = null, $bPassed = false, $bTriggered = false, $iOverrun = null)
+	public function DefineThreshold($iPercent, $tDeadline = null, $bPassed = false, $bTriggered = false, $iOverrun = null, $aHighlightDef = null)
 	{
 		$this->aThresholds[$iPercent] = array(
 			'deadline' => $tDeadline, // unix time (seconds)
 			'triggered' => $bTriggered,
-			'overrun' => $iOverrun
+			'overrun' => $iOverrun,
+			'highlight' => $aHighlightDef, // array('code' => string, 'persistent' => boolean)
 		);
 	}
 
@@ -129,6 +130,10 @@ class ormStopWatch
 			{
 				$bRet = true;
 			}
+			if (isset($aThresholdData['overrun']) && ($aThresholdData['overrun'] > 0))
+			{
+				$bRet = true;
+			}
 		}
 		return $bRet;
 	}
@@ -143,6 +148,31 @@ class ormStopWatch
 			return false;
 		}
 	}
+	
+	public function GetHighlightCode()
+	{
+		$sCode = '';
+		// Process the thresholds in ascending order
+		$aPercents = array();
+		foreach($this->aThresholds as $iPercent => $aDefs)
+		{
+			$aPercents[] = $iPercent;
+		}
+		sort($aPercents, SORT_NUMERIC);
+		foreach($aPercents as $iPercent)
+		{
+			$aDefs = $this->aThresholds[$iPercent];
+			if (array_key_exists('highlight', $aDefs) && is_array($aDefs['highlight']) && $this->IsThresholdPassed($iPercent))
+			{
+				// If persistant or SW running...
+				if (($aDefs['highlight']['persistent'] == true) || (($aDefs['highlight']['persistent'] == false) && !is_null($this->iLastStart)))
+				{
+					$sCode = $aDefs['highlight']['code'];
+				}
+			}
+		}
+		return $sCode;
+	}
 
 	public function GetAsHTML($oAttDef, $oHostObject = null)
 	{
@@ -258,16 +288,22 @@ class ormStopWatch
 	public function Reset($oObject, $oAttDef)
 	{
 		$this->iTimeSpent = 0;
-		$this->iStarted = null;
-		$this->iLastStart = null;
 		$this->iStopped = null;
+		$this->iStarted = null;
 
 		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
 		{
 			$aThresholdData['triggered'] = false;
-			$aThresholdData['deadline'] = null;
 			$aThresholdData['overrun'] = null;
 		}
+
+		if (!is_null($this->iLastStart))
+		{
+			// Currently running... starting again from now!
+			$this->iStarted = time();
+			$this->iLastStart = time();
+			$this->ComputeDeadlines($oObject, $oAttDef);
+		}
 	}
 
 	/**
@@ -418,9 +454,44 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							{
 								$sVerb = $aActionData['verb'];
 								$aParams = $aActionData['params'];
-								$sParams = implode(', ', $aParams);
+								$aValues = array();
+								foreach($aParams as $def)
+								{
+									if (is_string($def))
+									{
+										// Old method (pre-2.0.4) non typed parameters
+										$aValues[] = $def;
+									}
+									else // if(is_array($def))
+									{
+										$sParamType = array_key_exists('type', $def) ? $def['type'] : 'string';
+										switch($sParamType)
+										{
+											case 'int':
+												$value = (int)$def['value'];
+												break;
+										
+											case 'float':
+												$value = (float)$def['value'];
+												break;
+										
+											case 'bool':
+												$value = (bool)$def['value'];
+												break;
+										
+											case 'reference':
+												$value = ${$def['value']};
+												break;
+										
+											case 'string':
+											default:
+												$value = (string)$def['value'];
+										}
+										$aValues[] = $value;
+									}
+								}
 								$aCallSpec = array($oObj, $sVerb);
-								call_user_func_array($aCallSpec, $aParams);
+								call_user_func_array($aCallSpec, $aValues);
 							}
 
 							// Mark the threshold as "triggered"

core/restservices.class.inc.php

@@ -57,9 +57,10 @@ class ObjectResult
 	 * 	 
 	 * @param DBObject $oObject The object being reported
 	 * @param string $sAttCode The attribute code (must be valid)
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
 	 * @return string A scalar representation of the value
 	 */
-	protected function MakeResultValue(DBObject $oObject, $sAttCode)
+	protected function MakeResultValue(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
 	{
 		if ($sAttCode == 'id')
 		{
@@ -71,34 +72,32 @@ class ObjectResult
 			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 			if ($oAttDef instanceof AttributeLinkedSet)
 			{
-				$value = array();
-
-				// Make the list of required attributes
-				// - Skip attributes pointing to the current object (redundant data)
-				// - Skip link sets refering to the current data (infinite recursion!)
-				$aRelevantAttributes = array();
-				$sLnkClass = $oAttDef->GetLinkedClass();
-				foreach (MetaModel::ListAttributeDefs($sLnkClass) as $sLnkAttCode => $oLnkAttDef)
-				{
-					// Skip any attribute of the link that points to the current object
-					//
-					if ($sLnkAttCode == $oAttDef->GetExtKeyToMe()) continue;
-					if (method_exists($oLnkAttDef, 'GetKeyAttCode'))
-					{
-						if ($oLnkAttDef->GetKeyAttCode() ==$oAttDef->GetExtKeyToMe()) continue;
-					}
-
-					$aRelevantAttributes[] = $sLnkAttCode;
-				}
-
 				// Iterate on the set and build an array of array of attcode=>value
 				$oSet = $oObject->Get($sAttCode);
+				$value = array();
 				while ($oLnk = $oSet->Fetch())
 				{
+					$sLnkRefClass = $bExtendedOutput ? get_class($oLnk) : $oAttDef->GetLinkedClass();
+
 					$aLnkValues = array();
-					foreach ($aRelevantAttributes as $sLnkAttCode)
+					foreach (MetaModel::ListAttributeDefs($sLnkRefClass) as $sLnkAttCode => $oLnkAttDef)
 					{
-						$aLnkValues[$sLnkAttCode] = $this->MakeResultValue($oLnk, $sLnkAttCode);
+						// Skip attributes pointing to the current object (redundant data)
+						if ($sLnkAttCode == $oAttDef->GetExtKeyToMe())
+						{
+							continue;
+						}
+						// Skip any attribute of the link that points to the current object
+						$oLnkAttDef = MetaModel::GetAttributeDef($sLnkRefClass, $sLnkAttCode);
+						if (method_exists($oLnkAttDef, 'GetKeyAttCode'))
+						{
+							if ($oLnkAttDef->GetKeyAttCode() == $oAttDef->GetExtKeyToMe())
+							{
+								continue;
+							}
+						}
+						
+						$aLnkValues[$sLnkAttCode] = $this->MakeResultValue($oLnk, $sLnkAttCode, $bExtendedOutput);
 					}
 					$value[] = $aLnkValues;
 				}
@@ -116,11 +115,12 @@ class ObjectResult
 	 * 	 
 	 * @param DBObject $oObject The object being reported
 	 * @param string $sAttCode The attribute code (must be valid)
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
 	 * @return void
 	 */
-	public function AddField(DBObject $oObject, $sAttCode)
+	public function AddField(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
 	{
-		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode);
+		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode, $bExtendedOutput);
 	}
 }
 
@@ -143,18 +143,39 @@ class RestResultWithObjects extends RestResult
 	 * @param int An error code (RestResult::OK is no issue has been found)
 	 * @param string $sMessage Description of the error if any, an empty string otherwise
 	 * @param DBObject $oObject The object being reported
-	 * @param array $aFields An array of attribute codes. List of the attributes to be reported.
+	 * @param array $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
 	 * @return void
 	 */
-	public function AddObject($iCode, $sMessage, $oObject, $aFields)
+	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
 	{
-		$oObjRes = new ObjectResult(get_class($oObject), $oObject->GetKey());
+		$sClass = get_class($oObject);
+		$oObjRes = new ObjectResult($sClass, $oObject->GetKey());
 		$oObjRes->code = $iCode;
 		$oObjRes->message = $sMessage;
 
+		$aFields = null;
+		if (!is_null($aFieldSpec))
+		{
+			// Enum all classes in the hierarchy, starting with the current one
+			foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
+			{
+				if (array_key_exists($sRefClass, $aFieldSpec))
+				{
+					$aFields = $aFieldSpec[$sRefClass];
+					break;
+				}
+			}
+		}
+		if (is_null($aFields))
+		{
+			// No fieldspec given, or not found...
+			$aFields = array('id', 'friendlyname');
+		}
+
 		foreach ($aFields as $sAttCode)
 		{
-			$oObjRes->AddField($oObject, $sAttCode);
+			$oObjRes->AddField($oObject, $sAttCode, $bExtendedOutput);
 		}
 
 		$sObjKey = get_class($oObject).'::'.$oObject->GetKey();
@@ -265,6 +286,10 @@ class CoreServices implements iRestServiceProvider
 				'verb' => 'core/get_related',
 				'description' => 'Get related objects through the specified relation'
 			);
+			$aOps[] = array(
+				'verb' => 'core/check_credentials',
+				'description' => 'Check user credentials'
+			);
 		}
 		return $aOps;
 	}
@@ -285,11 +310,12 @@ class CoreServices implements iRestServiceProvider
 			$sClass = RestUtils::GetClass($aParams, 'class');
 			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
 			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
 	
 			$oObject = RestUtils::MakeObjectFromFields($sClass, $aFields);
 			$oObject->DBInsert();
 	
-			$oResult->AddObject(0, 'created', $oObject, $aShowFields);
+			$oResult->AddObject(0, 'created', $oObject, $aShowFields, $bExtendedOutput);
 			break;
 	
 		case 'core/update':
@@ -298,12 +324,13 @@ class CoreServices implements iRestServiceProvider
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
 			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
 			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
 	
 			$oObject = RestUtils::FindObjectFromKey($sClass, $key);
 			RestUtils::UpdateObjectFromFields($oObject, $aFields);
 			$oObject->DBUpdate();
 	
-			$oResult->AddObject(0, 'updated', $oObject, $aShowFields);
+			$oResult->AddObject(0, 'updated', $oObject, $aShowFields, $bExtendedOutput);
 			break;
 	
 		case 'core/apply_stimulus':
@@ -312,6 +339,7 @@ class CoreServices implements iRestServiceProvider
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
 			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
 			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
 			$sStimulus = RestUtils::GetMandatoryParam($aParams, 'stimulus');
 	
 			$oObject = RestUtils::FindObjectFromKey($sClass, $key);
@@ -347,7 +375,7 @@ class CoreServices implements iRestServiceProvider
 					if ($oObject->ApplyStimulus($sStimulus))
 					{
 						$oObject->DBUpdate();
-						$oResult->AddObject(0, 'updated', $oObject, $aShowFields);
+						$oResult->AddObject(0, 'updated', $oObject, $aShowFields, $bExtendedOutput);
 					}
 				}
 				else
@@ -363,11 +391,12 @@ class CoreServices implements iRestServiceProvider
 			$sClass = RestUtils::GetClass($aParams, 'class');
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
 			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
 	
 			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
 			while ($oObject = $oObjectSet->Fetch())
 			{
-				$oResult->AddObject(0, '', $oObject, $aShowFields);
+				$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
 			}
 			$oResult->message = "Found: ".$oObjectSet->Count();
 			break;
@@ -388,7 +417,6 @@ class CoreServices implements iRestServiceProvider
 			$key = RestUtils::GetMandatoryParam($aParams, 'key');
 			$sRelation = RestUtils::GetMandatoryParam($aParams, 'relation');
 			$iMaxRecursionDepth = RestUtils::GetOptionalParam($aParams, 'depth', 20 /* = MAX_RECURSION_DEPTH */);
-			$aShowFields = array('id', 'friendlyname');
 	
 			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
 			$aIndexByClass = array();
@@ -397,7 +425,7 @@ class CoreServices implements iRestServiceProvider
 				$aRelated = array();
 				$aGraph = array();
 				$aIndexByClass[get_class($oObject)][$oObject->GetKey()] = null;
-				$oResult->AddObject(0, '', $oObject, $aShowFields);
+				$oResult->AddObject(0, '', $oObject);
 				$this->GetRelatedObjects($oObject, $sRelation, $iMaxRecursionDepth, $aRelated, $aGraph);
 	
 				foreach($aRelated as $sClass => $aObjects)
@@ -405,7 +433,7 @@ class CoreServices implements iRestServiceProvider
 					foreach($aObjects as $oRelatedObj)
 					{
 						$aIndexByClass[get_class($oRelatedObj)][$oRelatedObj->GetKey()] = null;
-						$oResult->AddObject(0, '', $oRelatedObj, $aShowFields);
+						$oResult->AddObject(0, '', $oRelatedObj);
 					}				
 				}
 				foreach($aGraph as $sSrcKey => $aDestinations)
@@ -431,6 +459,21 @@ class CoreServices implements iRestServiceProvider
 			}
 			break;
 			
+		case 'core/check_credentials':
+			$oResult = new RestResult();
+			$sUser = RestUtils::GetMandatoryParam($aParams, 'user');
+			$sPassword = RestUtils::GetMandatoryParam($aParams, 'password');
+
+			if (UserRights::CheckCredentials($sUser, $sPassword) !== true)
+			{
+				$oResult->authorized = false;
+			}
+			else
+			{
+				$oResult->authorized = true;
+			}
+			break;
+	
 		default:
 			// unknown operation: handled at a higher level
 		}
@@ -503,7 +546,7 @@ class CoreServices implements iRestServiceProvider
 						$sPlanned = 'Must be deleted explicitely';
 					}
 				}
-				$oResult->AddObject($iCode, $sPlanned, $oToDelete, array('id', 'friendlyname'));
+				$oResult->AddObject($iCode, $sPlanned, $oToDelete);
 			}
 		}
 		foreach ($oDeletionPlan->ListUpdates() as $sRemoteClass => $aToUpdate)
@@ -521,7 +564,7 @@ class CoreServices implements iRestServiceProvider
 					$iCode = RestDelete::AUTO_UPDATE;
 					$sPlanned = 'Reset external keys: '.$aData['attributes_list'];
 				}
-				$oResult->AddObject($iCode, $sPlanned, $oToUpdate, array('id', 'friendlyname'));
+				$oResult->AddObject($iCode, $sPlanned, $oToUpdate);
 			}
 		}
 		

core/trigger.class.inc.php

@@ -64,7 +64,7 @@ abstract class Trigger extends cmdbAbstractObject
 
 	public function DoActivate($aContextArgs)
 	{
-		// Find the related 
+		// Find the related actions
 		$oLinkedActions = $this->Get('action_list');
 		while ($oLink = $oLinkedActions->Fetch())
 		{
@@ -109,16 +109,40 @@ abstract class TriggerOnObject extends Trigger
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>null, "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>"User,UserExternal,UserInternal,UserLDAP,UserLocal", "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values"=>null, "sql"=>"filter", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
-	
+
+	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		$sFilter = trim($this->Get('filter'));
+		if (strlen($sFilter) > 0)
+		{
+			try
+			{
+				$oSearch = DBObjectSearch::FromOQL($sFilter);
+
+				if (!MetaModel::IsParentClass($this->Get('target_class'), $oSearch->GetClass()))
+				{
+					$this->m_aCheckIssues[] = Dict::Format('TriggerOnObject:WrongFilterClass', $this->Get('target_class'));
+				}
+			}
+			catch(OqlException $e)
+			{
+				$this->m_aCheckIssues[] = Dict::Format('TriggerOnObject:WrongFilterQuery', $e->getMessage());
+			}
+		}
+	}
+
 	/**
 	 * Check whether the given object is in the scope of this trigger
 	 * and can potentially be the subject of notifications
@@ -128,7 +152,37 @@ abstract class TriggerOnObject extends Trigger
 	public function IsInScope(DBObject $oObject)
 	{
 		$sRootClass = $this->Get('target_class');
-		return  ($oObject instanceof $sRootClass);
+		return ($oObject instanceof $sRootClass);
+	}
+
+	public function DoActivate($aContextArgs)
+	{
+		$bGo = true;
+		if (isset($aContextArgs['this->id']))
+		{
+			$bGo = $this->IsTargetObject($aContextArgs['this->id']);
+		}
+		if ($bGo)
+		{
+			parent::DoActivate($aContextArgs);
+		}
+	}
+
+	public function IsTargetObject($iObjectId)
+	{
+		$sFilter = trim($this->Get('filter'));
+		if (strlen($sFilter) > 0)
+		{
+			$oSearch = DBObjectSearch::FromOQL($sFilter);
+			$oSearch->AddCondition('id', $iObjectId, '=');
+			$oSet = new DBObjectSet($oSearch);
+			$bRet = ($oSet->Count() > 0);
+		}
+		else
+		{
+			$bRet = true;
+		}
+		return $bRet;
 	}
 }
 /**
@@ -154,7 +208,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
 	}
@@ -181,7 +235,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 		MetaModel::Init_AddAttribute(new AttributeString("state", array("allowed_values"=>null, "sql"=>"state", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -209,7 +263,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -237,7 +291,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
@@ -265,7 +319,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
@@ -288,6 +342,7 @@ class lnkTriggerAction extends cmdbAbstractObject
 			"db_key_field" => "link_id",
 			"db_finalclass_field" => "",
 			"display_template" => "",
+			"is_link" => true,
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> '', "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));

core/userrights.class.inc.php

@@ -234,12 +234,19 @@ abstract class User extends cmdbAbstractObject
 		$aChanges = $this->ListChanges();
 		if (array_key_exists('login', $aChanges))
 		{
-			$sNewLogin = $aChanges['login'];
-			$oSearch = DBObjectSearch::FromOQL_AllData("SELECT User WHERE login = :newlogin");
-			$oSet = new DBObjectSet($oSearch, array(), array('newlogin' => $sNewLogin));
-			if ($oSet->Count() > 0)
+			if (strcasecmp($this->Get('login'), $this->GetOriginal('login')) !== 0)
 			{
-				$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:LoginMustBeUnique', $sNewLogin);
+				$sNewLogin = $aChanges['login'];
+				$oSearch = DBObjectSearch::FromOQL_AllData("SELECT User WHERE login = :newlogin");
+				if (!$this->IsNew())
+				{
+					$oSearch->AddCondition('id', $this->GetKey(), '!=');
+				}
+				$oSet = new DBObjectSet($oSearch, array(), array('newlogin' => $sNewLogin));
+				if ($oSet->Count() > 0)
+				{
+					$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:LoginMustBeUnique', $sNewLogin);
+				}
 			}
 		}
 		// Check that this user has at least one profile assigned
@@ -248,7 +255,6 @@ abstract class User extends cmdbAbstractObject
 		{
 			$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneProfileIsNeeded');
 		}
-		
 	}
 
 	function GetGrantAsHtml($sClass, $iAction)

core/valuesetdef.class.inc.php

@@ -100,6 +100,9 @@ class ValueSetObjects extends ValueSetDefinition
 	private $m_bAllowAllData;
 	private $m_aModifierProperties;
 
+	/**
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 */	
 	public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false, $aModifierProperties = array())
 	{
 		$this->m_sContains = '';
@@ -382,18 +385,36 @@ class ValueSetEnumClasses extends ValueSetEnum
 	}
 
 	protected function LoadValues($aArgs)
-	{	
-		// First, get the additional values
+	{
+		// Call the parent to parse the additional values...
 		parent::LoadValues($aArgs);
+		
+		// Translate the labels of the additional values
+		foreach($this->m_aValues as $sClass => $void)
+		{
+			if (MetaModel::IsValidClass($sClass))
+			{
+				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			}
+			else
+			{
+				unset($this->m_aValues[$sClass]);
+			}
+		}
 
 		// Then, add the classes from the category definition
 		foreach (MetaModel::GetClasses($this->m_sCategories) as $sClass)
 		{
-			$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			if (MetaModel::IsValidClass($sClass))
+			{
+				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			}
+			else
+			{
+				unset($this->m_aValues[$sClass]);
+			}
 		}
 
 		return true;
 	}
 }
-
-?>

css/light-grey.css

@@ -1416,3 +1416,7 @@ div.ui-dialog-header {
     padding-bottom: 10px;
     padding-top: 7px;
 }
+.form_field_error {
+	border: 1px solid #933;
+	background: #fcc;
+}

datamodels/1.x/authent-local/de.dict.authent-local.php

@@ -16,36 +16,17 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
- * Localized data
- *
- * @author      Stephan Rosenke <stephan.rosenke@itomig.de>
+ * @author	Stephan Rosenke <stephan.rosenke@itomig.de>
+ * @author 	David M. Gümbel <david.guembel@itomig.de>
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * @licence	http://opensource.org/licenses/AGPL-3.0
  */
 
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:UserLocal' => 'iTop-Benutzer',
 	'Class:UserLocal+' => 'Benutzer von iTop authentifiziert',
 	'Class:UserLocal/Attribute:password' => 'Passwort',
 	'Class:UserLocal/Attribute:password+' => 'Benutzerpasswort',
 ));
-
-
-
-?>
+?>

datamodels/1.x/authent-local/es_cr.dict.authent-local.php

@@ -0,0 +1,51 @@
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:UserLocal' => 'Usuario de iTop',
+	'Class:UserLocal+' => 'Usuario Autenticado vía iTop',
+	'Class:UserLocal/Attribute:password' => 'Contrase&ntilde;a',
+	'Class:UserLocal/Attribute:password+' => 'Contrase&ntilde;a',
+));
+
+
+
+?>

datamodels/1.x/authent-local/ja.dict.authent-local.php

@@ -1,51 +1,32 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Hirofumi Kosaka <kosaka@rworks.jp>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:UserLocal' => 'iTopユーザー',		 // 'iTop user',
-	'Class:UserLocal+' => 'iTopローカル認証ユーザー',	 // 'User authentified by iTop',
-	'Class:UserLocal/Attribute:password' => 'パスワード',   //  'Password',
-	'Class:UserLocal/Attribute:password+' => '認証文字列', // 'user authentication string',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @author	Hirofumi Kosaka <kosaka@rworks.jp>
+
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:UserLocal' => 'iTopユーザー',
+	'Class:UserLocal+' => 'iTopローカル認証ユーザー',
+	'Class:UserLocal/Attribute:password' => 'パスワード',
+	'Class:UserLocal/Attribute:password+' => '認証文字列',
+));
+?>

datamodels/1.x/authent-local/model.authent-local.php

@@ -74,7 +74,10 @@ class UserLocal extends UserInternal
 
 	public function CanChangePassword()
 	{
-		// For now everyone can change their password..
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			return false;
+		}
 		return true;
 	}
 
@@ -85,18 +88,47 @@ class UserLocal extends UserInternal
 		// Let's ask the password to compare the hashed values
 		if ($oPassword->CheckPassword($sOldPassword))
 		{
-			$this->Set('password', $sNewPassword);
-			$oChange = MetaModel::NewObject("CMDBChange");
-			$oChange->Set("date", time());
-			$sUserString = CMDBChange::GetCurrentUserName();
-			$oChange->Set("userinfo", $sUserString);
-			$oChange->DBInsert();
-			$this->DBUpdateTracked($oChange, true);
+			$this->SetPassword($sNewPassword);
 			return true;
 		}
 		return false;
 	}
+
+	/**
+	 * Use with care!
+	 */	 	
+	public function SetPassword($sNewPassword)
+	{
+		$this->Set('password', $sNewPassword);
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$sUserString = CMDBChange::GetCurrentUserName();
+		$oChange->Set("userinfo", $sUserString);
+		$oChange->DBInsert();
+		$this->DBUpdateTracked($oChange, true);
+	}
+
+	/**
+	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
+	 * for the given attribute in the current state of the object
+	 * @param $sAttCode string $sAttCode The code of the attribute
+	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
+	 * @return integer Flags: the binary combination of the flags applicable to this attribute
+	 */	 	  	 	
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			if (strpos('contactid,login,language,password,profile_list,allowed_org_list', $sAttCode) !== false)
+			{
+				// contactid and allowed_org_list are disabled to make sure the portal remains accessible 
+				$aReasons[] = 'Sorry, this attribute is read-only in the demonstration mode!';
+				$iFlags |= OPT_ATT_READONLY;
+			}
+		}
+		return $iFlags;
+	}
 }
 
-
-?>

datamodels/1.x/authent-local/ru.dict.authent-local.php

@@ -17,32 +17,16 @@
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 /**
- * Localized data
- *
- * @author      Vladimir Shilov <shilow@ukr.net>
+ * @author	Vladimir Shilov <shilow@ukr.net>
+
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
+ * @licence	http://opensource.org/licenses/AGPL-3.0
  */
 
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLocal' => 'Пользователь iTop',
 	'Class:UserLocal+' => 'Пользователь аутентифицированный iTop',
 	'Class:UserLocal/Attribute:password' => 'Пароль',
 	'Class:UserLocal/Attribute:password+' => 'строка аутентификации пользователя',
 ));
-
-?>
+?>

datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml

@@ -457,7 +457,7 @@
                 <hidden/>
               </attribute>
               <attribute id="agent_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -466,13 +466,13 @@
                 <mandatory/>
               </attribute>
               <attribute id="supervisor_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="manager_group_id">
                 <mandatory/>
               </attribute>
               <attribute id="manager_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="outage">
                 <hidden/>
@@ -1306,7 +1306,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions/>
@@ -1488,7 +1488,7 @@
                 <hidden/>
               </attribute>
               <attribute id="agent_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -1497,13 +1497,13 @@
                 <mandatory/>
               </attribute>
               <attribute id="supervisor_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="manager_group_id">
                 <mandatory/>
               </attribute>
               <attribute id="manager_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="outage">
                 <hidden/>
@@ -1513,7 +1513,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_plan">
                 <stimulus>ev_plan</stimulus>
                 <target>plannedscheduled</target>
                 <actions/>
@@ -1589,7 +1589,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_implement">
                 <stimulus>ev_implement</stimulus>
                 <target>implemented</target>
                 <actions/>
@@ -1796,12 +1796,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_monitor">
                 <stimulus>ev_monitor</stimulus>
                 <target>monitored</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_finish">
                 <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>
@@ -1879,7 +1879,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_finish">
                 <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>
@@ -2465,7 +2465,7 @@
                 <hidden/>
               </attribute>
               <attribute id="agent_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -2474,13 +2474,13 @@
                 <mandatory/>
               </attribute>
               <attribute id="supervisor_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="manager_group_id">
                 <mandatory/>
               </attribute>
               <attribute id="manager_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="outage">
                 <hidden/>
@@ -3248,12 +3248,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_validate">
                 <stimulus>ev_validate</stimulus>
                 <target>validated</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_reject">
                 <stimulus>ev_reject</stimulus>
                 <target>rejected</target>
                 <actions/>
@@ -3339,7 +3339,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions/>
@@ -3422,7 +3422,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reopen">
                 <stimulus>ev_reopen</stimulus>
                 <target>new</target>
                 <actions/>
@@ -3471,7 +3471,7 @@
                 <hidden/>
               </attribute>
               <attribute id="agent_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -3480,13 +3480,13 @@
                 <mandatory/>
               </attribute>
               <attribute id="supervisor_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="manager_group_id">
                 <mandatory/>
               </attribute>
               <attribute id="manager_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="outage">
                 <hidden/>
@@ -3502,7 +3502,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_plan">
                 <stimulus>ev_plan</stimulus>
                 <target>plannedscheduled</target>
                 <actions/>
@@ -3589,12 +3589,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_approve">
                 <stimulus>ev_approve</stimulus>
                 <target>approved</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_notapprove">
                 <stimulus>ev_notapprove</stimulus>
                 <target>notapproved</target>
                 <actions/>
@@ -3680,7 +3680,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_implement">
                 <stimulus>ev_implement</stimulus>
                 <target>implemented</target>
                 <actions/>
@@ -3763,7 +3763,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_replan">
                 <stimulus>ev_replan</stimulus>
                 <target>plannedscheduled</target>
                 <actions/>
@@ -3849,12 +3849,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_monitor">
                 <stimulus>ev_monitor</stimulus>
                 <target>monitored</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_finish">
                 <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>
@@ -3944,7 +3944,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_finish">
                 <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>
@@ -4353,7 +4353,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions/>
@@ -4547,7 +4547,7 @@
                 <hidden/>
               </attribute>
               <attribute id="agent_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -4556,13 +4556,13 @@
                 <mandatory/>
               </attribute>
               <attribute id="supervisor_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="manager_group_id">
                 <mandatory/>
               </attribute>
               <attribute id="manager_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="outage">
                 <hidden/>
@@ -4578,7 +4578,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_plan">
                 <stimulus>ev_plan</stimulus>
                 <target>plannedscheduled</target>
                 <actions/>
@@ -4660,12 +4660,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_approve">
                 <stimulus>ev_approve</stimulus>
                 <target>approved</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_notapprove">
                 <stimulus>ev_notapprove</stimulus>
                 <target>notapproved</target>
                 <actions/>
@@ -4746,7 +4746,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_implement">
                 <stimulus>ev_implement</stimulus>
                 <target>implemented</target>
                 <actions/>
@@ -4823,7 +4823,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_replan">
                 <stimulus>ev_replan</stimulus>
                 <target>plannedscheduled</target>
                 <actions/>
@@ -4903,12 +4903,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_monitor">
                 <stimulus>ev_monitor</stimulus>
                 <target>monitored</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_finish">
                 <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>
@@ -4992,7 +4992,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_finish">
                 <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>

datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml

@@ -54,7 +54,7 @@
                 <read_only/>
               </attribute>
               <attribute id="description">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="start_date">
                 <read_only/>
@@ -63,28 +63,28 @@
                 <mandatory/>
               </attribute>
               <attribute id="org_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="service_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="servicesubcategory_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="product">
                 <must_prompt/>
               </attribute>
               <attribute id="impact">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="urgency">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="priority">
                 <read_only/>
               </attribute>
               <attribute id="workgroup_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -130,7 +130,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -139,7 +139,7 @@
                   </action>
                 </actions>
               </transition>
-              <transition>
+              <transition id="ev_timeout">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_tto</target>
                 <actions/>
@@ -204,7 +204,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -284,17 +284,17 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -377,12 +377,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -546,12 +546,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_close">
                 <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions>

datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml

@@ -213,7 +213,7 @@
                 <read_only/>
               </attribute>
               <attribute id="description">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="ticket_log">
                 <hidden/>
@@ -222,28 +222,28 @@
                 <read_only/>
               </attribute>
               <attribute id="org_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="service_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="servicesubcategory_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="product">
                 <must_prompt/>
               </attribute>
               <attribute id="impact">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="urgency">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="priority">
                 <read_only/>
               </attribute>
               <attribute id="workgroup_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_id">
                 <hidden/>
@@ -268,7 +268,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -324,12 +324,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -398,12 +398,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_close">
                 <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions>
@@ -753,7 +753,7 @@
       <parent>ProblemManagement</parent>
       <definition>
         <layout>DashboardLayoutTwoCols</layout>
-        <title></title>
+        <title/>
         <cells>
           <cell id="0">
             <rank>0</rank>

datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml

@@ -91,7 +91,7 @@
                 <read_only/>
               </attribute>
               <attribute id="description">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="start_date">
                 <read_only/>
@@ -100,28 +100,28 @@
                 <mandatory/>
               </attribute>
               <attribute id="org_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="service_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="servicesubcategory_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="product">
                 <must_prompt/>
               </attribute>
               <attribute id="impact">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="urgency">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="priority">
                 <read_only/>
               </attribute>
               <attribute id="workgroup_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -173,7 +173,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -182,7 +182,7 @@
                   </action>
                 </actions>
               </transition>
-              <transition>
+              <transition id="ev_timeout">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_tto</target>
                 <actions/>
@@ -253,7 +253,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -339,17 +339,17 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_timeout">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -361,7 +361,7 @@
                   </action>
                 </actions>
               </transition>
-              <transition>
+              <transition id="ev_freeze">
                 <stimulus>ev_freeze</stimulus>
                 <target>frozen</target>
                 <actions/>
@@ -443,12 +443,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -536,17 +536,17 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_timeout">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions/>
@@ -641,12 +641,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_close">
                 <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions>

datamodels/1.x/itop-tickets-1.0.0/datamodel.itop-tickets.xml

@@ -422,7 +422,7 @@
                 <read_only/>
               </attribute>
               <attribute id="description">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="start_date">
                 <read_only/>
@@ -431,28 +431,28 @@
                 <mandatory/>
               </attribute>
               <attribute id="org_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="service_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="servicesubcategory_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="product">
                 <must_prompt/>
               </attribute>
               <attribute id="impact">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="urgency">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="priority">
                 <read_only/>
               </attribute>
               <attribute id="workgroup_id">
-                <must_change/>
+                <must_prompt/>
               </attribute>
               <attribute id="agent_email">
                 <hidden/>
@@ -498,7 +498,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -507,7 +507,7 @@
                   </action>
                 </actions>
               </transition>
-              <transition>
+              <transition id="ev_timeout">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_tto</target>
                 <actions/>
@@ -572,7 +572,7 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_assign">
                 <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
@@ -652,17 +652,17 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_timeout">
                 <stimulus>ev_timeout</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -745,12 +745,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_resolve">
                 <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
@@ -914,12 +914,12 @@
               </attribute>
             </flags>
             <transitions>
-              <transition>
+              <transition id="ev_reassign">
                 <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
-              <transition>
+              <transition id="ev_close">
                 <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions>

datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php

@@ -56,7 +56,7 @@ class ItopWelcome extends ModuleHandlerAPI
 			new WebPageMenuNode('NotificationsMenu', utils::GetAbsoluteUrlAppRoot().'pages/notifications.php', $oAdminMenu->GetIndex(), 3 /* fRank */);
 			new OQLMenuNode('AuditCategories', 'SELECT AuditCategory', $oAdminMenu->GetIndex(), 4 /* fRank */);
 			new WebPageMenuNode('RunQueriesMenu', utils::GetAbsoluteUrlAppRoot().'pages/run_query.php', $oAdminMenu->GetIndex(), 8 /* fRank */);
-			new OQLMenuNode('QueryMenu', 'SELECT Query', $oAdminMenu->GetIndex(), 8.5 /* fRank */);
+			new OQLMenuNode('QueryMenu', 'SELECT Query', $oAdminMenu->GetIndex(), 8.5 /* fRank */, true);
 			new WebPageMenuNode('ExportMenu', utils::GetAbsoluteUrlAppRoot().'webservices/export.php', $oAdminMenu->GetIndex(), 9 /* fRank */);
 			new WebPageMenuNode('DataModelMenu', utils::GetAbsoluteUrlAppRoot().'pages/schema.php', $oAdminMenu->GetIndex(), 10 /* fRank */);
 			new WebPageMenuNode('UniversalSearchMenu', utils::GetAbsoluteUrlAppRoot().'pages/UniversalSearch.php', $oAdminMenu->GetIndex(), 11 /* fRank */);

datamodels/2.x/authent-external/ru.dict.authent-external.php

@@ -1,30 +1,43 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 /**
- * @author	Vladimir Shilov <shilow@ukr.net>
-
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ * 
+ * @author   Vladimir Kunin <v.b.kunin@gmail.com>
+ * @license   http://opensource.org/licenses/AGPL-3.0
+ *
+ * 
+ * Инструкция по установке
+ * 
+ * Процесс установки заключается в замене имеющихся локализационных файлов полученными и последующем запуске процедуры обновления iTop для перекомпиляции кода.
+ * 	1. Скопируйте с заменой два полученных файла из "itop-rus/dictionaries" в "путь/до/вашего/itop/dictionaries".
+ * 	2. Скопируйте с заменой полученные файлы "itop-rus/datamodels/2.x/название-модуля/ru.dict.название-модуля.php" в "путь/до/вашего/itop/datamodels/2.x/название-модуля".
+ *  3. Перейдите по адресу "http://адрес/вашего/itop/setup", при этом файл "путь/до/вашего/itop/conf/production/config-itop.php" должен быть доступен для записи.
+ *  4. На второй странице установщика выберите "Upgrade an existing iTop instance" и следуйте дальнейшим инструкциям установщика.
+ *
+ * Ответы на вопросы по установке и использованию переводов, а также на любые другие вопросы по iTop всегда можно получить на сайте сообщества iTop по-русски http://community.itop-itsm.ru.
+ *
  */
 
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserExternal' => 'Внешний пользователь',
-	'Class:UserExternal+' => 'Пользователь аутентифицированный вне iTop',
+	'Class:UserExternal+' => 'Пользователь, аутентифицированный вне iTop',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-ldap/model.authent-ldap.php

@@ -166,7 +166,7 @@ class UserLDAP extends UserInternal
 	
 	protected function LogMessage($sMessage, $aData = array())
 	{
-		if (MetaModel::IsLogEnabledIssue())
+		if (MetaModel::GetModuleSetting('authent-ldap', 'debug', false) && MetaModel::IsLogEnabledIssue())
 		{
 			if (MetaModel::IsValidClass('EventIssue'))
 			{

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -56,6 +56,7 @@ SetupWebPage::AddModule(
 				LDAP_OPT_PROTOCOL_VERSION => 3,
 				LDAP_OPT_REFERRALS => 0,
 			),
+			'debug' => false,
 		),
 	)
 );

datamodels/2.x/authent-ldap/ru.dict.authent-ldap.php

@@ -1,32 +1,45 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 /**
- * @author	Vladimir Shilov <shilow@ukr.net>
-
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ * 
+ * @author   Vladimir Kunin <v.b.kunin@gmail.com>
+ * @license   http://opensource.org/licenses/AGPL-3.0
+ *
+ * 
+ * Инструкция по установке
+ * 
+ * Процесс установки заключается в замене имеющихся локализационных файлов полученными и последующем запуске процедуры обновления iTop для перекомпиляции кода.
+ * 	1. Скопируйте с заменой два полученных файла из "itop-rus/dictionaries" в "путь/до/вашего/itop/dictionaries".
+ * 	2. Скопируйте с заменой полученные файлы "itop-rus/datamodels/2.x/название-модуля/ru.dict.название-модуля.php" в "путь/до/вашего/itop/datamodels/2.x/название-модуля".
+ *  3. Перейдите по адресу "http://адрес/вашего/itop/setup", при этом файл "путь/до/вашего/itop/conf/production/config-itop.php" должен быть доступен для записи.
+ *  4. На второй странице установщика выберите "Upgrade an existing iTop instance" и следуйте дальнейшим инструкциям установщика.
+ *
+ * Ответы на вопросы по установке и использованию переводов, а также на любые другие вопросы по iTop всегда можно получить на сайте сообщества iTop по-русски http://community.itop-itsm.ru.
+ *
  */
 
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLDAP' => 'Пользователь LDAP',
-	'Class:UserLDAP+' => 'Пользователь аутентифицированный в LDAP',
+	'Class:UserLDAP+' => 'Пользователь, аутентифицированный в LDAP',
 	'Class:UserLDAP/Attribute:password' => 'Пароль',
-	'Class:UserLDAP/Attribute:password+' => 'строка аутентификации пользователя',
+	'Class:UserLDAP/Attribute:password+' => 'Строка аутентификации пользователя',
 ));
-?>
+
+
+
+?>

datamodels/2.x/authent-local/ru.dict.authent-local.php

@@ -1,32 +1,45 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 /**
- * @author	Vladimir Shilov <shilow@ukr.net>
-
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ * 
+ * @author   Vladimir Kunin <v.b.kunin@gmail.com>
+ * @license   http://opensource.org/licenses/AGPL-3.0
+ *
+ * 
+ * Инструкция по установке
+ * 
+ * Процесс установки заключается в замене имеющихся локализационных файлов полученными и последующем запуске процедуры обновления iTop для перекомпиляции кода.
+ * 	1. Скопируйте с заменой два полученных файла из "itop-rus/dictionaries" в "путь/до/вашего/itop/dictionaries".
+ * 	2. Скопируйте с заменой полученные файлы "itop-rus/datamodels/2.x/название-модуля/ru.dict.название-модуля.php" в "путь/до/вашего/itop/datamodels/2.x/название-модуля".
+ *  3. Перейдите по адресу "http://адрес/вашего/itop/setup", при этом файл "путь/до/вашего/itop/conf/production/config-itop.php" должен быть доступен для записи.
+ *  4. На второй странице установщика выберите "Upgrade an existing iTop instance" и следуйте дальнейшим инструкциям установщика.
+ *
+ * Ответы на вопросы по установке и использованию переводов, а также на любые другие вопросы по iTop всегда можно получить на сайте сообщества iTop по-русски http://community.itop-itsm.ru.
+ *
  */
 
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:UserLocal' => 'Пользователь iTop',
-	'Class:UserLocal+' => 'Пользователь аутентифицированный iTop',
+	'Class:UserLocal+' => 'Пользователь, аутентифицированный в iTop',
 	'Class:UserLocal/Attribute:password' => 'Пароль',
-	'Class:UserLocal/Attribute:password+' => 'строка аутентификации пользователя',
+	'Class:UserLocal/Attribute:password+' => 'Строка аутентификации пользователя',
 ));
-?>
+
+
+
+?>

datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>
@@ -37,15 +37,20 @@
         </reconciliation>
         <indexes>
           <index id="1">
-             <attributes>
-               <attribute id="temp_id"/>
-             </attributes>
+            <attributes>
+              <attribute id="temp_id"/>
+            </attributes>
           </index>
           <index id="2">
-             <attributes>
-               <attribute id="item_class"/>
-               <attribute id="item_id"/>
-             </attributes>
+            <attributes>
+              <attribute id="item_class"/>
+              <attribute id="item_id"/>
+            </attributes>
+          </index>
+          <index id="3">
+            <attributes>
+              <attribute id="item_org_id"/>
+            </attributes>
           </index>
         </indexes>
       </properties>

datamodels/2.x/itop-attachments/main.attachments.php

@@ -225,6 +225,10 @@ class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExt
 .btn_hidden {
 	display: none;
 }
+.drag_in {
+	-webkit-box-shadow:inset 0 0 10px 2px #1C94C4;
+	box-shadow:inset 0 0 10px 2px #1C94C4;
+}
 EOF
 		);
 		$oPage->add('<fieldset>');
@@ -239,7 +243,7 @@ EOF
 			$sDeleteBtn = Dict::S('Attachments:DeleteBtn');
 			$oPage->add_script(
 <<<EOF
-	function RemoveNewAttachment(att_id)
+	function RemoveAttachment(att_id)
 	{
 		$('#attachment_'+att_id).attr('name', 'removed_attachments[]');
 		$('#display_attachment_'+att_id).hide();
@@ -283,7 +287,7 @@ EOF
 						else
 						{
 							var sDownloadLink = GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=download_document&class=Attachment&id='+data.att_id+'&field=contents';
-							$('#attachments').append('<div class="attachment" id="display_attachment_'+data.att_id+'"><a data-preview="'+data.preview+'" href="'+sDownloadLink+'"><img src="'+data.icon+'"><br/>'+data.msg+'<input id="attachment_'+data.att_id+'" type="hidden" name="attachments[]" value="'+data.att_id+'"/></a><br/><input type="button" class="btn_hidden" value="{$sDeleteBtn}" onClick="RemoveNewAttachment('+data.att_id+');"/></div>');
+							$('#attachments').append('<div class="attachment" id="display_attachment_'+data.att_id+'"><a data-preview="'+data.preview+'" href="'+sDownloadLink+'"><img src="'+data.icon+'"><br/>'+data.msg+'<input id="attachment_'+data.att_id+'" type="hidden" name="attachments[]" value="'+data.att_id+'"/></a><br/><input type="button" class="btn_hidden" value="{$sDeleteBtn}" onClick="RemoveAttachment('+data.att_id+');"/></div>');
 							if($sIsDeleteEnabled)
 							{
 								$('#display_attachment_'+data.att_id).hover( function() { $(this).children(':button').toggleClass('btn_hidden'); } );
@@ -315,7 +319,7 @@ EOF
 				$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
 				$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
 				$sDownloadLink = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=download_document&class=Attachment&id='.$iAttId.'&field=contents';
-				$oPage->add('<div class="attachment" id="attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'<input type="hidden" name="attachments[]" value="'.$iAttId.'"/></a><br/>&nbsp;<input id="btn_remove_'.$iAttId.'" type="button" class="btn_hidden" value="Delete" onClick="$(\'#attachment_'.$iAttId.'\').remove();"/>&nbsp;</div>');
+				$oPage->add('<div class="attachment" id="display_attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'<input id="attachment_'.$iAttId.'" type="hidden" name="attachments[]" value="'.$iAttId.'"/></a><br/>&nbsp;<input id="btn_remove_'.$iAttId.'" type="button" class="btn_hidden" value="Delete" onClick="RemoveAttachment('.$iAttId.');"/>&nbsp;</div>');
 			}
 			
 			// Suggested attachments are listed here but treated as temporary
@@ -343,7 +347,7 @@ EOF
 						$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
 						$sDownloadLink = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=download_document&class=Attachment&id='.$iAttId.'&field=contents';
 						$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
-						$oPage->add('<div class="attachment" id="display_attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'<input type="hidden" name="attachments[]" value="'.$iAttId.'"/></a><br/>&nbsp;<input id="btn_remove_'.$iAttId.'" type="button" class="btn_hidden" value="Delete" onClick="RemoveNewAttachment('.$iAttId.');"/>&nbsp;</div>');
+						$oPage->add('<div class="attachment" id="display_attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'<input id="attachment_'+data.result.att_id+'" type="hidden" name="attachments[]" value="'.$iAttId.'"/></a><br/>&nbsp;<input id="btn_remove_'.$iAttId.'" type="button" class="btn_hidden" value="Delete" onClick="RemoveAttachment('.$iAttId.');"/>&nbsp;</div>');
 						$oPage->add_ready_script("$('#attachment_plugin').trigger('add_attachment', [$iAttId, '".addslashes($sFileName)."']);");
 					}
 				}
@@ -352,7 +356,88 @@ EOF
 			$oPage->add('</span>');			
 			$oPage->add('<div style="clear:both"></div>');			
 			$sMaxUpload = $this->GetMaxUpload();
-			$oPage->p(Dict::S('Attachments:AddAttachment').'<input type="file" name="file" id="file" onChange="ajaxFileUpload();"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
+//			$oPage->p(Dict::S('Attachments:AddAttachment').'<input type="file" name="file" id="file" onChange="ajaxFileUpload();"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
+$oPage->p(Dict::S('Attachments:AddAttachment').'<input type="file" name="file" id="file"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
+
+$oPage->add_linked_script('../js/jquery.iframe-transport.js');
+$oPage->add_linked_script('../js/jquery.fileupload.js');
+
+$oPage->add_ready_script(
+<<< EOF
+    $('#file').fileupload({
+		url: GetAbsoluteUrlModulesRoot()+'itop-attachments/ajax.attachment.php',
+		formData: { operation: 'add', temp_id: '$sTempId', obj_class: '$sClass' },
+        dataType: 'json',
+        done: function (e, data) {
+			if(typeof(data.result.error) != 'undefined')
+			{
+				if(data.result.error != '')
+				{
+					alert(data.result.error);
+				}
+				else
+				{
+					var sDownloadLink = GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=download_document&class=Attachment&id='+data.result.att_id+'&field=contents';
+					$('#attachments').append('<div class="attachment" id="display_attachment_'+data.result.att_id+'"><a data-preview="'+data.result.preview+'" href="'+sDownloadLink+'"><img src="'+data.result.icon+'"><br/>'+data.result.msg+'<input id="attachment_'+data.result.att_id+'" type="hidden" name="attachments[]" value="'+data.result.att_id+'"/></a><br/><input type="button" class="btn_hidden" value="{$sDeleteBtn}" onClick="RemoveAttachment('+data.result.att_id+');"/></div>');
+					if($sIsDeleteEnabled)
+					{
+						$('#display_attachment_'+data.result.att_id).hover( function() { $(this).children(':button').toggleClass('btn_hidden'); } );
+					}
+					$('#attachment_plugin').trigger('add_attachment', [data.result.att_id, data.msg]);
+				}
+			}
+        },
+        start: function() {
+        	$('#attachment_loading').show();
+		},
+        stop: function() {
+        	$('#attachment_loading').hide();
+		}
+    });
+
+	$(document).bind('dragover', function (e) {
+		var bFiles = false;
+		
+		if (e.dataTransfer.types)
+		{
+			for (var i = 0; i < e.dataTransfer.types.length; i++)
+			{
+				if (e.dataTransfer.types[i] == "text/plain")
+				{
+					bFiles = false; // mozilla contains "Files" in the types list when dragging images inside the page, but it also contains "text/plain" before
+					break;
+				}
+				
+				if (e.dataTransfer.types[i] == "Files")
+				{
+					bFiles = true;
+					break;
+				}
+			}
+		}
+	
+		if (!bFiles) return; // Not dragging files
+		
+		var dropZone = $('#file').closest('fieldset');
+		if (!dropZone.is(':visible'))
+		{
+			// Hidden, but inside an inactive tab? Higlight the tab
+			var sTabId = dropZone.closest('.ui-tabs-panel').attr('aria-labelledby');
+			dropZone = $('#'+sTabId).closest('li');
+		}
+	    timeout = window.dropZoneTimeout;
+	    if (!timeout) {
+	        dropZone.addClass('drag_in');
+	    } else {
+	        clearTimeout(timeout);
+	    }
+	    window.dropZoneTimeout = setTimeout(function () {
+	        window.dropZoneTimeout = null;
+	        dropZone.removeClass('drag_in');
+	    }, 300);
+	});   
+EOF
+);
 			$oPage->p('<span style="display:none;" id="attachment_loading">Loading, please wait...</span>');
 			$oPage->p('<input type="hidden" id="attachment_plugin" name="attachment_plugin"/>');
 			$oPage->add('</fieldset>');
@@ -383,7 +468,8 @@ EOF
 			}
 		}
 		$sPreviewNotAvailable = addslashes(Dict::S('Attachments:PreviewNotAvailable'));
-		$oPage->add_ready_script("$(document).tooltip({ items: '.attachment a',  position: { my: 'left top', at: 'right top', using: function( position, feedback ) { $( this ).css( position ); }}, content: function() { if ($(this).attr('data-preview') == 'true') { return('<img style=\"max-width:290px\" src=\"'+$(this).attr('href')+'\"></img>');} else { return '$sPreviewNotAvailable'; }}});");
+		$iMaxWidth = MetaModel::GetModuleSetting('itop-attachments', 'preview_max_width', 290);
+		$oPage->add_ready_script("$(document).tooltip({ items: '.attachment a',  position: { my: 'left top', at: 'right top', using: function( position, feedback ) { $( this ).css( position ); }}, content: function() { if ($(this).attr('data-preview') == 'true') { return('<img style=\"max-width:{$iMaxWidth}px\" src=\"'+$(this).attr('href')+'\"></img>');} else { return '$sPreviewNotAvailable'; }}});");
 	}
 
 	protected static function UpdateAttachments($oObject, $oChange = null)
@@ -401,14 +487,15 @@ EOF
 		{
 			$aActions = array();
 			$aAttachmentIds = utils::ReadParam('attachments', array());
-
+			$aRemovedAttachmentIds = utils::ReadParam('removed_attachments', array());
+			
 			// Get all current attachments
 			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
 			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
 			while ($oAttachment = $oSet->Fetch())
 			{
 				// Remove attachments that are no longer attached to the current object
-				if (!in_array($oAttachment->GetKey(), $aAttachmentIds))
+				if (in_array($oAttachment->GetKey(), $aRemovedAttachmentIds))
 				{
 					$oAttachment->DBDelete();
 					$aActions[] = self::GetActionDescription($oAttachment, false /* false => deletion */);
@@ -419,7 +506,6 @@ EOF
 			$sTempId = session_id().'_'.$iTransactionId;
 			// The object is being created from a form, check if there are pending attachments
 			// for this object, but deleting the "new" ones that were already removed from the form
-			$aRemovedAttachmentIds = utils::ReadParam('removed_attachments', array());
 			$sOQL = 'SELECT Attachment WHERE temp_id = :temp_id';
 			$oSearch = DBObjectSearch::FromOQL($sOQL);
 			foreach($aAttachmentIds as $iAttachmentId)

datamodels/2.x/itop-attachments/module.attachments.php

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/1.0.0',
+	'itop-attachments/2.1.0',
 	array(
 		// Identification
 		//
@@ -64,6 +64,7 @@ SetupWebPage::AddModule(
 		'settings' => array(
 			'allowed_classes' => array('Ticket'), // List of classes for which to manage "Attachments"
 			'position' => 'relations', // Where to display the attachments: relations | properties
+			'preview_max_width' => 290,
 		),
 	)
 );

datamodels/2.x/itop-attachments/pt_br .dict.itop-attachments.php

@@ -0,0 +1,41 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Anexos',
+	'Attachments:FieldsetTitle' => 'Anexos',
+	'Attachments:DeleteBtn' => 'Excluir',
+	'Attachments:History_File_Added' => 'Anexo %1$s adicionado.',
+	'Attachments:History_File_Removed' => 'Anexo %1$s excluído.',
+	'Attachments:AddAttachment' => 'Adicionar anexo: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'Arquivo carregado NÃO PERMITIDO pelo sistema.',
+	'Attachment:Max_Go' => '(Tamanho máximo arquivo: %1$s Gb)',
+	'Attachment:Max_Mo' => '(Tamanho máximo arquivo: %1$s Mb)',
+	'Attachment:Max_Ko' => '(Tamanho máximo arquivo: %1$s Kb)',
+	'Attachments:NoAttachment' => 'Nenhum anexo. ',
+));
+?>

datamodels/2.x/itop-backup/ajax.backup.php

@@ -0,0 +1,179 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Backup from an interactive session
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
+
+require_once(APPROOT.'core/mutex.class.inc.php');
+
+try
+{
+	$sOperation = utils::ReadParam('operation', '');
+
+	switch($sOperation)
+	{
+		case 'backup':
+		require_once(APPROOT.'/application/startup.inc.php');
+		require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+		LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+		$oPage = new ajax_page("");
+		$oPage->no_cache();
+		$oPage->SetContentType('text/html');
+
+		if (utils::GetConfig()->Get('demo_mode'))
+		{
+			$oPage->add("<div data-error-stimulus=\"Error\">Sorry, iTop is in <b>demonstration mode</b>: the feature is disabled.</div>");
+		}
+		else
+		{
+			try
+			{
+				set_time_limit(0);
+				$oBB = new BackupExec(APPROOT.'data/backups/manual/', 0 /*iRetentionCount*/);
+				$sRes = $oBB->Process(time() + 36000); // 10 hours to complete should be sufficient!
+			}
+			catch (Exception $e)
+			{
+				$oPage->p('Error: '.$e->getMessage());
+			}
+		}
+		$oPage->output();
+		break;
+
+		case 'restore_get_token':
+		require_once(APPROOT.'/application/startup.inc.php');
+		require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+		LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+		$oPage = new ajax_page("");
+		$oPage->no_cache();
+		$oPage->SetContentType('text/html');
+
+		$sEnvironment = utils::ReadParam('environment', 'production', false, 'raw_data');
+		$oRestoreMutex = new iTopMutex('restore.'.$sEnvironment);
+		if ($oRestoreMutex->TryLock())
+		{
+			$oRestoreMutex->Unlock();
+			$sFile = utils::ReadParam('file', '', false, 'raw_data');
+			$sToken = str_replace(' ', '', (string)microtime());
+			$sTokenFile = APPROOT.'/data/restore.'.$sToken.'.tok';
+			file_put_contents($sTokenFile, $sFile);
+	
+			$oPage->add_ready_script(
+<<<EOF
+	$("#restore_token").val('$sToken');
+EOF
+			);
+		}
+		else
+		{
+			$oPage->p(Dict::S('bkp-restore-running'));
+		}
+		$oPage->output();
+		break;
+
+
+		case 'restore_exec':
+		require_once(APPROOT."setup/runtimeenv.class.inc.php");
+		require_once(APPROOT.'/application/utils.inc.php');
+		require_once(APPROOT.'/setup/backup.class.inc.php');
+		require_once(dirname(__FILE__).'/dbrestore.class.inc.php');
+
+		IssueLog::Enable(APPROOT.'log/error.log');
+
+		$oPage = new ajax_page("");
+		$oPage->no_cache();
+		$oPage->SetContentType('text/html');
+
+		if (utils::GetConfig()->Get('demo_mode'))
+		{
+			$oPage->add("<div data-error-stimulus=\"Error\">Sorry, iTop is in <b>demonstration mode</b>: the feature is disabled.</div>");
+		}
+		else
+		{
+			$sEnvironment = utils::ReadParam('environment', 'production', false, 'raw_data');
+			$oRestoreMutex = new iTopMutex('restore.'.$sEnvironment);
+			$oRestoreMutex->Lock();
+			try
+			{
+				set_time_limit(0);
+	
+				// Get the file and destroy the token (single usage)
+				$sToken = utils::ReadParam('token', '', false, 'raw_data');
+				$sTokenFile = APPROOT.'/data/restore.'.$sToken.'.tok';
+				$sFile = file_get_contents($sTokenFile);
+				unlink($sTokenFile);
+	
+				$sMySQLBinDir = utils::ReadParam('mysql_bindir', '', false, 'raw_data');
+				$sDBHost = utils::ReadParam('db_host', '', false, 'raw_data');
+				$sDBUser = utils::ReadParam('db_user', '', false, 'raw_data');
+				$sDBPwd = utils::ReadParam('db_pwd', '', false, 'raw_data');
+				$sDBName = utils::ReadParam('db_name', '', false, 'raw_data');
+				$sDBSubName = utils::ReadParam('db_subname', '', false, 'raw_data');
+	
+				$oDBRS = new DBRestore($sDBHost, $sDBUser, $sDBPwd, $sDBName, $sDBSubName);
+				$oDBRS->SetMySQLBinDir($sMySQLBinDir);
+	
+				$sBackupDir = APPROOT.'data/backups/';
+				$sBackupFile = $sBackupDir.$sFile;
+				$sRes = $oDBRS->RestoreFromZip($sBackupFile, $sEnvironment);
+	
+				$oRestoreMutex->Unlock();
+			}
+			catch (Exception $e)
+			{
+				$oRestoreMutex->Unlock();
+				$oPage->p('Error: '.$e->getMessage());
+			}
+		}
+		$oPage->output();
+		break;
+
+		case 'download':
+		require_once(APPROOT.'/application/startup.inc.php');
+		require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+		LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+		if (utils::GetConfig()->Get('demo_mode'))
+		{
+			throw new Exception('iTop is in demonstration mode: the feature is disabled');
+		}
+		$sFile = utils::ReadParam('file', '', false, 'raw_data');
+		$oBackup = new DBBackupScheduled();
+		$sBackupDir = APPROOT.'data/backups/';
+		$oBackup->DownloadBackup($sBackupDir.$sFile);
+		break;
+	}
+}
+catch (Exception $e)
+{
+	IssueLog::Error($e->getMessage());
+}
+
+?>

datamodels/2.x/itop-backup/backup.params.distrib

@@ -0,0 +1,54 @@
+# Parameters file for backup.php and check-backup.php
+#
+# Usage:
+# backup.php --param_file=<this file>[,<another one>]
+# or
+# http://.../itop-backup/backup.php?param_file=<this file>[,<another one>]
+#
+# If a parameter is given both in the file and in the arguments,
+# then the value given as argument is retained
+#
+# Note: most of the default values provided here should work fine
+#       if you have created sample data with the setup program
+
+# MySQL coming with Easy PHP (Windows)
+mysql_bindir = C:\Program Files\EasyPHP-5.3.6.0\mysql\bin
+
+
+# Authentication
+auth_user = admin
+auth_pwd = admin
+
+# Target file - path and filename (optional)
+#
+# Formatting rules:
+# %Y-%m-%d => 2011-01-25... see PHP documentation of strftime()
+# Placeholders:
+#    __HOST__      MySQL server
+#    __DB__        Database name
+#    __SUBNAME__   Tables prefix
+# 
+backup_file = /var/log/__DB__-%Y-%m-%d
+	
+# Check thresholds (check-backup.php)
+#
+check_size_min = 20000 # bytes
+check_size_reduction_max = 10 # percentage
+
+# Ticket creation (check-backup.php)
+#
+# If the backup has failed, a ticket will be created
+# This process relies on the SOAP service "CreateIncident"
+#
+# Root URL of an instance of iTop, into which the ticket will be created
+check_ticket_itop = http://localhost/myiTop 
+# Any of the above paramaters are mandatory
+check_ticket_login = admin # must have the right to create an Incident Ticket
+check_ticket_pwd = admin
+check_ticket_title = Backup check failed
+check_ticket_customer = Demo
+check_ticket_service = Computers and peripherals
+check_ticket_service_subcategory = Repair
+check_ticket_workgroup = Hardware support
+check_ticket_impacted_server = dbserver1.demo.com
+	

datamodels/2.x/itop-backup/backup.php

@@ -0,0 +1,200 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation; version 3 of the License.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../../approot.inc.php');
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/webpage.class.inc.php');
+require_once(APPROOT.'application/csvpage.class.inc.php');
+require_once(APPROOT.'application/clipage.class.inc.php');
+require_once(APPROOT.'application/ajaxwebpage.class.inc.php');
+
+require_once(APPROOT.'core/log.class.inc.php');
+
+require_once(APPROOT.'application/startup.inc.php');
+
+class MyDBBackup extends DBBackup
+{
+	protected function LogInfo($sMsg)
+	{
+		$this->oPage->p($sMsg);
+	}
+
+	protected function LogError($sMsg)
+	{
+		$this->oPage->p('Error: '.$sMsg);
+		ToolsLog::Error($sMsg);
+	}
+
+	protected $oPage;
+	public function __construct($oPage)
+	{
+		$this->oPage = $oPage;
+		parent::__construct();
+	}
+}
+
+
+/**
+ * Checks if a parameter (possibly empty) was specified when calling this page
+ */
+function CheckParam($sParamName)
+{
+	global $argv;
+	
+	if (isset($_REQUEST[$sParamName])) return true; // HTTP parameter either GET or POST
+	if (!is_array($argv)) return false;
+	foreach($argv as $sArg)
+	{
+		if ($sArg == '--'.$sParamName) return true; // Empty command line parameter, long unix style
+		if ($sArg == $sParamName) return true; // Empty command line parameter, Windows style
+		if ($sArg == '-'.$sParamName) return true; // Empty command line parameter, short unix style
+		if (preg_match('/^--'.$sParamName.'=(.*)$/', $sArg, $aMatches)) return true; // Command parameter with a value
+	}
+	return false;
+}
+
+function Usage($oP)
+{
+	$oP->p('Perform a backup of the iTop database by running mysqldump');
+	$oP->p('Parameters:');
+	if (utils::IsModeCLI())
+	{
+		$oP->p('auth_user: login, must be administrator');
+		$oP->p('auth_pwd: ...');
+	}
+	$oP->p('backup_file [optional]: name of the file to store the backup into. Follows the PHP strftime format spec. The following placeholders are available: __HOST__, __DB__, __SUBNAME__');
+	$oP->p('simulate [optional]: set to check the name of the file that would be created');
+	$oP->p('mysql_bindir [optional]: specify the path for mysqldump');
+
+	if (utils::IsModeCLI())
+	{
+		$oP->p('Example: php -q backup.php --auth_user=admin --auth_pwd=myPassw0rd');
+		$oP->p('Known limitation: the current directory must be the directory of backup.php');
+	}
+	else
+	{
+		$oP->p('Example: .../backup.php?backup_file=/tmp/backup.__DB__-__SUBNAME__.%Y-%m');
+	}
+}
+
+function ExitError($oP, $sMessage)
+{
+	ToolsLog::Error($sMessage);
+	$oP->p($sMessage);
+	$oP->output();
+	exit;
+}
+
+
+function ReadMandatoryParam($oP, $sParam)
+{
+	$sValue = utils::ReadParam($sParam, null, true /* Allow CLI */, 'raw_data');
+	if (is_null($sValue))
+	{
+		ExitError($oP, "ERROR: Missing argument '$sParam'");
+	}
+	return trim($sValue);
+}
+
+
+/////////////////////////////////
+// Main program
+
+set_time_limit(0);
+
+if (utils::IsModeCLI())
+{
+	$oP = new CLIPage("iTop - Database Backup");
+}
+else
+{
+	$oP = new WebPage("iTop - Database Backup");
+}
+
+try
+{
+	utils::UseParamFile();
+}
+catch(Exception $e)
+{
+	ExitError($oP, $e->GetMessage());
+}
+
+if (utils::IsModeCLI())
+{
+	$oP->p(date('Y-m-d H:i:s')." - running backup utility");
+	$sAuthUser = ReadMandatoryParam($oP, 'auth_user');
+	$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd');
+	$bDownloadBackup = false;
+	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
+	{
+		UserRights::Login($sAuthUser); // Login & set the user's language
+	}
+	else
+	{
+		ExitError($oP, "Access restricted or wrong credentials ('$sAuthUser')");
+	}
+}
+else
+{
+	require_once(APPROOT.'application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+	$bDownloadBackup = utils::ReadParam('download', false);
+}
+
+if (!UserRights::IsAdministrator())
+{
+	ExitError($oP, "Access restricted to administors");
+}
+
+if (CheckParam('?') || CheckParam('h') || CheckParam('help'))
+{
+	Usage($oP);
+	$oP->output();
+	exit;
+}
+
+
+$sDefaultBackupFileName = SetupUtils::GetTmpDir().'/'."__DB__-%Y-%m-%d";
+$sBackupFile =  utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data');
+
+// Interpret strftime specifications (like %Y) and database placeholders
+$oBackup = new MyDBBackup($oP);
+$oBackup->SetMySQLBinDir(MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''));
+$sBackupFile = $oBackup->MakeName($sBackupFile);
+$sZipArchiveFile = $sBackupFile.'.zip';
+
+$bSimulate = utils::ReadParam('simulate', false, true);
+$res = false;
+if ($bSimulate)
+{
+	$oP->p("Simulate: would create file '$sZipArchiveFile'");
+}
+elseif (MetaModel::GetConfig()->Get('demo_mode'))
+{
+	$oP->p("Sorry, iTop is in demonstration mode: the feature is disabled");
+}
+else
+{
+	$oBackup->CreateZip($sZipArchiveFile);
+}
+if ($res && $bDownloadBackup)
+{
+	$oBackup->DownloadBackup($sZipArchiveFile);
+}
+$oP->output();
+?>

datamodels/2.x/itop-backup/check-backup.php

@@ -0,0 +1,267 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation; version 3 of the License.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+// Purpose: check that the backup has been successfully executed
+//          this script is aimed at being invoked in CLI mode only
+
+// Developer's notes:
+//   Duplicated code: sys_get_temp_dir, the computation of the target filename, etc.
+
+// Recommended usage in CRON
+// /usr/bin/php -q /var/www/combodo/modules/itop-backup/backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../../approot.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/core/config.class.inc.php');
+
+
+function ReadMandatoryParam($sParam)
+{
+	$value = utils::ReadParam($sParam, null, true /* Allow CLI */, 'raw_data');
+	if (is_null($value))
+	{
+		throw new Exception("Missing argument '$sParam'");
+	}
+	return $value; 
+}
+
+if (!function_exists('sys_get_temp_dir'))
+{
+	// Based on http://www.phpit.net/
+	// article/creating-zip-tar-archives-dynamically-php/2/
+	function sys_get_temp_dir()
+	{
+		// Try to get from environment variable
+		if (!empty($_ENV['TMP']))
+		{
+			return realpath($_ENV['TMP']);
+		}
+		else if (!empty($_ENV['TMPDIR']))
+		{
+			return realpath($_ENV['TMPDIR']);
+		}
+		else if (!empty($_ENV['TEMP']))
+		{
+			return realpath($_ENV['TEMP']);
+		}
+		// Detect by creating a temporary file
+		else
+		{
+			// Try to use system's temporary directory
+			// as random name shouldn't exist
+			$temp_file = tempnam(md5(uniqid(rand(), TRUE)), '');
+			if ($temp_file)
+			{
+				$temp_dir = realpath(dirname($temp_file));
+				unlink($temp_file);
+				return $temp_dir;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
+	}
+}
+
+
+
+function MakeArchiveFileName($iRefTime = null)
+{
+	$sDefaultBackupFileName = sys_get_temp_dir().'/'."__DB__-%Y-%m-%d";
+	$sBackupFile =  utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data');
+	
+	$oConfig = new Config(APPCONF.'production/config-itop.php');
+	
+	$sBackupFile = str_replace('__HOST__', $oConfig->GetDBHost(), $sBackupFile);
+	$sBackupFile = str_replace('__DB__', $oConfig->GetDBName(), $sBackupFile);
+	$sBackupFile = str_replace('__SUBNAME__', $oConfig->GetDBSubName(), $sBackupFile);
+	
+	if (is_null($iRefTime))
+	{
+		$sBackupFile = strftime($sBackupFile);
+	}
+	else
+	{
+		$sBackupFile = strftime($sBackupFile, $iRefTime);
+	}
+
+	return $sBackupFile.'.zip';
+}
+
+
+
+function RaiseAlarm($sMessage)
+{
+	echo "$sMessage\n";
+
+	try
+	{
+		$sTicketLogin = ReadMandatoryParam('check_ticket_login');
+		$sTicketPwd = ReadMandatoryParam('check_ticket_pwd');
+		$sTicketTitle = ReadMandatoryParam('check_ticket_title');
+		$sTicketCustomer = ReadMandatoryParam('check_ticket_customer');
+		$sTicketService = ReadMandatoryParam('check_ticket_service');
+		$sTicketSubcategory = ReadMandatoryParam('check_ticket_service_subcategory');
+		$sTicketWorkgroup = ReadMandatoryParam('check_ticket_workgroup');
+		$sTicketImpactedServer = ReadMandatoryParam('check_ticket_impacted_server');
+	}
+	catch (Exception $e)
+	{
+		echo "The ticket could not be created: ".$e->GetMessage()."\n";
+		return;
+	}
+
+   $sMessage = "Server: [[Server:".$sTicketImpactedServer."]]\n".$sMessage;
+
+	require_once(APPROOT.'webservices/itopsoaptypes.class.inc.php');
+	
+	//$sItopRootDefault = 'http'.((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off')) ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/../..';
+	//$sItopRoot = utils::ReadParam('check_ticket_itop', $sItopRootDefault);
+	$sItopRoot = ReadMandatoryParam('check_ticket_itop');
+
+	$sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php';
+	//$sWsdlUri .= '?service_category=';
+	
+	$aSOAPMapping = SOAPMapping::GetMapping();
+	
+	ini_set("soap.wsdl_cache_enabled","0");
+	$oSoapClient = new SoapClient(
+		$sWsdlUri,
+		array(
+			'trace' => 1,
+			'classmap' => $aSOAPMapping, // defined in itopsoaptypes.class.inc.php
+		)
+	);
+	
+	try
+	{
+		$oRes = $oSoapClient->CreateIncidentTicket
+		(
+			$sTicketLogin, /* login */
+			$sTicketPwd, /* password */
+			$sTicketTitle, /* title */
+			$sMessage, /* description */
+			null, /* caller */
+			new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', $sTicketCustomer))), /* customer */
+			new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', $sTicketService))), /* service */
+			new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', $sTicketSubcategory))), /* service subcategory */
+			'', /* product */
+			new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', $sTicketWorkgroup))), /* workgroup */
+			array(
+				new SOAPLinkCreationSpec(
+					'Server',
+					array(new SOAPSearchCondition('name', $sTicketImpactedServer)),
+					array()
+				),
+			), /* impacted cis */
+			'1', /* impact */
+			'1' /* urgency */
+		);
+	}
+	catch(Exception $e)
+	{
+		echo "The ticket could not be created: SOAP Exception = '".$e->getMessage()."'\n";
+	}
+
+	//echo "<pre>\n";
+	//print_r($oRes);
+	//echo "</pre>\n";
+
+	if ($oRes->status)
+	{
+		$sTicketName = $oRes->result[0]->values[1]->value;
+		echo "Created ticket: $sTicketName\n";
+	}
+	else
+	{
+		echo "ERROR: Failed to create the ticket in target iTop ($sItopRoot)\n";
+		foreach ($oRes->errors->messages as $oMessage)
+		{
+			echo $oMessage->text."\n";
+		}
+	}	
+}
+
+
+//////////
+// Main
+
+try
+{
+	utils::UseParamFile();
+}
+catch(Exception $e)
+{
+	echo "Error: ".$e->GetMessage()."\n";
+	exit;
+}
+
+$sZipArchiveFile = MakeArchiveFileName();
+echo date('Y-m-d H:i:s')." - Checking file: $sZipArchiveFile\n";
+
+if (file_exists($sZipArchiveFile))
+{
+	if ($aStat = stat($sZipArchiveFile))
+	{
+		$iSize = (int) $aStat['size'];
+		$iMIN = utils::ReadParam('check_size_min', 0);
+		if ($iSize > $iMIN)
+		{
+			echo "Found the archive\n";
+			$sOldArchiveFile = MakeArchiveFileName(time() - 86400); // yesterday's archive
+			if (file_exists($sOldArchiveFile))
+			{
+				if ($aOldStat = stat($sOldArchiveFile))
+				{
+					echo "Comparing its size with older file: $sOldArchiveFile\n";
+					$iOldSize = (int) $aOldStat['size'];
+					$fVariationPercent = 100 * ($iSize - $iOldSize) / $iOldSize;
+					$sVariation = round($fVariationPercent, 2)." percent(s)";
+
+					$iREDUCTIONMAX = utils::ReadParam('check_size_reduction_max');
+					if ($fVariationPercent < -$iREDUCTIONMAX)
+					{
+						RaiseAlarm("Backup file '$sZipArchiveFile' changed by $sVariation, expecting a reduction limited to $iREDUCTIONMAX percents of the original size");
+					}
+					elseif ($fVariationPercent < 0)
+					{
+						echo "Size variation: $sVariation (the maximum allowed reduction is $iREDUCTIONMAX) \n";
+					}
+					else
+					{
+						echo "The archive grew by: $sVariation\n";
+					}
+				}
+			}
+		}
+		else
+		{
+			RaiseAlarm("Backup file '$sZipArchiveFile' too small (Found: $iSize, while expecting $iMIN bytes)");
+		}
+	}
+	else
+	{
+		RaiseAlarm("Failed to stat backup file '$sZipArchiveFile'");
+	}
+}
+else
+{
+	RaiseAlarm("Missing backup file '$sZipArchiveFile'");
+}
+
+?>

datamodels/2.x/itop-backup/dbrestore.class.inc.php

@@ -0,0 +1,129 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+class DBRestore extends DBBackup
+{
+	protected function LogInfo($sMsg)
+	{
+		//IssueLog::Info('non juste info: '.$sMsg);
+	}
+	protected function LogError($sMsg)
+	{
+		IssueLog::Error($sMsg);
+	}
+
+	protected function LoadDatabase($sDataFile)
+	{
+		$this->LogInfo("Loading data onto $this->sDBHost/$this->sDBName(suffix:'$this->sDBSubName')");
+
+		// Just to check the connection to the DB (more accurate than getting the retcode of mysql)
+		$oMysqli = $this->DBConnect();
+
+		$sHost = self::EscapeShellArg($this->sDBHost);
+		$sUser = self::EscapeShellArg($this->sDBUser);
+		$sPwd = self::EscapeShellArg($this->sDBPwd);
+		$sDBName = self::EscapeShellArg($this->sDBName);
+		if (empty($this->sMySQLBinDir))
+		{
+			$sMySQLExe = 'mysql';
+		}
+		else
+		{
+			$sMySQLExe = '"'.$this->sMySQLBinDir.'/mysql"';
+		}
+		if (is_null($this->iDBPort))
+		{
+			$sPortOption = '';
+		}
+		else
+		{
+			$sPortOption = '--port='.$this->iDBPort.' ';
+		}
+
+		$sDataFileEscaped = self::EscapeShellArg($sDataFile);
+		$sCommand = "$sMySQLExe --default-character-set=utf8 --host=$sHost $sPortOption --user=$sUser --password=$sPwd $sDBName <$sDataFileEscaped 2>&1";
+		$sCommandDisplay = "$sMySQLExe --default-character-set=utf8 --host=$sHost $sPortOption --user=xxxx --password=xxxx $sDBName <$sDataFileEscaped 2>&1";
+
+		// Now run the command for real
+		$this->LogInfo("Executing command: $sCommandDisplay");
+		$aOutput = array();
+		$iRetCode = 0;
+		exec($sCommand, $aOutput, $iRetCode);
+		foreach($aOutput as $sLine)
+		{
+			$this->LogInfo("mysql said: $sLine");
+		}
+		if ($iRetCode != 0)
+		{
+			$this->LogError("Failed to execute: $sCommandDisplay. The command returned:$iRetCode");
+			foreach($aOutput as $sLine)
+			{
+				$this->LogError("mysql said: $sLine");
+			}
+			if (count($aOutput) == 1) 
+			{
+				$sMoreInfo = trim($aOutput[0]); 
+			}
+			else
+			{
+				$sMoreInfo = "Check the log file '".realpath(APPROOT.'/log/error.log')."' for more information.";
+			}
+			throw new BackupException("Failed to execute mysql: ".$sMoreInfo);
+		}
+	}
+
+	public function RestoreFromZip($sZipFile, $sEnvironment = 'production')
+	{
+		$this->LogInfo("Starting restore of ".basename($sZipFile));
+
+		$oZip = new ZipArchive();
+		$res = $oZip->open($sZipFile);
+
+		// Load the database
+		//
+		$sDataDir = tempnam(SetupUtils::GetTmpDir(), 'itop-');
+		unlink($sDataDir); // I need a directory, not a file...
+		SetupUtils::builddir($sDataDir); // Here is the directory
+		$oZip->extractTo($sDataDir, 'itop-dump.sql');
+		$sDataFile = $sDataDir.'/itop-dump.sql';
+		$this->LoadDatabase($sDataFile);
+		unlink($sDataFile);
+
+		// Update the code
+		//
+		$sDeltaFile = APPROOT.'data/'.$sEnvironment.'.delta.xml';
+		if ($oZip->locateName('delta.xml') !== false)
+		{
+			// Extract and rename delta.xml => <env>.delta.xml;
+			file_put_contents($sDeltaFile, $oZip->getFromName('delta.xml'));
+		}
+		else
+		{
+			@unlink($sDeltaFile);
+		}
+		$sConfigFile = APPROOT.'conf/'.$sEnvironment.'/config-itop.php';
+		@chmod($sConfigFile, 0770); // Allow overwriting the file
+		$oZip->extractTo(APPROOT.'conf/'.$sEnvironment, 'config-itop.php');
+		@chmod($sConfigFile, 0444); // Read-only
+
+		$oEnvironment = new RunTimeEnvironment($sEnvironment);
+		$oEnvironment->CompileFrom($sEnvironment);
+	}
+}
+

datamodels/2.x/itop-backup/de.dict.itop-backup.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 Combodo
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ 
+  * @author      Robert Jaehne <robert.jaehne@itomig.de>
+ 
+ */
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+
+	'bkp-backup-running' => 'Backup wird durchgeführt. Bitte warten ...',
+	'bkp-restore-running' => 'Wiederherstellung läuft. Bitte warten ...',
+
+	'Menu:BackupStatus' => 'Geplante Backups',
+	'bkp-status-title' => 'Geplante Backups',
+	'bkp-status-checks' => 'Einstellungen und Prüfungen',
+	'bkp-mysqldump-ok' => 'mysqldump ist vorhanden: %1$s',
+	'bkp-mysqldump-notfound' => 'mysqldump wurde nicht gefunden: %1$s - Stellen sie sicher, das er eingespielt und im Pfad verfügbar ist oder editieren sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
+	'bkp-mysqldump-issue' => 'mysqldump konnte nicht eingespielt werden (retcode=%1$d): Stellen sie sicher, das er eingespielt und im Pfad verfügbar ist oder editieren sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
+	'bkp-missing-dir' => 'Zielverzeichniss %1$s nicht gefunden',
+	'bkp-free-disk-space' => '<b>%1$s frei</b> in %2$s',
+	'bkp-dir-not-writeable' => '%1$s ist nicht schreibbar',
+	'bkp-wrong-format-spec' => 'Die verwendete Definition zur Formatierung von Dateinamen ist nicht korrekt (%1$s). Die Standard-Definition %2$s wird verwendet',
+	'bkp-name-sample' => 'Backup-Dateien werden abhängig von Datum, Zeit und Datenbank-Identifier erstellt. Beispiel: %1$s',
+	'bkp-week-days' => 'Backups werden <b>jeden %1$s um %2$s durchgeführt</b>',
+	'bkp-retention' => 'Mindestens <b>%1$d Backups werden im Zielverzeichniss vorgehalten</b>',
+	'bkp-next-to-delete' => 'Wird gelöscht, wenn das nächste Backup angelegt wird (unter Einstellungen "Menge vorhalten")',
+	'bkp-table-file' => 'Datei', 
+	'bkp-table-file+' => 'Nur Dateien mit der Endung .zip werden als Backup-Dateien berücksichtigt.',
+	'bkp-table-size' => 'Grösse',
+	'bkp-table-size+' => '',
+	'bkp-table-actions' => 'Aktionen',
+	'bkp-table-actions+' => '',
+	'bkp-status-backups-auto' => 'Geplante Backups',
+	'bkp-status-backups-manual' => 'Manuelle Backups',
+	'bkp-status-backups-none' => 'Kein Backup vorhanden',
+	'bkp-next-backup' => 'Das nächste Backup wird am <b>%1$s</b> (%2$s) um %3$s durchgeführt',
+	'bkp-button-backup-now' => 'Backup läuft!',
+	'bkp-button-restore-now' => 'Wiederherstellen!',
+	'bkp-confirm-backup' => 'Bitte bestätigen sie, dass sie jetzt ein Backup erstellen wollen now.',
+	'bkp-confirm-restore' => 'Bitte bestätigen sie, dass sie mit Backup %1$s eine Wiederherstellung durchführen wollen.',
+	'bkp-wait-backup' => 'Bitte warten, bis das Backup abgeschlossen ist ...',
+	'bkp-wait-restore' => 'Bitte warten, bis die Wiederherstellung abgeschlossen ist ...',
+	'bkp-success-restore' => 'Wiederherstellung erfolgreich.',
+));

datamodels/2.x/itop-backup/en.dict.itop-backup.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 Combodo
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+
+	'bkp-backup-running' => 'A backup is running. Please wait...',
+	'bkp-restore-running' => 'A restore is running. Please wait...',
+
+	'Menu:BackupStatus' => 'Scheduled Backups',
+	'bkp-status-title' => 'Scheduled Backups',
+	'bkp-status-checks' => 'Settings and checks',
+	'bkp-mysqldump-ok' => 'mysqldump is present: %1$s',
+	'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.',
+	'bkp-mysqldump-issue' => 'mysqldump could not be executed (retcode=%1$d): Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir',
+	'bkp-missing-dir' => 'The target directory %1$s count not be found',
+	'bkp-free-disk-space' => '<b>%1$s free</b> in %2$s',
+	'bkp-dir-not-writeable' => '%1$s is not writeable',
+	'bkp-wrong-format-spec' => 'The current specification to format the file names is wrong (%1$s). A default specification will apply: %2$s',
+	'bkp-name-sample' => 'Backup files are named depending on DB identifiers, date and time. Example: %1$s',
+	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>',
+	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.',
+	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")',
+	'bkp-table-file' => 'File', 
+	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files',
+	'bkp-table-size' => 'Size',
+	'bkp-table-size+' => '',
+	'bkp-table-actions' => 'Actions',
+	'bkp-table-actions+' => '',
+	'bkp-status-backups-auto' => 'Scheduled backups',
+	'bkp-status-backups-manual' => 'Manual backups',
+	'bkp-status-backups-none' => 'No backup yet',
+	'bkp-next-backup' => 'The next backup will occur on <b>%1$s</b> (%2$s) at %3$s',
+	'bkp-button-backup-now' => 'Backup now!',
+	'bkp-button-restore-now' => 'Restore!',
+	'bkp-confirm-backup' => 'Please confirm that you do request the backup to occur right now.',
+	'bkp-confirm-restore' => 'Please confirm that you do want to restore the backup %1$s.',
+	'bkp-wait-backup' => 'Please wait for the backup to complete...',
+	'bkp-wait-restore' => 'Please wait for the restore to complete...',
+	'bkp-success-restore' => 'Restore successfully completed.',
+));
+?>

datamodels/2.x/itop-backup/fr.dict.itop-backup.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 Combodo
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+
+	'bkp-backup-running' => 'Une sauvegarde est en cours. Veuillez patienter...',
+	'bkp-restore-running' => 'Une restauration des données est en cours. Veuillez patienter...',
+
+	'Menu:BackupStatus' => 'Sauvegarde automatique',
+	'bkp-status-title' => 'Sauvegarde automatique',
+	'bkp-status-checks' => 'Réglages et vérifications',
+	'bkp-mysqldump-ok' => 'mysqldump est installé: %1$s',
+	'bkp-mysqldump-notfound' => 'mysqldump n\'a pas été trouvé: %1$s - Veuillez vous assurer que les outils mysql sont installés et qu\'ils sont accessibles en ligne de commande, ou bien éditez le fichier de configuration pour en donner le chemin via mysql_bindir.',
+	'bkp-mysqldump-issue' => 'mysqldump n\'a pas pu être exécuté (code de retour: %1$d). Veuillez vérifier que les outils mysql sont installés et qu\'ils sont accessibles en ligne de commande, ou bien éditez le fichier de configuration pour en donner le chemin via mysql_bindir.',
+	'bkp-missing-dir' => 'Le répertoire cible \'%1$s\' n\'existe pas ou ne peut pas être lu.',
+	'bkp-free-disk-space' => 'Vous disposez de <b>%1$s d\'espace disque</b> sur %2$s',
+	'bkp-dir-not-writeable' => 'Le répertoire cible \'%1$s\' n\'est pas accessible en écriture.',
+	'bkp-wrong-format-spec' => 'La spécification de format pour le nom des sauvegarde est incorrecte (%1$s). La spécification par défaut sera appliquée: %2$s',
+	'bkp-name-sample' => 'Les fichiers de sauvegardes seront nommés en fonction de la base, la date et l\'heure. Par exemple: %1$s',
+	'bkp-week-days' => 'Les sauvegardes seront effectuées <b>tous les %1$s à %2$s</b>',
+	'bkp-retention' => 'Au plus <b>%1$d fichiers de sauvegardes seront conservés</b> dans le répertoire cible.',
+	'bkp-next-to-delete' => 'Sera effacé lors de la prochaine sauvegarde (Cf. réglage "retention_count")',
+	'bkp-table-file' => 'Fichier', 
+	'bkp-table-file+' => 'Seuls les fichiers ayant l\'extension .zip sont considérés comme étant des fichiers de sauvegarde',
+	'bkp-table-size' => 'Taille',
+	'bkp-table-size+' => '',
+	'bkp-table-actions' => 'Actions',
+	'bkp-table-actions+' => '',
+	'bkp-status-backups-auto' => 'Sauvegardes automatiques',
+	'bkp-status-backups-manual' => 'Sauvegardes manuelles',
+	'bkp-status-backups-none' => 'Aucune sauvegarde n\'a été faite jusqu\' à présent.',
+	'bkp-next-backup' => 'La prochaine sauvegarde aura lieu <b>%1$s</b> (%2$s) à %3$s',
+	'bkp-button-backup-now' => 'Sauvegarder maintenant !',
+	'bkp-button-restore-now' => 'Restaurer !',
+	'bkp-confirm-backup' => 'Veuillez confirmer que vous souhaiter effectuer une sauvegarde maintenant.',
+	'bkp-confirm-restore' => 'Veuillez confirmer que vous souhaiter effectuer la restauration de \'%1$s\' maintenant.',
+	'bkp-wait-backup' => 'Sauvegarde en cours...',
+	'bkp-wait-restore' => 'Restauration des données en cours...',
+	'bkp-success-restore' => 'Restauration des données terminée.',
+));
+?>

datamodels/2.x/itop-backup/main.itop-backup.php

@@ -0,0 +1,302 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation; version 3 of the License.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public License
+//   along with this program; if not, write to the Free Software
+//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+require_once(APPROOT.'setup/setuputils.class.inc.php');
+require_once(APPROOT.'setup/backup.class.inc.php');
+require_once(APPROOT.'core/mutex.class.inc.php');
+
+
+define('BACKUP_DEFAULT_FORMAT', '__DB__-%Y-%m-%d_%H_%M');
+
+class BackupHandler extends ModuleHandlerAPI
+{
+	public static function OnMetaModelStarted()
+	{
+
+		try
+		{
+			$oBackupMutex = new iTopMutex('backup.'.utils::GetCurrentEnvironment());
+			if ($oBackupMutex->TryLock())
+			{
+				$oBackupMutex->Unlock();
+			}
+			else
+			{
+				// Not needed: the DB dump is done in a single transaction
+				//MetaModel::GetConfig()->Set('access_mode', ACCESS_READONLY, 'itop-backup');
+				//MetaModel::GetConfig()->Set('access_message', ' - '.dict::S('bkp-backup-running'), 'itop-backup');
+			}
+	
+			$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
+			if ($oRestoreMutex->TryLock())
+			{
+				$oRestoreMutex->Unlock();
+			}
+			else
+			{
+				MetaModel::GetConfig()->Set('access_mode', ACCESS_READONLY, 'itop-backup');
+				MetaModel::GetConfig()->Set('access_message', ' - '.dict::S('bkp-restore-running'), 'itop-backup');
+			}
+		}
+		catch(Exception $e)
+		{
+			
+		}
+	}
+}
+
+class DBBackupScheduled extends DBBackup
+{
+	protected function LogInfo($sMsg)
+	{
+		static $bDebug = null;
+		if ($bDebug == null)
+		{
+			$bDebug = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'debug', false);
+		}
+
+		if ($bDebug)
+		{
+			echo $sMsg."\n";
+		}
+	}
+
+	protected function LogError($sMsg)
+	{
+		static $bDebug = null;
+		if ($bDebug == null)
+		{
+			$bDebug = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'debug', false);
+		}
+
+		IssueLog::Error($sMsg);
+		if ($bDebug)
+		{
+			echo 'Error: '.$sMsg."\n";
+		}
+	}
+
+	/**
+	 * List and order by date the backups in the given directory 	
+	 * Note: the algorithm is currently based on the file modification date... because there is no "creation date" in general
+	 */	
+	public function ListFiles($sBackupDir)
+	{
+		$aFiles = array();
+		$aTimes = array();
+		foreach(glob($sBackupDir.'*.zip') as $sFilePath)
+		{
+			$aFiles[] = $sFilePath;
+			$aTimes[] = filemtime($sFilePath); // unix time
+		}
+		array_multisort($aTimes, $aFiles);
+	
+		return $aFiles;
+	}
+}
+
+class BackupExec implements iScheduledProcess
+{
+	protected $sBackupDir;
+	protected $iRetentionCount;
+
+	/**
+	 * Constructor
+	 * @param sBackupDir string Target directory, defaults to APPROOT/data/backups/auto
+	 * @param iRetentionCount int Rotation (default to the value given in the configuration file 'retentation_count') set to 0 to disable this feature	 	 
+	 */	 	
+	public function __construct($sBackupDir = null, $iRetentionCount = null)
+	{
+		if (is_null($sBackupDir))
+		{
+			$this->sBackupDir = APPROOT.'data/backups/auto/';
+		}
+		else
+		{
+			$this->sBackupDir = $sBackupDir;
+		}
+		if (is_null($iRetentionCount))
+		{
+			$this->iRetentionCount = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'retention_count', 5);
+		}
+		else
+		{
+			$this->iRetentionCount = $iRetentionCount;
+		}
+	}
+
+	public function Process($iUnixTimeLimit)
+	{
+		$oMutex = new iTopMutex('backup.'.utils::GetCurrentEnvironment());
+		$oMutex->Lock();
+
+		try
+		{
+			// Make sure the target directory exists
+			SetupUtils::builddir($this->sBackupDir);
+	
+			$oBackup = new DBBackupScheduled();
+
+			// Eliminate files exceeding the retention setting
+			//
+			if ($this->iRetentionCount > 0)
+			{
+				$aFiles = $oBackup->ListFiles($this->sBackupDir);
+				while (count($aFiles) >= $this->iRetentionCount)
+				{
+					$sFileToDelete = array_shift($aFiles);
+					unlink($sFileToDelete);
+					if (file_exists($sFileToDelete))
+					{
+						// Ok, do not loop indefinitely on this
+						break;
+					}
+				}
+			}
+	
+			// Do execute the backup
+			//
+			$oBackup->SetMySQLBinDir(MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''));
+	
+			$sBackupFile = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'file_name_format', '__DB__-%Y-%m-%d_%H_%M');
+			$sName = $oBackup->MakeName($sBackupFile);
+			if ($sName == '')
+			{
+				$sName = $oBackup->MakeName(BACKUP_DEFAULT_FORMAT);
+			}
+			$sZipFile = $this->sBackupDir.$sName.'.zip';
+			$sSourceConfigFile = APPCONF.utils::GetCurrentEnvironment().'/'.ITOP_CONFIG_FILE;
+			$oBackup->CreateZip($sZipFile, $sSourceConfigFile);
+		}
+		catch (Exception $e)
+		{
+			$oMutex->Unlock();
+			throw $e;
+		}
+		$oMutex->Unlock();
+		return "Created the backup: $sZipFile";
+	}
+
+	/*
+		Interpret current setting for the week days
+		@returns array of int (monday = 1)
+	*/
+	public function InterpretWeekDays()
+	{
+		static $aWEEKDAYTON = array('monday' => 1, 'tuesday' => 2, 'wednesday' => 3, 'thursday' => 4, 'friday' => 5, 'saturday' => 6, 'sunday' => 7);
+		$aDays = array();
+		$sWeekDays = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'week_days', 'monday, tuesday, wednesday, thursday, friday');
+		if ($sWeekDays != '')
+		{
+			$aWeekDaysRaw = explode(',', $sWeekDays);
+			foreach ($aWeekDaysRaw as $sWeekDay)
+			{
+				$sWeekDay = strtolower(trim($sWeekDay));
+				if (array_key_exists($sWeekDay, $aWEEKDAYTON))
+				{
+					$aDays[] = $aWEEKDAYTON[$sWeekDay];
+				}
+				else
+				{
+					throw new Exception("'itop-backup: wrong format for setting 'week_days' (found '$sWeekDay')");
+				}
+			}
+		}
+		if (count($aDays) == 0)
+		{
+			throw new Exception("'itop-backup: missing setting 'week_days'");
+		}
+		$aDays = array_unique($aDays);   
+		sort($aDays);
+		return $aDays;
+	}
+
+	/*
+		Gives the exact time at which the process must be run next time
+		@returns DateTime
+	*/
+	public function GetNextOccurrence()
+	{
+		$bEnabled = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'enabled', true);
+		if (!$bEnabled)
+		{
+			$oRet = new DateTime('3000-01-01');
+		}
+		else
+		{
+			// 1st - Interpret the list of days as ordered numbers (monday = 1)
+			// 
+			$aDays = $this->InterpretWeekDays();	
+	
+			// 2nd - Find the next active week day
+			//
+			$sBackupTime = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'time', '23:30');
+			if (!preg_match('/[0-2][0-9]:[0-5][0-9]/', $sBackupTime))
+			{
+				throw new Exception("'itop-backup: wrong format for setting 'time' (found '$sBackupTime')");
+			}
+			$oNow = new DateTime();
+			$iNextPos = false;
+			for ($iDay = $oNow->format('N') ; $iDay <= 7 ; $iDay++)
+			{
+				$iNextPos = array_search($iDay, $aDays);
+				if ($iNextPos !== false)
+				{
+					if (($iDay > $oNow->format('N')) || ($oNow->format('H:i') < $sBackupTime))
+					{
+						break;
+					}
+				}
+			}
+	
+			// 3rd - Compute the result
+			//
+			if ($iNextPos === false)
+			{
+				// Jump to the first day within the next week
+				$iFirstDayOfWeek = $aDays[0];
+				$iDayMove = $oNow->format('N') - $iFirstDayOfWeek;
+				$oRet = clone $oNow;
+				$oRet->modify('-'.$iDayMove.' days');
+				$oRet->modify('+1 weeks');
+			}
+			else
+			{
+				$iNextDayOfWeek = $aDays[$iNextPos];
+				$iMove = $iNextDayOfWeek - $oNow->format('N');
+				$oRet = clone $oNow;
+				$oRet->modify('+'.$iMove.' days');
+			}
+			list($sHours, $sMinutes) = explode(':', $sBackupTime);
+			$oRet->setTime((int)$sHours, (int) $sMinutes);
+		}
+		return $oRet;
+	}
+}
+
+class ItopBackup extends ModuleHandlerAPI
+{
+	public static function OnMenuCreation()
+	{
+		if (UserRights::IsAdministrator())
+		{
+			$oAdminMenu = new MenuGroup('AdminTools', 80 /* fRank */);
+			new WebPageMenuNode('BackupStatus', utils::GetAbsoluteUrlModulePage('itop-backup', 'status.php'), $oAdminMenu->GetIndex(), 15 /* fRank */);
+		}
+	}
+}
+

datamodels/2.x/itop-backup/module.itop-backup.php

@@ -0,0 +1,60 @@
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-backup/2.1.1',
+	array(
+		// Identification
+		//
+		'label' => 'Backup utilities',
+		'category' => 'Application management',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => false,
+
+		// Components
+		//
+		'datamodel' => array(
+			'main.itop-backup.php',
+			//'model.itop-backup.php',
+		),
+		'webservice' => array(
+			//'webservices.itop-backup.php',
+		),
+		'dictionary' => array(
+			'en.dict.itop-backup.php',
+			'fr.dict.itop-backup.php',
+			//'de.dict.itop-backup.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-backup.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-backup.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+			'mysql_bindir' => '',
+			'week_days' => 'monday, tuesday, wednesday, thursday, friday',
+			'time' => '23:30',
+			//'file_name_format' => '__DB__-%Y-%m-%d_%H_%M',
+			'retention_count' => 5, 
+			'enabled' => true,
+			'debug' => false
+		),
+	)
+);
+
+?>

datamodels/2.x/itop-backup/status.php

@@ -0,0 +1,410 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Monitor the backup
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../../approot.inc.php');
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'application/startup.inc.php');
+
+require_once(APPROOT.'application/loginwebpage.class.inc.php');
+
+
+/////////////////////////////////////////////////////////////////////
+// Main program
+//
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+//$sOperation = utils::ReadParam('operation', 'menu');
+//$oAppContext = new ApplicationContext();
+
+$oP = new iTopWebPage(Dict::S('bkp-status-title'));
+$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
+
+
+try
+{
+	$oP->add("<h1>".Dict::S('bkp-status-title')."</h1>");
+
+	if (MetaModel::GetConfig()->Get('demo_mode'))
+	{
+		$oP->add("<div class=\"header_message message_info\">iTop is in <b>demonstration mode</b>: the feature is disabled.</div>");
+	}
+
+	$sImgOk = '<img src="../images/validation_ok.png"> ';
+	$sImgError = '<img src="../images/validation_error.png"> ';
+
+	$oP->add("<fieldset>");
+	$oP->add("<legend>".Dict::S('bkp-status-checks')."</legend>");
+
+	// Availability of mysqldump
+	//
+	$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
+	$sMySQLBinDir = utils::ReadParam('mysql_bindir', $sMySQLBinDir, true);
+	if (empty($sMySQLBinDir))
+	{
+		$sMySQLDump = 'mysqldump';
+	}
+	else
+	{
+		//echo 'Info - Found mysql_bindir: '.$sMySQLBinDir;
+		$sMySQLDump = '"'.$sMySQLBinDir.'/mysqldump"';
+	}
+	$sCommand = "$sMySQLDump -V 2>&1";
+
+	$aOutput = array();
+	$iRetCode = 0;
+	exec($sCommand, $aOutput, $iRetCode);
+	if ($iRetCode == 0)
+	{
+		$sMySqlDump = $sImgOk.Dict::Format("bkp-mysqldump-ok", $aOutput[0]);
+	}
+	elseif ($iRetCode == 1)
+	{
+		$sMySqlDump = $sImgError.Dict::Format("bkp-mysqldump-notfound", implode(' ', $aOutput));
+	}
+	else
+	{
+		$sMySqlDump = $sImgError.Dict::Format("bkp-mysqldump-issue", $iRetCode);
+	}
+	foreach($aOutput as $sLine)
+	{
+		//echo 'Info - mysqldump -V said: '.$sLine;
+	}
+	$oP->p($sMySqlDump);
+
+	// Destination directory
+	//
+	// Make sure the target directory exists and is writeable
+	$sBackupDir = APPROOT.'data/backups/';
+	SetupUtils::builddir($sBackupDir);
+	if (!is_dir($sBackupDir))
+	{
+		$oP->p($sImgError.Dict::Format('bkp-missing-dir', $sBackupDir));
+	}
+	else
+	{
+		$oP->p(Dict::Format('bkp-free-disk-space', SetupUtils::HumanReadableSize(SetupUtils::CheckDiskSpace($sBackupDir)), $sBackupDir));
+		if (!is_writable($sBackupDir))
+		{
+			$oP->p($sImgError.Dict::Format('bkp-dir-not-writeable', $sBackupDir));
+		}
+	}
+	$sBackupDirAuto = $sBackupDir.'auto/';
+	SetupUtils::builddir($sBackupDirAuto);
+	$sBackupDirManual = $sBackupDir.'manual/';
+	SetupUtils::builddir($sBackupDirManual);
+
+	// Wrong format
+	//
+	$sBackupFile = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'file_name_format', BACKUP_DEFAULT_FORMAT);
+	$oBackup = new DBBackupScheduled();
+	$sZipName = $oBackup->MakeName($sBackupFile);
+	if ($sZipName == '')
+	{
+		$oP->p($sImgError.Dict::Format('bkp-wrong-format-spec', $sBackupFile, BACKUP_DEFAULT_FORMAT));
+	}
+	else
+	{
+		$oP->p(Dict::Format('bkp-name-sample', $sZipName));
+	}
+
+	// Week Days
+	//
+	$aWeekDayToString = array(
+		1 => Dict::S('DayOfWeek-Monday'),
+		2 => Dict::S('DayOfWeek-Tuesday'),
+		3 => Dict::S('DayOfWeek-Wednesday'),
+		4 => Dict::S('DayOfWeek-Thursday'),
+		5 => Dict::S('DayOfWeek-Friday'),
+		6 => Dict::S('DayOfWeek-Saturday'),
+		7 => Dict::S('DayOfWeek-Sunday')
+	);
+	$aDayLabels = array();
+	$oBackupExec = new BackupExec();
+	foreach ($oBackupExec->InterpretWeekDays() as $iDay)
+	{
+		$aDayLabels[] = $aWeekDayToString[$iDay];
+	}
+	$sDays = implode(', ', $aDayLabels);
+	$sBackupTime = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'time', '23:30');
+	$oP->p(Dict::Format('bkp-week-days', $sDays, $sBackupTime));
+
+	$iRetention = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'retention_count', 5);
+	$oP->p(Dict::Format('bkp-retention', $iRetention));
+
+	$oP->add("</fieldset>");
+
+	// List of backups
+	//
+	$aFiles = $oBackup->ListFiles($sBackupDirAuto);
+	$aFilesToDelete = array();
+	while (count($aFiles) > $iRetention - 1)
+	{
+		$aFilesToDelete[] = array_shift($aFiles);
+	}
+
+	$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
+	if ($oRestoreMutex->TryLock())
+	{
+		$oRestoreMutex->Unlock();
+		$sDisableRestore = '';
+	}
+	else
+	{
+		$sDisableRestore = 'disabled="disabled"';
+	}
+	
+	// 1st table: list the backups made in the background
+	//
+	$aDetails = array();
+	foreach ($oBackup->ListFiles($sBackupDirAuto) as $sBackupFile)
+	{
+		$sFileName = basename($sBackupFile);
+		$sFilePath = 'auto/'.$sFileName;
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			$sName = $sFileName;
+		}
+		else
+		{
+			$sAjax = utils::GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php', array('operation' => 'download', 'file' => $sFilePath));
+			$sName = "<a href=\"$sAjax\">".$sFileName.'</a>';
+		}
+		$sSize = SetupUtils::HumanReadableSize(filesize($sBackupFile));
+		$sConfirmRestore = addslashes(Dict::Format('bkp-confirm-restore', $sFileName));
+		$sFileEscaped = addslashes($sFilePath);
+		$sRestoreBtn = '<button class="restore" onclick="LaunchRestoreNow(\''.$sFileEscaped.'\', \''.$sConfirmRestore.'\');" '.$sDisableRestore.'>'.Dict::S('bkp-button-restore-now').'</button>';
+		if (in_array($sBackupFile, $aFilesToDelete))
+		{
+			$aDetails[] = array('file' => $sName.' <span class="next_to_delete" title="'.Dict::S('bkp-next-to-delete').'">*</span>', 'size' => $sSize, 'actions' => $sRestoreBtn);
+		}
+		else
+		{
+			$aDetails[] = array('file' => $sName, 'size' => $sSize, 'actions' => $sRestoreBtn);
+		}
+	}
+	$aConfig = array(
+		'file' => array('label' => Dict::S('bkp-table-file'), 'description' => Dict::S('bkp-table-file+')),
+		'size' => array('label' => Dict::S('bkp-table-size'), 'description' => Dict::S('bkp-table-size+')),
+		'actions' => array('label' => Dict::S('bkp-table-actions'), 'description' => Dict::S('bkp-table-actions+')),
+	);
+	$oP->add("<fieldset>");
+	$oP->add("<legend>".Dict::S('bkp-status-backups-auto')."</legend>");
+	if (count($aDetails) > 0)
+	{
+		$oP->add('<div style="max-height:400px; overflow: auto;">');
+		$oP->table($aConfig, array_reverse($aDetails));
+		$oP->add('</div>');
+	}
+	else
+	{
+		$oP->p(Dict::S('bkp-status-backups-none'));
+	}
+	$oP->add("</fieldset>");
+
+	// 2nd table: list the backups made manually
+	//
+	$aDetails = array();
+	foreach ($oBackup->ListFiles($sBackupDirManual) as $sBackupFile)
+	{
+		$sFileName = basename($sBackupFile);
+		$sFilePath = 'manual/'.$sFileName;
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			$sName = $sFileName;
+		}
+		else
+		{
+			$sAjax = utils::GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php', array('operation' => 'download', 'file' => $sFilePath));
+			$sName = "<a href=\"$sAjax\">".$sFileName.'</a>';
+		}
+		$sSize = SetupUtils::HumanReadableSize(filesize($sBackupFile));
+		$sConfirmRestore = addslashes(Dict::Format('bkp-confirm-restore', $sFileName));
+		$sFileEscaped = addslashes($sFilePath);
+		$sRestoreBtn = '<button class="restore" onclick="LaunchRestoreNow(\''.$sFileEscaped.'\', \''.$sConfirmRestore.'\');" '.$sDisableRestore.'>'.Dict::S('bkp-button-restore-now').'</button>';
+		$aDetails[] = array('file' => $sName, 'size' => $sSize, 'actions' => $sRestoreBtn);
+	}
+	$aConfig = array(
+		'file' => array('label' => Dict::S('bkp-table-file'), 'description' => Dict::S('bkp-table-file+')),
+		'size' => array('label' => Dict::S('bkp-table-size'), 'description' => Dict::S('bkp-table-size+')),
+		'actions' => array('label' => Dict::S('bkp-table-actions'), 'description' => Dict::S('bkp-table-actions+')),
+	);
+	$oP->add("<fieldset>");
+	$oP->add("<legend>".Dict::S('bkp-status-backups-manual')."</legend>");
+	if (count($aDetails) > 0)
+	{
+		$oP->add('<div style="max-height:400px; overflow: auto;">');
+		$oP->table($aConfig, array_reverse($aDetails));
+		$oP->add('</div>');
+	}
+	else
+	{
+		$oP->p(Dict::S('bkp-status-backups-none'));
+	}
+	$oP->add("</fieldset>");
+
+	// Ongoing operation ?
+	//
+	$oBackupMutex = new iTopMutex('backup.'.utils::GetCurrentEnvironment());
+	if ($oBackupMutex->TryLock())
+	{
+		$oBackupMutex->Unlock();
+	}
+	else
+	{
+		$oP->p(Dict::S('bkp-backup-running'));
+	}
+	$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
+	if ($oRestoreMutex->TryLock())
+	{
+		$oRestoreMutex->Unlock();
+	}
+	else
+	{
+		$oP->p(Dict::S('bkp-restore-running'));
+	}
+
+	// Do backup now
+	//
+	$oBackupExec = new BackupExec();
+	$oNext = $oBackupExec->GetNextOccurrence();
+	$oP->p(Dict::Format('bkp-next-backup', $aWeekDayToString[$oNext->Format('N')], $oNext->Format('Y-m-d'), $oNext->Format('H:i')));
+	$oP->p('<button onclick="LaunchBackupNow();">'.Dict::S('bkp-button-backup-now').'</button>');
+	$oP->add('<div id="backup_success" class="header_message message_ok" style="display: none;"></div>');
+	$oP->add('<div id="backup_errors" class="header_message message_error" style="display: none;"></div>');
+	$oP->add('<input type="hidden" name="restore_token" id="restore_token"/>');
+	
+	$sConfirmBackup = addslashes(Dict::S('bkp-confirm-backup'));
+	$sPleaseWaitBackup = addslashes(Dict::S('bkp-wait-backup'));
+	$sPleaseWaitRestore = addslashes(Dict::S('bkp-wait-restore'));
+	$sRestoreDone = addslashes(Dict::S('bkp-success-restore'));
+
+	$sMySQLBinDir = addslashes(MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''));
+	$sDBHost = addslashes(MetaModel::GetConfig()->GetDBHost());
+	$sDBUser = addslashes(MetaModel::GetConfig()->GetDBUser());
+	$sDBPwd = addslashes(MetaModel::GetConfig()->GetDBPwd());
+	$sDBName = addslashes(MetaModel::GetConfig()->GetDBName());
+	$sDBSubName = addslashes(MetaModel::GetConfig()->GetDBSubName());
+
+	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
+	
+	$oP->add_script(
+<<<EOF
+function LaunchBackupNow()
+{
+	$('#backup_success').hide();
+	$('#backup_errors').hide();
+
+	if (confirm('$sConfirmBackup'))
+	{
+		$.blockUI({ message: '<h1><img src="../images/indicator.gif" /> $sPleaseWaitBackup</h1>' });
+
+		var oParams = {};
+		oParams.operation = 'backup';
+		$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
+			if (data.search(/error|exceptio|notice|warning/i) != -1)
+			{
+				$('#backup_errors').html(data);
+				$('#backup_errors').show();
+			}
+			else
+			{
+				window.location.reload();
+			}
+			$.unblockUI();
+		});
+	}
+}
+function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
+{
+	if (confirm(sConfirmationMessage))
+	{
+		$.blockUI({ message: '<h1><img src="../images/indicator.gif" /> $sPleaseWaitRestore</h1>' });
+
+		$('#backup_success').hide();
+		$('#backup_errors').hide();
+
+		var oParams = {};
+		oParams.operation = 'restore_get_token';
+		oParams.file = sBackupFile;
+		$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
+
+			// Get the value of restore_token
+			$('#backup_errors').append(data);
+
+			var oParams = {};
+			oParams.operation = 'restore_exec';
+			oParams.token = $("#restore_token").val();
+			oParams.mysql_bindir = '$sMySQLBinDir';
+			oParams.db_host = '$sDBHost';
+			oParams.db_user = '$sDBUser';
+			oParams.db_pwd = '$sDBPwd';
+			oParams.db_name = '$sDBName';
+			oParams.db_subname = '$sDBSubName';
+			oParams.environment = '$sEnvironment';
+			if (oParams.token.length > 0)
+			{
+				$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
+					if (data.search(/error|exceptio|notice|warning/i) != -1)
+					{
+						$('#backup_success').hide();
+						$('#backup_errors').html(data);
+						$('#backup_errors').show();
+					}
+					else
+					{
+						$('#backup_errors').hide();
+						$('#backup_success').html('$sRestoreDone');
+						$('#backup_success').show();
+					}
+					$.unblockUI();
+				});
+			}
+			else
+			{
+				$('button.restore').attr('disabled', 'disabled');
+				$.unblockUI();
+			}
+		});
+	}
+}
+EOF
+	);
+
+	if (MetaModel::GetConfig()->Get('demo_mode'))
+	{
+		$oP->add_ready_script("$('button').attr('disabled', 'disabled').attr('title', 'Disabled in demonstration mode')");
+	}
+}
+catch(Exception $e)
+{
+	$oP->p('<b>'.$e->getMessage().'</b>');
+}
+
+$oP->output();
+?>

datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
+        <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
@@ -91,4 +92,4 @@
       </presentation>
     </class>
   </classes>
-</itop_design>
+</itop_design>

datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/2.0.0',
+	'itop-bridge-virtualization-storage/2.1.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/2.0.0',
+	'itop-change-mgmt-itil/2.1.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt-itil/ru.dict.itop-change-mgmt-itil.php

@@ -1,126 +1,64 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
 /**
- * @author	Vladimir Shilov <shilow@ukr.net>
-
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
+ * Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
+ * 
+ * @author   Vladimir Kunin <v.b.kunin@gmail.com>
+ * @license   http://opensource.org/licenses/AGPL-3.0
+ *
+ * 
+ * Инструкция по установке
+ * 
+ * Процесс установки заключается в замене имеющихся локализационных файлов полученными и последующем запуске процедуры обновления iTop для перекомпиляции кода.
+ * 	1. Скопируйте с заменой два полученных файла из "itop-rus/dictionaries" в "путь/до/вашего/itop/dictionaries".
+ * 	2. Скопируйте с заменой полученные файлы "itop-rus/datamodels/2.x/название-модуля/ru.dict.название-модуля.php" в "путь/до/вашего/itop/datamodels/2.x/название-модуля".
+ *  3. Перейдите по адресу "http://адрес/вашего/itop/setup", при этом файл "путь/до/вашего/itop/conf/production/config-itop.php" должен быть доступен для записи.
+ *  4. На второй странице установщика выберите "Upgrade an existing iTop instance" и следуйте дальнейшим инструкциям установщика.
+ *
+ * Ответы на вопросы по установке и использованию переводов, а также на любые другие вопросы по iTop всегда можно получить на сайте сообщества iTop по-русски http://community.itop-itsm.ru.
+ *
  */
 
 Dict::Add('RU RU', 'Russian', 'Русский', array(
-	'Class:RoutineChange' => 'Регулярное изменение',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => 'Проверить',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject~~',
-	'Class:RoutineChange/Stimulus:ev_reject+' => '',
-	'Class:RoutineChange/Stimulus:ev_assign' => 'Назначить',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => 'Переоткрыть',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Планировать',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve~~',
-	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Перепланировать',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve~~',
-	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
-	'Class:RoutineChange/Stimulus:ev_implement' => 'Реализовать',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => 'Контролировать',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => 'Закончить',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-	'Class:NormalChange' => 'Обычное изменение',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => 'Дата принятия',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => 'Коментарий принятия',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => 'Проверить',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => 'Отклонить',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => 'Назначить',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => 'Переоткрыть',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Планировать',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => 'Утвердить',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Перепланировать',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => 'Отклонить утверждение',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => 'Реализовать',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => 'Контролировать',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => 'Закончить',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-	'Class:EmergencyChange' => 'Критическое изменение',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => 'Проверить',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => 'Отклонить',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => 'Назначить',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Переоткрыть',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Планировать',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => 'Утвердить',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Перепланировать',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Отклонить утверждение',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => 'Реализовать',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Контролировать',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => 'Закончить',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
 	'Menu:ChangeManagement' => 'Управление изменениями',
 	'Menu:Change:Overview' => 'Обзор',
 	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Новые изменения',
+	'Menu:NewChange' => 'Новый запрос на изменение',
 	'Menu:NewChange+' => 'Создание нового запроса на изменение',
 	'Menu:SearchChanges' => 'Поиск изменений',
-	'Menu:SearchChanges+' => 'Поиск запросов на изменения',
+	'Menu:SearchChanges+' => 'Поиск запросов на изменение',
 	'Menu:Change:Shortcuts' => 'Ярлыки',
 	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Изменения ожидающие принятия',
+	'Menu:WaitingAcceptance' => 'Изменения, ожидающие принятия',
 	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Изменения ожидающие утверждения',
+	'Menu:WaitingApproval' => 'Изменения, ожидающие утверждения',
 	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => 'Открытые изменения',
-	'Menu:Changes+' => '',
-	'Menu:MyChanges' => 'Изменения назначенные на меня',
-	'Menu:MyChanges+' => 'Изменения назначенные на меня (как агент)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
+	'Menu:Changes+' => 'Все открытые изменения',
+	'Menu:MyChanges' => 'Изменения, назначенные на меня',
+	'Menu:MyChanges+' => 'Изменения, назначенные на меня (как агента)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Изменения по категориям за 7 дней',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Количество изменений за 7 дней',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Изменения по домену за 7 дней',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Изменения по статусу за 7 дней',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Change' => 'Изменение',
 	'Class:Change+' => '',
 	'Class:Change/Attribute:status' => 'Статус',
@@ -133,15 +71,15 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Change/Attribute:status/Value:rejected+' => '',
 	'Class:Change/Attribute:status/Value:assigned' => 'Назначен',
 	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Намечен и запланирован',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Запланирован',
 	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
 	'Class:Change/Attribute:status/Value:approved' => 'Утверждён',
 	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Не утверждём',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Не утверждён',
 	'Class:Change/Attribute:status/Value:notapproved+' => '',
 	'Class:Change/Attribute:status/Value:implemented' => 'Реализован',
 	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => 'Контролируемый',
+	'Class:Change/Attribute:status/Value:monitored' => 'Под наблюдением',
 	'Class:Change/Attribute:status/Value:monitored+' => '',
 	'Class:Change/Attribute:status/Value:closed' => 'Закрыт',
 	'Class:Change/Attribute:status/Value:closed+' => '',
@@ -149,59 +87,61 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Change/Attribute:reason+' => '',
 	'Class:Change/Attribute:requestor_id' => 'Инициатор запроса',
 	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => 'Инициатор запроса',
+	'Class:Change/Attribute:requestor_email' => 'Email инициатора запроса',
 	'Class:Change/Attribute:requestor_email+' => '',
 	'Class:Change/Attribute:creation_date' => 'Создан',
 	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:impact' => 'Воздействие',
+	'Class:Change/Attribute:impact' => 'Критичность',
 	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => 'Руководитель команды',
+	'Class:Change/Attribute:supervisor_group_id' => 'Команда наблюдателя',
 	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => 'Руководитель команды',
+	'Class:Change/Attribute:supervisor_group_name' => 'Команда наблюдателя',
 	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => 'Руководитель',
+	'Class:Change/Attribute:supervisor_id' => 'Наблюдатель',
 	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => 'Руководитель',
+	'Class:Change/Attribute:supervisor_email' => 'Email наблюдателя',
 	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => 'Менеджер команды',
+	'Class:Change/Attribute:manager_group_id' => 'Команда менеджера',
 	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => 'Менеджер команды',
+	'Class:Change/Attribute:manager_group_name' => 'Команда менеджера',
 	'Class:Change/Attribute:manager_group_name+' => '',
 	'Class:Change/Attribute:manager_id' => 'Менеджер',
 	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => 'Менеджер',
+	'Class:Change/Attribute:manager_email' => 'Email менеджера',
 	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => 'Отключение',
+	'Class:Change/Attribute:outage' => 'Простой услуги',
 	'Class:Change/Attribute:outage+' => '',
 	'Class:Change/Attribute:outage/Value:no' => 'Нет',
 	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Отключение',
+	'Class:Change/Attribute:outage/Value:yes' => 'Да',
 	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:fallback' => 'Резервный план',
+	'Class:Change/Attribute:fallback' => 'План отката',
 	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Attribute:parent_id' => 'Parent change~~',
+	'Class:Change/Attribute:parent_id' => 'Родительское изменение',
 	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
+	'Class:Change/Attribute:parent_name' => 'Имя родительского изменения',
 	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
-	'Class:Change/Attribute:related_request_list+' => '',
-	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
-	'Class:Change/Attribute:related_problems_list+' => '',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
-	'Class:Change/Attribute:child_changes_list+' => '',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
+	'Class:Change/Attribute:related_request_list' => 'Связанные запросы',
+	'Class:Change/Attribute:related_request_list+' => 'Связанные запросы',
+	'Class:Change/Attribute:related_problems_list' => 'Связанные проблемы',
+	'Class:Change/Attribute:related_problems_list+' => 'Связанные проблемы',
+	'Class:Change/Attribute:related_incident_list' => 'Связанные инциденты',
+	'Class:Change/Attribute:related_incident_list+' => 'Связанные инциденты',
+	'Class:Change/Attribute:child_changes_list' => 'Дочерние изменения',
+	'Class:Change/Attribute:child_changes_list+' => 'Дочерние изменения',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Родительское изменение',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Тип изменения',
 	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
-	'Class:Change/Stimulus:ev_validate' => 'Проверка',
+	'Class:Change/Stimulus:ev_validate' => 'Подтвердить',
 	'Class:Change/Stimulus:ev_validate+' => '',
 	'Class:Change/Stimulus:ev_reject' => 'Отклонить',
 	'Class:Change/Stimulus:ev_reject+' => '',
 	'Class:Change/Stimulus:ev_assign' => 'Назначить',
 	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Переоткрыть',
+	'Class:Change/Stimulus:ev_reopen' => 'Вновь открыть',
 	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'План',
+	'Class:Change/Stimulus:ev_plan' => 'Планировать',
 	'Class:Change/Stimulus:ev_plan+' => '',
 	'Class:Change/Stimulus:ev_approve' => 'Утвердить',
 	'Class:Change/Stimulus:ev_approve+' => '',
@@ -211,25 +151,63 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:Change/Stimulus:ev_notapprove+' => '',
 	'Class:Change/Stimulus:ev_implement' => 'Реализовать',
 	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => 'Наблюдение',
+	'Class:Change/Stimulus:ev_monitor' => 'Наблюдать',
 	'Class:Change/Stimulus:ev_monitor+' => '',
 	'Class:Change/Stimulus:ev_finish' => 'Закончить',
 	'Class:Change/Stimulus:ev_finish+' => '',
-	'Class:ApprovedChange' => 'Утверждённые изменения',
+));
+
+//
+// Class: RoutineChange
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:RoutineChange' => 'Стандартное изменение',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => 'Подтвердить',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Отклонить',
+	'Class:RoutineChange/Stimulus:ev_reject+' => '',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Назначить',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => 'Вновь открыть',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Планировать',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_approve' => 'Утвердить',
+	'Class:RoutineChange/Stimulus:ev_approve+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Перепланировать',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Отклонить',
+	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Реализовать',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => 'Наблюдать',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => 'Закончить',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: ApprovedChange
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:ApprovedChange' => 'Утверждаемые изменения',
 	'Class:ApprovedChange+' => '',
 	'Class:ApprovedChange/Attribute:approval_date' => 'Дата утверждения',
 	'Class:ApprovedChange/Attribute:approval_date+' => '',
 	'Class:ApprovedChange/Attribute:approval_comment' => 'Коментарий утверждения',
 	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => 'Проверка',
+	'Class:ApprovedChange/Stimulus:ev_validate' => 'Подтвердить',
 	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => 'Отклонение',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Отклонить',
 	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => 'Назначение',
+	'Class:ApprovedChange/Stimulus:ev_assign' => 'Назначить',
 	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Переоткрыть',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Вновь открыть',
 	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'План',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Планировать',
 	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
 	'Class:ApprovedChange/Stimulus:ev_approve' => 'Утвердить',
 	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
@@ -239,9 +217,76 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
 	'Class:ApprovedChange/Stimulus:ev_implement' => 'Реализовать',
 	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Контролировать',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Наблюдать',
 	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
 	'Class:ApprovedChange/Stimulus:ev_finish' => 'Закончить',
 	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
 ));
-?>
+
+//
+// Class: NormalChange
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:NormalChange' => 'Нормальное изменение',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => 'Дата принятия',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => 'Комментарий принятия',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => 'Подтвердить',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Отклонить',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => 'Назначить',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => 'Вновь открыть',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Планировать',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => 'Утвердить',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Перепланировать',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Отклонить',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Реализовать',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => 'Наблюдать',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => 'Закончить',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: EmergencyChange
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	'Class:EmergencyChange' => 'Экстренное изменение',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => 'Подтвердить',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Отклонить',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => 'Назначить',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Вновь открыть',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Планировать',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => 'Утвердить',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Перепланировать',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Отклонить',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Реализовать',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Наблюдать',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => 'Закончить',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+));
+
+?>

datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -38,12 +38,12 @@
       <fields>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>new</value>
-            <value>assigned</value>
-            <value>planned</value>
-            <value>approved</value>
-            <value>closed</value>
-            <value>rejected</value>
+            <value id="new">new</value>
+            <value id="assigned">assigned</value>
+            <value id="planned">planned</value>
+            <value id="approved">approved</value>
+            <value id="closed">closed</value>
+            <value id="rejected">rejected</value>
           </values>
           <sql>status</sql>
           <default_value>new</default_value>
@@ -51,12 +51,12 @@
         </field>
         <field id="category" xsi:type="AttributeEnum">
           <values>
-            <value>hardware</value>
-            <value>software</value>
-            <value>system</value>
-            <value>network</value>
-            <value>application</value>
-            <value>other</value>
+            <value id="hardware">hardware</value>
+            <value id="software">software</value>
+            <value id="system">system</value>
+            <value id="network">network</value>
+            <value id="application">application</value>
+            <value id="other">other</value>
           </values>
           <sql>category</sql>
           <default_value>hardware</default_value>
@@ -105,6 +105,15 @@
           <default_value/>
           <is_null_allowed>true</is_null_allowed>
         </field>
+        <field id="outage" xsi:type="AttributeEnum">
+          <values>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
+          </values>
+          <sql>outage</sql>
+          <default_value>no</default_value>
+          <is_null_allowed>false</is_null_allowed>
+        </field>
         <field id="related_request_list" xsi:type="AttributeLinkedSet">
           <linked_class>UserRequest</linked_class>
           <ext_key_to_me>parent_change_id</ext_key_to_me>
@@ -136,6 +145,23 @@
         </field>
       </fields>
       <lifecycle>
+        <highlight_scale>
+          <item id="approved">
+            <rank>1</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/change-approved.png</icon>
+          </item>
+          <item id="rejected">
+            <rank>2</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/change-rejected.png</icon>
+          </item>
+          <item id="closed">
+            <rank>3</rank>
+            <color>HIGHLIGHT_CLASS_NONE</color>
+            <icon>images/change-closed.png</icon>
+          </item>
+        </highlight_scale>
         <attribute>status</attribute>
         <stimuli>
           <stimulus id="ev_assign" xsi:type="StimulusUserAction"/>
@@ -187,23 +213,20 @@
               <attribute id="changemanager_id">
                 <hidden/>
               </attribute>
+              <attribute id="outage">
+                <hidden/>
+              </attribute>
             </flags>
             <transitions>
-              <transition>
-                <stimulus>ev_assign</stimulus>
+              <transition id="ev_assign">
                 <target>assigned</target>
                 <actions/>
               </transition>
             </transitions>
           </state>
           <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
               <attribute id="team_id">
                 <mandatory/>
                 <must_prompt/>
@@ -212,54 +235,22 @@
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="title">
-                <mandatory/>
-              </attribute>
-              <attribute id="description">
-                <mandatory/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="reject_reason">
-                <hidden/>
-              </attribute>
               <attribute id="changemanager_id">
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="creation_date">
-                <read_only/>
-              </attribute>
-              <attribute id="approval_date">
-                <hidden/>
-              </attribute>
+              <attribute id="caller_id"/>
             </flags>
             <transitions>
-              <transition>
-                <stimulus>ev_plan</stimulus>
+              <transition id="ev_plan">
                 <target>planned</target>
                 <actions/>
               </transition>
             </transitions>
           </state>
           <state id="planned">
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="title">
-                <mandatory/>
-              </attribute>
-              <attribute id="description">
-                <mandatory/>
-              </attribute>
               <attribute id="start_date">
                 <mandatory/>
                 <must_prompt/>
@@ -268,21 +259,6 @@
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="reject_reason">
-                <hidden/>
-              </attribute>
-              <attribute id="creation_date">
-                <read_only/>
-              </attribute>
-              <attribute id="approval_date">
-                <hidden/>
-              </attribute>
               <attribute id="fallback_plan">
                 <mandatory/>
                 <must_prompt/>
@@ -290,24 +266,17 @@
               <attribute id="caller_id">
                 <mandatory/>
               </attribute>
-              <attribute id="team_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="agent_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="changemanager_id">
+              <attribute id="outage">
                 <mandatory/>
+                <must_prompt/>
               </attribute>
             </flags>
             <transitions>
-              <transition>
-                <stimulus>ev_reject</stimulus>
+              <transition id="ev_reject">
                 <target>rejected</target>
                 <actions/>
               </transition>
-              <transition>
-                <stimulus>ev_approve</stimulus>
+              <transition id="ev_approve">
                 <target>approved</target>
                 <actions>
                   <action>
@@ -321,8 +290,31 @@
             </transitions>
           </state>
           <state id="rejected">
+            <highlight>
+              <code>rejected</code>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
+              <attribute id="start_date">
+                <read_only/>
+              </attribute>
+              <attribute id="end_date">
+                <read_only/>
+              </attribute>
+              <attribute id="private_log">
+                <read_only/>
+                <read_only/>
+              </attribute>
+              <attribute id="caller_id">
+                <read_only/>
+              </attribute>
+              <attribute id="fallback_plan">
+                <read_only/>
+              </attribute>
+              <attribute id="category">
+                <read_only/>
+              </attribute>
+              <attribute id="parent_id">
                 <read_only/>
               </attribute>
               <attribute id="org_id">
@@ -334,34 +326,13 @@
               <attribute id="description">
                 <read_only/>
               </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="end_date">
-                <read_only/>
-              </attribute>
-              <attribute id="private_log">
-                <read_only/>
-              </attribute>
               <attribute id="reject_reason">
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="creation_date">
-                <read_only/>
-              </attribute>
               <attribute id="approval_date">
                 <read_only/>
               </attribute>
-              <attribute id="caller_id">
-                <read_only/>
-              </attribute>
               <attribute id="team_id">
                 <read_only/>
               </attribute>
@@ -371,32 +342,26 @@
               <attribute id="changemanager_id">
                 <read_only/>
               </attribute>
-              <attribute id="private_log">
-                <read_only/>
-              </attribute>
-              <attribute id="fallback_plan">
-                <read_only/>
-              </attribute>
-              <attribute id="category">
-                <read_only/>
-              </attribute>
-              <attribute id="parent_id">
+              <attribute id="outage">
                 <read_only/>
               </attribute>
             </flags>
             <transitions>
-              <transition>
-                <stimulus>ev_reopen</stimulus>
+              <transition id="ev_reopen">
                 <target>assigned</target>
                 <actions/>
               </transition>
             </transitions>
           </state>
           <state id="approved">
+            <highlight>
+              <code>approved</code>
+            </highlight>
+            <inherit_flags_from>planned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
+              <attribute id="private_log"/>
+              <attribute id="category"/>
+              <attribute id="parent_id"/>
               <attribute id="org_id">
                 <read_only/>
               </attribute>
@@ -406,21 +371,12 @@
               <attribute id="description">
                 <read_only/>
               </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
               <attribute id="start_date">
                 <read_only/>
               </attribute>
               <attribute id="end_date">
                 <read_only/>
               </attribute>
-              <attribute id="private_log">
-                <normal/>
-              </attribute>
               <attribute id="reject_reason">
                 <read_only/>
               </attribute>
@@ -442,19 +398,13 @@
               <attribute id="changemanager_id">
                 <read_only/>
               </attribute>
-              <attribute id="fallback_plan">
-                <normal/>
-              </attribute>
-              <attribute id="category">
-                <normal/>
-              </attribute>
-              <attribute id="parent_id">
-                <normal/>
+              <attribute id="fallback_plan"/>
+              <attribute id="outage">
+                <read_only/>
               </attribute>
             </flags>
             <transitions>
-              <transition>
-                <stimulus>ev_finish</stimulus>
+              <transition id="ev_finish">
                 <target>closed</target>
                 <actions>
                   <action>
@@ -465,52 +415,17 @@
             </transitions>
           </state>
           <state id="closed">
+            <highlight>
+              <code>closed</code>
+            </highlight>
+            <inherit_flags_from>approved</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <read_only/>
-              </attribute>
-              <attribute id="title">
-                <read_only/>
-              </attribute>
-              <attribute id="description">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
               <attribute id="close_date">
                 <read_only/>
               </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="end_date">
-                <read_only/>
-              </attribute>
-              <attribute id="reject_reason">
-                <read_only/>
-              </attribute>
               <attribute id="creation_date">
                 <read_only/>
               </attribute>
-              <attribute id="approval_date">
-                <read_only/>
-              </attribute>
-              <attribute id="caller_id">
-                <read_only/>
-              </attribute>
-              <attribute id="team_id">
-                <read_only/>
-              </attribute>
-              <attribute id="agent_id">
-                <read_only/>
-              </attribute>
-              <attribute id="changemanager_id">
-                <read_only/>
-              </attribute>
               <attribute id="private_log">
                 <read_only/>
               </attribute>
@@ -605,77 +520,6 @@
 		$this->Set('last_update', time());
 	}]]></code>
         </method>
-        <method id="ComputeValues">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[	public function ComputeValues()
-	{
-		if ($this->IsNew())
-		{
-			$iKey = MetaModel::GetNextKey(get_class($this));
-			$sName = sprintf('C-%06d', $iKey);
-			$this->Set('ref', $sName);
-		}
-	}]]></code>
-        </method>
-        <method id="GetIcon">
-          <comment>/**&#13;
-	 * Get the icon representing this object&#13;
-	 * @param boolean $bImgTag If true the result is a full IMG tag (or an emtpy string if no icon is defined)&#13;
-	 * @return string Either the full IMG tag ($bImgTag == true) or just the path to the icon file&#13;
-	 */</comment>
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[	public function GetIcon($bImgTag = true)
-	{
-		$sStatus = $this->Get('status');
-		switch($this->GetState())
-		{
-			case 'approved':
-			case 'implemented':
-			case 'monitored':
-			$sIcon = self::MakeIconFromName('change-approved.png');
-			break;
-			
-			case 'rejected':
-			case 'notapproved':
-			$sIcon = self::MakeIconFromName('change-rejected.png');
-			break;
-
-			case 'closed':
-			$sIcon = self::MakeIconFromName('change-closed.png');
-			break;
-
-			default:
-			$sIcon = MetaModel::GetClassIcon(get_class($this), $bImgTag);
-		}
-		return $sIcon;
-	}]]></code>
-        </method>
-        <method id="MakeIconFromName">
-          <static>true</static>
-          <access>protected</access>
-          <type>Overload-DBObject</type>
-          <code><![CDATA[	protected static function MakeIconFromName($sIconName, $bImgTag = true)
-	{
-		$sIcon = '';
-		if ($sIconName != '')
-		{
-			$sPath = '../env-'.utils::GetCurrentEnvironment().'/itop-change-mgmt/images/'.$sIconName;
-			if ($bImgTag)
-			{
-				$sIcon = "<img src=\"$sPath\" style=\"vertical-align:middle;\"/>";
-			}
-			else
-			{
-				$sIcon  = $sPath;
-			}
-		}
-		return $sIcon;
-	}]]></code>
-        </method>
       </methods>
       <presentation>
         <details>
@@ -752,6 +596,9 @@
                     <item id="category">
                       <rank>10</rank>
                     </item>
+                    <item id="outage">
+                      <rank>15.1</rank>
+                    </item>
                     <item id="reject_reason">
                       <rank>20</rank>
                     </item>

datamodels/2.x/itop-change-mgmt/de.dict.itop-change-mgmt.php

@@ -110,5 +110,11 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:Change/Attribute:related_incident_list+' => '',
 	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent Change Friendly Name',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Attribute:outage' => 'Ausfall',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'Nein',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Ja',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
 ));
 ?>

datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php

@@ -132,6 +132,12 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:Change/Stimulus:ev_approve+' => '',
 	'Class:Change/Stimulus:ev_finish' => 'Close',
 	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:Change/Attribute:outage' => 'Outage',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'No',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
 ));
 
 ?>

datamodels/2.x/itop-change-mgmt/es_cr.dict.itop-change-mgmt.php

@@ -133,6 +133,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Change/Stimulus:ev_approve+' => 'Aprobar',
 	'Class:Change/Stimulus:ev_finish' => 'Finalizar',
 	'Class:Change/Stimulus:ev_finish+' => 'Finalizar',
+	'Class:Change/Attribute:outage' => 'Falla',
+	'Class:Change/Attribute:outage+' => 'Falla',
+	'Class:Change/Attribute:outage/Value:no' => 'No',
+	'Class:Change/Attribute:outage/Value:no+' => 'No',
+	'Class:Change/Attribute:outage/Value:yes' => 'Si',
+	'Class:Change/Attribute:outage/Value:yes+' => 'Si',
 ));
 
 ?>

datamodels/2.x/itop-change-mgmt/fr.dict.itop-change-mgmt.php

@@ -94,6 +94,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Stimulus:ev_approve+' => '',
 	'Class:Change/Stimulus:ev_finish' => 'Fermer',
 	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:Change/Attribute:outage' => 'Interruption de service',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'Non',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Oui',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
 ));
 
 

datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/2.0.0',
+	'itop-change-mgmt/2.1.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php

@@ -0,0 +1,137 @@
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:ChangeManagement' => 'Gerenciamento Mudanças',
+	'Menu:Change:Overview' => 'Visão geral',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Nova mudança',
+	'Menu:NewChange+' => 'Criar uma nova solicitação de mudança',
+	'Menu:SearchChanges' => 'Pesquisar por mudanças',
+	'Menu:SearchChanges+' => 'Pesquisar por solicitação de mudança',
+	'Menu:Change:Shortcuts' => 'Atalho',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Mudanças à espera de aceitação',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Mudanças abertas',
+	'Menu:Changes+' => 'Todas mudanças abertas',
+	'Menu:MyChanges' => 'Mudanças atribuídas a mim',
+	'Menu:MyChanges+' => 'Mudanças atribuídas a mim (como Agente)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Mudanças por categoria nos últimos 7 dias',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Número de mudanças nos últimos 7 dias',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Mudanças por status nos últimos 7 dias',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Change' => 'Mudanças',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Nova',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Atribuido',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => 'Planejado',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rejeitado',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Aprovado',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Fechado',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:category' => 'Categoria',
+	'Class:Change/Attribute:category+' => '',
+	'Class:Change/Attribute:category/Value:application' => 'aplicação',
+	'Class:Change/Attribute:category/Value:application+' => 'aplicação',
+	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
+	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
+	'Class:Change/Attribute:category/Value:network' => 'rede',
+	'Class:Change/Attribute:category/Value:network+' => 'rede',
+	'Class:Change/Attribute:category/Value:other' => 'outro',
+	'Class:Change/Attribute:category/Value:other+' => 'outro',
+	'Class:Change/Attribute:category/Value:software' => 'software',
+	'Class:Change/Attribute:category/Value:software+' => 'software',
+	'Class:Change/Attribute:category/Value:system' => 'sistema',
+	'Class:Change/Attribute:category/Value:system+' => 'sistema',
+	'Class:Change/Attribute:reject_reason' => 'Razão rejeição',
+	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changemanager_id' => 'Gerente mudança',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:changemanager_email' => 'Email gerente mudança',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_id' => 'Parente mudança',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => 'Ref parente mudança',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Data criação',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => 'Data aprovação',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => 'Plano de contingência',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Solicitações relacionadas',
+	'Class:Change/Attribute:related_request_list+' => 'Todas as solicitações de usuários ligados a esta mudança',
+	'Class:Change/Attribute:related_incident_list' => 'Incidentes relacionados',
+	'Class:Change/Attribute:related_incident_list+' => 'Todos os incidentes ligados a esta mudança',
+	'Class:Change/Attribute:related_problems_list' => 'Problemas relacionados',
+	'Class:Change/Attribute:related_problems_list+' => 'Todos os problemas relacionados com esta mudança',
+	'Class:Change/Attribute:child_changes_list' => 'Mudanças filhas',
+	'Class:Change/Attribute:child_changes_list+' => 'Todas as sub-mudanças ligadas a esta mudança',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Nome amigável mudança relacionado',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Atribuir',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Planejar',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Aprovar',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Fechar',
+	'Class:Change/Stimulus:ev_finish+' => '',
+));
+
+?>

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Organization" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -44,8 +44,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -144,8 +144,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -307,8 +307,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -337,8 +337,8 @@
         </field>
         <field id="notify" xsi:type="AttributeEnum">
           <values>
-            <value>yes</value>
-            <value>no</value>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
           </values>
           <sql>notify</sql>
           <default_value>yes</default_value>
@@ -486,7 +486,7 @@
           <target_class>Location</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="location_name" xsi:type="AttributeExternalField">
           <extkey_attcode>location_id</extkey_attcode>
@@ -835,9 +835,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>draft</value>
-            <value>published</value>
-            <value>obsolete</value>
+            <value id="draft">draft</value>
+            <value id="published">published</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -972,7 +972,7 @@
           <static>false</static>
           <access>public</access>
           <type>Overload-cmdbAbstractObject</type>
-        <comment><![CDATA[/**
+          <comment><![CDATA[/**
 	 * Overload the display of the properties to add a tab (the first one)
 	 * with the preview of the document
 	 */
@@ -1320,9 +1320,9 @@
         </field>
         <field id="business_criticity" xsi:type="AttributeEnum">
           <values>
-            <value>high</value>
-            <value>medium</value>
-            <value>low</value>
+            <value id="high">high</value>
+            <value id="medium">medium</value>
+            <value id="low">low</value>
           </values>
           <sql>business_criticity</sql>
           <default_value>low</default_value>
@@ -1526,7 +1526,7 @@
           <target_class>Location</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="location_name" xsi:type="AttributeExternalField">
           <extkey_attcode>location_id</extkey_attcode>
@@ -1534,10 +1534,10 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>stock</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="stock">stock</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value>production</default_value>
@@ -1708,8 +1708,6 @@
         </list>
       </presentation>
     </class>
-
-    
     <class id="ConnectableCI" _delta="define">
       <parent>PhysicalDevice</parent>
       <properties>
@@ -1940,7 +1938,7 @@
           <target_class>Rack</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="rack_name" xsi:type="AttributeExternalField">
           <extkey_attcode>rack_id</extkey_attcode>
@@ -1955,7 +1953,7 @@
           <target_class>Enclosure</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="enclosure_name" xsi:type="AttributeExternalField">
           <extkey_attcode>enclosure_id</extkey_attcode>
@@ -1980,7 +1978,7 @@
           <target_class>PowerConnection</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="powerA_name" xsi:type="AttributeExternalField">
           <extkey_attcode>powerA_id</extkey_attcode>
@@ -1995,7 +1993,7 @@
           <target_class>PowerConnection</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="powerB_name" xsi:type="AttributeExternalField">
           <extkey_attcode>powerB_id</extkey_attcode>
@@ -2835,8 +2833,6 @@
         </list>
       </presentation>
     </class>
-
-
     <class id="ApplicationSolution" _delta="define">
       <parent>FunctionalCI</parent>
       <properties>
@@ -2881,8 +2877,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -3030,8 +3026,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -3163,7 +3159,7 @@
           <target_class>FunctionalCI</target_class>
           <is_null_allowed>false</is_null_allowed>
           <on_target_delete>DEL_AUTO</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="system_name" xsi:type="AttributeExternalField">
           <extkey_attcode>system_id</extkey_attcode>
@@ -3189,7 +3185,7 @@
           <target_class>SoftwareLicence</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="softwarelicence_name" xsi:type="AttributeExternalField">
           <extkey_attcode>softwarelicence_id</extkey_attcode>
@@ -3202,8 +3198,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -4501,11 +4497,11 @@
         </field>
         <field id="type" xsi:type="AttributeEnum">
           <values>
-            <value>Middleware</value>
-            <value>DBServer</value>
-            <value>PCSoftware</value>
-            <value>OtherSoftware</value>
-            <value>WebServer</value>
+            <value id="Middleware">Middleware</value>
+            <value id="DBServer">DBServer</value>
+            <value id="PCSoftware">PCSoftware</value>
+            <value id="OtherSoftware">OtherSoftware</value>
+            <value id="WebServer">WebServer</value>
           </values>
           <sql>type</sql>
           <default_value/>
@@ -4926,8 +4922,8 @@
         </field>
         <field id="perpetual" xsi:type="AttributeEnum">
           <values>
-            <value>yes</value>
-            <value>no</value>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
           </values>
           <sql>perpetual</sql>
           <default_value>no</default_value>
@@ -5736,24 +5732,24 @@
         </field>
         <field id="type" xsi:type="AttributeEnum">
           <values>
-            <value>NetworkDevice</value>
-            <value>Server</value>
-            <value>SANSwitch</value>
-            <value>StorageSystem</value>
-            <value>Rack</value>
-            <value>Enclosure</value>
-            <value>PC</value>
-            <value>Tablet</value>
-            <value>Telephone</value>
-            <value>MobilePhone</value>
-            <value>Printer</value>
-            <value>DiskArray</value>
-            <value>NAS</value>
-            <value>TapeLibrary</value>
-            <value>IPPhone</value>
-            <value>Peripheral</value>
-            <value>PowerSource</value>
-            <value>PDU</value>
+            <value id="NetworkDevice">NetworkDevice</value>
+            <value id="Server">Server</value>
+            <value id="SANSwitch">SANSwitch</value>
+            <value id="StorageSystem">StorageSystem</value>
+            <value id="Rack">Rack</value>
+            <value id="Enclosure">Enclosure</value>
+            <value id="PC">PC</value>
+            <value id="Tablet">Tablet</value>
+            <value id="Telephone">Telephone</value>
+            <value id="MobilePhone">MobilePhone</value>
+            <value id="Printer">Printer</value>
+            <value id="DiskArray">DiskArray</value>
+            <value id="NAS">NAS</value>
+            <value id="TapeLibrary">TapeLibrary</value>
+            <value id="IPPhone">IPPhone</value>
+            <value id="Peripheral">Peripheral</value>
+            <value id="PowerSource">PowerSource</value>
+            <value id="PDU">PDU</value>
           </values>
           <sql>type</sql>
           <default_value/>
@@ -6817,8 +6813,6 @@
         </list>
       </presentation>
     </class>
-
-
     <class id="NetworkInterface" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
@@ -6874,7 +6868,6 @@
         </list>
       </presentation>
     </class>
-
     <class id="IPInterface" _delta="define">
       <parent>NetworkInterface</parent>
       <properties>
@@ -7214,7 +7207,6 @@
         </list>
       </presentation>
     </class>
-
     <class id="lnkConnectableCIToNetworkDevice" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
@@ -7274,8 +7266,8 @@
         </field>
         <field id="connection_type" xsi:type="AttributeEnum">
           <values>
-            <value>uplink</value>
-            <value>downlink</value>
+            <value id="uplink">uplink</value>
+            <value id="downlink">downlink</value>
           </values>
           <sql>type</sql>
           <default_value>downlink</default_value>
@@ -7290,13 +7282,11 @@
           <type>Overload-cmdbAbstractObject</type>
           <code><![CDATA[	protected function AddConnectedNetworkDevice()
 	{
-		$iNetworkDeviceID = $this->Get('networkdevice_id');
-		$iDeviceID = $this->Get('connectableci_id');
 		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'));
-
-		$sOQL = "SELECT  lnkConnectableCIToNetworkDevice WHERE connectableci_id = :device AND networkdevice_id = :network AND network_port = :nwport AND device_port = :devport";
-			
-		$oConnectionSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL),
+		if (is_object($oDevice) && (get_class($oDevice) == 'NetworkDevice'))
+		{
+			$sOQL = "SELECT  lnkConnectableCIToNetworkDevice WHERE connectableci_id = :device AND networkdevice_id = :network AND network_port = :nwport AND device_port = :devport";
+			$oConnectionSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL),
 							array(),
 							array(
 								'network' => $this->Get('connectableci_id'),
@@ -7304,36 +7294,21 @@
 								'devport' => $this->Get('network_port'),
 								'nwport' => $this->Get('device_port'),
 								)
-		);	
-		$iAlreadyExist = $oConnectionSet->count();
-		if ((get_class($oDevice) == 'NetworkDevice') && ($iAlreadyExist == 0))
-		{
-			$sLink = $this->Get('connection_type');
-			$sConnLink = ($sLink == 'uplink') ? 'downlink' : 'uplink';
-
-			$oNewLink = new lnkConnectableCIToNetworkDevice();
-			$oNewLink->Set('networkdevice_id', $this->Get('connectableci_id'));
-			$oNewLink->Set('connectableci_id', $this->Get('networkdevice_id'));
-			$oNewLink->Set('network_port', $this->Get('device_port'));
-			$oNewLink->Set('device_port', $this->Get('network_port'));
-			$oNewLink->Set('connection_type', $sConnLink);
-
-			$oMyChange = MetaModel::NewObject("CMDBChange");
-			$oMyChange->Set("date", time());
-			if (UserRights::IsImpersonated())
+			);	
+			if ($oConnectionSet->Count() == 0)
 			{
-				$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser());
-			}
-			else
-			{
-				$sUserString = UserRights::GetUser();
-			}
-			$oMyChange->Set("userinfo", $sUserString);
-			$iChangeId = $oMyChange->DBInsert();
-			$oNewLink->DBInsertTracked($oMyChange);	
+				$sLink = $this->Get('connection_type');
+				$sConnLink = ($sLink == 'uplink') ? 'downlink' : 'uplink';
 
+				$oNewLink = new lnkConnectableCIToNetworkDevice();
+				$oNewLink->Set('networkdevice_id', $this->Get('connectableci_id'));
+				$oNewLink->Set('connectableci_id', $this->Get('networkdevice_id'));
+				$oNewLink->Set('network_port', $this->Get('device_port'));
+				$oNewLink->Set('device_port', $this->Get('network_port'));
+				$oNewLink->Set('connection_type', $sConnLink);
+				$oNewLink->DBInsert();	
+			}
 		}
-
 	}]]></code>
         </method>
         <method id="UpdateConnectedNetworkDevice">
@@ -7342,45 +7317,32 @@
           <type>Overload-cmdbAbstractObject</type>
           <code><![CDATA[	protected function UpdateConnectedNetworkDevice()
 	{
-		$iNetworkDeviceID = $this->Get('networkdevice_id');
-		$iDeviceID = $this->Get('connectableci_id');
 		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'));
-
-		$sOQL = "SELECT  lnkConnectableCIToNetworkDevice WHERE connectableci_id = :device AND networkdevice_id = :network AND network_port = :nwport AND device_port = :devport";
-		$oConnectionSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL),
+		if (is_object($oDevice) && (get_class($oDevice) == 'NetworkDevice'))
+		{
+			// Note: in case a port has been changed, search with the original values
+			$sOQL = "SELECT  lnkConnectableCIToNetworkDevice WHERE connectableci_id = :device AND networkdevice_id = :network AND network_port = :nwport AND device_port = :devport";
+			$oConnectionSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL),
 							array(),
 							array(
 								'network' => $this->Get('connectableci_id'),
 								'device' => $this->Get('networkdevice_id'),
-								'devport' => $this->Get('network_port'),
-								'nwport' => $this->Get('device_port'),
+								'devport' => $this->GetOriginal('network_port'),
+								'nwport' => $this->GetOriginal('device_port'),
 								)
-		);	
-		$iAlreadyExist = $oConnectionSet->count();
-		if ((get_class($oDevice) == 'NetworkDevice') && ($iAlreadyExist != 0))
-		{
-
+			);	
 			$sLink = $this->Get('connection_type');
 			$sConnLink = ($sLink == 'uplink') ? 'downlink' : 'uplink';
 
-			$oMyChange = MetaModel::NewObject("CMDBChange");
-			$oMyChange->Set("date", time());
-			if (UserRights::IsImpersonated())
+			// There should be one link - do it in a safe manner anyway
+			while ($oConnection = $oConnectionSet->Fetch())
 			{
-				$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser());
+				$oConnection->Set('connection_type', $sConnLink);
+				$oConnection->Set('network_port', $this->Get('device_port'));
+				$oConnection->Set('device_port', $this->Get('network_port'));
+				$oConnection->DBUpdate();	
 			}
-			else
-			{
-				$sUserString = UserRights::GetUser();
-			}
-			$oMyChange->Set("userinfo", $sUserString);
-			$iChangeId = $oMyChange->DBInsert();
-			$oConnection = $oConnectionSet->Fetch();
-			$oConnection->Set('connection_type', $sConnLink);
-			$oConnection->DBUpdateTracked($oMyChange);	
-
 		}
-
 	}]]></code>
         </method>
         <method id="DeleteConnectedNetworkDevice">
@@ -7389,13 +7351,13 @@
           <type>Overload-cmdbAbstractObject</type>
           <code><![CDATA[	protected function DeleteConnectedNetworkDevice()
 	{
-		$iNetworkDeviceID = $this->Get('networkdevice_id');
-		$iDeviceID = $this->Get('connectableci_id');
-
-		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'));
-
-		$sOQL = "SELECT  lnkConnectableCIToNetworkDevice WHERE connectableci_id = :device AND networkdevice_id = :network AND network_port = :nwport AND device_port = :devport";
-		$oConnectionSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL),
+		// The device might be already deleted (reentrance in the current procedure when both device are NETWORK devices!)
+		$oDevice = MetaModel::GetObject('ConnectableCI', $this->Get('connectableci_id'), false);
+		if (is_object($oDevice) && (get_class($oDevice) == 'NetworkDevice'))
+		{
+			// Track and delete the counterpart link
+			$sOQL = "SELECT  lnkConnectableCIToNetworkDevice WHERE connectableci_id = :device AND networkdevice_id = :network AND network_port = :nwport AND device_port = :devport";
+			$oConnectionSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL),
 							array(),
 							array(
 								'network' => $this->Get('connectableci_id'),
@@ -7403,27 +7365,13 @@
 								'devport' => $this->Get('network_port'),
 								'nwport' => $this->Get('device_port'),
 								)
-		);	
-		$iAlreadyExist = $oConnectionSet->count();
-		if ((get_class($oDevice) == 'NetworkDevice') && ($iAlreadyExist != 0))
-		{
-			$oMyChange = MetaModel::NewObject("CMDBChange");
-			$oMyChange->Set("date", time());
-			if (UserRights::IsImpersonated())
+			);
+			// There should be one link - do it in a safe manner anyway
+			while ($oConnection = $oConnectionSet->Fetch())
 			{
-				$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUser(), UserRights::GetUser());
+				$oConnection->DBDelete();	
 			}
-			else
-			{
-				$sUserString = UserRights::GetUser();
-			}
-			$oMyChange->Set("userinfo", $sUserString);
-			$iChangeId = $oMyChange->DBInsert();
-			$oConnection = $oConnectionSet->Fetch();
-			$oConnection->DBDeleteTracked($oMyChange);	
-
-		}
-
+		}	
 	}]]></code>
         </method>
         <method id="AfterInsert">
@@ -7815,9 +7763,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value>implementation</default_value>
@@ -8053,146 +8001,146 @@
       <rank>1</rank>
       <parent>ConfigManagement</parent>
       <definition>
-  <layout>DashboardLayoutOneCol</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletHeaderStatic">
-          <rank>0</rank>
-          <title>Menu:ConfigManagement:AllDevices</title>
-          <icon>itop-config-mgmt/images/server.png</icon>
-          <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
-        </dashlet>
-        <dashlet id="2" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>Server</class>
-        </dashlet>
-        <dashlet id="3" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>NetworkDevice</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletHeaderStatic">
-          <rank>0</rank>
-          <title>Menu:ConfigManagement:SWAndApps</title>
-          <icon>itop-config-mgmt/images/application.png</icon>
-        </dashlet>
-        <dashlet id="5" xsi:type="DashletBadge">
-          <rank>1</rank>
-          <class>Middleware</class>
-        </dashlet>
-        <dashlet id="6" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>DBServer</class>
-        </dashlet>
-        <dashlet id="7" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>WebServer</class>
-        </dashlet>
-        <dashlet id="8" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>PCSoftware</class>
-        </dashlet>
-        <dashlet id="9" xsi:type="DashletBadge">
-          <rank>5</rank>
-          <class>OtherSoftware</class>
-        </dashlet>
-        <dashlet id="10" xsi:type="DashletBadge">
-          <rank>6</rank>
-          <class>MiddlewareInstance</class>
-        </dashlet>
-        <dashlet id="11" xsi:type="DashletBadge">
-          <rank>7</rank>
-          <class>DatabaseSchema</class>
-        </dashlet>
-        <dashlet id="12" xsi:type="DashletBadge">
-          <rank>8</rank>
-          <class>WebApplication</class>
-        </dashlet>
-        <dashlet id="13" xsi:type="DashletBadge">
-          <rank>9</rank>
-          <class>Patch</class>
-        </dashlet>
-        <dashlet id="14" xsi:type="DashletBadge">
-          <rank>10</rank>
-          <class>Licence</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="4">
-      <rank>4</rank>
-      <dashlets>
-        <dashlet id="15" xsi:type="DashletHeaderStatic">
-          <rank>0</rank>
-          <title>Menu:ConfigManagement:Misc</title>
-          <icon>itop-config-mgmt/images/subnet.png</icon>
-        </dashlet>
-        <dashlet id="16" xsi:type="DashletBadge">
-          <rank>1</rank>
-          <class>NetworkInterface</class>
-        </dashlet>
-        <dashlet id="17" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>Subnet</class>
-        </dashlet>
-        <dashlet id="vlan" xsi:type="DashletBadge">
-          <rank>2.1</rank>
-          <class>VLAN</class>
-        </dashlet>
-        <dashlet id="18" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>BusinessProcess</class>
-        </dashlet>
-        <dashlet id="19" xsi:type="DashletBadge">
-          <rank>5</rank>
-          <class>ApplicationSolution</class>
-        </dashlet>
-        <dashlet id="20" xsi:type="DashletBadge">
-          <rank>6</rank>
-          <class>Group</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:AllDevices</title>
+                <icon>itop-config-mgmt/images/server.png</icon>
+                <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>Server</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>NetworkDevice</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:SWAndApps</title>
+                <icon>itop-config-mgmt/images/application.png</icon>
+              </dashlet>
+              <dashlet id="5" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>Middleware</class>
+              </dashlet>
+              <dashlet id="6" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>DBServer</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>WebServer</class>
+              </dashlet>
+              <dashlet id="8" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>PCSoftware</class>
+              </dashlet>
+              <dashlet id="9" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>OtherSoftware</class>
+              </dashlet>
+              <dashlet id="10" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>MiddlewareInstance</class>
+              </dashlet>
+              <dashlet id="11" xsi:type="DashletBadge">
+                <rank>7</rank>
+                <class>DatabaseSchema</class>
+              </dashlet>
+              <dashlet id="12" xsi:type="DashletBadge">
+                <rank>8</rank>
+                <class>WebApplication</class>
+              </dashlet>
+              <dashlet id="13" xsi:type="DashletBadge">
+                <rank>9</rank>
+                <class>Patch</class>
+              </dashlet>
+              <dashlet id="14" xsi:type="DashletBadge">
+                <rank>10</rank>
+                <class>Licence</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="15" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:Misc</title>
+                <icon>itop-config-mgmt/images/subnet.png</icon>
+              </dashlet>
+              <dashlet id="16" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>NetworkInterface</class>
+              </dashlet>
+              <dashlet id="17" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Subnet</class>
+              </dashlet>
+              <dashlet id="vlan" xsi:type="DashletBadge">
+                <rank>2.1</rank>
+                <class>VLAN</class>
+              </dashlet>
+              <dashlet id="18" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>BusinessProcess</class>
+              </dashlet>
+              <dashlet id="19" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>ApplicationSolution</class>
+              </dashlet>
+              <dashlet id="20" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>Group</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
       </definition>
     </menu>
     <menu id="Contact" xsi:type="DashboardMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ConfigManagement</parent>
       <definition>
-  <layout>DashboardLayoutOneCol</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletHeaderDynamic">
-          <rank>1</rank>
-          <title>Menu:Contact</title>
-          <icon>itop-config-mgmt/images/team.png</icon>
-          <subtitle>Menu:Contact:Count</subtitle>
-          <query>SELECT Contact</query>
-          <group_by>status</group_by>
-          <values>active,inactive</values>
-        </dashlet>
-        <dashlet id="2" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>Team</class>
-        </dashlet>
-        <dashlet id="3" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>Person</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-  </definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderDynamic">
+                <rank>1</rank>
+                <title>Menu:Contact</title>
+                <icon>itop-config-mgmt/images/team.png</icon>
+                <subtitle>Menu:Contact:Count</subtitle>
+                <query>SELECT Contact</query>
+                <group_by>status</group_by>
+                <values>active,inactive</values>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Team</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>Person</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewContact" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>3</rank>
@@ -8238,57 +8186,57 @@
       <oql>SELECT Group</oql>
       <do_search>1</do_search>
     </menu>
-  <menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
-    <rank>80</rank>
-    <parent>Catalogs</parent>
-    <definition>
-      <layout>DashboardLayoutOneCol</layout>
-      <title>Menu:ConfigManagement:Typology</title>
-      <cells>
-        <cell id="0">
-          <rank>0</rank>
-          <dashlets>
-            <dashlet id="1" xsi:type="DashletHeaderStatic">
-              <rank>0</rank>
-              <title>Menu:ConfigManagement:Typology</title>
-              <icon>itop-config-mgmt/images/typology.png</icon>
-            </dashlet>
-            <dashlet id="2" xsi:type="DashletBadge">
-              <rank>1</rank>
-              <class>Brand</class>
-            </dashlet>
-            <dashlet id="3" xsi:type="DashletBadge">
-              <rank>2</rank>
-              <class>Model</class>
-            </dashlet>
-            <dashlet id="4" xsi:type="DashletBadge">
-              <rank>3</rank>
-              <class>OSFamily</class>
-            </dashlet>
-            <dashlet id="5" xsi:type="DashletBadge">
-              <rank>4</rank>
-              <class>OSVersion</class>
-            </dashlet>
-            <dashlet id="6" xsi:type="DashletBadge">
-              <rank>5</rank>
-              <class>IOSVersion</class>
-            </dashlet>
-            <dashlet id="7" xsi:type="DashletBadge">
-              <rank>6</rank>
-              <class>NetworkDeviceType</class>
-            </dashlet>
-            <dashlet id="9" xsi:type="DashletBadge">
-              <rank>8</rank>
-              <class>ContactType</class>
-            </dashlet>
-            <dashlet id="10" xsi:type="DashletBadge">
-              <rank>9</rank>
-              <class>DocumentType</class>
-            </dashlet>
-          </dashlets>
-        </cell>
-      </cells>
-    </definition>
-  </menu>
+    <menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>80</rank>
+      <parent>Catalogs</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title>Menu:ConfigManagement:Typology</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:Typology</title>
+                <icon>itop-config-mgmt/images/typology.png</icon>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>Brand</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Model</class>
+              </dashlet>
+              <dashlet id="4" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>OSFamily</class>
+              </dashlet>
+              <dashlet id="5" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>OSVersion</class>
+              </dashlet>
+              <dashlet id="6" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>IOSVersion</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>NetworkDeviceType</class>
+              </dashlet>
+              <dashlet id="9" xsi:type="DashletBadge">
+                <rank>8</rank>
+                <class>ContactType</class>
+              </dashlet>
+              <dashlet id="10" xsi:type="DashletBadge">
+                <rank>9</rank>
+                <class>DocumentType</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
   </menus>
 </itop_design>

datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php

@@ -33,7 +33,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Relation:impacts/Description' => 'Elements impacted by',
 	'Relation:impacts/VerbUp' => 'Impact...',
 	'Relation:impacts/VerbDown' => 'Elements impacted by...',
-	'Relation:depends on/Description' => 'Elements this element depends on',
+	'Relation:depends on/Description' => 'Elements impacting',
 	'Relation:depends on/VerbUp' => 'Depends on...',
 	'Relation:depends on/VerbDown' => 'Impacts...',
 ));

datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php

@@ -780,7 +780,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:VirtualDevice' => 'Device Virtuel',
+	'Class:VirtualDevice' => 'Equipement Virtuel',
 	'Class:VirtualDevice+' => '',
 	'Class:VirtualDevice/Attribute:status' => 'Statut',
 	'Class:VirtualDevice/Attribute:status+' => '',
@@ -801,7 +801,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:VirtualHost' => 'Host Virtuel',
+	'Class:VirtualHost' => 'Hôte Virtuel',
 	'Class:VirtualHost+' => '',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Machines virtuelles',
 	'Class:VirtualHost/Attribute:virtualmachine_list+' => '',
@@ -1817,7 +1817,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Relation:impacts/Description' => 'Eléments impactés par',
 	'Relation:impacts/VerbUp' => 'Impacte...',
 	'Relation:impacts/VerbDown' => 'Dépend de...',
-	'Relation:depends on/Description' => 'Eléments dont dépend cet élément',
+	'Relation:depends on/Description' => 'Eléments dont dépend',
 	'Relation:depends on/VerbUp' => 'Dépend de...',
 	'Relation:depends on/VerbDown' => 'Impacte...',
 	'Menu:ConfigManagement:Typology' => 'Configuration des typologies',

datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/2.0.0',
+	'itop-config-mgmt/2.1.0',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-config/config.php

@@ -0,0 +1,223 @@
+<?php
+// Copyright (C) 2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Monitor the backup
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../../approot.inc.php');
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'application/startup.inc.php');
+
+require_once(APPROOT.'application/loginwebpage.class.inc.php');
+
+
+function TestConfig($sContents, $oP)
+{
+	try
+	{
+		ini_set('display_errors', 1);
+		ob_start();
+		eval('?'.'>'.trim($sContents));
+		$sNoise = trim(ob_get_contents());
+		ob_end_clean();
+	}
+	catch (Exception $e)
+	{
+		// well, never reach in case of parsing error :-(
+		throw new Exception('Error in configuration: '.$e->getMessage());
+	}
+	if (strlen($sNoise) > 0)
+	{
+		if (preg_match("/(Error|Parse error|Notice|Warning): (.+) in \S+ : eval\(\)'d code on line (\d+)/i", strip_tags($sNoise), $aMatches))
+		{
+			$sMessage = $aMatches[2];
+			$sLine = $aMatches[3];
+			$iLine = (int) $sLine;
+
+			// Highlight the line
+			$aLines = explode("\n", $sContents);
+			$iStart = 0;
+			for ($i = 0 ; $i < $iLine - 1; $i++) $iStart += strlen($aLines[$i]);
+			$iEnd = $iStart + strlen($aLines[$iLine - 1]);
+			$iTotalLines = count($aLines);
+			$oP->add_ready_script(
+<<<EOF
+setCursorPos($('#new_config')[0], $iStart, $iEnd);
+$('#new_config')[0].focus();
+var iScroll = Math.floor($('#new_config')[0].scrollHeight * ($iLine - 20) / $iTotalLines);
+$('#new_config').scrollTop(iScroll);
+EOF
+			);
+
+			$sMessage = Dict::Format('config-parse-error', $sMessage, $sLine);
+			throw new Exception($sMessage);
+		}
+		else
+		{
+			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
+			throw new Exception('Syntax error in configuration file: <tt>'.$sNoise.'</tt>');
+		}
+	}
+}
+
+
+/////////////////////////////////////////////////////////////////////
+// Main program
+//
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+//$sOperation = utils::ReadParam('operation', 'menu');
+//$oAppContext = new ApplicationContext();
+
+$oP = new iTopWebPage(Dict::S('config-edit-title'));
+$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
+
+
+try
+{
+	$sOperation = utils::ReadParam('operation', '');
+
+	$oP->add("<h1>".Dict::S('config-edit-title')."</h1>");
+
+	if (MetaModel::GetConfig()->Get('demo_mode'))
+	{
+		$oP->add("<div class=\"header_message message_info\">Sorry, iTop is in <b>demonstration mode</b>: the configuration file cannot be edited.</div>");
+	}
+	else
+	{
+		$oP->add_style(
+<<<EOF
+textarea {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+
+	width: 100%;
+	height: 550px;
+}
+.current_line {
+	display: none;
+	margin-left: 20px;
+}
+EOF
+		);
+	
+		$sConfigFile = APPROOT.'conf/'.utils::GetCurrentEnvironment().'/config-itop.php';
+	
+		if ($sOperation == 'save')
+		{
+			$sConfig = utils::ReadParam('new_config', '', false, 'raw_data');
+			$sOrginalConfig = utils::ReadParam('prev_config', '', false, 'raw_data');
+			if ($sConfig == $sOrginalConfig)
+			{
+				$oP->add('<div id="save_result" class="header_message">'.Dict::S('config-no-change').'</div>');
+			}
+			else
+			{
+				try
+				{
+					TestConfig($sConfig, $oP); // throws exceptions
+		
+					@chmod($sConfigFile, 0770); // Allow overwriting the file
+					file_put_contents($sConfigFile, $sConfig);
+					@chmod($sConfigFile, 0444); // Read-only
+		
+					$oP->p('<div id="save_result" class="header_message message_ok">'.Dict::S('Successfully recorded.').'</div>');
+					$sOrginalConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
+				}
+				catch (Exception $e)
+				{
+					$oP->p('<div id="save_result" class="header_message message_error">'.$e->getMessage().'</div>');
+				}
+			}
+		}
+		else
+		{
+			$sConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
+			$sOrginalConfig = $sConfig;
+		}
+	
+		$sConfigEscaped = htmlentities($sConfig, ENT_QUOTES, 'UTF-8');
+		$sOriginalConfigEscaped = htmlentities($sOrginalConfig, ENT_QUOTES, 'UTF-8');
+		$oP->p(Dict::S('config-edit-intro'));
+		$oP->add("<form method=\"POST\">");
+		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"save\">");
+		$oP->add("<input type=\"submit\" value=\"".Dict::S('config-apply')."\"><button onclick=\"ResetConfig(); return false;\">".Dict::S('config-cancel')."</button>");
+		$oP->add("<span class=\"current_line\">".Dict::Format('config-current-line', "<span class=\"line_number\"></span>")."</span>");
+		$oP->add("<input type=\"hidden\" id=\"prev_config\" name=\"prev_config\" value=\"$sOriginalConfigEscaped\">");
+		$oP->add("<textarea id =\"new_config\" name=\"new_config\" onkeyup=\"UpdateLineNumber();\" onmouseup=\"UpdateLineNumber();\">$sConfigEscaped</textarea>");
+		$oP->add("<input type=\"submit\" value=\"".Dict::S('config-apply')."\"><button onclick=\"ResetConfig(); return false;\">".Dict::S('config-cancel')."</button>");
+		$oP->add("<span class=\"current_line\">".Dict::Format('config-current-line', "<span class=\"line_number\"></span>")."</span>");
+		$oP->add("</form>");
+	
+		$sConfirmCancel = addslashes(Dict::S('config-confirm-cancel'));
+		$oP->add_script(
+<<<EOF
+function UpdateLineNumber()
+{
+	var oTextArea = $('#new_config')[0];
+	$('.line_number').html(oTextArea.value.substr(0, oTextArea.selectionStart).split("\\n").length);
+	$('.current_line').show();
+}
+function ResetConfig()
+{
+	if ($('#new_config').val() != $('#prev_config').val())
+	{
+		if (confirm('$sConfirmCancel'))
+		{
+			$('#new_config').val($('#prev_config').val());
+		}
+	}
+	$('.current_line').hide();
+	$('#save_result').hide();
+	return false;
+}
+
+function setCursorPos(input, start, end) {
+    if (arguments.length < 3) end = start;
+    if ("selectionStart" in input) {
+        setTimeout(function() {
+            input.selectionStart = start;
+            input.selectionEnd = end;
+        }, 1);
+    }
+    else if (input.createTextRange) {
+        var rng = input.createTextRange();
+        rng.moveStart("character", start);
+        rng.collapse();
+        rng.moveEnd("character", end - start);
+        rng.select();
+    }
+}
+EOF
+		);
+	}
+}
+catch(Exception $e)
+{
+	$oP->p('<b>'.$e->getMessage().'</b>');
+}
+
+$oP->output();

datamodels/2.x/itop-config/de.dict.itop-config.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 Combodo
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+
+	'Menu:ConfigEditor' => 'Konfiguration',
+	'config-edit-title' => 'Konfigurations-Editor',
+	'config-edit-intro' => 'Seien sie bei der Bearbeitung der Konfigurationsdatei sehr vorsichtig. Normalerweise sollten es aureichen die Einträge im oberen Teil der Konfiguration zu bearbeiten (Bsp.: die globalen Konfigurations- und Moduleinstellungen).',
+	'config-apply' => 'Anwenden',
+	'config-cancel' => 'Zurücksetzen',
+	'config-confirm-cancel' => 'Ihre Änderungen werden nicht gespeichert.',
+	'config-no-change' => 'Keine Änderungen: Die Datei wurde nicht verändert.',
+	'config-parse-error' => 'Zeile %2$d: %1$s.<br/>Die Datei wurde nicht aktualisiert.',
+	'config-current-line' => 'Editiere Zeile: %1$s',
+));

datamodels/2.x/itop-config/en.dict.itop-config.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 Combodo
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+
+	'Menu:ConfigEditor' => 'Configuration',
+	'config-edit-title' => 'Configuration File Editor',
+	'config-edit-intro' => 'Be very cautious when editing the configuration file. In particular, only the upper items (i.e. the global configuration and modules settings) should be edited.',
+	'config-apply' => 'Apply',
+	'config-cancel' => 'Reset',
+	'config-confirm-cancel' => 'Your changes will be lost.',
+	'config-no-change' => 'No change: the file has been left unchanged.',
+	'config-parse-error' => 'Line %2$d: %1$s.<br/>The file has NOT been updated.',
+	'config-current-line' => 'Editing line: %1$s',
+));
+?>

datamodels/2.x/itop-config/fr.dict.itop-config.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2013 Combodo
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+
+	'Menu:ConfigEditor' => 'Configuration',
+	'config-edit-title' => 'Editeur du Fichier de Configuration',
+	'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre iTop indisponible. En particulier, vous ne devriez éditer QUE les deux premiers éléments, à savoir la configuration globale et la configuration des modules.',
+	'config-save' => 'Appliquer',
+	'config-restore' => 'Réinitialiser',
+	'config-confirm-cancel' => 'Vos modifications seront perdues.',
+	'config-no-change' => 'Aucun changement : le fichier n\'a pas été altéré.',
+	'config-parse-error' => 'Ligne %2$d: %1$s.<br/>Le fichier n\'a PAS été modifié.',
+	'config-current-line' => 'Ligne en édition : %1$s',
+));
+?>