Release 1.2.1

SVN:1.2.1[1839]

addons/userrights/userrightsprofile.class.inc.php

@@ -27,7 +27,27 @@
 define('ADMIN_PROFILE_NAME', 'Administrator');
 define('PORTAL_PROFILE_NAME', 'Portal user');
 
-class UserRightsBaseClass extends cmdbAbstractObject
+class UserRightsBaseClassGUI extends cmdbAbstractObject
+{
+	// Whenever something changes, reload the privileges
+	
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+class UserRightsBaseClass extends DBObject
 {
 	// Whenever something changes, reload the privileges
 	
@@ -50,7 +70,7 @@ class UserRightsBaseClass extends cmdbAbstractObject
 
 
 
-class URP_Profiles extends UserRightsBaseClass
+class URP_Profiles extends UserRightsBaseClassGUI
 {
 	public static function Init()
 	{
@@ -87,28 +107,115 @@ class URP_Profiles extends UserRightsBaseClass
 		$this->m_bCheckReservedNames = false;
 	}
 
+	
+	protected static $m_aActions = array(
+		UR_ACTION_READ => 'Read',
+		UR_ACTION_MODIFY => 'Modify',
+		UR_ACTION_DELETE => 'Delete',
+		UR_ACTION_BULK_READ => 'Bulk Read',
+		UR_ACTION_BULK_MODIFY => 'Bulk Modify',
+		UR_ACTION_BULK_DELETE => 'Bulk Delete',
+	);
+
+	protected static $m_aCacheActionGrants = null;
+	protected static $m_aCacheStimulusGrants = null;
+	protected static $m_aCacheProfiles = null;
+	
+	public static function DoCreateProfile($sName, $sDescription, $bReservedName = false)
+	{
+		if (is_null(self::$m_aCacheProfiles))
+		{
+			self::$m_aCacheProfiles = array();
+			$oFilterAll = new DBObjectSearch('URP_Profiles');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oProfile = $oSet->Fetch())
+			{
+				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
+			}
+		}	
+
+		$sCacheKey = $sName;
+		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
+		{
+			return self::$m_aCacheProfiles[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_Profiles");
+		$oNewObj->Set('name', $sName);
+		$oNewObj->Set('description', $sDescription);
+		if ($bReservedName)
+		{
+			$oNewObj->DisableCheckOnReservedNames();			
+		}
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
+	public static function DoCreateActionGrant($iProfile, $iAction, $sClass, $bPermission = true)
+	{
+		$sAction = self::$m_aActions[$iAction];
+	
+		if (is_null(self::$m_aCacheActionGrants))
+		{
+			self::$m_aCacheActionGrants = array();
+			$oFilterAll = new DBObjectSearch('URP_ActionGrant');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oGrant = $oSet->Fetch())
+			{
+				self::$m_aCacheActionGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('action').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
+			}
+		}	
+
+		$sCacheKey = "$iProfile-$sAction-$sClass";
+		if (isset(self::$m_aCacheActionGrants[$sCacheKey]))
+		{
+			return self::$m_aCacheActionGrants[$sCacheKey];
+		}
+
+		$oNewObj = MetaModel::NewObject("URP_ActionGrant");
+		$oNewObj->Set('profileid', $iProfile);
+		$oNewObj->Set('permission', $bPermission ? 'yes' : 'no');
+		$oNewObj->Set('class', $sClass);
+		$oNewObj->Set('action', $sAction);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheActionGrants[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
+	public static function DoCreateStimulusGrant($iProfile, $sStimulusCode, $sClass)
+	{
+		if (is_null(self::$m_aCacheStimulusGrants))
+		{
+			self::$m_aCacheStimulusGrants = array();
+			$oFilterAll = new DBObjectSearch('URP_StimulusGrant');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oGrant = $oSet->Fetch())
+			{
+				self::$m_aCacheStimulusGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('stimulus').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
+			}
+		}	
+
+		$sCacheKey = "$iProfile-$sStimulusCode-$sClass";
+		if (isset(self::$m_aCacheStimulusGrants[$sCacheKey]))
+		{
+			return self::$m_aCacheStimulusGrants[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_StimulusGrant");
+		$oNewObj->Set('profileid', $iProfile);
+		$oNewObj->Set('permission', 'yes');
+		$oNewObj->Set('class', $sClass);
+		$oNewObj->Set('stimulus', $sStimulusCode);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheStimulusGrants[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
 	/*
 	* Create the built-in Administrator profile with its reserved name
 	*/	
 	public static function DoCreateAdminProfile()
 	{
-		$oNewObj = MetaModel::NewObject("URP_Profiles");
-		$oNewObj->Set('name', ADMIN_PROFILE_NAME);
-		$oNewObj->Set('description', 'Has the rights on everything (bypassing any control)');
-		$oNewObj->DisableCheckOnReservedNames();
-		$iNewId = $oNewObj->DBInsertNoReload();
-	}
-
-	/*
-	* Create the built-in User Portal profile with its reserved name
-	*/	
-	public static function DoCreateUserPortalProfile()
-	{
-		$oNewObj = MetaModel::NewObject("URP_Profiles");
-		$oNewObj->Set('name', PORTAL_PROFILE_NAME);
-		$oNewObj->Set('description', 'Has the rights to access to the user portal. People having this profile will not be allowed to access the standard application, they will be automatically redirected to the user portal.');
-		$oNewObj->DisableCheckOnReservedNames();
-		$iNewId = $oNewObj->DBInsertNoReload();
+		self::DoCreateProfile(ADMIN_PROFILE_NAME, 'Has the rights on everything (bypassing any control)', true /* reserved name */);
 	}
 
 	/*
@@ -158,7 +265,7 @@ class URP_Profiles extends UserRightsBaseClass
 	
 	function DoShowGrantSumary($oPage)
 	{
-		if ($this->GetName() == "Administrator")
+		if ($this->GetRawName() == "Administrator")
 		{
 			// Looks dirty, but ok that's THE ONE
 			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
@@ -180,7 +287,7 @@ class URP_Profiles extends UserRightsBaseClass
 				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
 				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
 				{ 
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription()).'">'.htmlentities($oStimulus->GetLabel()).'</span>';
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
@@ -222,7 +329,7 @@ class URP_Profiles extends UserRightsBaseClass
 
 
 
-class URP_UserProfile extends UserRightsBaseClass
+class URP_UserProfile extends UserRightsBaseClassGUI
 {
 	public static function Init()
 	{
@@ -262,7 +369,7 @@ class URP_UserProfile extends UserRightsBaseClass
 	}
 }
 
-class URP_UserOrg extends UserRightsBaseClass
+class URP_UserOrg extends UserRightsBaseClassGUI
 {
 	public static function Init()
 	{
@@ -431,41 +538,39 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$oChange->Set("userinfo", "Initialization");
 		$iChangeId = $oChange->DBInsert();
 
-		// Support drastic data model changes: no organization class !
-		if (MetaModel::IsValidClass('Organization'))
+		$iContactId = 0;
+		// Support drastic data model changes: no organization class (or not writable)!
+		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
 		{
 			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
 			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		}
-		else
-		{
-			$iOrgId = 0;
+
+			// Support drastic data model changes: no Person class  (or not writable)!
+			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
+			{
+				$oContact = new Person();
+				$oContact->Set('name', 'My last name');
+				$oContact->Set('first_name', 'My first name');
+				if (MetaModel::IsValidAttCode('Person', 'org_id'))
+				{
+					$oContact->Set('org_id', $iOrgId);
+				}
+				if (MetaModel::IsValidAttCode('Person', 'phone'))
+				{
+					$oContact->Set('phone', '+00 000 000 000');
+				}
+				$oContact->Set('email', 'my.email@foo.org');
+				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			}
 		}
 
-		// Support drastic data model changes: no Person class !
-		if (MetaModel::IsValidClass('Person'))
-		{
-			$oContact = new Person();
-			$oContact->Set('name', 'My last name');
-			$oContact->Set('first_name', 'My first name');
-			if (MetaModel::IsValidAttCode('Person', 'org_id'))
-			{
-				$oContact->Set('org_id', $iOrgId);
-			}
-			$oContact->Set('email', 'my.email@foo.org');
-			$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		}
-		else
-		{
-			$iContactId = 0;
-		}
 
 		$oUser = new UserLocal();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
-		if (MetaModel::IsValidAttCode('UserLocal', 'contactid'))
+		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
 		{
 			$oUser->Set('contactid', $iContactId);
 		}
@@ -489,7 +594,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	public function Init()
 	{
-		MetaModel::RegisterPlugin('userrights', 'ACbyProfile');
 	}
 
 
@@ -498,7 +602,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	protected $m_aProfiles; // id -> object
 	protected $m_aUserProfiles; // userid,profileid -> object
-	protected $m_aUserOrgs; // userid,orgid -> object
+	protected $m_aUserOrgs; // userid -> orgid
 
 	// Those arrays could be completed on demand (inheriting parent permissions)
 	protected $m_aClassActionGrants = null; // profile, class, action -> actiongrantid (or false if NO, or null/missing if undefined)
@@ -507,6 +611,11 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
 	protected $m_aObjectActionGrants = array();
 
+	protected function GetUserOrgs($oUser, $sClass)
+	{
+		return @$this->m_aUserOrgs[$oUser->GetKey()];
+	}
+
 	public function ResetCache()
 	{
 		// Loaded by Load cache
@@ -578,7 +687,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		$this->m_aUserOrgs = array();
 		while ($oUserOrg = $oUserOrgSet->Fetch())
 		{
-			$this->m_aUserOrgs[$oUserOrg->Get('userid')][$oUserOrg->Get('allowed_org_id')] = $oUserOrg;
+			$this->m_aUserOrgs[$oUserOrg->Get('userid')][] = $oUserOrg->Get('allowed_org_id');
 		}
 
 		$this->m_aClassStimulusGrants = array();
@@ -645,10 +754,25 @@ exit;
 
 		// Determine how to position the objects of this class
 		//
-		if ($sClass == 'Organization')
+		$aCallSpec = array($sClass, 'MapContextParam');
+		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
 		{
 			$sAttCode = 'id';
 		}
+		elseif (is_callable($aCallSpec))
+		{
+			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+
+			if ($sAttCode == null)
+			{
+				return true;
+			}
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				// Skip silently. The data model checker will tell you something about this...
+				return true;
+			}
+		}
 		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
 		{
 			$sAttCode = 'org_id';
@@ -659,23 +783,61 @@ exit;
 			// All of them are visible
 			return true;
 		}
-		$oExpression = new FieldExpression($sAttCode, $sClass);
-
 		// Position the user
 		//
-		@$aUserOrgs = $this->m_aUserOrgs[$oUser->GetKey()];
-		if (!isset($aUserOrgs) || count($aUserOrgs) == 0)
+		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+		if (is_null($aUserOrgs) || count($aUserOrgs) == 0)
 		{
 			// No position means 'Everywhere'
 			return true;
 		}
 
-		$aIds = array_keys($aUserOrgs);
-		$oListExpr = ListExpression::FromScalars($aIds);
-		$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
-
+		$oExpression = new FieldExpression($sAttCode, $sClass);
 		$oFilter  = new DBObjectSearch($sClass);
-		$oFilter->AddConditionExpression($oCondition);
+		$oListExpr = ListExpression::FromScalars($aUserOrgs);
+		
+		// Check if the condition points to a hierarchical key
+		$bConditionAdded = false;
+
+		if ($sAttCode == 'id')
+		{
+			// Filtering on the objects themselves
+			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sClass);
+			
+			if ($sHierarchicalKeyCode !== false)
+			{
+				$oRootFilter = new DBObjectSearch($sClass);
+				$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
+				$oRootFilter->AddConditionExpression($oCondition);
+				$oFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
+				$bConditionAdded = true;
+			}
+		}
+		else
+		{
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef->IsExternalKey())
+			{
+				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
+				
+				if ($sHierarchicalKeyCode !== false)
+				{
+					$oRootFilter = new DBObjectSearch($oAttDef->GetTargetClass());
+					$oExpression = new FieldExpression('id', $oAttDef->GetTargetClass());
+					$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
+					$oRootFilter->AddConditionExpression($oCondition);
+					$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
+					$oHKFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
+					$oFilter->AddCondition_PointingTo($oHKFilter, $sAttCode);
+					$bConditionAdded = true;
+				}
+			}
+		}
+		if (!$bConditionAdded)
+		{
+			$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
+			$oFilter->AddConditionExpression($oCondition);
+		}
 		return $oFilter;
 	}
 

addons/userrights/userrightsprojection.class.inc.php

@@ -97,7 +97,7 @@ class URP_Profiles extends UserRightsBaseClass
 	
 	function DoShowGrantSumary($oPage)
 	{
-		if ($this->GetName() == "Administrator")
+		if ($this->GetRawName() == "Administrator")
 		{
 			// Looks dirty, but ok that's THE ONE
 			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
@@ -119,7 +119,7 @@ class URP_Profiles extends UserRightsBaseClass
 				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
 				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
 				{ 
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription()).'">'.htmlentities($oStimulus->GetLabel()).'</span>';
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 				}
 			}
 			$sStimuli = implode(', ', $aStimuli);
@@ -660,7 +660,8 @@ class UserRightsProjection extends UserRightsAddOnAPI
 
 	public function Init()
 	{
-		MetaModel::RegisterPlugin('userrights', 'ACbyProfile', array($this, 'CacheData'));
+		// CacheData to be invoked in a module extension
+		//MetaModel::RegisterPlugin('userrights', 'ACbyProfile', array($this, 'CacheData'));
 	}
 
 	protected $m_aDimensions = array(); // id -> object

application/ajaxwebpage.class.inc.php

@@ -45,11 +45,13 @@ class ajax_page extends WebPage
     {
         parent::__construct($s_title);
         $this->m_sReadyScript = "";
-		$this->add_header("Content-type: text/html; charset=utf-8");
+		//$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->sContentType = 'text/html';
+		$this->sContentDisposition = 'inline';
     }	
 
 	public function AddTabContainer($sTabContainer, $sPrefix = '')
@@ -86,17 +88,29 @@ class ajax_page extends WebPage
 		return $sPreviousTab;
 	}
 	
+	public function GetCurrentTab()
+	{
+		return $this->m_sCurrentTab;
+	}
+	
     /**
      * Echoes the content of the whole page
      * @return void
      */	  
     public function output()
     {
+    	if (!empty($this->sContentType))
+    	{
+			$this->add_header('Content-type: '.$this->sContentType);
+    	}
+    	if (!empty($this->sContentDisposition))
+    	{
+			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
+    	}
         foreach($this->a_headers as $s_header)
         {
             header($s_header);
         }
-
 		if (count($this->m_aTabs) > 0)
 		{
 					$this->add_ready_script(
@@ -165,14 +179,28 @@ EOF
 	
         $s_captured_output = ob_get_contents();
         ob_end_clean();
-        echo $this->s_content;
-        echo $this->s_deferred_content;
+        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);
+        }
+        else
+        {
+        	echo $this->s_content;
+        }
+        //echo $this->s_deferred_content;
         if (count($this->a_scripts) > 0)
         {
             echo "<script type=\"text/javascript\">\n";
             echo implode("\n", $this->a_scripts);
             echo "\n</script>\n";
         }
+        if (!empty($this->s_deferred_content))
+        {
+            echo "<script type=\"text/javascript\">\n";
+            echo "\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');\n";
+            echo "\n</script>\n";
+        }
         if (!empty($this->m_sReadyScript))
         {
 	        echo "<script type=\"text/javascript\">\n";
@@ -181,7 +209,7 @@ EOF
         }
 		if (trim($s_captured_output) != "")
         {
-            echo $s_captured_output;
+        	echo self::FilterXSS($s_captured_output);
         }
     }
 
@@ -206,6 +234,64 @@ EOF
             parent::add($sHtml);
         }
     }
+
+	/**
+	 * Records the current state of the 'html' part of the page output
+	 * @return mixed The current state of the 'html' output
+	 */    
+    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();
+        }
+    }
+
+    /**
+     * Returns the part of the html output that occurred since the call to start_capture
+     * and removes this part from the current html output
+     * @param $offset mixed The value returned by start_capture
+     * @return string The part of the html output that was added since the call to start_capture
+     */    
+    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;
+    }
+
+	/**
+	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
+	 * This is useful to add hidden content, DIVs or FORMs that should not
+	 * be embedded into each other.	 	 
+	 */
+    public function add_at_the_end($s_html, $sId = '')
+    {
+    	if ($sId != '')
+    	{
+	    	$this->add_script("$('#{$sId}').remove();"); // Remove any previous instance of the same Id
+    	}
+        $this->s_deferred_content .= $s_html;
+    }
 	
 	/**
 	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
@@ -214,9 +300,6 @@ EOF
 	 */	 	 	
 	public function add_ready_script($sScript)
 	{
-		// Does nothing in ajax rendered content.. for now...
-		// Maybe we should add this as a simple <script> tag at the end of the output
-		// considering that at this time everything in the page is "ready"...
 		$this->m_sReadyScript .= $sScript;
 	}
 	
@@ -230,6 +313,10 @@ EOF
 		return 0;
 	}
 	
+	public static function FilterXSS($sHTML)
+	{
+		return str_ireplace(array('<script', '</script>'), array('<!-- <removed-script', '</removed-script> -->'), $sHTML);
+	}
 }
 
 ?>

application/application.inc.php

@@ -26,8 +26,10 @@
 require_once(APPROOT.'/application/applicationcontext.class.inc.php');
 require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
+require_once(APPROOT.'/application/sqlblock.class.inc.php');
 require_once(APPROOT.'/application/audit.category.class.inc.php');
 require_once(APPROOT.'/application/audit.rule.class.inc.php');
+require_once(APPROOT.'/application/query.class.inc.php');
 //require_once(APPROOT.'/application/menunode.class.inc.php');
 require_once(APPROOT.'/application/utils.inc.php');
 

application/applicationcontext.class.inc.php

@@ -24,6 +24,43 @@
  */
 
 require_once(APPROOT."/application/utils.inc.php");
+
+/**
+ * Interface for directing end-users to the relevant application
+ */ 
+interface iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId);
+}
+
+/**
+ * Direct end-users to the standard iTop application: UI.php
+ */ 
+class iTopStandardURLMaker implements iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId)
+	{
+		$sPage = DBObject::ComputeStandardUIPage($sClass);
+		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
+		$sUrl = "{$sAbsoluteUrl}pages/$sPage?operation=details&class=$sClass&id=$iId";
+		return $sUrl;
+	}
+}
+
+/**
+ * Direct end-users to the standard Portal application
+ */ 
+class PortalURLMaker implements iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId)
+	{
+		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
+		$sUrl = "{$sAbsoluteUrl}portal/index.php?operation=details&class=$sClass&id=$iId";
+		return $sUrl;
+	}
+}
+
+
 /**
  * Helper class to store and manipulate the parameters that make the application's context
  *
@@ -40,12 +77,16 @@ class ApplicationContext
 	protected $aValues;
 	protected static $aDefaultValues; // Cache shared among all instances
 	
-	public function __construct()
+	public function __construct($bReadContext = true)
 	{
 		$this->aNames = array(
 			'org_id', 'menu'
 		);
-		$this->ReadContext();
+		if ($bReadContext)
+		{
+			$this->ReadContext();			
+		}
+
 	}
 	
 	/**
@@ -54,7 +95,7 @@ class ApplicationContext
 	 */
 	protected function ReadContext()
 	{
-		if (empty(self::$aDefaultValues))
+		if (!isset(self::$aDefaultValues))
 		{
 			self::$aDefaultValues = array();
 			$aContext = utils::ReadParam('c', array());
@@ -126,7 +167,7 @@ class ApplicationContext
 		$sContext = "";
 		foreach($this->aValues as $sName => $sValue)
 		{
-			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"$sValue\" />\n";
+			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n";
 		}
 		return $sContext;
 	}
@@ -166,5 +207,101 @@ class ApplicationContext
 			unset($this->aValues[$sParamName]);
 		}
 	}
+
+	/**
+	 * Initializes the given object with the default values provided by the context
+	 */
+	public function InitObjectFromContext(DBObject &$oObj)
+	{
+		$sClass = get_class($oObj);
+		foreach($this->GetNames() as $key)
+		{
+			$aCallSpec = array($sClass, 'MapContextParam');
+			if (is_callable($aCallSpec))
+			{
+				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
+			}
+
+			if (MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+				if ($oAttDef->IsWritable())
+				{
+					$value = $this->GetCurrentValue($key, null);
+					if (!is_null($value))
+					{
+						$oObj->Set($sAttCode, $value);
+					}
+				}
+			}
+		}		
+	}
+	
+	static $m_sUrlMakerClass = null;
+
+	/**
+	 * Set the current application url provider
+	 * @param sClass string Class implementing iDBObjectURLMaker	 
+	 * @return void
+	 */
+	public static function SetUrlMakerClass($sClass = 'iTopStandardURLMaker')
+	{
+		$sPrevious = self::GetUrlMakerClass();
+
+		self::$m_sUrlMakerClass = $sClass;
+		$_SESSION['UrlMakerClass'] = $sClass;
+
+		return $sPrevious;
+	}
+
+	/**
+	 * Get the current application url provider
+	 * @return string the name of the class
+	 */
+	public static function GetUrlMakerClass()
+	{
+		if (is_null(self::$m_sUrlMakerClass))
+		{
+			if (isset($_SESSION['UrlMakerClass']))
+			{
+				self::$m_sUrlMakerClass = $_SESSION['UrlMakerClass'];
+			}
+			else
+			{
+				self::$m_sUrlMakerClass = 'iTopStandardURLMaker';
+			}
+		}
+		return self::$m_sUrlMakerClass;
+	}
+
+	/**
+	 * Get the current application url provider
+	 * @return string the name of the class
+	 */
+   public static function MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass = null, $bWithNavigationContext = true)
+   {
+   	$oAppContext = new ApplicationContext();
+
+      if (is_null($sUrlMakerClass))
+      {
+			$sUrlMakerClass = self::GetUrlMakerClass();
+		}
+		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
+		if (strlen($sUrl) > 0)
+		{
+			if ($bWithNavigationContext)
+			{
+				return $sUrl."&".$oAppContext->GetForLink();
+			}
+			else
+			{
+				return $sUrl;
+			}
+		}
+		else
+		{
+			return '';
+		}	
+	}
 }
 ?>

application/applicationextension.inc.php

@@ -0,0 +1,51 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Class iPlugin
+ * Management of application plugin 
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+interface iApplicationUIExtension
+{
+	public function OnDisplayProperties($oObject, WebPage $oPage, $bEditMode = false);
+	public function OnDisplayRelations($oObject, WebPage $oPage, $bEditMode = false);
+	public function OnFormSubmit($oObject, $sFormPrefix = '');
+	public function OnFormCancel($sTempId); // temp id is made of session_id and transaction_id, it identifies the object in a unique way
+
+	public function EnumUsedAttributes($oObject); // Not yet implemented
+	public function GetIcon($oObject); // Not yet implemented
+	public function GetHilightClass($oObject);
+
+	public function EnumAllowedActions(DBObjectSet $oSet);
+}
+
+interface iApplicationObjectExtension
+{
+	public function OnIsModified($oObject);
+	public function OnCheckToWrite($oObject);
+	public function OnCheckToDelete($oObject);
+	public function OnDBUpdate($oObject, $oChange = null);
+	public function OnDBInsert($oObject, $oChange = null);
+	public function OnDBDelete($oObject, $oChange = null);
+}
+
+?>

application/displayblock.class.inc.php

@@ -178,36 +178,6 @@ class DisplayBlock
 	public function Display(WebPage $oPage, $sId, $aExtraParams = array())
 	{
 		$oPage->add($this->GetDisplay($oPage, $sId, $aExtraParams));
-		/*
-		$aExtraParams = array_merge($aExtraParams, $this->m_aParams);
-		$aExtraParams['block_id'] = $sId;
-		if (!$this->m_bAsynchronous)
-		{
-			// render now
-			$oPage->add("<div id=\"$sId\" class=\"display_block\">\n");
-			$this->RenderContent($oPage, $aExtraParams);
-			$oPage->add("</div>\n");
-		}
-		else
-		{
-			// render it as an Ajax (asynchronous) call
-			$sFilter = $this->m_oFilter->serialize();
-			$oPage->add("<div id=\"$sId\" class=\"display_block loading\">\n");
-			$oPage->p("<img src=\"../images/indicator_arrows.gif\"> Loading...");
-			$oPage->add("</div>\n");
-			$oPage->add('
-			<script language="javascript">
-			$.post("ajax.render.php?style='.$this->m_sStyle.'",
-			   { operation: "ajax", filter: "$sFilter" },
-			   function(data){
-				 $("#'.$sId.'").empty();
-				 $("#'.$sId.'").append(data);
-				 $("#'.$sId.'").removeClass("loading");
-				}
-			 );
-			 </script>'); // TO DO: add support for $aExtraParams in asynchronous/Ajax mode
-		}
-		*/
 	}
 	
 	public function GetDisplay(WebPage $oPage, $sId, $aExtraParams = array())
@@ -262,41 +232,20 @@ class DisplayBlock
 			$sHtml .= "<div id=\"$sId\" class=\"display_block loading\">\n";
 			$sHtml .= $oPage->GetP("<img src=\"../images/indicator_arrows.gif\"> ".Dict::S('UI:Loading'));
 			$sHtml .= "</div>\n";
-			$sHtml .= '
-			<script language="javascript">
+			$oPage->add_script('
 			$.post("ajax.render.php?style='.$this->m_sStyle.'",
 			   { operation: "ajax", filter: "'.$sFilter.'", extra_params: "'.$sExtraParams.'" },
 			   function(data){
 				 $("#'.$sId.'").empty();
 				 $("#'.$sId.'").append(data);
 				 $("#'.$sId.'").removeClass("loading");
-				 // Check each "listResults" table for a checkbox in the first column and make the first column sortable only if it does not contain a checkbox in the header
-				 $("#'.$sId.'".listResults").each( function()
-					{
-						var table = $(this);
-						var id = $(this).parent();
-						var checkbox = (table.find(\'th:first :checkbox\').length > 0);
-						if (checkbox)
-						{
-							// There is a checkbox in the first column, do not make it sortable
-							table.tablesorter( { headers: { 0: {sorter: false}}, widgets: [\'myZebra\', \'truncatedList\']} ); // sortable and zebra tables
-						}
-						else
-						{
-							// There is NO checkbox in the first column, all columns are considered sortable
-							table.tablesorter( { widgets: [\'myZebra\', \'truncatedList\']} ); // sortable and zebra tables
-						}
-					});	
 				}
 			 );
-			 </script>';
+			 ');
 		}
 		if ($bAutoReload)
 		{
-			$sHtml .= '
-			<script language="javascript">
-			setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');
-			 </script>';
+			$oPage->add_script('setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
 		}
 		return $sHtml;
 	}
@@ -331,9 +280,10 @@ class DisplayBlock
 				$oAppContext = new ApplicationContext();
 				$sClass = $this->m_oFilter->GetClass();
 				$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($sClass));
+				$aCallSpec = array($sClass, 'MapContextParam');
 				foreach($oAppContext->GetNames() as $sContextParam)
 				{
-					eval("\$sParamCode = $sClass::MapContextParam('$sContextParam');"); //Map context parameter to the value/filter code depending on the class
+					$sParamCode = call_user_func($aCallSpec, $sContextParam); //Map context parameter to the value/filter code depending on the class
 					if (!is_null($sParamCode))
 					{
 						$sParamValue = $oAppContext->GetCurrentValue($sContextParam, null);
@@ -345,7 +295,7 @@ class DisplayBlock
 				}
 				foreach($aFilterCodes as $sFilterCode)
 				{
-					$sExternalFilterValue = utils::ReadParam($sFilterCode, '');
+					$sExternalFilterValue = utils::ReadParam($sFilterCode, '', false, 'raw_data');
 					$condition = null;
 					if (isset($aExtraParams[$sFilterCode]))
 					{
@@ -361,11 +311,33 @@ class DisplayBlock
 
 					if (!is_null($condition))
 					{
-						$this->m_oFilter->AddCondition($sFilterCode, $condition); // Use the default 'loose' operator
+						$this->AddCondition($sFilterCode, $condition);
 					}
 				}
 			}
-			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);
+			$aOrderBy = array();
+			if (isset($aExtraParams['order_by']))
+			{
+				// Convert the string describing the order_by parameter into an array
+				// The syntax is +attCode1,-attCode2
+				// attCode1 => ascending, attCode2 => descending
+				$aTemp = explode(',', $aExtraParams['order_by']);
+				foreach($aTemp as $sTemp)
+				{
+					$aMatches = array();
+					if (preg_match('/^([+-])?(.+)$/', $sTemp, $aMatches))
+					{
+						$bAscending = true;
+						if ($aMatches[1] == '-')
+						{
+							$bAscending  = false;
+						}
+						$aOrderBy[$aMatches[2]] = $bAscending;
+					}					
+				}
+			}
+			
+			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, $aOrderBy, $aQueryParams);
 		}
 		switch($this->m_sStyle)
 		{
@@ -375,9 +347,17 @@ class DisplayBlock
 				$sGroupByField = $aExtraParams['group_by'];
 				$aGroupBy = array();
 				$sLabels = array();
+				$iTotalCount = $this->m_oSet->Count();
 				while($oObj = $this->m_oSet->Fetch())
 				{
-					$sValue = $oObj->Get($sGroupByField);
+					if (isset($aExtraParams['group_by_expr']))
+					{
+						eval("\$sValue = ".sprintf($aExtraParams['group_by_expr'],  $oObj->Get($sGroupByField)).';');
+					}
+					else
+					{
+						$sValue = $oObj->Get($sGroupByField);
+					}
 					$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
 					$sLabels[$sValue] = $oObj->GetAsHtml($sGroupByField);
 				}
@@ -388,12 +368,14 @@ class DisplayBlock
 				foreach($aGroupBy as $sValue => $iCount)
 				{
 					$aData[] = array ( 'group' => $sLabels[$sValue],
-									  'value' => "<a href=\"./UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter&$sGroupByField=".urlencode($sValue)."\">$iCount</a>"); // TO DO: add the context information
+									  'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter&$sGroupByField=".urlencode($sValue)."\">$iCount</a>"); // TO DO: add the context information
 				}
 				$aAttribs =array(
 					'group' => array('label' => MetaModel::GetLabel($this->m_oFilter->GetClass(), $sGroupByField), 'description' => ''),
 					'value' => array('label'=> Dict::S('UI:GroupBy:Count'), 'description' => Dict::S('UI:GroupBy:Count+'))
 				);
+				$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
+				$sHtml .= $oPage->GetP(Dict::Format($sFormat, $iTotalCount));
 				$sHtml .= $oPage->GetTable($aAttribs, $aData);
 			}
 			else
@@ -441,7 +423,15 @@ class DisplayBlock
 						$aKeys = array();
 						foreach($aGroupByFields as $aField)
 						{
-							$aKeys[$aField['alias'].'.'.$aField['att_code']] = $aObjects[$aField['alias']]->Get($aField['att_code']);
+							$sAlias = $aField['alias'];
+							if (is_null($aObjects[$sAlias]))
+							{
+								$aKeys[$sAlias.'.'.$aField['att_code']] = '';
+							}
+							else
+							{
+								$aKeys[$sAlias.'.'.$aField['att_code']] = $aObjects[$sAlias]->Get($aField['att_code']);
+							}
 						}
 						$sCategory = implode($aKeys, ' ');
 						$aResults[$sCategory][] = $aObjects;
@@ -469,7 +459,11 @@ class DisplayBlock
 							$aSimpleArray = array();
 							foreach($aObjects as $aRow)
 							{
-								$aSimpleArray[] = $aRow[$aDisplayAliases[0]];
+								$oObj = $aRow[$aDisplayAliases[0]];
+								if (!is_null($oObj))
+								{
+									$aSimpleArray[] = $oObj;
+								}
 							}
 							$oSet = CMDBObjectSet::FromArray($this->m_oFilter->GetClass(), $aSimpleArray);
 							$sHtml .= "<tr><td>".cmdbAbstractObject::GetDisplaySet($oPage, $oSet, $aExtraParams)."</td></tr>\n";
@@ -555,7 +549,7 @@ class DisplayBlock
 								}
 							}
 							
-							$sHtml .= $oPage->GetP("<a href=\"./UI.php?operation=new&class=$sClass&$sParams{$sDefault}\">".Dict::Format('UI:ClickToCreateNew', Metamodel::GetName($sClass))."</a>\n");
+							$sHtml .= $oPage->GetP("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=new&class=$sClass&$sParams{$sDefault}\">".Dict::Format('UI:ClickToCreateNew', Metamodel::GetName($sClass))."</a>\n");
 						}
 					}
 				}
@@ -591,7 +585,7 @@ class DisplayBlock
 								$sDefaults .= '&'.urlencode($sName).'='.urlencode($sValue);
 							}
 						}
-						$sHtml .= $oPage->GetP("<a href=\"../pages/UI.php?operation=modify_links&class=$sClass&sParams&link_attr=".$aExtraParams['link_attr']."&id=".$aExtraParams['object_id']."&target_class=$sTargetClass&addObjects=true$sDefaults\">".Dict::Format('UI:ClickToCreateNew', Metamodel::GetName($sClass))."</a>\n");
+						$sHtml .= $oPage->GetP("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=modify_links&class=$sClass&sParams&link_attr=".$aExtraParams['link_attr']."&id=".$aExtraParams['object_id']."&target_class=$sTargetClass&addObjects=true$sDefaults\">".Dict::Format('UI:ClickToCreateNew', Metamodel::GetName($sClass))."</a>\n");
 					}
 				}
 			}
@@ -616,7 +610,7 @@ class DisplayBlock
 					$sContextParamValue = $oAppContext->GetCurrentValue($sFilterCode, null);
 					if (!is_null($sContextParamValue) && ! empty($sContextParamValue) && MetaModel::IsValidFilterCode($sClass, $sFilterCode))
 					{
-						$this->m_oFilter->AddCondition($sFilterCode, $sContextParamValue); // Use the default 'loose' operator
+						$this->AddCondition($sFilterCode, $sContextParamValue);
 					}
 				}
 				$aQueryParams = array();
@@ -627,7 +621,7 @@ class DisplayBlock
 				$this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);				
 			}
 			$iCount = $this->m_oSet->Count();
-			$sHyperlink = '../pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.$this->m_oFilter->serialize();
+			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.$this->m_oFilter->serialize();
 			$sHtml .= '<p><a class="actions" href="'.$sHyperlink.'">';
 			$sHtml .= MetaModel::GetClassIcon($sClass, true, 'float;left;margin-right:10px;');
 			$sHtml .= MetaModel::GetName($sClass).': '.$iCount.'</a></p>';
@@ -635,9 +629,9 @@ class DisplayBlock
 			$sHtml .= '<p>';
 			if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY))
 			{
-				$sHtml .= "<a href=\"../pages/UI.php?operation=new&class={$sClass}&$sParams\">".Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($sClass))."</a><br/>\n";
+				$sHtml .= "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=new&class={$sClass}&$sParams\">".Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($sClass))."</a><br/>\n";
 			}
-			$sHtml .= "<a href=\"../pages/UI.php?operation=search_form&class={$sClass}&$sParams\">".Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass))."</a>\n";
+			$sHtml .= "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search_form&class={$sClass}&$sParams\">".Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass))."</a>\n";
 			$sHtml .= '</p>';
 			break;
 
@@ -658,7 +652,7 @@ class DisplayBlock
 					$sContextParamValue = $oAppContext->GetCurrentValue($sFilterCode, null);
 					if (!is_null($sContextParamValue) && ! empty($sContextParamValue) && MetaModel::IsValidFilterCode($sClass, $sFilterCode))
 					{
-						$this->m_oFilter->AddCondition($sFilterCode, $sContextParamValue); // Use the default 'loose' operator
+						$this->AddCondition($sFilterCode, $sContextParamValue);
 					}
 				}
 				$aQueryParams = array();
@@ -681,14 +675,14 @@ class DisplayBlock
 					$oFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
 					$oSet = new DBObjectSet($oFilter);
 					$aCounts[$sStateValue] = $oSet->Count();
-					$aStateLabels[$sStateValue] = Dict::S("Class:".$oAttDef->GetHostClass()."/Attribute:$sStateAttrCode/Value:$sStateValue");
+					$aStateLabels[$sStateValue] = $oAttDef->GetValueLabel($sStateValue);
 					if ($aCounts[$sStateValue] == 0)
 					{
 						$aCounts[$sStateValue] = '-';
 					}
 					else
 					{
-						$sHyperlink = '../pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.$oFilter->serialize();
+						$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.$oFilter->serialize();
 						$aCounts[$sStateValue] = "<a href=\"$sHyperlink\">{$aCounts[$sStateValue]}</a>";
 					}
 				}
@@ -697,18 +691,11 @@ class DisplayBlock
 			$sHtml .= '<tr><td>'.implode('</td><td>', $aCounts).'</td></tr></table></div>';
 			// Title & summary
 			$iCount = $this->m_oSet->Count();
-			$sHyperlink = '../pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.$this->m_oFilter->serialize();
+			$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.$this->m_oFilter->serialize();
 			$sHtml .= '<h1>'.Dict::S(str_replace('_', ':', $sTitle)).'</h1>';
 			$sHtml .= '<a class="summary" href="'.$sHyperlink.'">'.Dict::Format(str_replace('_', ':', $sLabel), $iCount).'</a>';
 			break;
 			
-			case 'bare_details':
-			while($oObj = $this->m_oSet->Fetch())
-			{
-				$sHtml .= $oObj->GetBareProperties($oPage);
-			}
-			break;
-			
 			case 'csv':
 			$sHtml .= "<textarea style=\"width:95%;height:98%\">\n";
 			$sHtml .= cmdbAbstractObject::GetSetAsCSV($this->m_oSet);
@@ -745,20 +732,72 @@ EOF
 			
 			case 'open_flash_chart':
 			static $iChartCounter = 0;
+			$oAppContext = new ApplicationContext();
+			$sContext = $oAppContext->GetForLink();
+			if (!empty($sContext))
+			{
+				$sContext = '&'.$sContext;
+			}
 			$sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie';
 			$sTitle = isset($aExtraParams['chart_title']) ? $aExtraParams['chart_title'] : '';
 			$sGroupBy = isset($aExtraParams['group_by']) ? $aExtraParams['group_by'] : '';
+			$sGroupByExpr = isset($aExtraParams['group_by_expr']) ? '&params[group_by_expr]='.$aExtraParams['group_by_expr'] : '';
 			$sFilter = $this->m_oFilter->serialize();
 			$sHtml .= "<div id=\"my_chart_{$iChartCounter}\">If the chart does not display, <a href=\"http://get.adobe.com/flash/\" target=\"_blank\">install Flash</a></div>\n";
 			$oPage->add_script("function ofc_resize(left, width, top, height) { /* do nothing special */ }");
 			$oPage->add_ready_script("swfobject.embedSWF(\"../images/open-flash-chart.swf\", \"my_chart_{$iChartCounter}\", \"100%\", \"300\",\"9.0.0\", \"expressInstall.swf\",
-			{\"data-file\":\"".urlencode("../pages/ajax.render.php?operation=open_flash_chart&params[group_by]=$sGroupBy&params[chart_type]=$sChartType&params[chart_title]=$sTitle&filter=".$sFilter)."\"}, {wmode: 'transparent'} );\n");
+			{\"data-file\":\"".urlencode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=open_flash_chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[chart_title]=$sTitle&id=$sId&filter=".$sFilter)."\"}, {wmode: 'transparent'} );\n");
 			$iChartCounter++;
+			if (isset($aExtraParams['group_by']))
+			{
+				$sGroupByField = $aExtraParams['group_by'];
+				$aGroupBy = array();
+				while($oObj = $this->m_oSet->Fetch())
+				{
+					if (isset($aExtraParams['group_by_expr']))
+					{
+						eval("\$sValue = ".sprintf($aExtraParams['group_by_expr'],  $oObj->Get($sGroupByField)).';');
+					}
+					else
+					{
+						$sValue = $oObj->Get($sGroupByField);
+					}
+					$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
+				}
+				$sFilter = urlencode($this->m_oFilter->serialize());
+				$aData = array();
+				$aLabels = array();
+				$idx = 0;
+				$aURLs = array();
+				foreach($aGroupBy as $sValue => $iValue)
+				{
+					$oDrillDownFilter = clone $this->m_oFilter;
+					$oDrillDownFilter->AddCondition($sGroupByField, $sValue, '=');
+					$aURLs[$idx] = $oDrillDownFilter->serialize();
+					$idx++;
+				}
+				$sURLList = '';
+				foreach($aURLs as $index => $sURL)
+				{
+					$sURLList .= "\taURLs[$index] = '".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&format=html{$sContext}&filter=".addslashes($sURL)."';\n";
+				}
+				$oPage->add_script(
+<<<EOF
+function ofc_drill_down_{$sId}(index)
+{
+	var aURLs = new Array();
+{$sURLList}
+	window.location.href=aURLs[index];
+}
+EOF
+				);
+			}
 			break;
 			
 			case 'open_flash_chart_ajax':
 			require_once(APPROOT.'/pages/php-ofc-library/open-flash-chart.php');
 			$sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie';
+			$sId = utils::ReadParam('id', '');
 
 			$oChart = new open_flash_chart();
 			switch($sChartType)
@@ -772,18 +811,28 @@ EOF
 					$aGroupBy = array();
 					while($oObj = $this->m_oSet->Fetch())
 					{
-						$sValue = $oObj->Get($sGroupByField);
+						if (isset($aExtraParams['group_by_expr']))
+						{
+							eval("\$sValue = ".sprintf($aExtraParams['group_by_expr'],  $oObj->Get($sGroupByField)).';');
+						}
+						else
+						{
+							$sValue = $oObj->Get($sGroupByField);
+						}
 						$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
 					}
 					$sFilter = urlencode($this->m_oFilter->serialize());
 					$aData = array();
 					$aLabels = array();
+					$maxValue = 0;
 					foreach($aGroupBy as $sValue => $iValue)
 					{
-						$aData[] = $iValue;
+						$oBarValue = new bar_value($iValue);
+						$oBarValue->on_click("ofc_drill_down_$sId");
+						$aData[] = $oBarValue;
+						if ($iValue > $maxValue) $maxValue = $iValue;
 						$aLabels[] = $sValue;
 					}
-					$maxValue = max($aData);
 					$oYAxis = new y_axis();
 					$aMagicValues = array(1,2,5,10);
 					$iMultiplier = 1;
@@ -828,14 +877,23 @@ EOF
 					$aGroupBy = array();
 					while($oObj = $this->m_oSet->Fetch())
 					{
-						$sValue = $oObj->Get($sGroupByField);
+						if (isset($aExtraParams['group_by_expr']))
+						{
+							eval("\$sValue = ".sprintf($aExtraParams['group_by_expr'],  $oObj->Get($sGroupByField)).';');
+						}
+						else
+						{
+							$sValue = $oObj->Get($sGroupByField);
+						}
 						$aGroupBy[$sValue] = isset($aGroupBy[$sValue]) ? $aGroupBy[$sValue]+1 : 1;
 					}
 					$sFilter = urlencode($this->m_oFilter->serialize());
 					$aData = array();
 					foreach($aGroupBy as $sValue => $iValue)
 					{
-						$aData[] = new pie_value($iValue, $sValue); //@@ BUG: not passed via ajax !!!
+						$PieValue = new pie_value($iValue, $sValue); //@@ BUG: not passed via ajax !!!
+						$PieValue->on_click("ofc_drill_down_$sId");
+						$aData[] = $PieValue;
 					}
 	
 	
@@ -860,6 +918,43 @@ EOF
 		}
 		return $sHtml;
 	}
+	
+	/**
+	 * Add a condition (restriction) to the current DBObjectSearch on which the display block is based
+	 * taking into account the hierarchical keys for which the condition is based on the 'below' operator
+	 */
+	protected function AddCondition($sFilterCode, $condition)
+	{
+		$sClass = $this->m_oFilter->GetClass();
+		$bConditionAdded = false;
+		
+		// If the condition is an external key with a class having a hierarchy, use a "below" criteria
+		if (MetaModel::IsValidAttCode($sClass, $sFilterCode))
+		{
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sFilterCode);
+
+			if ($oAttDef->IsExternalKey())
+			{
+				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
+				
+				if ($sHierarchicalKeyCode !== false)
+				{
+					$oFilter = new DBObjectSearch($oAttDef->GetTargetClass());
+					$oFilter->AddCondition('id', $condition);
+					$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
+					$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
+					$this->m_oFilter->AddCondition_PointingTo($oHKFilter, $sFilterCode);
+					$bConditionAdded = true;
+				}
+			}
+		}
+		
+		// In all other cases, just add the condition directly
+		if (!$bConditionAdded)
+		{
+			$this->m_oFilter->AddCondition($sFilterCode, $condition); // Use the default 'loose' operator
+		}
+	}
 }
 
 /**
@@ -939,7 +1034,7 @@ class HistoryBlock extends DisplayBlock
 		$aValues = array();
 		foreach($aChanges as $aChange)
 		{
-			$aValues[] = array('date' => $aChange['date'], 'userinfo' => $aChange['userinfo'], 'log' => "<ul><li>".implode('</li><li>', $aChange['log'])."</li></ul>");
+			$aValues[] = array('date' => $aChange['date'], 'userinfo' => htmlentities($aChange['userinfo'], ENT_QUOTES, 'UTF-8'), 'log' => "<ul><li>".implode('</li><li>', $aChange['log'])."</li></ul>");
 		}
 		$sHtml .= $oPage->GetTable($aAttribs, $aValues);
 		return $sHtml;
@@ -962,11 +1057,17 @@ class MenuBlock extends DisplayBlock
 		$sHtml = '';
 		$oAppContext = new ApplicationContext();
 		$sContext = $oAppContext->GetForLink();
+		if (!empty($sContext))
+		{
+			$sContext = '&'.$sContext;
+		}
 		$sClass = $this->m_oFilter->GetClass();
 		$oSet = new CMDBObjectSet($this->m_oFilter);
 		$sFilter = $this->m_oFilter->serialize();
+		$sFilterDesc = $this->m_oFilter->ToOql();
 		$aActions = array();
-		$sUIPage = cmdbAbstractObject::ComputeUIPage($sClass);
+		$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
+		$sRootUrl = utils::GetAbsoluteUrlAppRoot();
 		// 1:n links, populate the target object as a default value when creating a new linked object
 		if (isset($aExtraParams['target_attr']))
 		{
@@ -985,7 +1086,7 @@ class MenuBlock extends DisplayBlock
 			case 0:
 			// No object in the set, the only possible action is "new"
 			$bIsModifyAllowed =  (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES);
-			if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "../page/$sUIPage?operation=new&class=$sClass&$sContext{$sDefault}"); }
+			if ($bIsModifyAllowed) { $aActions['UI:Menu:New'] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}"); }
 			break;
 			
 			case 1:
@@ -998,23 +1099,22 @@ class MenuBlock extends DisplayBlock
 			// Just one object in the set, possible actions are "new / clone / modify and delete"
 			if (!isset($aExtraParams['link_attr']))
 			{
-				$sUrl = utils::GetAbsoluteUrl(false);
-				if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:Modify'), 'url' => "../pages/$sUIPage?operation=modify&class=$sClass&id=$id&$sContext#"); }
-				if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "../pages/$sUIPage?operation=new&class=$sClass&$sContext{$sDefault}"); }
-				if ($bIsDeleteAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:Delete'), 'url' => "../pages/$sUIPage?operation=delete&class=$sClass&id=$id&$sContext"); }
+				if ($bIsModifyAllowed) { $aActions['UI:Menu:Modify'] = array ('label' => Dict::S('UI:Menu:Modify'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify&class=$sClass&id=$id{$sContext}#"); }
+				if ($bIsModifyAllowed) { $aActions['UI:Menu:New'] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}"); }
+				if ($bIsDeleteAllowed) { $aActions['UI:Menu:Delete'] = array ('label' => Dict::S('UI:Menu:Delete'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}"); }
 				// Transitions / Stimuli
 				$aTransitions = $oObj->EnumTransitions();
 				if (count($aTransitions))
 				{
 					$this->AddMenuSeparator($aActions);
-					$aStimuli = Metamodel::EnumStimuli($sClass);
+					$aStimuli = Metamodel::EnumStimuli(get_class($oObj));
 					foreach($aTransitions as $sStimulusCode => $aTransitionDef)
 					{
 						$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? UserRights::IsStimulusAllowed($sClass, $sStimulusCode, $oSet) : UR_ALLOWED_NO;
 						switch($iActionAllowed)
 						{
 							case UR_ALLOWED_YES:
-							$aActions[] = array('label' => $aStimuli[$sStimulusCode]->GetLabel(), 'url' => "../pages/UI.php?operation=stimulus&stimulus=$sStimulusCode&class=$sClass&id=$id&$sContext");
+							$aActions[$sStimulusCode] = array('label' => $aStimuli[$sStimulusCode]->GetLabel(), 'url' => "{$sRootUrl}pages/UI.php?operation=stimulus&stimulus=$sStimulusCode&class=$sClass&id=$id{$sContext}");
 							break;
 							
 							default:
@@ -1029,23 +1129,23 @@ class MenuBlock extends DisplayBlock
 					$this->AddMenuSeparator($aActions);
 					foreach($aRelations as $sRelationCode)
 					{
-						$aActions[] = array ('label' => MetaModel::GetRelationVerbUp($sRelationCode), 'url' => "../pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&class=$sClass&id=$id&$sContext");
+						$aActions[$sRelationCode] = array ('label' => MetaModel::GetRelationVerbUp($sRelationCode), 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&class=$sClass&id=$id{$sContext}");
 					}
 				}
 				$this->AddMenuSeparator($aActions);
 				// Static menus: Email this page & CSV Export
-				$aActions[] = array ('label' => Dict::S('UI:Menu:EMail'), 'url' => "mailto:?subject=".$oObj->GetName()."&body=".urlencode("$sUrl?operation=details&class=$sClass&id=$id&$sContext"));
-				$aActions[] = array ('label' => Dict::S('UI:Menu:CSVExport'), 'url' => "../pages/$sUIPage?operation=search&filter=$sFilter&format=csv&$sContext");
+				$sUrl = ApplicationContext::MakeObjectUrl($sClass, $id);
+				$aActions['UI:Menu:EMail'] = array ('label' => Dict::S('UI:Menu:EMail'), 'url' => "mailto:?subject=".urlencode($oObj->GetRawName())."&body=".urlencode($sUrl));
+				$aActions['UI:Menu:CSVExport'] = array ('label' => Dict::S('UI:Menu:CSVExport'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=search&filter=$sFilter&format=csv{$sContext}");
 			}
-			else
+			$this->AddMenuSeparator($aActions);
+			foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
 			{
-				// List of links, the only actions are 'Add...' and 'Manage...'
-				$id = $aExtraParams['object_id'];
-				$sTargetAttr = $aExtraParams['target_attr'];
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr);
-				$sTargetClass = $oAttDef->GetTargetClass();
-				if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:Add'), 'url' => "../pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true&$sContext"); }
-				if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:Manage'), 'url' => "../pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&sContext"); }
+				$oSet->Rewind();
+				foreach($oExtensionInstance->EnumAllowedActions($oSet) as $sLabel => $sUrl)
+				{
+					$aActions[$sLabel] = array ('label' => $sLabel, 'url' => $sUrl);
+				}
 			}
 			break;
 			
@@ -1062,36 +1162,128 @@ class MenuBlock extends DisplayBlock
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr);
 				$sTargetClass = $oAttDef->GetTargetClass();
 				$bIsDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
-				if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:Add'), 'url' => "../pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true&$sContext"); }
-				if ($bIsBulkModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:Manage'), 'url' => "../pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&sContext"); }
+				if ($bIsModifyAllowed) { $aActions['UI:Menu:Add'] = array ('label' => Dict::S('UI:Menu:Add'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true{$sContext}"); }
+				if ($bIsBulkModifyAllowed) { $aActions['UI:Menu:Manage'] = array ('label' => Dict::S('UI:Menu:Manage'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id{$sContext}"); }
 				//if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => 'Remove All...', 'url' => "#"); }
 			}
 			else
 			{
 				// many objects in the set, possible actions are: new / modify all / delete all
-				$sUrl = utils::GetAbsoluteUrl();
-				if ($bIsModifyAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "../pages/$sUIPage?operation=new&class=$sClass&$sContext{$sDefault}"); }
-				//if ($bIsBulkModifyAllowed) { $aActions[] = array ('label' => 'Modify All...', 'url' => "../pages/$sUIPage?operation=modify_all&filter=$sFilter&$sContext"); }
-				if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => Dict::S('UI:Menu:BulkDelete'), 'url' => "../pages/$sUIPage?operation=select_for_deletion&filter=$sFilter&$sContext"); }
+				if ($bIsModifyAllowed) { $aActions['UI:Menu:New'] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}"); }
+				if ($bIsBulkModifyAllowed) { $aActions['UI:Menu:ModifyAll'] = array ('label' => Dict::S('UI:Menu:ModifyAll'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_modify_all&class=$sClass&filter=$sFilter{$sContext}"); }
+				if ($bIsBulkDeleteAllowed) { $aActions['UI:Menu:BulkDelete'] = array ('label' => Dict::S('UI:Menu:BulkDelete'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=select_for_deletion&filter=$sFilter{$sContext}"); }
+
+				// Stimuli
+				$aStates = MetaModel::EnumStates($sClass);
+				if (count($aStates) > 0)
+				{
+					// Life cycle actions may be available... if all objects are in the same state
+					$oSet->Rewind();
+					$aStates = array();
+					while($oObj = $oSet->Fetch())
+					{
+						$aStates[$oObj->GetState()] = $oObj->GetState();
+					}
+					$oSet->Rewind();
+					if (count($aStates) == 1)
+					{
+						// All objects are in the same state...
+						$sState = array_pop($aStates);
+						$aTransitions = Metamodel::EnumTransitions($sClass, $sState);
+						if (count($aTransitions))
+						{
+							$this->AddMenuSeparator($aActions);
+							$aStimuli = Metamodel::EnumStimuli($sClass);
+							foreach($aTransitions as $sStimulusCode => $aTransitionDef)
+							{
+								$oChecker = new StimulusChecker($this->m_oFilter, $sState, $sStimulusCode);
+								$iActionAllowed = (get_class($aStimuli[$sStimulusCode]) == 'StimulusUserAction') ? $oChecker->IsAllowed() : UR_ALLOWED_NO;
+								switch($iActionAllowed)
+								{
+									case UR_ALLOWED_YES:
+									case UR_ALLOWED_DEPENDS:
+									$aActions[$sStimulusCode] = array('label' => $aStimuli[$sStimulusCode]->GetLabel(), 'url' => "{$sRootUrl}pages/UI.php?operation=select_bulk_stimulus&stimulus=$sStimulusCode&state=$sState&class=$sClass&filter=$sFilter{$sContext}");
+									break;
+									
+									default:
+									// Do nothing
+								}
+							}
+						}
+					}
+				}
 				$this->AddMenuSeparator($aActions);
-				$aActions[] = array ('label' => Dict::S('UI:Menu:EMail'), 'url' => "mailto:?subject=".$oSet->GetFilter()->__DescribeHTML()."&body=".urlencode("$sUrl?operation=search&filter=$sFilter&$sContext"));
-				$aActions[] = array ('label' => Dict::S('UI:Menu:CSVExport'), 'url' => "../pages/$sUIPage?operation=search&filter=$sFilter&format=csv&$sContext");
+				$sUrl = utils::GetAbsoluteUrlAppRoot();
+				$aActions['UI:Menu:EMail'] = array ('label' => Dict::S('UI:Menu:EMail'), 'url' => "mailto:?subject=$sFilterDesc&body=".urlencode("{$sUrl}pages/$sUIPage?operation=search&filter=$sFilter{$sContext}"));
+				$aActions['UI:Menu:CSVExport'] = array ('label' => Dict::S('UI:Menu:CSVExport'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=search&filter=$sFilter&format=csv{$sContext}");
+			}
+			$this->AddMenuSeparator($aActions);
+			foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
+			{
+				$oSet->Rewind();
+				foreach($oExtensionInstance->EnumAllowedActions($oSet) as $sLabel => $sUrl)
+				{
+					$aActions[$sLabel] = array ('label' => $sLabel, 'url' => $sUrl);
+				}
 			}
 		}
-		$sHtml .= "<div class=\"itop_popup\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
-		foreach ($aActions as $aAction)
+		$aFavoriteActions = array();
+		$aCallSpec = array($sClass, 'GetShortcutActions');
+		if (is_callable($aCallSpec))
 		{
-			$sClass = isset($aAction['class']) ? " class=\"{$aAction['class']}\"" : "";
-			if (empty($aAction['url']))
+			$aShortcutActions = call_user_func($aCallSpec, $sClass);
+			foreach ($aActions as $key => $aAction)
 			{
-				$sHtml .= "<li>{$aAction['label']}</li>\n";			
+				if (in_array($key, $aShortcutActions))
+				{
+					$aFavoriteActions[] = $aAction;
+					unset($aActions[$key]);
+				}
+			}
+		}
+		else
+		{
+			$aShortcutActions = array();
+		}
+		
+		if (count($aFavoriteActions) > 0)
+		{
+			$sHtml .= "<div class=\"itop_popup\"><ul>\n<li>".Dict::S('UI:Menu:OtherActions')."\n<ul>\n";
+		}
+		else
+		{
+			$sHtml .= "<div class=\"itop_popup\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
+		}	
+		$sPrevUrl = '';
+		foreach ($aActions as $key => $aAction)
+		{
+			if (in_array($key, $aShortcutActions))
+			{
+				$aFavoriteActions[] = $aAction;
 			}
 			else
 			{
-				$sHtml .= "<li><a href=\"{$aAction['url']}\"$sClass>{$aAction['label']}</a></li>\n";
+				$sClass = isset($aAction['class']) ? " class=\"{$aAction['class']}\"" : "";
+				if (empty($aAction['url']))
+				{
+					if ($sPrevUrl != '') // Don't output consecutively two separators...
+					{
+						$sHtml .= "<li>{$aAction['label']}</li>\n";			
+					}
+					$sPrevUrl = '';
+				}
+				else
+				{
+					$sHtml .= "<li><a href=\"{$aAction['url']}\"$sClass>{$aAction['label']}</a></li>\n";
+					$sPrevUrl = $aAction['url'];
+				}
 			}
 		}
-		$sHtml .= "</ul>\n</li>\n</ul></div>\n";
+		$sHtml .= "</ul>\n</li>\n</ul></div>";
+		foreach(array_reverse($aFavoriteActions) as $aAction)
+		{
+			$sHtml .= "<div class=\"actions_button\"><a href='{$aAction['url']}'>{$aAction['label']}</a></div>";			
+		}
 		static $bPopupScript = false;
 		if (!$bPopupScript)
 		{
@@ -1112,9 +1304,11 @@ class MenuBlock extends DisplayBlock
 		$sSeparator = '<hr class="menu-separator"/>';
 		if (count($aActions) > 0) // Make sure that the separator is not the first item in the menu
 		{
-			if ($aActions[count($aActions)-1]['label'] != $sSeparator) // Make sure there are no 2 consecutive separators
+			$aKeys = array_keys($aActions);
+			$sLastKey = array_pop($aKeys);
+			if ($aActions[$sLastKey]['label'] != $sSeparator) // Make sure there are no 2 consecutive separators
 			{
-				$aActions[] = array('label' => $sSeparator, 'url' => '');
+				$aActions['sep_'.(count($aActions)-1)] = array('label' => $sSeparator, 'url' => '');
 			}
 		}
 	}	

application/itopwebpage.class.inc.php

@@ -36,46 +36,50 @@ class iTopWebPage extends NiceWebPage
 	private $m_aTabs;
 	private $m_sCurrentTabContainer;
 	private $m_sCurrentTab;
+	private $m_sMessage;
+	private $m_sInitScript;
 	
-    public function __construct($sTitle)
-    {
-        parent::__construct($sTitle);
-        $this->m_sCurrentTabContainer = '';
-        $this->m_sCurrentTab = '';
+	public function __construct($sTitle)
+	{
+		parent::__construct($sTitle);
+
+		ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
+
+		$this->m_sCurrentTabContainer = '';
+		$this->m_sCurrentTab = '';
 		$this->m_aTabs = array();
 		$this->m_sMenu = "";
+		$this->m_sMessage = '';
+		$sAbsURLAppRoot = addslashes(utils::GetAbsoluteUrlAppRoot()); // Pass it to Javascript scripts
 		$oAppContext = new ApplicationContext();
 		$sExtraParams = $oAppContext->GetForLink();
-//		$this->m_currentOrganization = $currentOrganization;
+		$sAppContext = addslashes($sExtraParams);
 		$this->add_header("Content-type: text/html; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
 		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
-//		$this->add_linked_stylesheet("../css/date.picker.css");
 		$this->add_linked_script('../js/jquery.layout.min.js');
 		$this->add_linked_script('../js/jquery.ba-bbq.min.js');
-//		$this->add_linked_script("../js/jquery.dimensions.js");
 		$this->add_linked_script("../js/jquery.tablehover.js");
 		$this->add_linked_script("../js/jquery.treeview.js");
 		$this->add_linked_script("../js/jquery.autocomplete.js");
-		$this->add_linked_script("../js/jquery.bgiframe.js");
 		$this->add_linked_script("../js/jquery.positionBy.js");
 		$this->add_linked_script("../js/jquery.popupmenu.js");
 		$this->add_linked_script("../js/date.js");
-//		$this->add_linked_script("../js/jquery.date.picker.js");
 		$this->add_linked_script("../js/jquery.tablesorter.min.js");
 		$this->add_linked_script("../js/jquery.blockUI.js");
 		$this->add_linked_script("../js/utils.js");
 		$this->add_linked_script("../js/swfobject.js");
 		$this->add_linked_script("../js/ckeditor/ckeditor.js");
 		$this->add_linked_script("../js/ckeditor/adapters/jquery.js");
-		$this->add_ready_script(
-<<<EOF
+		$this->add_linked_script("../js/jquery.qtip-1.0.min.js");
+		$this->add_linked_script("../js/jquery.tablesorter.pager.js");
+		$this->m_sInitScript =
+<<< EOF
 	try
 	{
-	var myLayout; // a var is required because this page utilizes: myLayout.allowOverflow() method
-
-	$(document).ready(function () {
+		var myLayout; // a var is required because this page utilizes: myLayout.allowOverflow() method
+	
 		// Layout
 		paneSize = GetUserPreference('menu_size', 300)
 		myLayout = $('body').layout({
@@ -127,10 +131,37 @@ class iTopWebPage extends NiceWebPage
 		{
 			myLayout.close('west');
 		}
-
+	
 		// Accordion Menu
 		$("#accordion").accordion({ header: "h3", navigation: true, autoHeight: false, collapsible: false, icons: false }); // collapsible will be enabled once the item will be selected
- 	});
+	
+		// Tabs, using JQuery BBQ to store the history
+		// The "tab widgets" to handle.
+		var tabs = $('div[id^=tabbedContent]');
+		    
+		// This selector will be reused when selecting actual tab widget A elements.
+		var tab_a_selector = 'ul.ui-tabs-nav a';
+		  
+		// 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) {
+				$('.resizable', ui.panel).resizable(); // Make resizable everything that claims to be resizable !
+			}
+		});
+		
+		$('.resizable').filter(':visible').resizable();
+	}
+	catch(err)
+	{
+		// Do something with the error !
+		alert(err);
+	}
+EOF
+;
+		$this->add_ready_script(
+<<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
 	$.tablesorter.addWidget({ 
 	    // give the widget a id 
@@ -172,7 +203,6 @@ class iTopWebPage extends NiceWebPage
 	    } 
 	});
 
-	$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
 	// Adjust initial size
 	$('.v-resizable').each( function()
 		{
@@ -212,12 +242,6 @@ class iTopWebPage extends NiceWebPage
 	// This selector will be reused when selecting actual tab widget A elements.
 	var tab_a_selector = 'ul.ui-tabs-nav a';
 	  
-	// 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' });
-	  
 	// Define our own click handler for the tabs, overriding the default.
 	tabs.find( tab_a_selector ).click(function()
 	{
@@ -268,26 +292,22 @@ class iTopWebPage extends NiceWebPage
 			}
 		});
 	});
-	  
+	
+	// Shortcut menu actions
+	$('.actions_button a').click( function() {
+		aMatches = /#(.*)$/.exec(window.location.href);
+		if (aMatches != null)
+		{
+			currentHash = aMatches[1];
+			if ( /#(.*)$/.test(this.href))
+			{
+				this.href = this.href.replace(/#(.*)$/, '#'+currentHash);
+			}
+		}
+	});
+
 	// End of Tabs handling
 	$("table.listResults").tableHover(); // hover tables
-	// Check each 'listResults' table for a checkbox in the first column and make the first column sortable only if it does not contain a checkbox in the header
-	$(".listResults").each( function()
-		{
-			var table = $(this);
-			var id = $(this).parent();
-			var checkbox = (table.find('th:first :checkbox').length > 0);
-			if (checkbox)
-			{
-				// There is a checkbox in the first column, don't make it sortable
-				table.tablesorter( { headers: { 0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
-			}
-			else
-			{
-				// There is NO checkbox in the first column, all columns are considered sortable
-				table.tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
-			}
-		});
 	$(".date-pick").datepicker({
 			showOn: 'button',
 			buttonImage: '../images/calendar.png',
@@ -331,20 +351,8 @@ class iTopWebPage extends NiceWebPage
 	$('#ModalDlg').dialog({ autoOpen: false, modal: true, width: 0.8*docWidth }); // JQuery UI dialogs
 	ShowDebug();
 	$('#logOffBtn>ul').popupmenu();
-//	$.history.init(history_callback);
-//	$("a[rel='history']").click(function()
-//	{
-//		$.history.load(this.href.replace(/^.*#/, ''));
-//		return false;
-//	});
-	}
-	catch(err)
-	{
-		// Do something with the error !
-		alert(err);
-	}
 	
-	//$('.display_block').draggable(); // make the blocks draggable
+	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry').toggle(); });
 EOF
 );
 		$sUserPrefs = appUserPreferences::GetAsJSON();
@@ -362,10 +370,6 @@ EOF
 //			}
 //		}
 
-		function formatItem(row) {
-			return row[0];
-		}
-		
 		function goBack()
 		{
 			window.history.back();
@@ -373,22 +377,23 @@ EOF
 		
 		function BackToDetails(sClass, id, sDefaultUrl)
 		{
+			window.bInCancel = true;
 			if (id > 0)
 			{
-				window.location.href = './UI.php?operation=details&class='+sClass+'&id='+id;
+				window.location.href = AddAppContext(GetAbsoluteUrlAppRoot()+'pages/UI.php?operation=details&class='+sClass+'&id='+id);
 			}
 			else
 			{
-				window.location.href = sDefaultUrl;				
+				window.location.href = sDefaultUrl; // Already contains the context...				
 			}
 		}
 
 		
 		function BackToList(sClass)
 		{
-			window.location.href = './UI.php?operation=search_oql&oql_class='+sClass+'&oql_clause=WHERE id=0';
+			window.location.href = AddAppContext(GetAbsoluteUrlAppRoot()+'pages/UI.php?operation=search_oql&oql_class='+sClass+'&oql_clause=WHERE id=0');
 		}
-
+		
 		function ShowDebug()
 		{
 			if ($('#rawOutput > div').html() != '')
@@ -397,7 +402,46 @@ EOF
 			}
 		}
 		
+		function GetAbsoluteUrlAppRoot()
+		{
+			return '$sAbsURLAppRoot';
+		}
+		
+		function GetAbsoluteUrlModulesRoot()
+		{
+			return '$sAbsURLAppRoot'+'modules/';
+		}
+		
+		function AddAppContext(sURL)
+		{
+			var sContext = '$sAppContext';
+			if (sContext.length > 0)
+			{
+				if (sURL.indexOf('?') == -1)
+				{
+					return sURL+'?'+sContext;
+				}				
+				return sURL+'&'+sContext;
+			}
+			return sURL;
+		}
+		
 		var oUserPreferences = $sUserPrefs;
+
+		// For disabling the CKEditor at init time when the corresponding textarea is disabled !
+		CKEDITOR.plugins.add( 'disabler',
+		{
+		    init : function( editor )
+		    {
+		        editor.on( 'instanceReady', function(e)
+		        {
+		        	e.removeListener();
+			        $('#'+ editor.name).trigger('update');
+                });
+		    }
+		    
+		});
+
 EOF
 );
 		
@@ -422,11 +466,22 @@ EOF
 	{
 		// List of visible Organizations
 		$iCount = 0;
+		$oSet = null;
 		if (MetaModel::IsValidClass('Organization'))
 		{
+			// Display the list of *favorite* organizations... but keeping in mind what is the real number of organizations
+			$aFavoriteOrgs = appUserPreferences::GetPref('favorite_orgs', null);
 			$oSearchFilter = new DBObjectSearch('Organization');
 			$oSet = new CMDBObjectSet($oSearchFilter);
-			$iCount = $oSet->Count();
+			$iCount = $oSet->Count(); // total number of existing Orgs
+			
+			// Now get the list of Orgs to be displayed in the menu
+			$oSearchFilter = DBObjectSearch::FromOQL(ApplicationMenu::GetFavoriteSiloQuery());
+			if (!empty($aFavoriteOrgs))
+			{
+				$oSearchFilter->AddCondition('id', $aFavoriteOrgs, 'IN');
+			}
+			$oSet = new CMDBObjectSet($oSearchFilter); // List of favorite orgs
 		}
 		switch($iCount)
 		{
@@ -443,10 +498,12 @@ EOF
 			break;
 			
 			default:
+			$sHtml = '';
 			$oAppContext = new ApplicationContext();
 			$iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
 			$sHtml = '<div id="SiloSelection">';
-			$sHtml .= '<form style="display:inline" action="'.$_SERVER['PHP_SELF'].'"><select class="org_combo" name="c[org_id]" title="Pick an organization" onChange="this.form.submit();">';
+			$sHtml .= '<form style="display:inline" action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php">'; //<select class="org_combo" name="c[org_id]" title="Pick an organization" onChange="this.form.submit();">';
+/*
 			$sSelected = ($iCurrentOrganization == '') ? ' selected' : '';
 			$sHtml .= '<option value=""'.$sSelected.'>'.Dict::S('UI:AllOrganizations').'</option>';
 			while($oOrg = $oSet->Fetch())
@@ -464,10 +521,16 @@ EOF
 				$sHtml .= '<option title="'.$oOrg->GetName().'" value="'.$oOrg->GetKey().'"'.$sSelected.'>'.$oOrg->GetName().'</option>';
 			}
 			$sHtml .= '</select>';
+*/
+			$sFavoriteOrgs = '';
+			$oWidget = new UIExtKeyWidget('Organization', 'org_id');
+			$sHtml .= $oWidget->Display($this, 50, false, '', $oSet, $iCurrentOrganization, 'org_id', false, 'c[org_id]', '', array('iFieldSize' => 20, 'iMinChars' => MetaModel::GetConfig()->Get('min_autocomplete_chars'), 'sDefaultValue' => Dict::S('UI:AllOrganizations')), $bSearchMode = true);
+			$this->add_ready_script('$("#org_id").bind("extkeychange", function() { $("#SiloSelection form").submit(); } )');
+			$this->add_ready_script("$('#label_org_id').click( function() { $(this).val(''); $('#org_id').val(''); return true; } );\n");
 			// Add other dimensions/context information to this form
-//			$oAppContext = new ApplicationContext();
 			$oAppContext->Reset('org_id'); // org_id is handled above and we want to be able to change it here !
-			$sHtml .= $oAppContext->GetForForm();		
+			$oAppContext->Reset('menu'); // don't pass the menu, since a menu may expect more parameters
+			$sHtml .= $oAppContext->GetForForm(); // Pass what remains, if anything...
 			$sHtml .= '</form>';
 			$sHtml .= '</div>';
 		}
@@ -488,6 +551,7 @@ EOF
 	 */
     public function output()
     {
+		$sForm = $this->GetSiloSelectionForm();
 		$this->DisplayMenu(); // Compute the menu
 
 		// Put here the 'ready scripts' that must be executed after all others
@@ -496,6 +560,9 @@ EOF
 	// Since the event is only triggered when the hash changes, we need to trigger
 	// the event now, to handle the hash the page may have loaded with.
 	$(window).trigger( 'hashchange' );
+	
+	// Some table are sort-able, some are not, let's fix this
+	$('table.listResults').each( function() { FixTableSorter($(this)); } );
 
 EOF
 );
@@ -511,7 +578,7 @@ EOF
         // Make sure that Internet Explorer renders the page using its latest/highest/greatest standards !
         echo "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n";
         echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-        echo "<title>{$this->s_title}</title>\n";
+        echo "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
         echo $this->get_base_tag();
         // Stylesheets MUST be loaded before any scripts otherwise
         // jQuery scripts may face some spurious problems (like failing on a 'reload')
@@ -529,11 +596,22 @@ EOF
         }
         foreach($this->a_linked_scripts as $s_script)
         {
+         	// Make sure that the URL to the script contains the application's version number
+        	// so that the new script do NOT get reloaded from the cache when the application is upgraded
+        	if (strpos($s_script, '?') === false)
+        	{
+        		$s_script .= "?itopversion=".ITOP_VERSION;
+        	}
+        	else
+        	{
+        		$s_script .= "&itopversion=".ITOP_VERSION;
+        	}
             echo "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
         }
+		$this->add_script("\$(document).ready(function() {\n{$this->m_sInitScript};\nwindow.setTimeout('onDelayedReady()',10)\n});");
         if (count($this->m_aReadyScripts)>0)
         {
-			$this->add_script("\$(document).ready(function() {\n".implode("\n", $this->m_aReadyScripts)."\n});");
+			$this->add_script("\nonDelayedReady = function() {\n".implode("\n", $this->m_aReadyScripts)."\n}\n");
 		}
         if (count($this->a_scripts)>0)
         {
@@ -554,7 +632,9 @@ EOF
             }
             echo "</style>\n";
         }
-		echo "<link rel=\"search\" type=\"application/opensearchdescription+xml\" title=\"iTop\" href=\"./opensearch.xml.php\" />\n";
+		echo "<link rel=\"search\" type=\"application/opensearchdescription+xml\" title=\"iTop\" href=\"".utils::GetAbsoluteUrlAppRoot()."pages/opensearch.xml.php\" />\n";
+		echo "<link rel=\"shortcut icon\" href=\"".utils::GetAbsoluteUrlAppRoot()."images/favicon.ico\" />\n";
+		
         echo "</head>\n";
         echo "<body>\n";
 
@@ -564,7 +644,6 @@ EOF
 
 
 
-
 		// Render the revision number
 		if (ITOP_REVISION == '$WCREV$')
 		{
@@ -578,7 +657,7 @@ EOF
 		}
 
 		// Render the text of the global search form
-		$sText = Utils::ReadParam('text', '');
+		$sText = htmlentities(utils::ReadParam('text', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8');
 		$sOnClick = "";
 		if (empty($sText))
 		{
@@ -587,10 +666,7 @@ EOF
 			// 2) clicking on it will erase it
 			$sText = Dict::S("UI:YourSearch");
 			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
-		}
-
-		$sForm = $this->GetSiloSelectionForm();
-		
+		}		
 		// Render the tabs in the page (if any)
 		foreach($this->m_aTabs as $sTabContainerName => $m_aTabs)
 		{
@@ -632,15 +708,16 @@ EOF
 		}
 		$sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/onOffBtn.png\"><ul>";
 		$sLogOffMenu .= "<li><span>$sLogonMessage</span></li>\n";
+		$sLogOffMenu .= "<li><a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/preferences.php\">".Dict::S('UI:Preferences')."</a></li>\n";
 		
-		if (utils::CanLogOff() && UserRights::CanLogOff())
+		if (utils::CanLogOff())
 		{
 			//$sLogOffMenu .= "<li><a href=\"../pages/UI.php?loginop=logoff\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
-			$sLogOffMenu .= "<li><a href=\"../pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
+			$sLogOffMenu .= "<li><a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
 		}
 		if (UserRights::CanChangePassword())
 		{
-			$sLogOffMenu .= "<li><a href=\"../pages/UI.php?loginop=change_pwd\">".Dict::S('UI:ChangePwdMenu')."</a></li>\n";
+			$sLogOffMenu .= "<li><a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?loginop=change_pwd\">".Dict::S('UI:ChangePwdMenu')."</a></li>\n";
 		}
 		$sLogOffMenu .= "</ul>\n</li>\n</ul></span>\n";
 
@@ -669,6 +746,10 @@ EOF
 			}
 			$sApplicationBanner .= '</div>';
 		}
+		else if(strlen($this->m_sMessage))
+		{
+			$sApplicationBanner = '<div id="admin-banner"><span style="padding:5px;">'.$this->m_sMessage.'<span></div>';
+		}
 		else
 		{
 			$sApplicationBanner = '';
@@ -680,16 +761,16 @@ EOF
 		echo '<div id="left-pane" class="ui-layout-west">';
 		echo '<!-- Beginning of the left pane -->';
 		echo '	<div id="header-logo">';
-		echo '	<div id="top-left"></div><div id="logo"><a href="http://www.combodo.com/itop"><img src="../images/itop-logo.png" title="'.$sVersionString.'" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
+		echo '	<div id="top-left"></div><div id="logo"><a href="http://www.combodo.com/itop"><img src="../images/itop-logo.png" title="'.htmlentities($sVersionString, ENT_QUOTES, 'UTF-8').'" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
 		echo '	</div>';
 		echo '	<div class="header-menu">';
 		echo '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
-		echo '		<div style="text-align:center;">'.$sForm.'</div>';
+		echo '		<div style="text-align:center;">'.self::FilterXSS($sForm).'</div>';
 		echo '	</div>';
 		echo '	<div id="menu" class="ui-layout-content">';
 		echo '		<div id="inner_menu">';
 		echo '			<div id="accordion">';
-		echo $this->m_sMenu;
+		echo self::FilterXSS($this->m_sMenu);
 		echo '			<!-- Beginning of the accordion menu -->';
 		echo '			<!-- End of the accordion menu-->';
 		echo '			</div>';
@@ -701,74 +782,27 @@ EOF
 
 		echo '<div class="ui-layout-center">';
 		echo '	<div id="top-bar" style="width:100%">';
-		echo $sApplicationBanner;
-		echo '		<div id="global-search"><form action="../pages/UI.php"><table><tr><td></td><td id="g-search-input"><input type="text" name="text" value="'.$sText.'"'.$sOnClick.'/></td>';
+		echo self::FilterXSS($sApplicationBanner);
+		echo '		<div id="global-search"><form action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><table><tr><td></td><td id="g-search-input"><input type="text" name="text" value="'.$sText.'"'.$sOnClick.'/></td>';
 		echo '<td><input type="image" src="../images/searchBtn.png"/></a></td>';
 		echo '<td><a style="background:transparent;" href="'.$sOnlineHelpUrl.'" target="_blank"><img style="border:0;padding-left:20px;padding-right:10px;" title="'.Dict::S('UI:Help').'" src="../images/help.png"/></td>';
-		echo '<td style="padding-right:20px;padding-left:10px;">'.$sLogOffMenu.'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
+		echo '<td style="padding-right:20px;padding-left:10px;">'.self::FilterXSS($sLogOffMenu).'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
 		//echo '<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
 		echo '	</div>';
 		echo '	<div class="ui-layout-content">';
 		echo '	<!-- Beginning of page content -->';
-		echo $this->s_content;
+		echo self::FilterXSS($this->s_content);
 		echo '	<!-- End of page content -->';
 		echo '	</div>';
 		echo '</div>';
-/*		
-		echo "<div class=\"iTopLogo\" title=\"$sVersionString\"><span>iTop</span></div>\n";
-		//echo "<div id=\"GlobalSearch\"><div style=\"border: 1px solid #999; padding:1px; background-color:#fff;\"><img src=\"../images/magnifier.gif\"/><input style=\"border:0\" type=\"text\" size=\"15\" title=\"Global Search\"></input></div></div>\n";
-		$sText = Utils::ReadParam('text', '');
-		$sOnClick = "";
-		if (empty($sText))
-		{
-			// if no search text is supplied then
-			// 1) the search text is filled with "your search"
-			// 2) clicking on it will erase it
-			$sText = Dict::S("UI:YourSearch");
-			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
-		}
-		$sUserName = UserRights::GetUser();
-		$sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
-		if (UserRights::IsAdministrator())
-		{
-			$sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
-		}
-		else
-		{
-			$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);		
-		}
-		$sLogOffBtn = Dict::S('UI:Button:Logoff');
-		$sSearchBtn = Dict::S('UI:Button:GlobalSearch');
-		echo "<div id=\"Login\" style=\"position:absolute; top:18px; right:16px; width:600px;\">{$sLogonMessage}&nbsp;&nbsp;";
-		echo "<form action=\"../pages/UI.php\" method=\"post\" style=\"display:inline\">\n";
-		echo "<input type=\"submit\" value=\"$sLogOffBtn\" />\n";
-		echo "<input type=\"hidden\" name=\"loginop\" value=\"logoff\" />\n";
-		echo "</form>\n";
-		echo "<form action=\"../pages/UI.php\" style=\"display:inline\"><div style=\"padding:1px; background-color:#fff;display:inline;\"><img src=\"../images/magnifier.gif\"/><input style=\"border:0\" type=\"text\" size=\"15\" title=\"Global Search\" name=\"text\" value=\"$sText\"$sOnClick></input></div><input type=\"submit\" value=\"$sSearchBtn\" />
-			  <input type=\"hidden\" name=\"operation\" value=\"full_text\" /></form>\n";
-		echo "</div>\n";
 
-		echo "</div>\n";
-
-		// Display the menu
-		echo "<div id=\"MySplitter\">\n";
-		echo "  <div id=\"LeftPane\">\n";
-		echo $this->m_sMenu;
-		echo "  </div> <!-- LeftPane -->\n";
-		
-		echo "<div id=\"RightPane\">\n";
-    
-        
-		// Display the page's content
-        echo $this->s_content;
-
-*/
         // Add the captured output
         if (trim($s_captured_output) != "")
         {
-            echo "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">$s_captured_output</div></div>\n";
+            echo "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">".self::FilterXSS($s_captured_output)."</div></div>\n";
         }
-        echo $this->s_deferred_content;
+		echo "<div id=\"at_the_end\">".self::FilterXSS($this->s_deferred_content)."</div>";
+//		echo $this->s_deferred_content;
 		echo "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
 		echo "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
 		echo "<div style=\"display:none\" id=\"ajax_content\"></div>";
@@ -811,6 +845,11 @@ EOF
 		return $sPreviousTab;
 	}
 	
+	public function GetCurrentTab()
+	{
+		return $this->m_sCurrentTab;
+	}
+	
 	/**
 	 * Make the given tab the active one, as if it were clicked
 	 * DOES NOT WORK: apparently in the *old* version of jquery
@@ -882,6 +921,58 @@ EOF
         }
     }
     
+	/**
+	 * Records the current state of the 'html' part of the page output
+	 * @return mixed The current state of the 'html' output
+	 */    
+    public function start_capture()
+    {
+        if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_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);
+        }
+        else
+        {
+            return parent::start_capture();
+        }
+    }
+
+    /**
+     * Returns the part of the html output that occurred since the call to start_capture
+     * and removes this part from the current html output
+     * @param $offset mixed The value returned by start_capture
+     * @return string The part of the html output that was added since the call to start_capture
+     */    
+    public function end_capture($offset)
+    {
+    	if (is_array($offset))
+    	{
+    		if (isset($this->m_aTabs[$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']);
+    		}
+    		else
+    		{
+    			$sCaptured = '';
+    		}
+    	}
+    	else
+    	{
+    		$sCaptured = parent::end_capture($offset);
+    	}
+    	return $sCaptured;
+    }
+        
+    /**
+     * Set the message to be displayed in the 'admin-banner' section at the top of the page
+     */
+    public function SetMessage($sMessage)
+    {
+    	$this->m_sMessage = $sMessage;	
+    }
+    
     /*
     public function AddSearchForm($sClassName, $bOpen = false)
     {

application/itopwizardwebpage.class.inc.php

@@ -48,7 +48,7 @@ class iTopWizardWebPage extends iTopWebPage
     		$sStyle = ($iIndex == $this->m_iCurrentStep) ? 'wizActiveStep' : 'wizStep';
     		$aSteps[] = "<div class=\"$sStyle\"><span>$sStepTitle</span></div>";
     	}
-    	$sWizardHeader = "<div class=\"wizHeader\"><h1>{$this->s_title}</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
+    	$sWizardHeader = "<div class=\"wizHeader\"><h1>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
     	$this->s_content = "$sWizardHeader<div class=\"wizContainer\">".$this->s_content."</div>";
     	parent::output();
 	}

application/loginwebpage.class.inc.php

@@ -27,8 +27,11 @@ require_once(APPROOT."/application/nicewebpage.class.inc.php");
 /**
  * Web page used for displaying the login form
  */
+
 class LoginWebPage extends NiceWebPage
 {
+	protected static $m_sLoginFailedMessage = '';
+	
     public function __construct()
     {
         parent::__construct("iTop Login");
@@ -88,10 +91,21 @@ EOF
 );
 	}
 	
+	public static function SetLoginFailedMessage($sMessage)
+	{
+		self::$m_sLoginFailedMessage = $sMessage;
+	}
+	
 	public function DisplayLoginForm($sLoginType, $bFailedLogin = false)
 	{
 		switch($sLoginType)
 		{
+			case 'cas':
+			utils::InitCASClient();					
+			// force CAS authentication
+			phpCAS::forceAuthentication(); // Will redirect the user and exit since the user is not yet authenticated
+			break;
+			
 			case 'basic':
 			case 'url':
 			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
@@ -103,8 +117,8 @@ EOF
 			case 'external':
 			case 'form':
 			default: // In case the settings get messed up...
-			$sAuthUser = utils::ReadParam('auth_user', '');
-			$sAuthPwd = utils::ReadParam('suggest_pwd', '');
+			$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
+			$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
 	
 			$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
 			$this->add("<div id=\"login-logo\"><a href=\"http://www.combodo.com/itop\"><img title=\"$sVersionShort\" src=\"../images/itop-logo-external.png\"></a></div>\n");
@@ -112,7 +126,14 @@ EOF
 			$this->add("<h1>".Dict::S('UI:Login:Welcome')."</h1>\n");
 			if ($bFailedLogin)
 			{
-				$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectLoginPassword')."</p>\n");
+				if (self::$m_sLoginFailedMessage != '')
+				{
+					$this->add("<p class=\"hilite\">".self::$m_sLoginFailedMessage."</p>\n");
+				}
+				else
+				{
+					$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectLoginPassword')."</p>\n");
+				}
 			}
 			else
 			{
@@ -120,12 +141,13 @@ EOF
 			}
 			$this->add("<form method=\"post\">\n");
 			$this->add("<table width=\"100%\">\n");
-			$this->add("<tr><td style=\"text-align:right\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label></td><td style=\"text-align:left\"><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"$sAuthUser\" /></td></tr>\n");
-			$this->add("<tr><td style=\"text-align:right\"><label for=\"pwd\">".Dict::S('UI:Login:PasswordPrompt').":</label></td><td style=\"text-align:left\"><input id=\"pwd\" type=\"password\" name=\"auth_pwd\" value=\"$sAuthPwd\" /></td></tr>\n");
+			$this->add("<tr><td style=\"text-align:right\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label></td><td style=\"text-align:left\"><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
+			$this->add("<tr><td style=\"text-align:right\"><label for=\"pwd\">".Dict::S('UI:Login:PasswordPrompt').":</label></td><td style=\"text-align:left\"><input id=\"pwd\" type=\"password\" name=\"auth_pwd\" value=\"".htmlentities($sAuthPwd, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
 			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"> <input type=\"submit\" value=\"".Dict::S('UI:Button:Login')."\" /></td></tr>\n");
 			$this->add("</table>\n");
 			$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
 			$this->add("</form>\n");
+			$this->add(Dict::S('UI:Login:About'));
 			$this->add("</div>\n");
 			break;
 		}
@@ -133,8 +155,7 @@ EOF
 
 	public function DisplayChangePwdForm($bFailedLogin = false)
 	{
-		$sAuthUser = utils::ReadParam('auth_user', '');
-		$sAuthPwd = utils::ReadParam('suggest_pwd', '');
+		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
 
 		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
 		$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
@@ -216,10 +237,8 @@ EOF
 	{
 		if (self::SecureConnectionRequired() && !self::IsConnectionSecure())
 		{
-			// Non secured URL... redirect to a secured one
-			$sUrl = Utils::GetAbsoluteUrl(true /* query string */, true /* force HTTPS */);
-			header("Location: $sUrl");			
-			exit;
+			// Non secured URL... request for a secure connection
+			throw new Exception('Secure connection required!');			
 		}
 
 		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
@@ -241,10 +260,22 @@ EOF
 				$sLoginType = $aAllowedLoginTypes[$index];
 				switch($sLoginType)
 				{
+					case 'cas':
+					utils::InitCASClient();					
+					// check CAS authentication
+					if (phpCAS::isAuthenticated())
+					{
+						$sAuthUser = phpCAS::getUser();
+						$sAuthPwd = '';
+						$sLoginMode = 'cas';
+						$sAuthentication = 'external';
+					}
+					break;
+					
 					case 'form':
 					// iTop standard mode: form based authentication
-					$sAuthUser = utils::ReadPostedParam('auth_user', '');
-					$sAuthPwd = utils::ReadPostedParam('auth_pwd', '');
+					$sAuthUser = utils::ReadPostedParam('auth_user', '', false, 'raw_data');
+					$sAuthPwd = utils::ReadPostedParam('auth_pwd', '', false, 'raw_data');
 					if ($sAuthUser != '')
 					{
 						$sLoginMode = 'form';
@@ -270,12 +301,10 @@ EOF
 					case 'external':
 					// Web server supplied authentication
 					$bExternalAuth = false;
-                    $sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
-                    $sEval = '$bExternalAuth = isset('.$sExtAuthVar.');';
-                    eval($sEval);
-                    if ($bExternalAuth)
-                    {
-						eval('$sAuthUser = '.$sExtAuthVar.';'); // Retrieve the value
+					$sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
+					eval('$sAuthUser = isset('.$sExtAuthVar.') ? '.$sExtAuthVar.' : false;'); // Retrieve the value
+					if ($sAuthUser && (strlen($sAuthUser) > 0))
+					{
 						$sAuthPwd = ''; // No password in this case the web server already authentified the user...
 						$sLoginMode = 'external';
 						$sAuthentication = 'external';
@@ -284,10 +313,10 @@ EOF
 
 					case 'url':
 					// Credentials passed directly in the url
-					$sAuthUser = utils::ReadParam('auth_user', '');
-					if ($sAuthUser != '')
+					$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+					$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
+					if (($sAuthUser != '') && ($sAuthPwd != null))
 					{
-						$sAuthPwd = utils::ReadParam('auth_pwd', '');
 						$sLoginMode = 'url';
 					}		
 					break;	
@@ -314,8 +343,9 @@ EOF
 			}
 			else
 			{
-				if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sAuthentication))
+				if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sLoginMode, $sAuthentication))
 				{
+					//echo "Check Credentials returned false for user $sAuthUser!";
 					self::ResetSession();
 					$oPage = new LoginWebPage();
 					$oPage->DisplayLoginForm( $sLoginMode, true /* failed attempt */);
@@ -326,6 +356,16 @@ EOF
 				{
 					// User is Ok, let's save it in the session and proceed with normal login
 					UserRights::Login($sAuthUser, $sAuthentication); // Login & set the user's language
+					
+					if (MetaModel::GetConfig()->Get('log_usage'))
+					{
+						$oLog = new EventLoginUsage();
+						$oLog->Set('userinfo', UserRights::GetUser());
+						$oLog->Set('user_id', UserRights::GetUserObject()->GetKey());
+						$oLog->Set('message', 'Successful login');
+						$oLog->DBInsertNoReload();
+					}
+					
 					$_SESSION['auth_user'] = $sAuthUser;
 					$_SESSION['login_mode'] = $sLoginMode;
 				}
@@ -342,6 +382,7 @@ EOF
 	 */
 	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false)
 	{
+		$sMessage  = ''; // In case we need to return a message to the calling web page
 		$operation = utils::ReadParam('loginop', '');
 		session_name(MetaModel::GetConfig()->Get('session_name'));
 		session_start();
@@ -383,14 +424,15 @@ EOF
 		{
 			$sAuthUser = $_SESSION['auth_user'];
 			UserRights::Login($sAuthUser); // Set the user's language
-			$sOldPwd = utils::ReadPostedParam('old_pwd');
-			$sNewPwd = utils::ReadPostedParam('new_pwd');
+			$sOldPwd = utils::ReadPostedParam('old_pwd', '', false, 'raw_data');
+			$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
 			if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
 			{
 				$oPage = new LoginWebPage();
 				$oPage->DisplayChangePwdForm(true); // old pwd was wrong
 				$oPage->output();
 			}
+			$sMessage = Dict::S('UI:Login:PasswordChanged');
 		}
 		
 		self::Login();
@@ -400,16 +442,16 @@ EOF
 			require_once(APPROOT.'/setup/setuppage.class.inc.php');
 			$oP = new SetupWebPage(Dict::S('UI:PageTitle:FatalError'));
 			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");	
-			$oP->p("<a href=\"../pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
+			$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
 			$oP->output();
 			exit;
 		}
 		elseif ( (!$bIsAllowedToPortalUsers) && (UserRights::IsPortalUser()))
 		{
 			// No rights to be here, redirect to the portal
-			header('Location: ../portal/index.php');
+			header('Location: '.utils::GetAbsoluteUrlAppRoot().'portal/index.php');
 		}
-	}
-
+		return $sMessage;
+	}	
 } // End of class
 ?>

application/menunode.class.inc.php

@@ -61,6 +61,27 @@ class ApplicationMenu
 {
 	static $aRootMenus = array();
 	static $aMenusIndex = array();
+	static $sFavoriteSiloQuery = 'SELECT Organization';
+	
+	/**
+	 * Set the query used to limit the list of displayed organizations in the drop-down menu
+	 * @param $sOQL string The OQL query returning a list of Organization objects
+	 * @return none
+	 */
+	static public function SetFavoriteSiloQuery($sOQL)
+	{
+		self::$sFavoriteSiloQuery = $sOQL;
+	}
+	
+	/**
+	 * Get the query used to limit the list of displayed organizations in the drop-down menu
+	 * @return string The OQL query returning a list of Organization objects
+	 */
+	static public function GetFavoriteSiloQuery()
+	{
+		return self::$sFavoriteSiloQuery;
+	}
+	
 	
 	/**
 	 * Main function to add a menu entry into the application, can be called during the definition
@@ -83,6 +104,11 @@ class ApplicationMenu
 				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
 			}
 		}
+		else
+		{
+			// the menu already exists, let's combine the conditions that make it visible
+			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
+		}
 		return $index;
 	}
 	
@@ -266,22 +292,22 @@ abstract class MenuNode
 	/**
 	 * Class of objects to check if the menu is enabled, null if none
 	 */
-	protected $m_sEnableClass;
+	protected $m_aEnableClasses;
 
 	/**
 	 * User Rights Action code to check if the menu is enabled, null if none
 	 */
-	protected $m_iEnableAction;
+	protected $m_aEnableActions;
 
 	/**
 	 * User Rights allowed results (actually a bitmask) to check if the menu is enabled, null if none
 	 */
-	protected $m_iEnableActionResults;
+	protected $m_aEnableActionResults;
 
 	/**
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
 	 */	
-	protected $m_sEnableStimulus;
+	protected $m_aEnableStimuli;
 	
 	/**
 	 * Create a menu item, sets the condition to have it displayed and inserts it into the application's main menu
@@ -297,10 +323,10 @@ abstract class MenuNode
 	public function __construct($sMenuId, $iParentIndex = -1, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		$this->sMenuId = $sMenuId;
-		$this->m_sEnableClass = $sEnableClass;
-		$this->m_iEnableAction = $iActionCode;
-		$this->m_iEnableActionResults = $iAllowedResults;
-		$this->m_sEnableStimulus = $sEnableStimulus;
+		$this->m_aEnableClasses = array($sEnableClass);
+		$this->m_aEnableActions = array($iActionCode);
+		$this->m_aEnableActionResults = array($iAllowedResults);
+		$this->m_aEnableStimuli = array($sEnableStimulus);
 		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
 	}
 	
@@ -327,41 +353,57 @@ abstract class MenuNode
 	public function GetHyperlink($aExtraParams)
 	{
 		$aExtraParams['c[menu]'] = $this->GetIndex();
-		return $this->AddParams('../pages/UI.php', $aExtraParams);
+		return $this->AddParams(utils::GetAbsoluteUrlAppRoot().'pages/UI.php', $aExtraParams);
 	}
 	
+	/**
+	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
+	 * @param $oMenuNode MenuNode Another definition of the same menu node, with potentially different access restriction
+	 * @return void
+	 */
+	public function AddCondition(MenuNode $oMenuNode)
+	{
+		foreach($oMenuNode->m_aEnableClasses as $index => $sClass )
+		{
+			$this->m_aEnableClasses[] = $sClass;
+			$this->m_aEnableActions[] = $oMenuNode->m_aEnableActions[$index];
+			$this->m_aEnableActionResults[] = $oMenuNode->m_aEnableActionResults[$index];
+			$this->m_aEnableStimuli[] = $oMenuNode->m_aEnableStimuli[$index];
+		}
+	}
 	/**
 	 * Tells whether the menu is enabled (i.e. displayed) for the current user
 	 * @return bool True if enabled, false otherwise
 	 */
 	public function IsEnabled()
 	{
-		if ($this->m_sEnableClass != null)
+		foreach($this->m_aEnableClasses as $index => $sClass)
 		{
-			if (MetaModel::IsValidClass($this->m_sEnableClass))
+			if ($sClass != null)
 			{
-				if ($this->m_sEnableStimulus != null)
+				if (MetaModel::IsValidClass($sClass))
 				{
-					if (!UserRights::IsStimulusAllowed($this->m_sEnableClass, $this->m_sEnableStimulus))
+					if ($this->m_aEnableStimuli[$index] != null)
 					{
-						return false;
+						if (!UserRights::IsStimulusAllowed($sClass, $this->m_aEnableStimuli[$index]))
+						{
+							return false;
+						}
+					}
+					if ($this->m_aEnableActions[$index] != null)
+					{
+						$iResult = UserRights::IsActionAllowed($sClass, $this->m_aEnableActions[$index]);
+						if (!($iResult & $this->m_aEnableActionResults[$index]))
+						{
+							return false;
+						}
 					}
 				}
-				if ($this->m_iEnableAction != null)
+				else
 				{
-					$iResult = UserRights::IsActionAllowed($this->m_sEnableClass, $this->m_iEnableAction);
-					if (($iResult & $this->m_iEnableActionResults))
-					{
-						return true;
-					}
-					else
-					{
-						return false;
-					}
+					return false;
 				}
-				return true;
 			}
-			return false;
 		}
 		return true;
 	}
@@ -652,7 +694,7 @@ class NewObjectMenuNode extends MenuNode
 
 	public function GetHyperlink($aExtraParams)
 	{
-		$sHyperlink = '../pages/UI.php?operation=new&class='.$this->sClass;
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$this->sClass;
 		$aExtraParams['c[menu]'] = $this->GetIndex();
 		return $this->AddParams($sHyperlink, $aExtraParams);
 	}

application/portalwebpage.class.inc.php

@@ -26,6 +26,18 @@
 require_once(APPROOT."/application/nicewebpage.class.inc.php");
 require_once(APPROOT."/application/applicationcontext.class.inc.php");
 require_once(APPROOT."/application/user.preferences.class.inc.php");
+
+define('BUTTON_CANCEL', 1);
+define('BUTTON_BACK', 2);
+define('BUTTON_NEXT', 4);
+define('BUTTON_FINISH', 8);
+
+define('PARAM_ARROW_SEP', '_x_');
+
+class TransactionException extends Exception
+{
+}
+
 /**
  * Web page with some associated CSS and scripts (jquery) for a fancier display
  * of the Portal web page
@@ -35,16 +47,21 @@ class PortalWebPage extends NiceWebPage
 	/**
 	 * Portal menu
 	 */
+	protected $m_sWelcomeMsg;
 	protected $m_aMenuButtons;
 	
     public function __construct($sTitle, $sAlternateStyleSheet = '')
     {
+    	$this->m_sWelcomeMsg = '';
     	$this->m_aMenuButtons = array();
         parent::__construct($sTitle);
 		$this->add_header("Content-type: text/html; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
 		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
+		$sAbsURLAppRoot = addslashes(utils::GetAbsoluteUrlAppRoot()); // Pass it to Javascript scripts
+		$oAppContext = new ApplicationContext();
+		$sAppContext = addslashes($oAppContext->GetForLink());
 		if ($sAlternateStyleSheet != '')
 		{
 			$this->add_linked_stylesheet("../portal/$sAlternateStyleSheet/portal.css");
@@ -58,15 +75,16 @@ class PortalWebPage extends NiceWebPage
 		$this->add_linked_script("../js/jquery.tablehover.js");
 		$this->add_linked_script("../js/jquery.treeview.js");
 		$this->add_linked_script("../js/jquery.autocomplete.js");
-		$this->add_linked_script("../js/jquery.bgiframe.js");
 		$this->add_linked_script("../js/jquery.positionBy.js");
 		$this->add_linked_script("../js/jquery.popupmenu.js");
 		$this->add_linked_script("../js/date.js");
 		$this->add_linked_script("../js/jquery.tablesorter.min.js");
+		$this->add_linked_script("../js/jquery.tablesorter.pager.js");
 		$this->add_linked_script("../js/jquery.blockUI.js");
 		$this->add_linked_script("../js/utils.js");
 		$this->add_linked_script("../js/forms-json-utils.js");
 		$this->add_linked_script("../js/swfobject.js");
+		$this->add_linked_script("../js/jquery.qtip-1.0.min.js");
 		$this->add_ready_script(
 <<<EOF
 try
@@ -107,8 +125,6 @@ try
 	    } 
 	});
 		
-	$("table.listResults").tableHover(); // hover tables
-	$(".listResults").tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
 	$(".date-pick").datepicker({
 			showOn: 'button',
 			buttonImage: '../images/calendar.png',
@@ -118,7 +134,8 @@ try
 			changeMonth: true,
 			changeYear: true
 		});
-	$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
+	//$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
+	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry').toggle(); });
 }
 catch(err)
 {
@@ -130,9 +147,18 @@ EOF
 
 	$this->add_script(
 <<<EOF
-	function CheckSelection(sMessage)
+	function CheckSelection(sMessage, sInputId)
 	{
-		var bResult = ($('input:checked').length > 0);
+		var bResult;
+		if (sInputId.length > 0)
+		{
+			bResult = ($('input[name='+sInputId+']:checked').length > 0);
+		}
+		else
+		{
+			// First select found...
+			bResult = ($('input:checked').length > 0);
+		}
 		if (!bResult)
 		{
 			alert(sMessage);
@@ -140,19 +166,67 @@ EOF
 		return bResult;
 	}
 
-	function GoBack()
+		
+	function GetAbsoluteUrlAppRoot()
 	{
-		var form = $('#request_form');
-		var step = $('input[name=step]');
+		return '$sAbsURLAppRoot';
+	}
+	
+	function AddAppContext(sURL)
+	{
+		var sContext = '$sAppContext';
+		if (sContext.length > 0)
+		{
+			if (sURL.indexOf('?') == -1)
+			{
+				return sURL+'?'+sContext;
+			}				
+			return sURL+'&'+sContext;
+		}
+		return sURL;
+	}
+	
+	function GoBack(sFormId)
+	{
+		var form = $('#'+sFormId);
+		var step_back = $('input[name=step_back]');
 
 		form.unbind('submit'); // De-activate validation
-		step.val(step.val() -2); // To go Back one step: next step is x, current step is x-1, previous step is x-2
+
+		step_back.val(1);
 		form.submit(); // Go
 	}
+
+	function GoHome()
+	{
+		var form = $('FORM');
+		form.unbind('submit'); // De-activate validation
+		window.location.href = '?operation=';
+		return false;
+	}
+
+	function SetWizardNextStep(sStep)
+	{
+		var next_step = $('input[id=next_step]');
+		next_step.val(sStep);
+	}
 EOF
 );
 		
 	}
+
+	public function SetCurrentTab($sTabLabel = '')
+	{
+	}
+
+	/**
+	 * Specify a welcome message (optional)
+	 */
+	public function SetWelcomeMessage($sMsg)
+	{
+		$this->m_sWelcomeMsg = $sMsg;
+	}
+		 	
 	
 	/**
 	 * Add a button to the portal's main menu
@@ -161,17 +235,594 @@ EOF
 	{
 		$this->m_aMenuButtons[] = array('id' => $sId, 'label' => $sLabel, 'hyperlink' => $sHyperlink);
 	}
+
+	var $m_bEnableDisconnectButton = true;
+	public function EnableDisconnectButton($bEnable)
+	{
+		$this->m_bEnableDisconnectButton = $bEnable;
+	}
 	
 	public function output()
 	{
 		$sMenu = '';
-		$this->AddMenuButton('logoff', 'Portal:Disconnect', '../pages/logoff.php?portal=1'); // This menu is always present and is the last one
+		if ($this->m_bEnableDisconnectButton)
+		{
+			$this->AddMenuButton('logoff', 'Portal:Disconnect', utils::GetAbsoluteUrlAppRoot().'pages/logoff.php'); // This menu is always present and is the last one
+		}
 		foreach($this->m_aMenuButtons as $aMenuItem)
 		{
 			$sMenu .= "<a class=\"button\" id=\"{$aMenuItem['id']}\" href=\"{$aMenuItem['hyperlink']}\"><span>".Dict::S($aMenuItem['label'])."</span></a>";
 		}
-		$this->s_content = '<div id="portal"><div id="banner"><div id="logo"></div>'.$sMenu.'</div><div id="content">'.$this->s_content.'</div></div>';
+		$this->s_content = '<div id="portal"><div id="welcome">'.$this->m_sWelcomeMsg.'</div><div id="banner"><div id="logo"></div><div id="menu">'.$sMenu.'</div></div><div id="content">'.$this->s_content.'</div></div>';
 		parent::output();
 	}
+
+	/**
+	 * Displays a list of objects, without any hyperlink (except for the object's details)
+	 * @param DBObjectSet $oSet The set of objects to display
+	 * @param Array $aZList The ZList (list of field codes) to use for the tabular display
+	 * @param String $sEmptyListMessage Message displayed whenever the list is empty
+	 * @return string The HTML text representing the list
+	 */
+	 public function DisplaySet($oSet, $aZList, $sEmptyListMessage = '')
+	 {
+		if ($oSet->Count() > 0)
+		{
+			$sClass = $oSet->GetClass();
+			if (is_subclass_of($sClass, 'cmdbAbstractObject'))
+			{
+				// Home-made and very limited display of an object set
+
+				//
+				//$oSet->Seek(0);// juste pour que le warning soit moins crado
+				//$oSet->Fetch();// juste pour que le warning soit moins crado
+				//
+
+				$this->add("<div id=\"listOf$sClass\">\n");
+				cmdbAbstractObject::DisplaySet($this, $oSet, array('currentId' => "listOf$sClass", 'menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList)));
+				$this->add("</div>\n");
+			}
+			else
+			{
+				// Home-made and very limited display of an object set
+				$aAttribs = array();
+				$aValues = array();
+				$aAttribs['key'] = array('label' => MetaModel::GetName($sClass), 'description' => '');
+				foreach($aZList as $sAttCode)
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+					$aAttribs[$sAttCode] = array('label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
+				}
+				while($oObj = $oSet->Fetch())
+				{
+					$aRow = array();
+					
+					$aRow['key'] = '<a href="./index.php?operation=details&class='.get_class($oObj).'&id='.$oObj->GetKey().'">'.$oObj->GetName().'</a>';
+					$sHilightClass = $oObj->GetHilightClass();
+					if ($sHilightClass != '')
+					{
+						$aRow['@class'] = $sHilightClass;	
+					}
+					foreach($aZList as $sAttCode)
+					{
+						$aRow[$sAttCode] = $oObj->GetAsHTML($sAttCode);
+					}
+					$aValues[$oObj->GetKey()] = $aRow;
+				}
+				$this->table($aAttribs, $aValues);
+			}
+		}
+		elseif (strlen($sEmptyListMessage) > 0)
+		{
+			$this->add($sEmptyListMessage);
+		}
+	}
+
+	/**
+	 * Display the attributes of an object (no title, no form)
+	 * @param Object $oObj Any kind of object
+	 * @param aAttList The list of attributes to display
+	 * @return void
+	 */
+	public function DisplayObjectDetails($oObj, $aAttList)
+	{
+		$sClass = get_class($oObj);
+		$aDetails = array();
+		foreach($aAttList as $sAttCode)
+		{
+			$iFlags = $oObj->GetAttributeFlags($sAttCode);
+			$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
+			if ( (!$oAttDef->IsLinkSet()) && (($iFlags & OPT_ATT_HIDDEN) == 0) )
+			{
+				// Don't display linked set and non-visible attributes (in this state)
+				$sDisplayValue = $oObj->GetAsHTML($sAttCode);
+				$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
+			}
+		}
+		$this->details($aDetails);
+	}
+	
+	/**
+	 * DisplayObjectLinkset
+	 * @param Object $oObj Any kind of object
+	 * @param $sLinkSetAttCode The attribute code of the link set attribute to display
+	 * @param $sRemoteAttCode The external key on the linked class, pointing to the remote objects
+	 * @param $aZList The list of attribute of the remote object
+	 * @param $sEmptyListMessage The message to display if the list is empty	  
+	 * @return void
+	 */
+	public function DisplayObjectLinkset($oObj, $sLinkSetAttCode, $sRemoteAttCode, $aZList, $sEmptyListMessage = '', $oSearchRestriction = null)
+	{
+		if (empty($sEmptyListMessage))
+		{
+			$sEmptyListMessage = Dict::S('UI:Search:NoObjectFound');
+		}
+	
+		$oLinkSet = $oObj->Get($sLinkSetAttCode);
+		if ($oLinkSet->Count() > 0)
+		{
+			$sClass = $oLinkSet->GetClass();
+			$oExtKeyToRemote = MetaModel::GetAttributeDef($sClass, $sRemoteAttCode);
+			$sRemoteClass = $oExtKeyToRemote->GetTargetClass();			
+	
+			if (is_null($oSearchRestriction))
+			{
+				$oObjSearch = new DBObjectSearch($sRemoteClass);
+			}
+			else
+			{
+				$oObjSearch = $oSearchRestriction;
+			}
+			$oObjSearch->AddCondition_ReferencedBy($oLinkSet->GetFilter(), $sRemoteAttCode);
+
+			$aExtraParams = array('menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList));
+			$oBlock = new DisplayBlock($oObjSearch, 'list', false);
+			$oBlock->Display($this, 1, $aExtraParams);
+		}
+		elseif (strlen($sEmptyListMessage) > 0)
+		{
+			$this->add($sEmptyListMessage);
+		}
+	}
+
+
+	protected function DisplaySearchField($sClass, $sAttSpec, $aExtraParams, $sPrefix, $sFieldName = null)
+	{
+		if (is_null($sFieldName))
+		{
+			$sFieldName = str_replace('->', PARAM_ARROW_SEP, $sAttSpec);
+		}
+
+		$iPos = strpos($sAttSpec, '->');
+		if ($iPos !== false)
+		{
+			$sAttCode = substr($sAttSpec, 0, $iPos);
+			$sSubSpec = substr($sAttSpec, $iPos + 2);
+
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				throw new Exception("Invalid attribute code '$sClass/$sAttCode' in search specification '$sAttSpec'");
+			}
+
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef->IsLinkSet())
+			{
+				$sTargetClass = $oAttDef->GetLinkedClass();
+			}
+			elseif ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+			{
+				$sTargetClass = $oAttDef->GetTargetClass(EXTKEY_ABSOLUTE);
+			}
+			else
+			{
+				throw new Exception("Attribute specification '$sAttSpec', '$sAttCode' should be either a link set or an external key");
+			}
+			$this->DisplaySearchField($sTargetClass, $sSubSpec, $aExtraParams, $sPrefix, $sFieldName);
+		}
+		else
+		{
+			// $sAttSpec is an attribute code
+			//
+			$this->add('<span style="white-space: nowrap;padding:5px;display:inline-block;">');
+			$sFilterValue = '';
+			$sFilterValue = utils::ReadParam($sPrefix.$sFieldName, '', false, 'raw_data');
+			$sFilterOpCode = null; // Use the default 'loose' OpCode
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttSpec);
+			if ($oAttDef->IsExternalKey())
+			{
+				$sTargetClass = $oAttDef->GetTargetClass();
+				$oAllowedValues = new DBObjectSet(new DBObjectSearch($sTargetClass));
+		
+				$iFieldSize = $oAttDef->GetMaxSize();
+				$iMaxComboLength = $oAttDef->GetMaximumComboLength();
+				$this->add("<label>".MetaModel::GetFilterLabel($sClass, $sAttSpec).":</label>&nbsp;");
+				//$oWidget = UIExtKeyWidget::DIsplayFromAttCode($sAttSpec, $sClass, $oAttDef->GetLabel(), $oAllowedValues, $sFilterValue, $sPrefix.$sFieldName, false, '', $sPrefix, '');
+				//$this->add($oWidget->Display($this, $aExtraParams, true /* bSearchMode */));
+				$aExtKeyParams = $aExtraParams;
+				$aExtKeyParams['iFieldSize'] = $oAttDef->GetMaxSize();
+				$aExtKeyParams['iMinChars'] = $oAttDef->GetMinAutoCompleteChars();
+				//	                      DisplayFromAttCode($this, $sAttCode, $sClass, $sTitle,              $oAllowedValues, $value,        $iInputId,            $bMandatory, $sFieldName = '', $sFormPrefix = '', $aArgs, $bSearchMode = false)
+				$sHtml = UIExtKeyWidget::DisplayFromAttCode($this, $sAttSpec, $sClass, $oAttDef->GetLabel(), $oAllowedValues, $sFilterValue, $sPrefix.$sFieldName, false, $sPrefix.$sFieldName, $sPrefix, $aExtKeyParams, true);
+				$this->add($sHtml);
+			}
+			else
+			{
+				$aAllowedValues = MetaModel::GetAllowedValues_flt($sClass, $sAttSpec, $aExtraParams);
+				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");
+				}
+				else
+				{
+					//Enum field or external key, display a combo
+					$sValue = "<select name=\"$sPrefix$sFieldName\">\n";
+					$sValue .= "<option value=\"\">".Dict::S('UI:SearchValue:Any')."</option>\n";
+					foreach($aAllowedValues as $key => $value)
+					{
+						if ($sFilterValue == $key)
+						{
+							$sSelected = ' selected';
+						}
+						else
+						{
+							$sSelected = '';
+						}
+						$sValue .= "<option value=\"$key\"$sSelected>$value</option>\n";
+					}
+					$sValue .= "</select>\n";
+					$this->add("<label>".MetaModel::GetFilterLabel($sClass, $sAttSpec).":</label>&nbsp;$sValue\n");
+				}
+			}				
+			unset($aExtraParams[$sFieldName]);
+			$this->add('</span> ');
+
+			$sTip = $oAttDef->GetHelpOnSmartSearch();
+			if (strlen($sTip) > 0)
+			{
+				$sTip = addslashes($sTip);
+				$sTip = str_replace(array("\n", "\r"), " ", $sTip);
+				// :input does represent in form visible input (INPUT, SELECT, TEXTAREA)
+				$this->add_ready_script("$(':input[name={$sPrefix}$sFieldName]').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+			}
+		}
+	}
+	
+	
+	public function DisplaySearchForm($sClass, $aAttList, $aExtraParams, $sPrefix, $bClosed = true)
+	{
+		$sCSSClass = ($bClosed) ? 'DrawerClosed' : '';
+		$this->add("<div id=\"ds_$sPrefix\" class=\"SearchDrawer $sCSSClass\">\n");
+		$this->add_ready_script(
+<<<EOF
+		$("#dh_$sPrefix").click( function() {
+		$("#ds_$sPrefix").slideToggle('normal', function() { $("#ds_$sPrefix").parent().resize(); } );
+		$("#dh_$sPrefix").toggleClass('open');
+	});
+EOF
+		);
+		$this->add("<form id=\"search_$sClass\" action=\"\" method=\"post\">\n"); // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
+	//	$this->add("<h2>".Dict::Format('UI:SearchFor_Class_Objects', 'xxxxxx')."</h2>\n");
+		$this->add("<p>\n");
+		foreach($aAttList as $sAttSpec)
+		{
+			//$oAppContext->Reset($sAttSpec); // Make sure the same parameter will not be passed twice
+			$this->DisplaySearchField($sClass, $sAttSpec, $aExtraParams, $sPrefix);
+		}
+		$this->add("</p>\n");
+		$this->add("<p align=\"right\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Search')."\"></p>\n");
+		foreach($aExtraParams as $sName => $sValue)
+		{
+			$this->add("<input type=\"hidden\" name=\"$sName\" value=\"$sValue\" />\n");
+		}
+	//	$this->add($oAppContext->GetForForm());
+		$this->add("</form>\n");
+ 		$this->add("</div>\n");
+ 		$this->add("<div class=\"HRDrawer\"></div>\n");
+ 		$this->add("<div id=\"dh_$sPrefix\" class=\"DrawerHandle\">".Dict::S('UI:SearchToggle')."</div>\n");
+	}
+
+	/**
+	 * Read parameters from the page
+	 * Parameters that were absent from the page's parameters are not set in the resulting hash array
+	 * @input string $sMethod Either get or post
+	 * @return Hash Array of name => value corresponding to the parameters that were passed to the page
+	 */
+	public function ReadAllParams($sParamList, $sPrefix = 'attr_')
+	{
+		$aParams = explode(',', $sParamList);
+		$aValues = array();
+		foreach($aParams as $sName)
+		{
+			$sName = trim($sName);
+			$value = utils::ReadParam($sPrefix.$sName, null, false, 'raw_data');
+			if (!is_null($value))
+			{
+				$aValues[$sName] = $value;
+			}
+		}
+		return $aValues;
+	}
+
+	/**
+	 * Outputs a list of parameters as hidden fields
+	 * Example: attr_dummy[-123][id] = "blah"
+	 * @param Hash $aParameters Array name => value for the parameters
+	 * @param Array $aExclude The list of parameters that must not be handled this way (probably already in the visible part of the form)
+	 * @return void
+	 */
+	protected function DumpHiddenParamsInternal($sName, $value)
+	{
+		if (is_array($value))
+		{
+			foreach($value as $sKey => $item)
+			{
+				$this->DumpHiddenParamsInternal($sName.'['.$sKey.']', $item);
+			}
+		}
+		else
+		{
+			$this->Add("<input type=\"hidden\" name=\"$sName\" value=\"$value\">");
+		}
+	}
+
+	/**
+	 * Outputs a list of parameters as hidden field into the current page
+	 * (must be called when inside a form)
+	 * @param Hash $aParameters Array name => value for the parameters
+	 * @param Array $aExclude The list of parameters that must not be handled this way (probably already in the visible part of the form)
+	 * @return void
+	 */
+	public function DumpHiddenParams($aParameters, $aExclude = null, $sPrefix = 'attr_')
+	{
+		foreach($aParameters as $sAttCode => $value)
+		{
+			if (is_null($aExclude) || !in_array($sAttCode, $aExclude))
+			{
+				$this->DumpHiddenParamsInternal($sPrefix.$sAttCode, $value);
+			}
+		}
+	}
+
+	public function PostedParamsToFilter($sClass, $aAttList, $sPrefix)
+	{
+		$oFilter = new DBObjectSearch($sClass);
+		$iCountParams = 0;
+		foreach($aAttList as $sAttSpec)
+		{
+			$sFieldName = str_replace('->', PARAM_ARROW_SEP, $sAttSpec);
+			$value = utils::ReadPostedParam($sPrefix.$sFieldName, null, 'raw_data');
+			if (!is_null($value) && strlen($value) > 0)
+			{
+				$oFilter->AddConditionAdvanced($sAttSpec, $value);
+				$iCountParams++;
+			}
+		}
+		if ($iCountParams == 0)
+		{
+			return null;
+		}
+		else
+		{
+			return $oFilter;
+		}
+	}
+
+	/**
+	 * Updates the object form POSTED arguments, and writes it into the DB (applies a stimuli if requested)
+	 * @param DBObject $oObj The object to update
+	 * $param array $aAttList If set, this will limit the list of updated attributes	 
+	 * @return void
+	 */
+	public function DoUpdateObjectFromPostedForm(DBObject $oObj, $aAttList = null)
+	{
+		$sTransactionId = utils::ReadPostedParam('transaction_id', '');
+		if (!utils::IsTransactionValid($sTransactionId))
+		{
+			throw new TransactionException();
+		}
+	
+		$sClass = get_class($oObj);
+
+		$sStimulus = trim(utils::ReadPostedParam('apply_stimulus', ''));
+		$sTargetState = '';
+		if (!empty($sStimulus))
+		{
+			// Compute the target state
+
+			$aTransitions = $oObj->EnumTransitions();
+			if (!isset($aTransitions[$sStimulus]))
+			{
+				throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulus, $oObj->GetName(), $oObj->GetStateLabel()));
+			}
+			$sTargetState = $aTransitions[$sStimulus]['target_state'];
+		}
+			
+		$oObj->UpdateObjectFromPostedForm('' /* form prefix */, $aAttList, $sTargetState);
+
+		// Optional: apply a stimulus
+		//
+		if (!empty($sStimulus))
+		{
+			if (!$oObj->ApplyStimulus($sStimulus))
+			{
+					throw new Exception("Cannot apply stimulus '$sStimulus' to {$oObj->GetName()}");
+			}
+		}
+		
+		// Record the change
+		//
+		$oMyChange = MetaModel::NewObject("CMDBChange");
+		$oMyChange->Set("date", time());
+		$sUserString = CMDBChange::GetCurrentUserName();
+		$oMyChange->Set("userinfo", $sUserString);
+		$iChangeId = $oMyChange->DBInsert();
+		$oObj->DBUpdateTracked($oMyChange);
+		
+		// Trigger ?
+		//
+		$aClasses = MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL);
+		$sClassList = implode(", ", CMDBSource::Quote($aClasses));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnPortalUpdate AS t WHERE t.target_class IN ($sClassList)"));
+		while ($oTrigger = $oSet->Fetch())
+		{
+			$oTrigger->DoActivate($oObj->ToArgs('this'));
+		}
+
+		$this->p("<h1>".Dict::Format('UI:Class_Object_Updated', MetaModel::GetName(get_class($oObj)), $oObj->GetName())."</h1>\n");
+	}
+
+	/**
+	 * Find the object of the specified Class/ID.
+	 * @param WebPage $oP The current page
+	 * @return DBObject The found object, or throws an exception in case of failure
+	 */
+	public function FindObjectFromArgs($aAllowedClasses = null)
+	{
+		$sClass = utils::ReadParam('class', '', true, 'class');
+		$iId = utils::ReadParam('id', 0, true, 'integer');
+	
+		if (empty($sClass))
+		{
+			throw new Exception("Missing argument 'class'");
+		}
+		if (!MetaModel::IsValidClass($sClass))
+		{
+			throw new Exception("Wrong value for argument 'class': $sClass");
+		}
+		if ($iId == 0)
+		{
+			throw new Exception("Missing argument 'id'");
+		}
+
+		if(!is_null($aAllowedClasses))
+		{
+			$bAllowed = false;
+			foreach($aAllowedClasses as $sParentClass)
+			{
+				if (MetaModel::IsParentClass($sParentClass, $sClass))
+				{
+					$bAllowed = true;
+				}
+			}
+			if (!$bAllowed)
+			{
+				throw new Exception("Class '$sClass not allowed in this implementation'");
+			}
+		}
+
+		$oObj = MetaModel::GetObject($sClass, $iId, false);
+		if (!is_object($oObj))
+		{
+			throw new Exception("Could not find the object $sClass/$iId");
+		}
+		return $oObj;
+	}
+
+	var $m_sWizardId = null;
+
+	public function WizardFormStart($sId = '', $sNextStep = null, $bAttachment = false, $sMethod = 'post')
+	{
+		$this->m_sWizardId = $sId;
+
+		// multipart... needed for file upload
+		$this->add("<form id=\"{$this->m_sWizardId}\" method=\"$sMethod\" enctype=\"multipart/form-data\">\n");
+
+		$aPreviousSteps = $this->GetWizardStepHistory();
+		if (utils::ReadParam('step_back', 0) == 1)
+		{
+			// Back into the past history
+			array_pop($aPreviousSteps);
+		}
+		else
+		{
+			// Moving forward
+			array_push($aPreviousSteps, utils::ReadParam('next_step'));
+		}
+
+		$sStepHistory = implode(',', $aPreviousSteps);
+		$this->add("<input type=\"hidden\" id=\"step_history\" name=\"step_history\" value=\"$sStepHistory\">");
+
+		if (!is_null($sNextStep))
+		{		
+			$this->add("<input type=\"hidden\" id=\"next_step\" name=\"next_step\" value=\"$sNextStep\">");
+		}
+		$this->add("<input type=\"hidden\" id=\"step_back\" name=\"step_back\" value=\"0\">");
+
+		$sTransactionId = utils::GetNewTransactionId();
+		$this->SetTransactionId($sTransactionId);
+		$this->add("<input type=\"hidden\" id=\"transaction_id\" name=\"transaction_id\" value=\"$sTransactionId\">\n");
+		$this->add_ready_script("$(window).unload(function() { OnUnload('$sTransactionId') } );\n");
+	}
+
+	public function WizardFormButtons($iButtonFlags)
+	{
+		$aButtons = array();
+		if ($iButtonFlags & BUTTON_CANCEL)
+		{
+			$aButtons[] = "<input id=\"btn_cancel\" type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"GoHome();\">";
+		}
+		if ($iButtonFlags & BUTTON_BACK)
+		{
+			$aButtons[] = "<input id=\"btn_back\" type=\"submit\" value=\"".Dict::S('UI:Button:Back')."\"  onClick=\"GoBack('{$this->m_sWizardId}');\">";
+		}
+		if ($iButtonFlags & BUTTON_NEXT)
+		{
+			$aButtons[] = "<input id=\"btn_next\" type=\"submit\" value=\"".Dict::S('UI:Button:Next')."\">";
+		}
+		if ($iButtonFlags & BUTTON_FINISH)
+		{
+			$aButtons[] = "<input id=\"btn_finish\" type=\"submit\" value=\"".Dict::S('UI:Button:Finish')."\">";
+		}
+
+		$this->add('<div id="buttons">');
+		$this->add(implode('', $aButtons));
+		$this->add('</div>');
+	}
+
+	public function WizardFormEnd()
+	{
+		$this->add("</form>\n");
+	}
+
+	public function GetWizardStep()
+	{
+		if (utils::ReadParam('step_back', 0) == 1)
+		{
+			// Take the value into the history - one level above
+			$aPreviousSteps = $this->GetWizardStepHistory();
+			array_pop($aPreviousSteps);
+			return end($aPreviousSteps);
+		}
+		else
+		{
+			return utils::ReadParam('next_step');
+		}
+	}
+
+	protected function GetWizardStepHistory()
+	{
+		$sRawHistory = trim(utils::ReadParam('step_history', '', false, 'raw_data'));
+		if (strlen($sRawHistory) == 0)
+		{
+			return array();
+		}
+		else
+		{
+			return explode(',', $sRawHistory);
+		}
+	}
+
+	public function WizardCheckSelectionOnSubmit($sMessageIfNoSelection, $sInputName = '')
+	{
+		$this->add_ready_script(
+<<<EOF
+	$('#{$this->m_sWizardId}').submit(function() {
+		return CheckSelection('$sMessageIfNoSelection', '$sInputName');
+	});
+EOF
+		);
+	}
 }
+
 ?>

application/query.class.inc.php

@@ -0,0 +1,107 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Persistent class Event and derived
+ * Application internal events
+ * There is also a file log 
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+abstract class Query extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_query",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"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())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		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('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class QueryOQL extends Query
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_query_oql",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		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('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		
+		if (!$bEditMode)
+		{
+			$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			$sOql = $this->Get('oql');
+			$oSearch = DBObjectSearch::FromOQL($sOql);
+			$aParameters = $oSearch->GetQueryParams();
+			foreach($aParameters as $sParam => $val)
+			{
+				$sUrl .= '&arg_'.$sParam.'=["'.$sParam.'"]';
+			}
+			$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');		
+		}
+	}
+}
+
+?>

application/sqlblock.class.inc.php

@@ -0,0 +1,531 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * SqlBlock - display tables or charts, given an SQL query - use cautiously!
+ *  
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+
+require_once(APPROOT.'/pages/php-ofc-library/open-flash-chart.php');
+
+/**
+ * Helper class to design optimized dashboards, based on an SQL query
+ *  
+ */
+class SqlBlock
+{
+	protected $m_sQuery;
+	protected $m_aColumns;
+	protected $m_sTitle;
+	protected $m_sType;
+	protected $m_aParams;
+	                            
+	public function __construct($sQuery, $aColumns, $sTitle, $sType, $aParams = array())
+	{
+		$this->m_sQuery = $sQuery;
+		$this->m_aColumns = $aColumns;
+		$this->m_sTitle = $sTitle;
+		$this->m_sType = $sType;
+		$this->m_aParams = $aParams;
+	}
+	
+	/**
+	 * Constructs a SqlBlock object from an XML template
+	/*
+	 *
+	 *		<sqlblock>
+	 *			<sql>SELECT date_format(start_date, '%d') AS Date, count(*) AS Count FROM ticket WHERE DATE_SUB(NOW(), INTERVAL 15 DAY) &lt; start_date AND finalclass = 'UserIssue' GROUP BY date_format(start_date, '%d') AND $CONDITION(param1, ticket.org_id)$</sql>
+	 *			<type>table</type>
+	 *			<title>UserRequest:Overview-Title</title>
+	 *			<parameter>
+	 * 				<name>param1</name>
+	 * 				<type>context</type>
+	 * 				<mapping>org_id</mapping>
+	 * 			</parameter>
+	 *			<column>
+	 *				<name>Date</name>
+	 *				<label>UserRequest:Overview-Date</label>
+	 *				<drilldown></drilldown>
+	 *			</column>
+	 *			<column>
+	 *				<name>Count</name>
+	 *				<label>UserRequest:Overview-Count</label>
+	 *				<drilldown>SELECT UserIssue WHERE date_format(start_date, '%d') = :Date</drilldown>
+	 *			</column>
+	 *		</sqlblock>
+	 *
+	 * Tags
+	 * - sql: a (My)SQL query. Do not forget to use html entities (e.g. &lt; for <)
+	 * - type: table (default), bars or pie. If bars or pie is selected only the two first columns are taken into account.
+	 * - title: optional title, typed in clear or given as a dictionnary entry
+	 * - parameter: specifies how to map the context parameters (namely org_id) to a given named parameter in the query.
+	 *   The expression $CONDITION(<param_name>, <sql_column_name>) will be automatically replaced by:
+	 *   either the string "1" if there is no restriction on the organisation in iTop
+	 *   or the string "(<sql_column_name>=<value_of_org_id>)" if there is a limitation to one organizations in iTop
+	 *   or the string "(<sql_column_name> IN (<values_of_org_id>))" if there is a limitation to a given set of organizations in iTop
+	 * - column: specification of a column (not displayed if omitted)
+	 * - column / name: name of the column in the SQL query (use aliases)
+	 * - column / label: label, typed in clear or given as a dictionnary entry
+	 * - column / drilldown: NOT IMPLEMENTED YET - OQL with parameters corresponding to column names (in the query)
+	 *
+	 * @param $sTemplate string The XML template
+	 * @return DisplayBlock The DisplayBlock object, or null if the template is invalid
+	 */
+	public static function FromTemplate($sTemplate)
+	{
+		$oXml = simplexml_load_string('<root>'.$sTemplate.'</root>', 'SimpleXMLElement', LIBXML_NOCDATA);
+		if (false)
+		{
+			// Debug
+			echo "<pre>\n";
+			print_r($oXml);
+			echo "</pre>\n";
+		}
+
+		if (isset($oXml->title))
+		{
+			$sTitle = (string)$oXml->title;
+		}
+		if (isset($oXml->type))
+		{
+			$sType = (string)$oXml->type;
+		}
+		else
+		{
+			$sType = 'table';
+		}
+		if (!isset($oXml->sql))
+		{
+			throw new Exception('Missing tag "sql" in sqlblock');
+		}
+		$sQuery = (string)$oXml->sql;
+
+		$aColumns = array();
+		if (isset($oXml->column))
+		{
+			foreach ($oXml->column AS $oColumnData)
+			{
+				if (!isset($oColumnData->name))
+				{
+					throw new Exception("Missing tag 'name' in sqlblock/column");
+				}
+				$sName = (string) $oColumnData->name;
+				if (strlen($sName) == 0)
+				{
+					throw new Exception("Empty tag 'name' in sqlblock/column");
+				}
+
+				$aColumns[$sName] = array();
+				if (isset($oColumnData->label))
+				{
+					$sLabel = (string)$oColumnData->label;
+					if (strlen($sLabel) > 0)
+					{
+						$aColumns[$sName]['label'] = Dict::S($sLabel);
+					}
+				}
+				if (isset($oColumnData->drilldown))
+				{
+					$sDrillDown = (string)$oColumnData->drilldown;
+					if (strlen($sDrillDown) > 0)
+					{
+						$aColumns[$sName]['drilldown'] = $sDrillDown;
+					}
+				}
+			}
+		}
+		$aParams = array();
+		if (isset($oXml->parameter))
+		{
+			foreach ($oXml->parameter AS $oParamData)
+			{
+				if (!isset($oParamData->name))
+				{
+					throw new Exception("Missing tag 'name' for parameter in sqlblock/column");
+				}
+				$sName = (string) $oParamData->name;
+				if (strlen($sName) == 0)
+				{
+					throw new Exception("Empty tag 'name' for parameter in sqlblock/column");
+				}
+				if (!isset($oParamData->mapping))
+				{
+					throw new Exception("Missing tag 'mapping' for parameter in sqlblock/column");
+				}
+				$sMapping = (string) $oParamData->mapping;
+				if (strlen($sMapping) == 0)
+				{
+					throw new Exception("Empty tag 'mapping' for parameter in sqlblock/column");
+				}
+				
+				if (isset($oParamData->type))
+				{
+					$sParamType = $oParamData->type;
+				}
+				else
+				{
+					$sParamType = 'context';
+				}
+				$aParams[$sName] = array('mapping' => $sMapping, 'type' => $sParamType);
+			}
+		}
+		
+		return new SqlBlock($sQuery, $aColumns, $sTitle, $sType, $aParams);		
+	}
+	
+	/**
+	 * Applies the defined parameters into the SQL query
+	 * @return string the SQL query to execute
+	 */
+	public function BuildQuery()
+	{
+		$oAppContext = new ApplicationContext();
+		$sQuery = $this->m_sQuery;
+		$sQuery = str_replace('$DB_PREFIX$', MetaModel::GetConfig()->GetDBSubname(), $sQuery); // put the tables DB prefix (if any)
+		foreach($this->m_aParams as $sName => $aParam)
+		{
+			if ($aParam['type'] == 'context')
+			{
+				$sSearchPattern = '/\$CONDITION\('.$sName.',([^\)]+)\)\$/';
+				$value = $oAppContext->GetCurrentValue($aParam['mapping']);
+				if (empty($value))
+				{
+					$sSQLExpr = '(1)';
+				}
+				else
+				{
+					// Special case for managing the hierarchy of organizations
+					if (($aParam['mapping'] == 'org_id') && ( MetaModel::IsValidClass('Organization')))
+					{
+						$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
+						if ($sHierarchicalKeyCode != false)
+						{
+							// organizations are in hierarchy... gather all the orgs below the given one...
+							$sOQL = "SELECT Organization AS node JOIN Organization AS root ON node.$sHierarchicalKeyCode BELOW root.id WHERE root.id = :value";
+							$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array(), array('value' => $value));
+							$aOrgIds = array();
+							while($oOrg = $oSet->Fetch())
+							{
+								$aOrgIds[]= $oOrg->GetKey();
+							}
+							$sSQLExpr = '($1 IN('.implode(',', $aOrgIds).'))';
+						}
+						else
+						{
+							$sSQLExpr = '($1 = '.CMDBSource::Quote($value).')';
+						}
+					}
+					else
+					{
+						$sSQLExpr = '($1 = '.CMDBSource::Quote($value).')';
+					}
+				}
+				$sQuery = preg_replace($sSearchPattern, $sSQLExpr, $sQuery);
+			}
+		}
+		return $sQuery;
+	}
+	
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		if (empty($aExtraParams['currentId']))
+		{
+			$sId = 'sqlblock_'.$oPage->GetUniqueId(); // Works only if the page is not an Ajax one !
+		}
+		else
+		{
+			$sId = $aExtraParams['currentId'];
+		}
+//		$oPage->add($this->GetRenderContent($oPage, $aExtraParams, $sId));
+
+		$sQuery = $this->BuildQuery();
+		$res = CMDBSource::Query($sQuery);
+		$aQueryCols = CMDBSource::GetColumns($res);
+
+		// Prepare column definitions (check + give default values)
+		//
+		foreach($this->m_aColumns as $sName => $aColumnData)
+		{
+			if (!in_array($sName, $aQueryCols))
+			{
+				throw new Exception("Unknown column name '$sName' in sqlblock column");
+			}
+			if (!isset($aColumnData['label']))
+			{
+				$this->m_aColumns[$sName]['label'] = $sName;
+			}
+			if (isset($aColumnData['drilldown']) && !empty($aColumnData['drilldown']))
+			{
+				// Check if the OQL is valid
+				try
+				{
+					$this->m_aColumns[$sName]['filter'] = DBObjectSearch::FromOQL($aColumnData['drilldown']);
+				}
+				catch(OQLException $e)
+				{
+					unset($aColumnData['drilldown']);
+				}
+			}
+		}
+
+		if (strlen($this->m_sTitle) > 0)
+		{
+			$oPage->add("<h2>".Dict::S($this->m_sTitle)."</h2>\n");
+		}
+
+		switch ($this->m_sType)
+		{
+		case 'bars':
+		case 'pie':
+			$aColNames = array_keys($this->m_aColumns);
+			$sXColName = $aColNames[0];
+			$sYColName = $aColNames[1]; 
+			$aData = array();
+			$aRows = array();
+			while($aRow = CMDBSource::FetchArray($res))
+			{
+				$aData[$aRow[$sXColName]] = $aRow[$sYColName];
+				$aRows[$aRow[$sXColName]] = $aRow;
+			}
+			$this->RenderChart($oPage, $sId, $aData, $this->m_aColumns[$sYColName]['drilldown'], $aRows);
+			break;
+
+		default:
+		case 'table':
+			$oAppContext = new ApplicationContext();
+			$sContext = $oAppContext->GetForLink();
+			if (!empty($sContext))
+			{
+				$sContext = '&'.$sContext;
+			}
+			$aDisplayConfig = array();
+			foreach($this->m_aColumns as $sName => $aColumnData)
+			{
+				$aDisplayConfig[$sName] = array('label' => $aColumnData['label'], 'description' => '');
+			}
+	
+			$aDisplayData = array();
+			while($aRow = CMDBSource::FetchArray($res))
+			{
+				$aSQLColNames = array_keys($aRow);
+				$aDisplayRow = array();
+				foreach($this->m_aColumns as $sName => $aColumnData)
+				{
+					if (isset($aColumnData['filter']))
+					{
+						$sFilter = $aColumnData['drilldown'];
+						$sClass = $aColumnData['filter']->GetClass();
+						$sFilter = str_replace('SELECT '.$sClass, '', $sFilter);
+						foreach($aSQLColNames as $sColName)
+						{
+							$sFilter = str_replace(':'.$sColName, "'".addslashes( $aRow[$sColName] )."'", $sFilter);
+						}
+						$sURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_oql&search_form=0&oql_class='.$sClass.'&oql_clause='.urlencode($sFilter).'&format=html'.$sContext;
+						$aDisplayRow[$sName] = '<a href="'.$sURL.'">'.$aRow[$sName]."</a>";					
+					}
+					else
+					{
+						$aDisplayRow[$sName] = $aRow[$sName];
+					}
+				}
+				$aDisplayData[] = $aDisplayRow;
+			}
+			$oPage->table($aDisplayConfig, $aDisplayData);
+			break;
+		}
+	}
+	
+	public function GetRenderContent(WebPage $oPage, $aExtraParams = array(), $sId)
+	{
+		$sHtml = '';
+		return $sHtml;
+	}
+
+	protected function RenderChart($oPage, $sId, $aValues, $sDrillDown = '', $aRows = array())
+	{
+		// 1- Compute Open Flash Chart data
+		//
+		$aValueKeys = array();
+		$index = 0;
+		if ((count($aValues) > 0) && ($sDrillDown != ''))
+		{
+			$oFilter = DBObjectSearch::FromOQL($sDrillDown);
+			$sClass = $oFilter->GetClass();
+			$sOQLClause = str_replace('SELECT '.$sClass, '', $sDrillDown);
+			$aSQLColNames = array_keys(current($aRows)); // Read the list of columns from the current (i.e. first) element of the array
+			$oAppContext = new ApplicationContext();
+			$sURL = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search_oql&search_form=0&oql_class='.$sClass.'&format=html&'.$oAppContext->GetForLink().'&oql_clause=';				
+		}
+		$aURLs = array();
+		foreach($aValues as $key => $value)
+		{
+			// Make sure that values are integers (so that max() will work....)
+			// and build an array of STRING with the keys (numeric keys are transformed into string by PHP :-(
+			$aValues[$key] = (int)$value;
+			$aValueKeys[] = (string)$key;
+			
+			// Build the custom query for the 'drill down' on each element
+			if ($sDrillDown != '')
+			{
+				$sFilter = $sOQLClause;
+				foreach($aSQLColNames as $sColName)
+				{
+					$sFilter = str_replace(':'.$sColName, "'".addslashes( $aRows[$key][$sColName] )."'", $sFilter);
+					$aURLs[$index] = $sURL.urlencode($sFilter);
+				}
+			}
+			$index++;
+		}
+	
+		$oChart = new open_flash_chart();
+	
+		if ($this->m_sType == 'bars')
+		{
+			$oChartElement = new bar_glass();
+		
+			if (count($aValues) > 0)
+			{
+				$maxValue = max($aValues);
+			}
+			else
+			{
+				$maxValue = 1;
+			}
+			$oYAxis = new y_axis();
+			$aMagicValues = array(1,2,5,10);
+			$iMultiplier = 1;
+			$index = 0;
+			$iTop = $aMagicValues[$index % count($aMagicValues)]*$iMultiplier;
+			while($maxValue > $iTop)
+			{
+				$index++;
+				$iTop = $aMagicValues[$index % count($aMagicValues)]*$iMultiplier;
+				if (($index % count($aMagicValues)) == 0)
+				{
+					$iMultiplier = $iMultiplier * 10;
+				}
+			}
+			//echo "oYAxis->set_range(0, $iTop, $iMultiplier);\n";
+			$oYAxis->set_range(0, $iTop, $iMultiplier);
+			$oChart->set_y_axis( $oYAxis );
+			$aBarValues = array();
+			foreach($aValues as $iValue)
+			{
+				$oBarValue = new bar_value($iValue);
+				$oBarValue->on_click("ofc_drilldown_{$sId}");
+				$aBarValues[] = $oBarValue;
+			}
+			$oChartElement->set_values($aBarValues);	
+			//$oChartElement->set_values(array_values($aValues));
+			$oXAxis = new x_axis();
+			$oXLabels = new x_axis_labels();
+			// set them vertical
+			$oXLabels->set_vertical();
+			// set the label text
+			$oXLabels->set_labels($aValueKeys);
+			// Add the X Axis Labels to the X Axis
+			$oXAxis->set_labels( $oXLabels );
+			$oChart->set_x_axis( $oXAxis );
+		}
+		else
+		{
+			$oChartElement = new pie();
+			$oChartElement->set_start_angle( 35 );
+			$oChartElement->set_animate( true );
+			$oChartElement->set_tooltip( '#label# - #val# (#percent#)' );
+			$oChartElement->set_colours( array('#FF8A00', '#909980', '#2C2B33', '#CCC08D', '#596664') );
+	
+			$aData = array();
+			foreach($aValues as $sValue => $iValue)
+			{
+				$oPieValue = new pie_value($iValue, $sValue); //@@ BUG: not passed via ajax !!!
+				$oPieValue->on_click("ofc_drilldown_{$sId}");
+				$aData[] = $oPieValue;
+			}
+	
+			$oChartElement->set_values( $aData );
+			$oChart->x_axis = null;
+		}
+	
+		// Title given in HTML
+		//$oTitle = new title($this->m_sTitle);
+		//$oChart->set_title($oTitle);
+		$oChart->set_bg_colour('#FFFFFF');
+		$oChart->add_element( $oChartElement );
+			
+		$sData = $oChart->toPrettyString();
+		$sData = json_encode($sData);
+
+		// 2- Declare the Javascript function that will render the chart data\
+		//
+		$oPage->add_script(
+<<< EOF
+function ofc_get_data_{$sId}()
+{
+	return $sData;
+}
+EOF
+		);
+		
+		if (count($aURLs) > 0)
+		{
+			$sURLList = '';
+			foreach($aURLs as $index => $sURL)
+			{
+				$sURLList .= "\taURLs[$index] = '".addslashes($sURL)."';\n";
+			}
+
+			$oPage->add_script(
+<<< EOF
+function ofc_drilldown_{$sId}(index)
+{
+	var aURLs = new Array();
+{$sURLList}
+	var sURL = aURLs[index];
+	
+	window.location.href = sURL; // Navigate ! 
+}
+EOF
+			);
+		}
+
+		// 3- Insert the Open Flash chart
+		//
+		$oPage->add("<div id=\"$sId\"><div>\n");
+		$oPage->add_ready_script(
+<<<EOF
+swfobject.embedSWF(	"../images/open-flash-chart.swf", 
+	"{$sId}", 
+	"100%", "300","9.0.0",
+	"expressInstall.swf",
+	{"get-data":"ofc_get_data_{$sId}", "id":"{$sId}"}, 
+	{'wmode': 'transparent'}
+);
+EOF
+		);
+	}
+}
+
+?>

application/template.class.inc.php

@@ -35,7 +35,15 @@ class DisplayTemplate
 	
 	public function __construct($sTemplate)
 	{
-		$this->m_aTags = array('itopblock', 'itopcheck', 'itoptabs', 'itoptab', 'itoptoggle', 'itopstring');
+		$this->m_aTags = array (
+			'itopblock',
+			'itopcheck',
+			'itoptabs',
+			'itoptab',
+			'itoptoggle',
+			'itopstring',
+			'sqlblock'
+		);
 		$this->m_sTemplate = $sTemplate;
 	}
 	
@@ -161,7 +169,7 @@ class DisplayTemplate
 				$oPage->AddTabContainer('Tabs_'.$iTabContainerCount);
 				$oPage->SetCurrentTabContainer('Tabs_'.$iTabContainerCount);
 				$iTabContainerCount++;
-				//$oPage->p('Content:<pre>'.htmlentities($sContent).'</pre>');
+				//$oPage->p('Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
 				$oTemplate = new DisplayTemplate($sContent);
 				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
 				$oPage->SetCurrentTabContainer('');
@@ -185,7 +193,7 @@ class DisplayTemplate
 				$oPage->SetCurrentTab(Dict::S(str_replace('_', ' ', $aAttributes['name'])));
 				$oTemplate = new DisplayTemplate($sContent);
 				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent).'</pre>');
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
 				$oPage->SetCurrentTab('');
 			break;
 			
@@ -195,7 +203,7 @@ class DisplayTemplate
 				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
 				$oTemplate = new DisplayTemplate($sContent);
 				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent).'</pre>');
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
 				$oPage->EndCollapsibleSection();
 			break;
 			
@@ -203,6 +211,11 @@ class DisplayTemplate
 				$oPage->add(Dict::S($sContent));
 			break;
 			
+			case 'sqlblock':
+				$oBlock = SqlBlock::FromTemplate($sContent);
+				$oBlock->RenderContent($oPage);
+			break;
+			
 			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
 				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
 			break;
@@ -227,7 +240,6 @@ class DisplayTemplate
 		<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = \'$class$\'</itopblock>
 		</div>
 		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
-		<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT NetworkDevice AS d WHERE d.id = $id$</itopblock>
 		<itoptabs>
 			<itoptab name="Interfaces">
 				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</itopblock>
@@ -241,13 +253,150 @@ class DisplayTemplate
 		</itoptabs>';
 		
 		$oPage = new iTopWebPage('Unit Test');
-		//$oPage->add("Template content: <pre>".htmlentities($sTemplate)."</pre>\n");
+		//$oPage->add("Template content: <pre>".htmlentities($sTemplate, ENT_QUOTES, 'UTF-8')."</pre>\n");
 		$oTemplate = new DisplayTemplate($sTemplate);
 		$oTemplate->Render($oPage, array('class'=>'Network device','pkey'=> 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3));
 		$oPage->output();
 	}
 }
 
-//DisplayTemplate::UnitTest();
+/**
+ * Special type of template for displaying the details of an object
+ * On top of the defaut 'blocks' managed by the parent class, the following placeholders
+ * are available in such a template:
+ * $attribute_code$ An attribute of the object (in edit mode this is the input for the attribute)
+ * $attribute_code->label()$ The label of an attribute
+ * $PlugIn:plugInClass->properties()$ The ouput of OnDisplayProperties of the specified plugInClass
+ */
+class ObjectDetailsTemplate extends DisplayTemplate
+{
+	public function __construct($sTemplate, $oObj, $sFormPrefix = '')
+	{
+		parent::__construct($sTemplate);
+		$this->m_oObj = $oObj;
+		$this->m_sPrefix = $sFormPrefix;
+	}
+	
+	public function Render(WebPage $oPage, $aParams = array(), $bEditMode = false)
+	{
+		$sStateAttCode = MetaModel :: GetStateAttributeCode(get_class($this->m_oObj));
+		$aTemplateFields = array();
+		preg_match_all('/\\$this->([a-z0-9_]+)\\$/', $this->m_sTemplate, $aMatches);
+		$aTemplateFields = $aMatches[1];
+		preg_match_all('/\\$this->field\\(([a-z0-9_]+)\\)\\$/', $this->m_sTemplate, $aMatches);
+		$aTemplateFields = array_merge($aTemplateFields, $aMatches[1]);
+		$aFieldsComments = (isset($aParams['fieldsComments'])) ? $aParams['fieldsComments'] : array();
+		$aFieldsMap = array();
 
+		$sClass = get_class($this->m_oObj);
+		// Renders the fields used in the template
+		foreach(MetaModel::ListAttributeDefs(get_class($this->m_oObj)) as $sAttCode => $oAttDef)
+		{
+			$aParams['this->label('.$sAttCode.')'] = $oAttDef->GetLabel();
+			$aParams['this->comments('.$sAttCode.')'] = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
+			$iInputId = '2_'.$sAttCode; // TODO: generate a real/unique prefix...
+			if (in_array($sAttCode, $aTemplateFields))
+			{
+				if ($this->m_oObj->IsNew())
+				{
+					$iFlags = $this->m_oObj->GetInitialStateAttributeFlags($sAttCode);
+				}
+				else
+				{
+				$iFlags = $this->m_oObj->GetAttributeFlags($sAttCode);
+				}
+				if (($iFlags & OPT_ATT_MANDATORY) && $this->m_oObj->IsNew())
+				{
+					$iFlags = $iFlags & ~OPT_ATT_READONLY; // Mandatory fields cannot be read-only when creating an object
+				}
+				
+				if ((!$oAttDef->IsWritable()) || ($sStateAttCode == $sAttCode))
+				{
+					$iFlags = $iFlags | OPT_ATT_READONLY;
+				}
+
+				if ($iFlags & OPT_ATT_HIDDEN)
+				{
+					$aParams['this->label('.$sAttCode.')'] = '';
+					$aParams['this->field('.$sAttCode.')'] = '';
+					$aParams['this->comments('.$sAttCode.')'] = '';
+					$aParams['this->'.$sAttCode] = '';
+				}
+				else
+				{
+					if ($bEditMode && ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE)))
+					{
+						// Check if the attribute is not read-only because of a synchro...
+						$aReasons = array();
+						$sSynchroIcon = '';
+						if ($iFlags & OPT_ATT_SLAVE)
+						{
+							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
+							$sSynchroIcon = "&nbsp;<img id=\"synchro_$sInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
+							$sTip = '';
+							foreach($aReasons as $aRow)
+							{
+								$sTip .= "<p>Synchronized with {$aRow['name']} - {$aRow['description']}</p>";
+							}
+							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+						}
+	
+						// Attribute is read-only
+						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
+						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.htmlentities($this->m_oObj->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/></span>';
+						$aFieldsMap[$sAttCode] = $iInputId;
+						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
+					}
+	
+					if ($bEditMode && !($iFlags & OPT_ATT_READONLY)) //TODO: check the data synchro status...
+					{
+						$aParams['this->field('.$sAttCode.')'] = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
+						$this->m_oObj->Get($sAttCode),
+						$this->m_oObj->GetEditValue($sAttCode),
+						$iInputId, // InputID
+						'',
+						$iFlags,
+						array('this' => $this->m_oObj) // aArgs
+					).'</span>';
+					$aFieldsMap[$sAttCode] = $iInputId;
+				}
+				else 
+				{
+						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
+					}
+					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
+				}
+			}
+		}
+		
+		// Renders the PlugIns used in the template
+		preg_match_all('/\\$PlugIn:([A-Za-z0-9_]+)->properties\\(\\)\\$/', $this->m_sTemplate, $aMatches);
+		$aPlugInProperties = $aMatches[1];
+		foreach($aPlugInProperties as $sPlugInClass)
+		{
+			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
+			if ($oInstance != null) // Safety check...
+			{
+				$offset = $oPage->start_capture();
+				$oInstance->OnDisplayProperties($this->m_oObj, $oPage, $bEditMode);
+				$sContent = $oPage->end_capture($offset);
+				$aParams["PlugIn:{$sPlugInClass}->properties()"]= $sContent;			
+			}
+			else
+			{
+				$aParams["PlugIn:{$sPlugInClass}->properties()"]= "Missing PlugIn: $sPlugInClass";				
+			}			
+		}
+
+		$offset = $oPage->start_capture();
+		parent::Render($oPage, $aParams);
+		$sContent = $oPage->end_capture($offset);
+		// Remove empty table rows in case some attributes are hidden...
+		$sContent = preg_replace('/<tr[^>]*>\s*(<td[^>]*>\s*<\\/td>)+\s*<\\/tr>/im', '', $sContent);
+		$oPage->add($sContent);
+		return $aFieldsMap;
+	}
+}
+
+//DisplayTemplate::UnitTest();
 ?>

application/templates/welcome_popup.html

@@ -1,4 +1,4 @@
-<div style="width:100%;background: url(../images/welcome.jpg) top left no-repeat;">
+<div style="width:100%;background: #fff url(../images/welcome.jpg) top left no-repeat;">
 <style>
 .dashboard {
 vertical-align:top;

application/transaction.class.inc.php

@@ -38,11 +38,11 @@ class privUITransaction
 		// Strictly speaking, the two lines below should be grouped together
 		// by a critical section
 		// sem_acquire($rSemIdentified);
-		$id = 1 + count($_SESSION['transactions']);
+		$id = str_replace(array('.', ' '), '', microtime()); //1 + count($_SESSION['transactions']);
 		$_SESSION['transactions'][$id] = true;
 		// sem_release($rSemIdentified);
 		
-		return sprintf("%d", $id);
+		return (string)$id;
 	}
 
 	/**

application/ui.extkeywidget.class.inc.php

@@ -63,27 +63,34 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');
 
 class UIExtKeyWidget 
 {
-	protected static $iWidgetIndex = 0;
-	protected $sAttCode;
-	protected $sNameSuffix;
 	protected $iId;
-	protected $sTitle;
+	protected $sTargetClass;
+	protected $sAttCode;
 	
-	public function __construct($sAttCode, $sClass, $sTitle, $aAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
+	//public function __construct($sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sNameSuffix = '', $sFieldPrefix = '', $sFormPrefix = '')
+	static public function DisplayFromAttCode($oPage, $sAttCode, $sClass, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName = '', $sFormPrefix = '', $aArgs, $bSearchMode = false)
 	{
-		self::$iWidgetIndex++;
-		$this->sAttCode = $sAttCode;
-		$this->sClass = $sClass;
-		$this->oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		$this->sNameSuffix = $sNameSuffix;
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		$sTargetClass = $oAttDef->GetTargetClass();
+		$iMaxComboLength = $oAttDef->GetMaximumComboLength();
+		$bAllowTargetCreation = $oAttDef->AllowTargetCreation();
+		if (!$bSearchMode)
+		{
+			$sDisplayStyle = $oAttDef->GetDisplayStyle();
+		}
+		else
+		{
+			$sDisplayStyle = 'select'; // In search mode, always use a drop-down list
+		}
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode);
+		return $oWidget->Display($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix, $aArgs, $bSearchMode, $sDisplayStyle);
+	}
+
+	public function __construct($sTargetClass, $iInputId, $sAttCode = '')
+	{
+		$this->sTargetClass = $sTargetClass;
 		$this->iId = $iInputId;
-		$this->aAllowedValues = $aAllowedValues;
-		$this->value = $value;
-		$this->sFieldPrefix = $sFieldPrefix;
-		$this->sTargetClass = $this->oAttDef->GetTargetClass();
-		$this->sTitle = $sTitle;
-		$this->sFormPrefix = $sFormPrefix;
-		$this->bMandatory = $bMandatory;
+		$this->sAttCode = $sAttCode;
 	}
 	
 	/**
@@ -92,100 +99,189 @@ class UIExtKeyWidget
 	 * @param Hash $aArgs Extra context arguments
 	 * @return string The HTML fragment to be inserted into the page
 	 */
-	public function Display(WebPage $oPage, $aArgs = array())
+	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), $bSearchMode = false, $sDisplayStyle = 'select')
 	{
-		$bCreate = (!MetaModel::IsAbstract($this->sTargetClass)) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $this->oAttDef->AllowTargetCreation());
+		$sTitle = addslashes($sTitle);	
+		$oPage->add_linked_script('../js/extkeywidget.js');
+		$oPage->add_linked_script('../js/forms-json-utils.js');
+		
+		$bCreate = (!$bSearchMode) && (!MetaModel::IsAbstract($this->sTargetClass)) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
+		$bExtensions = true;
 		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sAttrFieldPrefix = ($bSearchMode) ? '' : 'attr_';
 
 		$sHTMLValue = "<span style=\"white-space:nowrap\">"; // no wrap
-		if (count($this->aAllowedValues) < $this->oAttDef->GetMaximumComboLength())
+		$sFilter = addslashes($oAllowedValues->GetFilter()->ToOQL());
+		if($bSearchMode)
 		{
-			// Few choices, use a normal 'select'
-			$sSelectMode = 'true';
-			
-			$sHelpText = $this->oAttDef->GetHelpOnEdition();
-
-			// In case there are no valid values, the select will be empty, thus blocking the user from validating the form
-			$sHTMLValue = "<select title=\"$sHelpText\" name=\"attr_{$this->sFieldPrefix}{$this->sAttCode}{$this->sNameSuffix}\" id=\"$this->iId\">\n";
-			$sHTMLValue .= "<option value=\"\">".Dict::S('UI:SelectOne')."</option>\n";
-			foreach($this->aAllowedValues as $key => $display_value)
+			$sWizHelper = 'null';
+			$sWizHelperJSON = "''";
+		} 
+		else
+		{
+			$sWizHelper = 'oWizardHelper'.$sFormPrefix;
+			$sWizHelperJSON = $sWizHelper.'.ToJSON()';
+		}
+		if (is_null($oAllowedValues))
+		{
+			throw new Exception('Implementation: null value for allowed values definition');
+		}
+		elseif ($oAllowedValues->Count() < $iMaxComboLength)
+		{
+			// Discrete list of values, use a SELECT or RADIO buttons depending on the config
+			switch($sDisplayStyle)
 			{
-				if ((count($this->aAllowedValues) == 1) && ($this->bMandatory == 'true') )
+				case 'radio':
+				case 'radio_horizontal':
+				case 'radio_vertical':
+				$sValidationField = "<span id=\"v_{$this->iId}\"></span>";
+				$sHTMLValue = '';
+				$bVertical = ($sDisplayStyle != 'radio_horizontal');
+				$bExtensions = false;
+				$oAllowedValues->Rewind();
+				$aAllowedValues = array();
+				while($oObj = $oAllowedValues->Fetch())
 				{
-					// When there is only once choice, select it by default
-					$sSelected = ' selected';
+					$aAllowedValues[$oObj->GetKey()] = $oObj->GetName();
+				}				
+				$sHTMLValue = $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", $bMandatory, $bVertical, $sValidationField);
+				$aEventsList[] ='change';
+				break;
+
+				case 'select':
+				default:
+				$sSelectMode = 'true';
+				
+				$sHelpText = ''; //$this->oAttDef->GetHelpOnEdition();
+				
+				$sHTMLValue = "<select title=\"$sHelpText\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" id=\"$this->iId\">\n";
+				if ($bSearchMode)
+				{
+					$sDisplayValue = isset($aArgs['sDefaultValue']) ? $aArgs['sDefaultValue'] : Dict::S('UI:SearchValue:Any');
+					$sHTMLValue .= "<option value=\"\">$sDisplayValue</option>\n";			
 				}
 				else
 				{
-					$sSelected = ($this->value == $key) ? ' selected' : '';
+					$sHTMLValue .= "<option value=\"\">".Dict::S('UI:SelectOne')."</option>\n";
 				}
-				$sHTMLValue .= "<option value=\"$key\"$sSelected>$display_value</option>\n";
-			}
-			$sHTMLValue .= "</select>\n";
-		$oPage->add_ready_script(
+				$oAllowedValues->Rewind();
+				while($oObj = $oAllowedValues->Fetch())
+				{
+					$key = $oObj->GetKey();
+					$display_value = $oObj->GetName();
+	
+					if (($oAllowedValues->Count() == 1) && ($bMandatory == 'true') )
+					{
+						// When there is only once choice, select it by default
+						$sSelected = ' selected';
+					}
+					else
+					{
+						$sSelected = ($value == $key) ? ' selected' : '';
+					}
+					$sHTMLValue .= "<option value=\"$key\"$sSelected>$display_value</option>\n";
+				}
+				$sHTMLValue .= "</select>\n";
+				$oPage->add_ready_script(
 <<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sClass}', '{$this->sAttCode}', '{$this->sNameSuffix}', $sSelectMode, oWizardHelper{$this->sFormPrefix});
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}');
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
+		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
+		$('#$this->iId').bind('change', function() { $(this).trigger('extkeychange') } );
 
 EOF
-);
+				);
+			} // Switch
 		}
 		else
 		{
 			// Too many choices, use an autocomplete
 			$sSelectMode = 'false';
 		
-			if ($this->oAttDef->IsNull($this->value)) // Null values are displayed as ''
+			if (is_null($value) || ($value == 0)) // Null values are displayed as ''
 			{
-				$sDisplayValue = '';
+				$sDisplayValue = isset($aArgs['sDefaultValue']) ? $aArgs['sDefaultValue'] : '';
 			}
 			else
 			{
-				$sDisplayValue = $this->GetObjectName($this->value);
+				$sDisplayValue = $this->GetObjectName($value);
 			}
-			$sFormPrefix = $this->sFormPrefix;
-			$iMinChars = $this->oAttDef->GetMinAutoCompleteChars();
-			$iFieldSize = $this->oAttDef->GetMaxSize();
+			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 3; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
+			$iFieldSize = isset($aArgs['iFieldSize']) ? $aArgs['iFieldSize'] : 30; //@@@ $this->oAttDef->GetMaxSize();
 	
 			// the input for the auto-complete
-			$sHTMLValue = "<input count=\"".count($this->aAllowedValues)."\" type=\"text\" id=\"label_$this->iId\" size=\"30\" maxlength=\"$iFieldSize\" value=\"$sDisplayValue\"/>&nbsp;";
-			$sHTMLValue .= "<a class=\"no-arrow\" href=\"javascript:oACWidget_{$this->iId}.Search();\"><img style=\"border:0;vertical-align:middle;\" src=\"../images/mini_search.gif\" /></a>&nbsp;";
+			$sHTMLValue = "<input count=\"".$oAllowedValues->Count()."\" type=\"text\" id=\"label_$this->iId\" size=\"$iFieldSize\" value=\"$sDisplayValue\"/>&nbsp;";
+			$sHTMLValue .= "<img id=\"mini_search_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_search.gif\" onClick=\"oACWidget_{$this->iId}.Search();\"/>&nbsp;";
 	
 			// another hidden input to store & pass the object's Id
-			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"attr_{$this->sFieldPrefix}{$this->sAttCode}{$this->sNameSuffix}\" value=\"$this->value\" />\n";
+			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"$value\" />\n";
 	
 			// Scripts to start the autocomplete and bind some events to it
-		$oPage->add_ready_script(
+			$oPage->add_ready_script(
 <<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sClass}', '{$this->sAttCode}', '{$this->sNameSuffix}', $sSelectMode, oWizardHelper{$this->sFormPrefix});
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}');
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
-		$('#label_$this->iId').autocomplete('./ajax.render.php', { scroll:true, minChars:{$iMinChars}, formatItem:formatItem, autoFill:false, matchContains:true, keyHolder:'#{$this->iId}', extraParams:{operation:'autocomplete', sclass:'{$this->sClass}',attCode:'{$this->sAttCode}'}});
-		$('#label_$this->iId').blur(function() { $(this).search(); } );
+		$('#label_$this->iId').autocomplete(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', { scroll:true, minChars:{$iMinChars}, autoFill:false, matchContains:true, mustMatch: true, keyHolder:'#{$this->iId}', extraParams:{operation:'ac_extkey', sTargetClass:'{$this->sTargetClass}',sFilter:'$sFilter', json: function() { return $sWizHelperJSON; } }});
+		$('#label_$this->iId').keyup(function() { if ($(this).val() == '') { $('#$this->iId').val(''); } } ); // Useful for search forms: empty value in the "label", means no value, immediatly !
 		$('#label_$this->iId').result( function(event, data, formatted) { OnAutoComplete('{$this->iId}', event, data, formatted); } );
-		$('#ac_dlg_$this->iId').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, title: '{$this->sTitle}', resizeStop: oACWidget_{$this->iId}.UpdateSizes, close: oACWidget_{$this->iId}.OnClose });
-
+		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
+		if ($('#ac_dlg_{$this->iId}').length == 0)
+		{
+			$('body').append('<div id="ac_dlg_{$this->iId}"></div>');
+		}
 EOF
 );
-			$oPage->add_at_the_end($this->GetSearchDialog($oPage)); // To prevent adding forms inside the main form
-
 		}
-		if ($bCreate)
+		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
 		{
-			$sHTMLValue .= "<a class=\"no-arrow\" href=\"javascript:oACWidget_{$this->iId}.CreateObject();\"><img style=\"border:0;vertical-align:middle;\" src=\"../images/mini_add.gif\" /></a>&nbsp;";
-			$oPage->add_at_the_end('<div id="ajax_'.$this->iId.'"></div>');
+			$sHTMLValue .= "<img id=\"mini_tree_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_tree.gif\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"/>&nbsp;";
+			$oPage->add_ready_script(
+<<<EOF
+			if ($('#ac_tree_{$this->iId}').length == 0)
+			{
+				$('body').append('<div id="ac_tree_{$this->iId}"></div>');
+			}		
+EOF
+);
+		}
+		if ($bCreate && $bExtensions)
+		{
+			$sHTMLValue .= "<img id=\"mini_add_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_add.gif\" onClick=\"oACWidget_{$this->iId}.CreateObject();\"/>&nbsp;";
+			$oPage->add_ready_script(
+<<<EOF
+		if ($('#ajax_{$this->iId}').length == 0)
+		{
+			$('body').append('<div id="ajax_{$this->iId}"></div>');
+		}
+EOF
+);
+		}
+		if ($sDisplayStyle == 'select')
+		{
+			$sHTMLValue .= "<span id=\"v_{$this->iId}\"></span>";
 		}
-		$sHTMLValue .= "<span id=\"v_{$this->iId}\"></span>";
 		$sHTMLValue .= "</span>"; // end of no wrap
 		return $sHTMLValue;
 	}
 	
-	protected function GetSearchDialog(WebPage $oPage)
+	public function GetSearchDialog(WebPage $oPage, $sTitle, $oCurrObject = null)
 	{
-		$sHTML = '<div id="ac_dlg_'.$this->iId.'"><div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">';
+		$sHTML = '<div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">';
 
-		$oFilter = new DBObjectSearch($this->sTargetClass);
-		$oSet = new CMDBObjectSet($oFilter);
-		$oBlock = new DisplayBlock($oFilter, 'search', false);
+		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
+		{
+			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
+			$aParams = array('query_params' => array('this' => $oCurrObject));
+			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aParams);
+			$oFilter = $oSet->GetFilter();
+		}
+		else
+		{
+			$aParam = array();
+			$oFilter = new DBObjectSearch($this->sTargetClass);
+			$oSet = new CMDBObjectSet($oFilter);
+		}
+		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
 		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId, array('open' => true, 'currentId' => $this->iId));
 		$sHTML .= "<form id=\"fr_{$this->iId}\" OnSubmit=\"return oACWidget_{$this->iId}.DoOk();\">\n";
 		$sHTML .= "<div id=\"dr_{$this->iId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
@@ -193,13 +289,19 @@ EOF
 		$sHTML .= "</div>\n";
 		$sHTML .= "<input type=\"button\" id=\"btn_cancel_{$this->iId}\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#ac_dlg_{$this->iId}').dialog('close');\">&nbsp;&nbsp;";
 		$sHTML .= "<input type=\"button\" id=\"btn_ok_{$this->iId}\" value=\"".Dict::S('UI:Button:Ok')."\"  onClick=\"oACWidget_{$this->iId}.DoOk();\">";
+		$sHTML .= "<input type=\"hidden\" id=\"count_{$this->iId}\" value=\"0\">";
 		$sHTML .= "</form>\n";
-		$sHTML .= '</div></div></div>';
+		$sHTML .= '</div></div>';
 
-		$oPage->add_ready_script("$('#fs_{$this->iId}').bind('submit.uiAutocomplete', oACWidget_{$this->iId}.DoSearchObjects);");
-		$oPage->add_ready_script("$('#dc_{$this->iId}').resize(oACWidget_{$this->iId}.UpdateSizes);");
-
-		return $sHTML;
+		$sDialogTitle = addslashes($sTitle);
+		$oPage->add_ready_script(
+<<<EOF
+		$('#ac_dlg_{$this->iId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, title: '$sDialogTitle', resizeStop: oACWidget_{$this->iId}.UpdateSizes, close: oACWidget_{$this->iId}.OnClose });
+		$('#fs_{$this->iId}').bind('submit.uiAutocomplete', oACWidget_{$this->iId}.DoSearchObjects);
+		$('#dc_{$this->iId}').resize(oACWidget_{$this->iId}.UpdateSizes);
+EOF
+);
+		$oPage->add($sHTML);
 	}
 
 	/**
@@ -208,22 +310,48 @@ EOF
 	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of m_sRemoteClass
 	 * @param Array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of the search
 	 */
-	public function SearchObjectsToSelect(WebPage $oP, $sTargetClass = '')
+	public function SearchObjectsToSelect(WebPage $oP, $sFilter, $sRemoteClass = '', $oObj = null)
 	{
-		if ($sTargetClass != '')
+		if (is_null($sFilter))
 		{
-			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
-			$oFilter = new DBObjectSearch($sTargetClass);
+			throw new Exception('Implementation: null value for allowed values definition');
 		}
-		else
+		try
 		{
-			// No remote class specified use the one defined in the linkedset
-			$oFilter = new DBObjectSearch($this->sTargetClass);		
+			$oFilter = DBObjectSearch::FromOQL($sFilter);
+			$oBlock = new DisplayBlock($oFilter, 'list', false, array('query_params' => array('this' => $oObj)));
+			$oBlock->Display($oP, $this->iId.'_results', array('this' => $oObj, 'cssCount'=> '#count_'.$this->iId, 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single')); // Don't display the 'Actions' menu on the results
+		}
+		catch(MissingQueryArgument $e)
+		{
+			// When used in a search form the $this parameter may be missing, in this case return all possible values...
+			// TODO check if we can improve this behavior...
+			$sOQL = 'SELECT '.$sRemoteClass;
+			$oFilter = DBObjectSearch::FromOQL($sOQL);
+			//$oBlock = new DisplayBlock($oFilter, 'list', false);
+			//$oBlock->Display($oP, $this->iId.'_results', array('cssCount'=> '#count_'.$this->iId, 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single')); // Don't display the 'Actions' menu on the results
+		}
+	}
+	
+	/**
+	 * Search for objects to be selected
+	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param string $sFilter The OQL expression used to define/limit limit the scope of possible values
+	 * @param DBObject $oObj The current object for the OQL context
+	 * @param string $sContains The text of the autocomplete to filter the results
+	 */
+	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains)
+	{
+		if (is_null($sFilter))
+		{
+			throw new Exception('Implementation: null value for allowed values definition');
+		}
+		$oValuesSet = new ValueSetObjects($sFilter, 'friendlyname'); // Bypass GetName() to avoid the encoding by htmlentities
+		$aValues = $oValuesSet->GetValues(array('this' => $oObj), $sContains);
+		foreach($aValues as $sKey => $sFriendlyName)
+		{
+			$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
 		}
-		$oFilter->AddCondition('id', array_keys($this->aAllowedValues), 'IN');
-		$oSet = new CMDBObjectSet($oFilter);
-		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, $this->iId, array('menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'display_limit' => false)); // Don't display the 'Actions' menu on the results
 	}
 	
 	/**
@@ -238,34 +366,169 @@ EOF
 	/**
 	 * Get the form to create a new object of the 'target' class
 	 */
-	public function GetObjectCreationForm(WebPage $oPage)
+	public function GetObjectCreationForm(WebPage $oPage, $oCurrObject)
 	{
+		// Set all the default values in an object and clone this "default" object
+		$oNewObj = MetaModel::NewObject($this->sTargetClass);
+
+		// 1st - set context values
+		$oAppContext = new ApplicationContext();
+		$oAppContext->InitObjectFromContext($oNewObj);
+
+		// 2nd set the default values from the constraint on the external key... if any
+		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
+		{
+			$oAttDef = MetaModel::GetAttributeDef(get_class($oCurrObject), $this->sAttCode);
+			$aParams = array('this' => $oCurrObject);
+			$oSet = $oAttDef->GetAllowedValuesAsObjectSet($aParams);
+			$aConsts = $oSet->ListConstantFields();
+			$sClassAlias = $oSet->GetFilter()->GetClassAlias();
+			if (isset($aConsts[$sClassAlias]))
+			{
+				foreach($aConsts[$sClassAlias] as $sAttCode => $value)
+				{
+					$oNewObj->Set($sAttCode, $value);
+				}
+			}
+		}
+		
+		// 3rd - set values from the page argument 'default'
+		$oNewObj->UpdateObjectFromArg('default');
+
+		$sDialogTitle = addslashes($this->sTitle);
 		$oPage->add('<div id="ac_create_'.$this->iId.'"><div class="wizContainer" style="vertical-align:top;"><div id="dcr_'.$this->iId.'">');
 		$oPage->add("<h1>".MetaModel::GetClassIcon($this->sTargetClass)."&nbsp;".Dict::Format('UI:CreationTitle_Class', MetaModel::GetName($this->sTargetClass))."</h1>\n");
-	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, null, array(), array('formPrefix' => $this->iId, 'noRelations' => true));	
+	 	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: '$this->sTitle'});\n");
+//		$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("$('#dcr_{$this->iId} form').removeAttr('onsubmit');");
 		$oPage->add_ready_script("$('#dcr_{$this->iId} form').bind('submit.uilinksWizard', oACWidget_{$this->iId}.DoCreateObject);");
 	}
 
+	/**
+	 * Display the hierarchy of the 'target' class
+	 */
+	public function DisplayHierarchy(WebPage $oPage, $sFilter, $currValue, $oObj)
+	{
+		$sDialogTitle = addslashes(Dict::Format('UI:HierarchyOf_Class', MetaModel::GetName($this->sTargetClass)));
+		$oPage->add('<div id="dlg_tree_'.$this->iId.'"><div class="wizContainer" style="vertical-align:top;"><div style="overflow:auto;background:#fff;margin-bottom:5px;" id="tree_'.$this->iId.'">');
+		$oPage->add('<table style="width:100%"><tr><td>');
+		if (is_null($sFilter))
+		{
+			throw new Exception('Implementation: null value for allowed values definition');
+		}
+		try
+		{
+			$oFilter = DBObjectSearch::FromOQL($sFilter);
+			$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj));
+		}
+		catch(MissingQueryArgument $e)
+		{
+			// When used in a search form the $this parameter may be missing, in this case return all possible values...
+			// TODO check if we can improve this behavior...
+			$sOQL = 'SELECT '.$this->m_sTargetClass;
+			$oFilter = DBObjectSearch::FromOQL($sOQL);
+			$oSet = new DBObjectSet($oFilter);
+		}
+
+		$sHKAttCode = MetaModel::IsHierarchicalClass($this->sTargetClass);
+		$this->DumpTree($oPage, $oSet, $sHKAttCode, $currValue);
+
+		$oPage->add('</td></tr></table>');
+		$oPage->add('</div>');
+		$oPage->add("<input type=\"button\" id=\"btn_cancel_{$this->iId}\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_tree_{$this->iId}').dialog('close');\">&nbsp;&nbsp;");
+		$oPage->add("<input type=\"button\" id=\"btn_ok_{$this->iId}\" value=\"".Dict::S('UI:Button:Ok')."\"  onClick=\"oACWidget_{$this->iId}.DoHKOk();\">");
+		
+		$oPage->add('</div></div>');
+		$oPage->add_ready_script("\$('#tree_$this->iId ul').treeview();\n");
+		$oPage->add_ready_script("\$('#dlg_tree_$this->iId').dialog({ width: 'auto', height: 'auto', autoOpen: true, modal: true, title: '$sDialogTitle', resizeStop: oACWidget_{$this->iId}.OnHKResize, close: oACWidget_{$this->iId}.OnHKClose });\n");
+	}
+
 	/**
 	 * Get the form to create a new object of the 'target' class
 	 */
 	public function DoCreateObject($oPage)
 	{
 		$oObj = MetaModel::NewObject($this->sTargetClass);
-		$oObj->UpdateObject($this->sFormPrefix.$this->iId);
-		$oMyChange = MetaModel::NewObject("CMDBChange");
-		$oMyChange->Set("date", time());
-		$sUserString = CMDBChange::GetCurrentUserName();
-		$oMyChange->Set("userinfo", $sUserString);
-		$iChangeId = $oMyChange->DBInsert();
-		$oObj->DBInsertTracked($oMyChange);
-	
-		return array('name' => $oObj->GetName(), 'id' => $oObj->GetKey());
-		
-		//return array('name' => 'test', 'id' => '42');
+		$aErrors = $oObj->UpdateObjectFromPostedForm($this->iId);
+		if (count($aErrors) == 0)
+		{
+			$oMyChange = MetaModel::NewObject("CMDBChange");
+			$oMyChange->Set("date", time());
+			$sUserString = CMDBChange::GetCurrentUserName();
+			$oMyChange->Set("userinfo", $sUserString);
+			$iChangeId = $oMyChange->DBInsert();
+			$oObj->DBInsertTracked($oMyChange);
+			return array('name' => $oObj->GetName(), 'id' => $oObj->GetKey());
+		}
+		else
+		{
+			return array('name' => implode(' ', $aErrors), 'id' => 0);		
+		}
 	}
+
+	function DumpTree($oP, $oSet, $sParentAttCode, $currValue)
+	{
+		$aTree = array();
+		$aNodes = array();
+		while($oObj = $oSet->Fetch())
+		{
+			$iParentId = $oObj->Get($sParentAttCode);
+			if (!isset($aTree[$iParentId]))
+			{
+				$aTree[$iParentId] = array();
+			}
+			$aTree[$iParentId][$oObj->GetKey()] = $oObj->GetName();
+			$aNodes[$oObj->GetKey()] = $oObj;
+		}
+		
+		$aParents = array_keys($aTree);
+		$aRoots = array();
+		foreach($aParents as $id)
+		{
+			if (!array_key_exists($id, $aNodes))
+			{
+				$aRoots[] = $id;
+			}
+		}
+		foreach($aRoots as $iRootId)
+		{
+			$this->DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue);
+		}
+	}
+	
+	function DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue)
+	{
+		$bSelect = true;
+		$bMultiple = false;
+		$sSelect = '';
+		if (array_key_exists($iRootId, $aTree))
+		{
+			$aSortedRoots = $aTree[$iRootId];
+			asort($aSortedRoots);
+			$oP->add("<ul>\n");
+			foreach($aSortedRoots as $id => $sName)
+			{
+				if ($bSelect)
+				{
+					$sChecked = ($aNodes[$id]->GetKey() == $currValue) ? 'checked' : '';
+					if ($bMultiple)
+					{
+						$sSelect = '<input type="checkbox" value="'.$aNodes[$id]->GetKey().'" name="selectObject[]" '.$sChecked.'>&nbsp;';
+					}
+					else
+					{
+						$sSelect = '<input type="radio" value="'.$aNodes[$id]->GetKey().'" name="selectObject" '.$sChecked.'>&nbsp;';
+					}
+				}
+				$oP->add('<li>'.$sSelect.$aNodes[$id]->GetHyperlink());
+				$this->DumpNodes($oP, $id, $aTree, $aNodes, $currValue);
+				$oP->add("</li>\n");
+			}
+			$oP->add("</ul>\n");
+		}
+	}
+
 }
 ?>

application/ui.htmleditorwidget.class.inc.php

@@ -61,14 +61,14 @@ class UIHTMLEditorWidget
 		$sHelpText = $this->m_sHelpText;
 		$sValidationField = $this->m_sValidationField;
 
-		$sHtmlValue = "<table><tr><td><textarea class=\"htmlEditor\" title=\"$sHelpText\" name=\"attr_{$this->m_sFieldPrefix}{$sCode}\" rows=\"14\" cols=\"110\" id=\"$iId\">$sValue</textarea></td><td>$sValidationField</td></tr></table>";
+		$sHtmlValue = "<table><tr><td><textarea class=\"htmlEditor\" title=\"$sHelpText\" name=\"attr_{$this->m_sFieldPrefix}{$sCode}\" rows=\"10\" cols=\"10\" id=\"$iId\">$sValue</textarea></td><td>$sValidationField</td></tr></table>";
 
 		// Replace the text area with CKEditor
 		// To change the default settings of the editor,
 		// a) edit the file /js/ckeditor/config.js
 		// b) or override some of the configuration settings, using the second parameter of ckeditor()
 		$sLanguage = strtolower(trim(UserRights::GetUserLanguage()));
-		$oPage->add_ready_script("$('#$iId').ckeditor(function() { /* callback code */ }, { language : '$sLanguage' , contentsLanguage : '$sLanguage' });"); // Transform $iId into a CKEdit
+		$oPage->add_ready_script("$('#$iId').ckeditor(function() { /* callback code */ }, { language : '$sLanguage' , contentsLanguage : '$sLanguage', extraPlugins: 'disabler' });"); // Transform $iId into a CKEdit
 
 		// Please read...
 		// ValidateCKEditField triggers a timer... calling itself indefinitely
@@ -78,7 +78,8 @@ class UIHTMLEditorWidget
 		// The most relevant solution would be to implement a plugin to CKEdit, and handle the internal events like: setData, insertHtml, insertElement, loadSnapshot, key, afterUndo, afterRedo
 
 		// Could also be bound to 'instanceReady.ckeditor'
-		$oPage->add_ready_script("$('#$iId').bind('validate', function(evt, sFormId) { return ValidateCKEditField('$iId', '', {$this->m_sMandatory}, sFormId, '') } );");
+		$oPage->add_ready_script("$('#$iId').bind('validate', function(evt, sFormId) { return ValidateCKEditField('$iId', '', {$this->m_sMandatory}, sFormId, '') } );\n");
+		$oPage->add_ready_script("$('#$iId').bind('update', function() { BlockField('cke_$iId', $('#$iId').attr('disabled')); } );\n");
 
 		return $sHtmlValue;
 	}

application/ui.linkswidget.class.inc.php

@@ -34,6 +34,7 @@ class UILinksWidget
 	protected $m_iInputId;
 	protected $m_aAttributes;
 	protected $m_sExtKeyToRemote;
+	protected $m_sExtKeyToMe;
 	protected $m_sLinkedClass;
 	protected $m_sRemoteClass;
 	protected $m_bDuplicatesAllowed;
@@ -50,6 +51,7 @@ class UILinksWidget
 		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
 		$this->m_sLinkedClass = $oAttDef->GetLinkedClass();
 		$this->m_sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+		$this->m_sExtKeyToMe = $oAttDef->GetExtKeyToMe();
 		$oLinkingAttDef = 	MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
 		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
 		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
@@ -66,7 +68,7 @@ class UILinksWidget
 			{
 				// State attribute is always hidden from the UI
 			}
-			else if (!$oAttDef->IsExternalField() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
+			else if ($oAttDef->IsWritable() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
 			{
 				$iFlags = MetaModel::GetAttributeFlags($this->m_sLinkedClass, $sDefaultState, $sAttCode);				
 				if ( !($iFlags & OPT_ATT_HIDDEN) && !($iFlags & OPT_ATT_READONLY) )
@@ -97,7 +99,7 @@ class UILinksWidget
 	 * @param Hash $aArgs Extra context arguments
 	 * @return string The HTML fragment of the one-row form
 	 */
-	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId = null, $aArgs = array() )
+	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId = null, $aArgs = array(), $oCurrentObj )
 	{
 		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
 		$aRow = array();
@@ -107,6 +109,7 @@ class UILinksWidget
 			$sPrefix .= "[$key][";
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
+			$aArgs['this'] = $linkObjOrId;
 			$aRow['form::checkbox'] = "<input class=\"selection\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$key\">";
 			$aRow['form::checkbox'] .= "<input type=\"hidden\" name=\"attr_{$sPrefix}id{$sNameSuffix}\" value=\"$key\">";
 			foreach($this->m_aEditableFields as $sFieldCode)
@@ -121,8 +124,13 @@ class UILinksWidget
 		{
 			// form for creating a new record
 			$sPrefix .= "[$linkObjOrId][";
+			$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
+			$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, -$linkObjOrId);
+			$oNewLinkObj->Set($this->m_sExtKeyToRemote, $oRemoteObj); // Setting the extkey with the object alsoo fills the related external fields
+			$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object alsoo fills the related external fields
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
+			$aArgs['this'] = $oNewLinkObj;
 			$aRow['form::checkbox'] = "<input class=\"selection\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$linkObjOrId\">";
 			$aRow['form::checkbox'] .= "<input type=\"hidden\" name=\"attr_{$sPrefix}id{$sNameSuffix}\" value=\"\">";
 			foreach($this->m_aEditableFields as $sFieldCode)
@@ -182,17 +190,17 @@ class UILinksWidget
 		
 		// Content
 		$sHtml .= "</tbody>\n";
-		if (count($aData) == 0)
+		$sEmptyRowStyle = '';
+		if (count($aData) != 0)
 		{
-			$sHtml .= "<tr 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>";
+			$sEmptyRowStyle = 'style="display:none;"';
 		}
-		else
+
+		$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)
 		{
-			foreach($aData as $iRowId => $aRow)
-			{
-				$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
-			}		
-		}
+			$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
+		}		
 		$sHtml .= "</tbody>\n";
 		
 		// Footer
@@ -207,9 +215,11 @@ class UILinksWidget
 	 * @param WebPage $oP The web page used for all the output
 	 * @param DBObjectSet The initial value of the linked set
 	 * @param Hash $aArgs Extra context arguments
+	 * @param string $sFormPrefix prefix of the fields in the current form
+	 * @param DBObject $oCurrentObj the current object to which the linkset is related
 	 * @return string The HTML fragment to be inserted into the page
 	 */
-	public function Display(WebPage $oPage, DBObjectSet $oValue, $aArgs = array())
+	public function Display(WebPage $oPage, DBObjectSet $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
 	{
 		$sHtmlValue = '';
 		$sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
@@ -219,113 +229,35 @@ class UILinksWidget
 		while($oCurrentLink = $oValue->Fetch())
 		{
 			$aRow = array();
-			$key = $oCurrentLink->GetKey();
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote));
+			if ($oCurrentLink->IsNew())
+			{
+				$key = -$oLinkedObj->GetKey();
+				$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $key, $aArgs, $oCurrentObj);
+			}
+			else
+			{
+				$key = $oCurrentLink->GetKey();
+				$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj);
+			}
 
-			$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs);
 		}
 		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
 		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
+		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
 		$oPage->add_ready_script(<<<EOF
-		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates);
+		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper);
 		oWidget{$this->m_iInputId}.Init();
 EOF
 );
 		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget{$this->m_iInputId}.RemoveSelected();\" >";
-		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"></span>\n";
+		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"><span id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></span>\n";
 		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
 		$sHtmlValue .= "</div>\n";
-		$oPage->add_at_the_end($this->GetObjectPickerDialog($oPage)); // To prevent adding forms inside the main form
+		$oPage->add_at_the_end("<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\"></div>"); // To prevent adding forms inside the main form
 		return $sHtmlValue;
 	}
-	
-	/**
-	 * This static function is called by the Ajax Page when there is a need to fill an autocomplete combo
-	 * @param $oPage WebPage The ajax page used for the output (sent back to the browser)
-	 * @param $sClass string The name of the class of the current object being edited
-	 * @param $sAttCode string The name of the attribute being edited
-	 * @param $sName string The partial name that was typed by the user
-	 * @param $iMaxCount integer The maximum number of items to return
-	 * @return void
-	 */	 	 	  	 	 	 	
-	static public function Autocomplete(WebPage $oPage, $sClass, $sAttCode, $sName, $iMaxCount)
-	{
-		// #@# todo - add context information, otherwise any value will be authorized for external keys
-		$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, array() /* $aArgs */, $sName);
-		if ($aAllowedValues != null)
-		{
-			$iCount = $iMaxCount;
-			foreach($aAllowedValues as $key => $value)
-			{
-				$oPage->add($value."|".$key."\n");
-				$iCount--;
-				if ($iCount == 0) break;
-			}
-		}
-		else // No limitation to the allowed values
-		{
-			// Search for all the object of the linked class
-			$oAttDef = 	$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			$sLinkedClass = $oAttDef->GetLinkedClass();
-			$sSearchClass = self::GetTargetClass($sClass, $sAttCode);
-			$oFilter = new DBObjectSearch($sSearchClass);
-			$sSearchAttCode = MetaModel::GetNameAttributeCode($sSearchClass);
-			$oFilter->AddCondition($sSearchAttCode, $sName, 'Begins with');
-			$oSet = new CMDBObjectSet($oFilter, array($sSearchAttCode => true));
-			$iCount = 0;
-			while( ($iCount < $iMaxCount) && ($oObj = $oSet->fetch()) )
-			{
-				$oPage->add($oObj->GetName()."|".$oObj->GetKey()."\n");
-				$iCount++;
-			}
-		}
-	}
-
-	/**
-	 * This static function is called by the Ajax Page display a set of objects being linked
-	 * to the object being created	 
-	 * @param $oPage WebPage The ajax page used for the put^put (sent back to the browser
-	 * @param $sClass string The name of the 'linking class' which is the class of the objects to display
-	 * @param $sSet JSON serialized set of objects
-	 * @param $sExtKeyToMe Name of the attribute in sClass that is pointing to a given object
-	 * @param $iObjectId The id of the object $sExtKeyToMe is pointing to
-	 * @return void
-	 */	 	 	  	 	 	 	
-	static public function RenderSet($oPage, $sClass, $sJSONSet, $sExtKeyToMe, $sExtKeyToRemote, $iObjectId)
-	{
-		$aSet = json_decode($sJSONSet, true); // true means hash array instead of object
-		$oSet = CMDBObjectSet::FromScratch($sClass);
-		foreach($aSet as $aObject)
-		{
-			$oObj = MetaModel::NewObject($sClass);
-			foreach($aObject as $sAttCode => $value)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-				if ($oAttDef->IsExternalKey() && ($value != 0))
-				{
-					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value); // @@ optimization, don't do & query per object in the set !
-					$oObj->Set($sAttCode, $oTargetObj);
-				}
-				else
-				{
-					$oObj->Set($sAttCode, $value);
-				}
-
-			}
-			$oSet->AddObject($oObj);
-		}
-		$aExtraParams = array();
-		$aExtraParams['link_attr'] = $sExtKeyToMe;
-		$aExtraParams['object_id'] = $iObjectId;
-		$aExtraParams['target_attr'] = $sExtKeyToRemote;
-		$aExtraParams['menu'] = false;
-		$aExtraParams['select'] = false;
-		$aExtraParams['view_link'] = false;
-		
-		cmdbAbstractObject::DisplaySet($oPage, $oSet, $aExtraParams);
-	}
-
-	
+	         
 	protected static function GetTargetClass($sClass, $sAttCode)
 	{
 		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
@@ -345,27 +277,26 @@ EOF
 		return $sTargetClass;
 	}
 	
-	protected function GetObjectPickerDialog($oPage)
+	public function GetObjectPickerDialog($oPage, $oCurrentObj)
 	{
-		$sHtml = "<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\">";
-		$sHtml .= "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
-		$oSet = new CMDBObjectSet($oFilter);
+		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}", array('open' => true));
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
 		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">";
 		$sHtml .= "</div>\n";
 		$sHtml .= "</form>\n";
-		$sHtml .= "</div>\n";
+		$oPage->add($sHtml);
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
 		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
 		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
-		return $sHtml;
 	}
 
 	/**
@@ -419,18 +350,19 @@ EOF
 		}
 		$oSet = new CMDBObjectSet($oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, 'ResultsToAdd', array('menu' => false, 'selection_mode' => true, 'display_limit' => false)); // Don't display the 'Actions' menu on the results
+		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", array('menu' => false, 'cssCount'=> '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true)); // Don't display the 'Actions' menu on the results
 	}
 	
-	public function DoAddObjects(WebPage $oP, $aLinkedObjectIds = array())
+	public function DoAddObjects(WebPage $oP, $oFullSetFilter, $oCurrentObj)
 	{
-		$aTable = array();
+		$aLinkedObjectIds = utils::ReadMultipleSelection($oFullSetFilter);
+
 		foreach($aLinkedObjectIds as $iObjectId)
 		{
 			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId);
 			if (is_object($oLinkedObj))
 			{
-				$aRow = $this->GetFormRow($oP, $oLinkedObj, -$iObjectId ); // Not yet created link get negative Ids
+				$aRow = $this->GetFormRow($oP, $oLinkedObj, -$iObjectId, array(), $oCurrentObj ); // Not yet created link get negative Ids
 				$oP->add($this->DisplayFormRow($oP, $this->m_aTableConfig, $aRow, -$iObjectId)); 
 			}
 			else
@@ -439,5 +371,47 @@ EOF
 			}
 		}
 	}
+	
+	/**
+	 * Initializes the default search parameters based on 1) a 'current' object and 2) the silos defined by the context
+	 * @param DBObject $oSourceObj
+	 * @param DBObjectSearch $oSearch
+	 */
+	protected function SetSearchDefaultFromContext($oSourceObj, &$oSearch)
+	{
+		$oAppContext = new ApplicationContext();
+		$sSrcClass = get_class($oSourceObj);
+		$sDestClass = $oSearch->GetClass();
+		foreach($oAppContext->GetNames() as $key)
+		{
+			// Find the value of the object corresponding to each 'context' parameter
+			$aCallSpec = array($sSrcClass, 'MapContextParam');
+			$sAttCode = '';
+			if (is_callable($aCallSpec))
+			{
+				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
+			}
+
+			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sSrcClass, $sAttCode);
+				$defaultValue = $oSourceObj->Get($sAttCode);
+
+				// Find the attcode for the same 'context' parameter in the destination class
+				// and sets its value as the default value for the search condition
+				$aCallSpec = array($sDestClass, 'MapContextParam');
+				$sAttCode = '';
+				if (is_callable($aCallSpec))
+				{
+					$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
+				}
+	
+				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue))
+				{
+					$oSearch->AddCondition($sAttCode, $defaultValue);
+				}
+			}
+		}
+	}
 }
 ?>

application/ui.passwordwidget.class.inc.php

@@ -52,18 +52,33 @@ class UIPasswordWidget
 	{
 		$sCode = $this->sAttCode.$this->sNameSuffix;
 		$iWidgetIndex = self::$iWidgetIndex;
-		$sPasswordValue = utils::ReadPostedParam("attr_$sCode", '*****');
-		$sConfirmPasswordValue = utils::ReadPostedParam("attr_{$sCode}_confirmed", '*****');
+		$sPasswordValue = utils::ReadPostedParam("attr_{$sCode}[value]", '*****', 'raw_data');
+		$sConfirmPasswordValue = utils::ReadPostedParam("attr_{$sCode}[confirm]", '*****', 'raw_data');
 		$sChangedValue = (($sPasswordValue != '*****') || ($sConfirmPasswordValue != '*****')) ? 1 : 0;
 		$sHtmlValue = '';
-		$sHtmlValue = '<input type="password" maxlength="255" name="attr_'.$sCode.'" id="'.$this->iId.'" value="'.htmlentities($sPasswordValue, ENT_QUOTES, 'UTF-8').'"/>&nbsp;<span class="form_validation" id="v_'.$this->iId.'"></span><br/>';
-		$sHtmlValue .= '<input type="password" maxlength="255" id="'.$this->iId.'_confirm" value="'.htmlentities($sConfirmPasswordValue, ENT_QUOTES, 'UTF-8').'" name="attr_'.$sCode.'_confirmed"/> '.Dict::S('UI:PasswordConfirm').' <input type="button" value="'.Dict::S('UI:Button:ResetPassword').'" onClick="ResetPwd(\''.$this->iId.'\');">';
-		$sHtmlValue .= '<input type="hidden" id="'.$this->iId.'_changed" name="attr_'.$sCode.'_changed" value="'.$sChangedValue.'"/>';
+		$sHtmlValue = '<input type="password" maxlength="255" name="attr_'.$sCode.'[value]" id="'.$this->iId.'" value="'.htmlentities($sPasswordValue, ENT_QUOTES, 'UTF-8').'"/>&nbsp;<span class="form_validation" id="v_'.$this->iId.'"></span><br/>';
+		$sHtmlValue .= '<input type="password" maxlength="255" id="'.$this->iId.'_confirm" value="'.htmlentities($sConfirmPasswordValue, ENT_QUOTES, 'UTF-8').'" name="attr_'.$sCode.'[confirm]"/> '.Dict::S('UI:PasswordConfirm').' <input id="'.$this->iId.'_reset" type="button" value="'.Dict::S('UI:Button:ResetPassword').'" onClick="ResetPwd(\''.$this->iId.'\');">';
+		$sHtmlValue .= '<input type="hidden" id="'.$this->iId.'_changed" name="attr_'.$sCode.'[changed]" value="'.$sChangedValue.'"/>';
 
 		$oPage->add_ready_script("$('#$this->iId').bind('keyup change', function(evt) { return PasswordFieldChanged('$this->iId') } );"); // Bind to a custom event: validate
 		$oPage->add_ready_script("$('#$this->iId').bind('keyup change validate', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate
 		$oPage->add_ready_script("$('#{$this->iId}_confirm').bind('keyup change', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate
-
+		$oPage->add_ready_script("$('#{$this->iId}').bind('update', function(evt, sFormId)
+			{
+				if ($(this).attr('disabled'))
+				{
+					$('#{$this->iId}_confirm').attr('disabled', 'disabled');
+					$('#{$this->iId}_changed').attr('disabled', 'disabled');
+					$('#{$this->iId}_reset').attr('disabled', 'disabled');
+				}
+				else
+				{
+					$('#{$this->iId}_confirm').removeAttr('disabled');
+					$('#{$this->iId}_changed').removeAttr('disabled');
+					$('#{$this->iId}_reset').removeAttr('disabled');
+				}
+			}
+		);"); // Bind to a custom event: update to handle enabling/disabling
 		return $sHtmlValue;
 	}
 }

application/uilinkswizard.class.inc.php

@@ -85,7 +85,7 @@ class UILinksWizard
 		$sTargetClass = $oAttDef->GetTargetClass();
 		$oTargetObj = MetaModel::GetObject($sTargetClass, $this->m_iObjectId);
 
-		$oP->set_title("iTop - ".MetaModel::GetName($this->m_sLinkedClass)." objects linked with ".MetaModel::GetName(get_class($oTargetObj)).": ".$oTargetObj->GetName());
+		$oP->set_title("iTop - ".MetaModel::GetName($this->m_sLinkedClass)." objects linked with ".MetaModel::GetName(get_class($oTargetObj)).": ".$oTargetObj->GetRawName());
 		$oP->add("<div class=\"wizContainer\">\n");
 		$oP->add("<form method=\"post\">\n");
 		$oP->add("<div class=\"page_header\">\n");
@@ -97,8 +97,7 @@ class UILinksWizard
 		$oP->add("<input type=\"hidden\" name=\"linking_attcode\" value=\"{$this->m_sLinkingAttCode}\">\n");
 		$oP->add("<h1>".Dict::Format('UI:ManageObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName(get_class($oTargetObj)), "<span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span>")."</h1>\n");
 		$oP->add("</div>\n");
-		$oP->add("<script type=\"text/javascript\">\n");
-		$oP->add(
+		$oP->add_script(
 <<<EOF
 		function OnSelectChange()
 		{
@@ -132,7 +131,7 @@ class UILinksWizard
 		function AddObjects()
 		{
 			// TO DO: compute the list of objects already linked with the current Object
-			$.post( 'ajax.render.php', { 'operation': 'addObjects',
+			$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', { 'operation': 'addObjects',
 										'class': '{$this->m_sClass}',
 										'linkageAttr': '{$this->m_sLinkageAttr}',
 										'linkedClass': '{$this->m_sLinkedClass}',
@@ -175,7 +174,7 @@ class UILinksWizard
 			theMap['operation'] = 'searchObjectsToAdd';
 			
 			// Run the query and display the results
-			$.post( 'ajax.render.php', theMap, 
+			$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
 				function(data)
 				{
 					$('#SearchResultsToAdd').html(data);
@@ -223,7 +222,7 @@ class UILinksWizard
 			theMap['operation'] = 'doAddObjects';
 			
 			// Run the query and display the results
-			$.post( 'ajax.render.php', theMap, 
+			$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
 				function(data)
 				{
 					//console.log('Data: ' + data);
@@ -257,7 +256,6 @@ class UILinksWizard
 		}
 EOF
 );
-		$oP->Add("</script>\n");
 		$oP->add_ready_script("InitForm();");
 		$oFilter = new DBObjectSearch($this->m_sClass);
 		$oFilter->AddCondition($this->m_sLinkageAttr, $this->m_iObjectId, '=');
@@ -395,7 +393,7 @@ EOF
 		$oFilter = new DBObjectSearch($this->m_sLinkedClass);
 		$oSet = new CMDBObjectSet($oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, 'ResultsToAdd', array('menu' => false, 'selection_mode' => true, 'display_limit' => false)); // Don't display the 'Actions' menu on the results
+		$oBlock->Display($oP, 'ResultsToAdd', array('menu' => false, 'selection_mode' => true)); // Don't display the 'Actions' menu on the results
 	}
 	
 	public function DoAddObjects(WebPage $oP, $aLinkedObjectIds = array())

application/uiwizard.class.inc.php

@@ -53,7 +53,7 @@ class UIWizard
 	{
 		if ($iStepIndex == 1) // one big form that contains everything, to make sure that the uploaded files are posted too
 		{
-			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"../pages/UI.php\">\n");
+			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php\">\n");
 		}
 		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
 		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
@@ -112,8 +112,7 @@ class UIWizard
 		<input type=\"button\" value=\"".Dict::S('UI:Button:Next')."\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
 		<input type=\"button\" value=\"".Dict::S('UI:Button:Finish')."\" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
 		</div>\n");
-		$this->m_oPage->add("
-<script type=\"text/javascript\">
+		$this->m_oPage->add_script("
 function OnEnterStep{$iStepIndex}()
 {
 	oWizardHelper.ResetQuery();
@@ -123,7 +122,7 @@ $sJSHandlerCode
 
 	oWizardHelper.AjaxQueryServer();
 }
-</script>\n");
+");
 		$this->m_oPage->add("</div>\n\n");
 	}	
 
@@ -139,16 +138,15 @@ $sJSHandlerCode
 		$this->m_oPage->add("<input type=\"hidden\" name=\"operation\" value=\"wizard_apply_new\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" id=\"wizard_json_obj\" name=\"json_obj\" value=\"\" />\n");
-		$this->m_oPage->add("<script type=\"text/javascript\">\n");
-		$this->m_oPage->add("function OnEnterStep$iStepIndex() {\n");
+		$sScript = "function OnEnterStep$iStepIndex() {\n";
 		foreach($aFieldsMap as $iInputId => $sAttCode)
 		{
-			$this->m_oPage->add("\toWizardHelper.UpdateCurrentValue('$sAttCode');\n");		
+			$sScript .= "\toWizardHelper.UpdateCurrentValue('$sAttCode');\n";		
 		}
-		$this->m_oPage->add("\toWizardHelper.Preview('object_preview');\n");		
-		$this->m_oPage->add("\t$('#wizard_json_obj').val(oWizardHelper.ToJSON());\n");		
-		$this->m_oPage->add("}\n");
-		$this->m_oPage->add("</script>\n");
+		$sScript .= "\toWizardHelper.Preview('object_preview');\n";		
+		$sScript .= "\t$('#wizard_json_obj').val(oWizardHelper.ToJSON());\n";		
+		$sScript .= "}\n";
+		$this->m_oPage->add_script($sScript);
 		$this->m_oPage->add("<div id=\"object_preview\">\n");
 		$this->m_oPage->add("</div>\n");
 		$this->m_oPage->add($oAppContext->GetForForm());		
@@ -227,7 +225,7 @@ $sJSHandlerCode
 			
 		// Now use the dependencies between the fields to order them
 		// Start from the order of the 'details'
-		$aList = MetaModel::GetZListItems($this->m_sClass, 'details');
+		$aList = MetaModel::FlattenZlist(MetaModel::GetZListItems($this->m_sClass, 'details'));
 		$index = 0;
 		$aOrder = array();
 		foreach($aFields as $sAttCode => $void)

application/user.preferences.class.inc.php

@@ -169,9 +169,9 @@ class appUserPreferences extends DBObject
 	* Overloading this function here to secure a fix done right before the release
 	* The real fix should be to implement this verb in DBObject	
 	*/
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
 	{
-		$this->DBDelete();
+		$this->DBDelete($oDeletionPlan);
 	}
 }
 ?>

application/utils.inc.php

@@ -27,6 +27,7 @@ require_once(APPROOT.'/core/config.class.inc.php');
 require_once(APPROOT.'/application/transaction.class.inc.php');
 
 define('ITOP_CONFIG_FILE', APPROOT.'/config-itop.php');
+define('SERVER_NAME_PLACEHOLDER', '$SERVER_NAME$');
 
 class FileUploadException extends Exception
 {
@@ -41,7 +42,83 @@ class utils
 {
 	private static $m_sConfigFile = ITOP_CONFIG_FILE;
 	private static $m_oConfig = null;
+	private static $m_bCASClient = false;
 
+	// Parameters loaded from a file, parameters of the page/command line still have precedence
+	private static $m_aParamsFromFile = null;
+	private static $m_aParamSource = array();
+
+	protected static function LoadParamFile($sParamFile)
+	{
+		if (!file_exists($sParamFile))
+		{
+			throw new Exception("Could not find the parameter file: '$sParamFile'");
+		}
+		if (!is_readable($sParamFile))
+		{
+			throw new Exception("Could not load parameter file: '$sParamFile'");
+		}
+		$sParams = file_get_contents($sParamFile);
+
+		if (is_null(self::$m_aParamsFromFile))
+		{
+			self::$m_aParamsFromFile = array();
+		}
+
+		$aParamLines = explode("\n", $sParams);
+		foreach ($aParamLines as $sLine)
+		{
+			$sLine = trim($sLine);
+
+			// Ignore the line after a '#'
+			if (($iCommentPos = strpos($sLine, '#')) !== false)
+			{
+				$sLine = substr($sLine, 0, $iCommentPos);
+				$sLine = trim($sLine);
+			}
+
+			// Note: the line is supposed to be already trimmed
+			if (preg_match('/^(\S*)\s*=(.*)$/', $sLine, $aMatches))
+			{
+				$sParam = $aMatches[1];
+				$value = trim($aMatches[2]);
+				self::$m_aParamsFromFile[$sParam] = $value;
+				self::$m_aParamSource[$sParam] = $sParamFile;
+			}
+		}
+	}
+
+	public static function UseParamFile($sParamFileArgName = 'param_file', $bAllowCLI = true)
+	{
+		$sFileSpec = self::ReadParam($sParamFileArgName, '', $bAllowCLI, 'raw_data');
+		foreach(explode(',', $sFileSpec) as $sFile)
+		{
+			$sFile = trim($sFile);
+			if (!empty($sFile))
+			{
+				self::LoadParamFile($sFile);
+			}
+		}
+	}
+
+	/**
+	 * Return the source file from which the parameter has been found,
+	 * usefull when it comes to pass user credential to a process executed
+	 * in the background	 
+	 * @param $sName Parameter name
+	 * @return The file name if any, or null
+	 */
+	public static function GetParamSourceFile($sName)
+	{
+		if (array_key_exists($sName, self::$m_aParamSource))
+		{
+			return self::$m_aParamSource[$sName];
+		}
+		else
+		{
+			return null;
+		}
+	}
 
 	public static function IsModeCLI()
 	{
@@ -58,10 +135,19 @@ class utils
 	}
 
 
-	public static function ReadParam($sName, $defaultValue = "", $bAllowCLI = false)
+	public static function ReadParam($sName, $defaultValue = "", $bAllowCLI = false, $sSanitizationFilter = 'parameter')
 	{
 		global $argv;
 		$retValue = $defaultValue;
+
+		if (!is_null(self::$m_aParamsFromFile))
+		{
+			if (isset(self::$m_aParamsFromFile[$sName]))
+			{
+				$retValue = self::$m_aParamsFromFile[$sName];
+			}
+		}
+
 		if (isset($_REQUEST[$sName]))
 		{
 			$retValue = $_REQUEST[$sName];
@@ -76,29 +162,115 @@ class utils
 				}
 			}
 		}
-		return $retValue;
+		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
 	}
 	
-	public static function ReadPostedParam($sName, $defaultValue = "")
+	public static function ReadPostedParam($sName, $defaultValue = '', $sSanitizationFilter = 'parameter')
 	{
-		return isset($_POST[$sName]) ? $_POST[$sName] : $defaultValue;
+		$retValue = isset($_POST[$sName]) ? $_POST[$sName] : $defaultValue;
+		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
+	}
+	
+	public static function Sanitize($value, $defaultValue, $sSanitizationFilter)
+	{
+		if ($value === $defaultValue)
+		{
+			// Preserve the real default value (can be used to detect missing mandatory parameters)
+			$retValue = $value;
+		}
+		else
+		{
+			$retValue = self::Sanitize_Internal($value, $sSanitizationFilter);
+			if ($retValue === false)
+			{
+				$retValue = $defaultValue;
+			}
+		}
+		return $retValue;		
+	}
+	
+	protected static function Sanitize_Internal($value, $sSanitizationFilter)
+	{
+		switch($sSanitizationFilter)
+		{
+			case 'integer':
+			$retValue = filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			break;
+			
+			case 'class':
+			$retValue = $value;
+			if (!MetaModel::IsValidClass($value))
+			{
+				$retValue = false;
+			}
+			break;
+
+			case 'string':
+			$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
+			break;
+			
+			case 'parameter':
+			case 'field_name':
+			if (is_array($value))
+			{
+				$retValue = array();
+				foreach($value as $key => $val)
+				{
+					$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
+					if ($retValue[$key] === false)
+					{
+						$retValue = false;
+						break;
+					}
+				}
+			}
+			else
+			{
+				switch($sSanitizationFilter)
+				{
+					case 'parameter':
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=-]*$/'))); // the '=' equal character is used in serialized filters
+					break;
+					
+					case 'field_name':
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
+					break;
+				}
+			}
+			break;
+			
+			break;
+			
+			default:
+			case 'raw_data':
+			$retValue = $value;
+			// Do nothing
+		}
+		return $retValue;		
 	}
 	
 	/**
 	 * Reads an uploaded file and turns it into an ormDocument object - Triggers an exception in case of error
 	 * @param string $sName Name of the input used from uploading the file	 
+	 * @param string $sIndex If Name is an array of posted files, then the index must be used to point out the file	 
 	 * @return ormDocument The uploaded file (can be 'empty' if nothing was uploaded)
 	 */	 	 
-	public static function  ReadPostedDocument($sName)
+	public static function  ReadPostedDocument($sName, $sIndex = null)
 	{
 		$oDocument = new ormDocument(); // an empty document
 		if(isset($_FILES[$sName]))
 		{
-			switch($_FILES[$sName]['error'])
+			$aFileInfo = $_FILES[$sName];
+
+			$sError = is_null($sIndex) ? $aFileInfo['error'] : $aFileInfo['error'][$sIndex];
+			switch($sError)
 			{
 				case UPLOAD_ERR_OK:
-				$doc_content = file_get_contents($_FILES[$sName]['tmp_name']);
-				$sMimeType = $_FILES[$sName]['type'];
+				$sTmpName = is_null($sIndex) ? $aFileInfo['tmp_name'] : $aFileInfo['tmp_name'][$sIndex];
+				$sMimeType = is_null($sIndex) ? $aFileInfo['type'] : $aFileInfo['type'][$sIndex];
+				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
+
+				$doc_content = file_get_contents($sTmpName);
 				if (function_exists('finfo_file'))
 				{
 					// as of PHP 5.3 the fileinfo extension is bundled within PHP
@@ -116,7 +288,7 @@ class utils
 					}
 					@finfo_close($rInfo);
 				}
-				$oDocument = new ormDocument($doc_content, $sMimeType, $_FILES[$sName]['name']);
+				$oDocument = new ormDocument($doc_content, $sMimeType, $sName);
 				break;
 				
 				case UPLOAD_ERR_NO_FILE:
@@ -141,11 +313,12 @@ class utils
 				break;
 
 				case UPLOAD_ERR_EXTENSION:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $_FILES[$sName]['name']));
+				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
+				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $sName));
 				break;
 				
 				default:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $_FILES[$sName]['error']));
+				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $sError));
 				break;
 
 			}
@@ -153,6 +326,43 @@ class utils
 		return $oDocument;
 	}
 	
+	/**
+	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 * @param $oFullSetFilter DBObjectSearch The criteria defining the whole sets of objects being selected
+	 * @return Array An arry of object IDs corresponding to the objects selected in the set
+	 */	
+	public static function ReadMultipleSelection($oFullSetFilter)
+	{
+		$aSelectedObj = utils::ReadParam('selectObject', array());
+		$sSelectionMode = utils::ReadParam('selectionMode', '');
+		if ($sSelectionMode != '')
+		{
+			// Paginated selection
+			$aExceptions = utils::ReadParam('storedSelection', array());
+			if ($sSelectionMode == 'positive')
+			{
+				// Only the explicitely listed items are selected
+				$aSelectedObj = $aExceptions;
+			}
+			else
+			{
+				// All items of the set are selected, except the one explicitely listed
+				$aSelectedObj = array();
+				$oFullSet = new DBObjectSet($oFullSetFilter);
+				$sClassAlias = $oFullSetFilter->GetClassAlias();
+				$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
+				while($oObj = $oFullSet->Fetch())
+				{
+					if (!in_array($oObj->GetKey(), $aExceptions))
+					{
+						$aSelectedObj[] = $oObj->GetKey();
+					}
+				}
+			}
+		}
+		return $aSelectedObj;
+	}
+
 	public static function GetNewTransactionId()
 	{
 		return privUITransaction::GetNewTransactionId();
@@ -201,39 +411,89 @@ class utils
         return $iReturn;
     }
 
-    /**
-     * Returns an absolute URL to the current page
-     * @param $bQueryString bool True to also get the query string, false otherwise
-     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
-     * @return string The absolute URL to the current page
-     */                   
-	static public function GetAbsoluteUrl($bQueryString = true, $bForceHTTPS = false)
+	/**
+	 * Helper function to convert a string to a date, given a format specification. It replaces strtotime which does not allow for specifying a date in a french format (for instance)
+	 * Example: StringToTime('01/05/11 12:03:45', '%d/%m/%y %H:%i:%s')
+	 * @param string $sDate
+	 * @param string $sFormat
+	 * @return timestamp or false if the input format is not correct
+	 */	 	  
+	public static function StringToTime($sDate, $sFormat)
 	{
-		// Build an absolute URL to this page on this server/port
-		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-		if (MetaModel::GetConfig()->GetSecureConnectionRequired() || MetaModel::GetConfig()->GetHttpsHyperlinks())
+	   // Source: http://php.net/manual/fr/function.strftime.php
+		// (alternative: http://www.php.net/manual/fr/datetime.formats.date.php)
+		static $aDateTokens = null;
+		static $aDateRegexps = null;
+		if (is_null($aDateTokens))
 		{
-			// If a secure connection is required, or if the URL is requested to start with HTTPS
-			// then any URL must start with https !
-			$bForceHTTPS = true;
+		   $aSpec = array(
+				'%d' =>'(?<day>[0-9]{2})',
+				'%m' => '(?<month>[0-9]{2})',
+				'%y' => '(?<year>[0-9]{2})',
+				'%Y' => '(?<year>[0-9]{4})',
+				'%H' => '(?<hour>[0-2][0-9])',
+				'%i' => '(?<minute>[0-5][0-9])',
+				'%s' => '(?<second>[0-5][0-9])',
+				);
+			$aDateTokens = array_keys($aSpec);
+			$aDateRegexps = array_values($aSpec);
 		}
-		if ($bForceHTTPS)
-		{
-			$sProtocol = 'https';
-			$sPort = '';
+	   
+	   $sDateRegexp = str_replace($aDateTokens, $aDateRegexps, $sFormat);
+	   
+	   if (preg_match('!^(?<head>)'.$sDateRegexp.'(?<tail>)$!', $sDate, $aMatches))
+	   {
+			$sYear = isset($aMatches['year']) ? $aMatches['year'] : 0;
+			$sMonth = isset($aMatches['month']) ? $aMatches['month'] : 1;
+			$sDay = isset($aMatches['day']) ? $aMatches['day'] : 1;
+			$sHour = isset($aMatches['hour']) ? $aMatches['hour'] : 0;
+			$sMinute = isset($aMatches['minute']) ? $aMatches['minute'] : 0;
+			$sSecond = isset($aMatches['second']) ? $aMatches['second'] : 0;
+			return strtotime("$sYear-$sMonth-$sDay $sHour:$sMinute:$sSecond");
 		}
-		else
+	   else
+	   {
+	   	return false;
+	   }
+	   // http://www.spaweditor.com/scripts/regex/index.php
+	}
+
+    /**
+     * Returns the absolute URL to the server's root path
+     * @return string The absolute URL to the server's root, without the first slash
+     */                   
+	static public function GetAbsoluteUrlAppRoot()
+	{
+		$sUrl = MetaModel::GetConfig()->Get('app_root_url');
+		if (strpos($sUrl, SERVER_NAME_PLACEHOLDER) > -1)
 		{
-			$sProtocol = (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!="off")) ? 'https' : 'http';
-			$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
-			if ($sProtocol == 'http')
+			if (isset($_SERVER['SERVER_NAME']))
 			{
-				$sPort = ($iPort == 80) ? '' : ':'.$iPort;
+				$sServerName = $_SERVER['SERVER_NAME'];
 			}
 			else
 			{
-				$sPort = ($iPort == 443) ? '' : ':'.$iPort;
+				// CLI mode ?
+				$sServerName = php_uname('n');
 			}
+			$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
+		}
+		return $sUrl;
+	}
+
+	static public function GetDefaultUrlAppRoot()
+	{
+		// Build an absolute URL to this page on this server/port
+		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
+		$sProtocol = (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!="off")) ? 'https' : 'http';
+		$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
+		if ($sProtocol == 'http')
+		{
+			$sPort = ($iPort == 80) ? '' : ':'.$iPort;
+		}
+		else
+		{
+			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
 		}
 		// $_SERVER['REQUEST_URI'] is empty when running on IIS
 		// Let's use Ivan Tcholakov's fix (found on www.dokeos.com)
@@ -250,48 +510,53 @@ class utils
 			}
 			$_SERVER['REQUEST_URI'] = $sPath;
 		}
-   		$sPath = $_SERVER['REQUEST_URI'];
-        if (!$bQueryString)
-        {
-            // remove all the parameters from the query string
-            $iQuestionMarkPos = strpos($sPath, '?');
-            if ($iQuestionMarkPos !== false)
-            {
-                $sPath = substr($sPath, 0, $iQuestionMarkPos);
-            }
-        } 
-		$sUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
-		
-		return $sUrl;
-	}
+		$sPath = $_SERVER['REQUEST_URI'];
+
+		// remove all the parameters from the query string
+		$iQuestionMarkPos = strpos($sPath, '?');
+		if ($iQuestionMarkPos !== false)
+		{
+			$sPath = substr($sPath, 0, $iQuestionMarkPos);
+		}
+		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
+
+		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
+		$sCurrentScript = str_replace('\\', '/', $sCurrentScript); // canonical path
+		$sAppRoot = str_replace('\\', '/', APPROOT); // canonical path
+		$sCurrentRelativePath = str_replace($sAppRoot, '', $sCurrentScript);
 	
-    /**
-     * Returns the absolute URL PATH of the current page
-     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
-     * @return string The absolute URL to the current page
-     */                   
-	static public function GetAbsoluteUrlPath($bForceHTTPS = false)
-	{
-		$sAbsoluteUrl = self::GetAbsoluteUrl(false, $bForceHTTPS); // False => Don't get the query string
-		$sAbsoluteUrl = substr($sAbsoluteUrl, 0, 1+strrpos($sAbsoluteUrl, '/')); // remove the current page, keep just the path, up to the last /
-		return $sAbsoluteUrl;
+		$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
+		if ($sAppRootPos !== false)
+		{
+			$sAppRootUrl = substr($sAbsoluteUrl, 0, $sAppRootPos); // remove the current page and path
+		}
+		else
+		{
+			// Second attempt without index.php at the end...
+			$sCurrentRelativePath = str_replace('index.php', '', $sCurrentRelativePath);
+			$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
+			if ($sAppRootPos !== false)
+			{
+				$sAppRootUrl = substr($sAbsoluteUrl, 0, $sAppRootPos); // remove the current page and path
+			}
+			else
+			{
+				// No luck...
+				throw new Exception("Failed to determine application root path $sAbsoluteUrl ($sCurrentRelativePath) APPROOT:'$sAppRoot'");
+			}			
+		}
+		return $sAppRootUrl;
 	}
 
     /**
-     * Returns the absolute URL to the server's root path
-     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
-     * @return string The absolute URL to the server's root, without the first slash
+     * Returns the absolute URL to the modules root path
+     * Hardcoded here for compatibility with iTop 2.0 modules     
+     * @return string The absolute URL to the modules
      */                   
-	static public function GetAbsoluteUrlRoot($bForceHTTPS = false)
+	static public function GetAbsoluteUrlModulesRoot()
 	{
-		$sAbsoluteUrl = self::GetAbsoluteUrl(false, $bForceHTTPS); // False => Don't get the query string
-		$sServerPos = 3 + strpos($sAbsoluteUrl, '://');
-		$iFirstSlashPos = strpos($sAbsoluteUrl, '/', $sServerPos);
-		if ($iFirstSlashPos !== false)
-		{
-			$sAbsoluteUrl = substr($sAbsoluteUrl, 0, $iFirstSlashPos); // remove the current page, keep just the path, without the first /
-		}
-		return $sAbsoluteUrl;
+		$sUrl = self::GetAbsoluteUrlAppRoot().'modules/';
+		return $sUrl;
 	}
 
 	/**
@@ -303,7 +568,157 @@ class utils
 	 */
 	static function CanLogOff()
 	{
-		return (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'form');
+		$bResult = false;
+		if(isset($_SESSION['login_mode']))
+		{
+			$sLoginMode = $_SESSION['login_mode'];
+			switch($sLoginMode)
+			{
+				case 'external':
+				$bResult = false;
+				break;
+	
+				case 'form':
+				case 'basic':
+				case 'url':
+				case 'cas':
+				default:
+				$bResult = true;
+				
+			}			
+		}
+		return $bResult;
 	}
+	
+	/**
+	 * Initializes the CAS client
+	 */
+	 static function InitCASClient()
+	 {
+		$sCASIncludePath =  MetaModel::GetConfig()->Get('cas_include_path');
+		include_once($sCASIncludePath.'/CAS.php');
+		
+		$bCASDebug = MetaModel::GetConfig()->Get('cas_debug');
+		if ($bCASDebug)
+		{
+			phpCAS::setDebug(APPROOT.'/error.log');
+		}
+		
+		if (!self::$m_bCASClient)
+		{
+			// Initialize phpCAS
+			$sCASVersion = MetaModel::GetConfig()->Get('cas_version');
+			$sCASHost = MetaModel::GetConfig()->Get('cas_host');
+			$iCASPort = MetaModel::GetConfig()->Get('cas_port');
+			$sCASContext = MetaModel::GetConfig()->Get('cas_context');
+			phpCAS::client($sCASVersion, $sCASHost, $iCASPort, $sCASContext, false /* session already started */);
+			self::$m_bCASClient = true;
+			$sCASCACertPath = MetaModel::GetConfig()->Get('cas_server_ca_cert_path');
+			if (empty($sCASCACertPath))
+			{
+				// If no certificate authority is provided, do not attempt to validate
+				// the server's certificate
+				// THIS SETTING IS NOT RECOMMENDED FOR PRODUCTION. 
+				// VALIDATING THE CAS SERVER IS CRUCIAL TO THE SECURITY OF THE CAS PROTOCOL! 
+				phpCAS::setNoCasServerValidation();
+			}
+			else
+			{
+				phpCAS::setCasServerCACert($sCASCACertPath);
+			}			
+		}
+	 }
+	 
+	 static function DebugBacktrace($iLimit = 5)
+	 {
+		$aFullTrace = debug_backtrace();
+		$aLightTrace = array();
+		for($i=1; ($i<=$iLimit && $i < count($aFullTrace)); $i++) // Skip the last function call... which is the call to this function !
+		{
+			$aLightTrace[$i] = $aFullTrace[$i]['function'].'(), called from line '.$aFullTrace[$i]['line'].' in '.$aFullTrace[$i]['file'];
+		}
+		echo "<p><pre>".print_r($aLightTrace, true)."</pre></p>\n";
+	 }
+
+	/**
+	 * Execute the given iTop PHP script, passing it the current credentials
+	 * Only CLI mode is supported, because of the need to hand the credentials over to the next process
+	 * Throws an exception if the execution fails or could not be attempted (config issue)
+	 * @param string $sScript Name and relative path to the file (relative to the iTop root dir)
+	 * @param hash $aArguments Associative array of 'arg' => 'value'
+	 * @return array(iCode, array(output lines))
+	 */	 	  
+	/**
+	 */
+	static function ExecITopScript($sScriptName, $aArguments)
+	{
+		$aDisabled = explode(', ', ini_get('disable_functions'));
+		if (in_array('exec', $aDisabled))
+		{
+			throw new Exception("The PHP exec() function has been disabled on this server");
+		}
+
+		$sPHPExec = trim(MetaModel::GetConfig()->Get('php_path'));
+		if (strlen($sPHPExec) == 0)
+		{
+			throw new Exception("The path to php must not be empty. Please set a value for 'php_path' in your configuration file.");
+		}
+
+		$sAuthUser = self::ReadParam('auth_user', '', 'raw_data');
+		$sAuthPwd = self::ReadParam('auth_pwd', '', 'raw_data');
+		$sParamFile = self::GetParamSourceFile('auth_user');
+		if (is_null($sParamFile))
+		{
+			$aArguments['auth_user'] = $sAuthUser;
+			$aArguments['auth_pwd'] = $sAuthPwd;
+		}
+		else
+		{
+			$aArguments['param_file'] = $sParamFile;
+		}
+		
+		$aArgs = array();
+		foreach($aArguments as $sName => $value)
+		{
+			// Note: See comment from the 23-Apr-2004 03:30 in the PHP documentation
+			//    It suggests to rely on pctnl_* function instead of using escapeshellargs
+			$aArgs[] = "--$sName=".escapeshellarg($value);
+		}
+		$sArgs = implode(' ', $aArgs);
+		
+		$sScript = realpath(APPROOT.$sScriptName);
+		if (!file_exists($sScript))
+		{
+			throw new Exception("Could not find the script file '$sScriptName' from the directory '".APPROOT."'");
+		}
+
+		$sCommand = '"'.$sPHPExec.'" '.escapeshellarg($sScript).' -- '.$sArgs;
+
+		if (version_compare(phpversion(), '5.3.0', '<'))
+		{
+			if (substr(PHP_OS,0,3) == 'WIN')
+			{
+				// Under Windows, and for PHP 5.2.x, the whole command has to be quoted
+				// Cf PHP doc: http://php.net/manual/fr/function.exec.php, comment from the 27-Dec-2010
+				$sCommand = '"'.$sCommand.'"';
+			}
+		}
+
+		$sLastLine = exec($sCommand, $aOutput, $iRes);
+		if ($iRes == 1)
+		{
+			throw new Exception(Dict::S('Core:ExecProcess:Code1')." - ".$sCommand);
+		}
+		elseif ($iRes == 255)
+		{
+			$sErrors = implode("\n", $aOutput);
+			throw new Exception(Dict::S('Core:ExecProcess:Code255')." - ".$sCommand.":\n".$sErrors);
+		}
+
+		//$aOutput[] = $sCommand;
+		return array($iRes, $aOutput);
+	}
+
+
 }
 ?>

application/webpage.class.inc.php

@@ -46,7 +46,11 @@ class WebPage
     protected $a_headers;
     protected $a_base;
     protected $iNextId;
-    
+    protected $iTransactionId;
+	protected $sContentType;
+	protected $sContentDisposition;
+	protected $sContentFileName;
+	    
     public function __construct($s_title)
     {
         $this->s_title = $s_title;
@@ -59,6 +63,10 @@ class WebPage
         $this->a_headers = array();
         $this->a_base = array( 'href' => '', 'target' => '');
         $this->iNextId = 0;
+        $this->iTransactionId = 0;
+        $this->sContentType = '';
+        $this->sContentDisposition = '';
+        $this->sContentFileName = '';
         ob_start(); // Start capturing the output
     }
 	
@@ -88,11 +96,11 @@ class WebPage
     }
     
 	/**
-	 * Add any text or HTML fragment at the end of the body of the page
+	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
 	 * This is useful to add hidden content, DIVs or FORMs that should not
 	 * be embedded into each other.	 	 
 	 */
-    public function add_at_the_end($s_html)
+    public function add_at_the_end($s_html, $sId = '')
     {
         $this->s_deferred_content .= $s_html;
     }
@@ -152,27 +160,33 @@ class WebPage
 		$sHtml .= "<tbody>\n";
 		foreach($aData as $aRow)
 		{
-			if (isset($aRow['@class'])) // Row specific class, for hilighting certain rows
-			{
-				$sHtml .= "<tr class=\"{$aRow['@class']}\">\n";				
-			}
-			else
-			{
-				$sHtml .= "<tr>\n";
-			}
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$aMatches = array();
-				$sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : '';
-				$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
-				$sHtml .= "<td $sClass>$sValue</td>\n";
-			}
-			$sHtml .= "</tr>\n";
+			$sHtml .= $this->GetTableRow($aRow, $aConfig);
 		}
 		$sHtml .= "</tbody>\n";
 		$sHtml .= "</table>\n";
 		return $sHtml;
 	}
+	
+	public function GetTableRow($aRow, $aConfig)
+	{
+		$sHtml = '';
+		if (isset($aRow['@class'])) // Row specific class, for hilighting certain rows
+		{
+			$sHtml .= "<tr class=\"{$aRow['@class']}\">";				
+		}
+		else
+		{
+			$sHtml .= "<tr>";
+		}
+		foreach($aConfig as $sName=>$aAttribs)
+		{
+			$sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : '';
+			$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
+			$sHtml .= "<td $sClass>$sValue</td>";
+		}
+		$sHtml .= "</tr>";
+		return $sHtml;	
+	}
     
 	/**
 	 * Add some Javascript to the header of the page
@@ -202,7 +216,7 @@ class WebPage
 	 */
     public function add_linked_script($s_linked_script)
     {
-        $this->a_linked_scripts[] = $s_linked_script;
+        $this->a_linked_scripts[$s_linked_script] = $s_linked_script;
     }
 
 	/**
@@ -238,13 +252,35 @@ class WebPage
 
 		$this->add($this->GetDetails($aFields));
     }
+
+	/**
+	 * Records the current state of the 'html' part of the page output
+	 * @return mixed The current state of the 'html' output
+	 */    
+    public function start_capture()
+    {
+    	return strlen($this->s_content);
+    }
+    
+    /**
+     * Returns the part of the html output that occurred since the call to start_capture
+     * and removes this part from the current html output
+     * @param $offset mixed The value returned by start_capture
+     * @return string The part of the html output that was added since the call to start_capture
+     */
+    public function end_capture($offset)
+    {
+    	$sCaptured = substr($this->s_content, $offset);
+    	$this->s_content = substr($this->s_content, 0, $offset);
+    	return $sCaptured;
+    }
 	
 	/**
 	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
 	 */
 	public function GetDetails($aFields)
 	{
-		$sHtml = "<table>\n";
+		$sHtml = "<table class=\"details\">\n";
 		$sHtml .= "<tbody>\n";
 		foreach($aFields as $aAttrib)
 		{
@@ -258,12 +294,62 @@ class WebPage
 			{
 				$sHtml .= "<td class=\"label\">".$aAttrib['label']."</td><td>".$aAttrib['value']."</td>\n";
 			}
+			$sComment = (isset($aAttrib['comments'])) ? $aAttrib['comments'] : '&nbsp;';
+			$sInfo = (isset($aAttrib['infos'])) ? $aAttrib['infos'] : '&nbsp;';
+			$sHtml .= "<td>$sComment</td><td>$sInfo</td>\n";
     		$sHtml .= "</tr>\n";
 		}
 		$sHtml .= "</tbody>\n";
 		$sHtml .= "</table>\n";
 		return $sHtml;
     }
+
+	/**
+	 * Build a set of radio buttons suitable for editing a field/attribute of an object (including its validation)
+	 * @param $aAllowedValues hash Array of value => display_value
+	 * @param $value mixed Current value for the field/attribute
+	 * @param $iId mixed Unique Id for the input control in the page
+	 * @param $sFieldName string The name of the field, attr_<$sFieldName> will hold the value for the field
+	 * @param $bMandatory bool Whether or not the field is mandatory
+	 * @param $bVertical bool Disposition of the radio buttons vertical or horizontal
+	 * @param $sValidationField string HTML fragment holding the validation field (exclamation icon...)
+	 * @return string The HTML fragment corresponding to the radio buttons
+	 */
+	public function GetRadioButtons($aAllowedValues, $value, $iId, $sFieldName, $bMandatory, $bVertical, $sValidationField)
+	{
+		$idx = 0;
+		$sHTMLValue = '';
+		foreach($aAllowedValues as $key => $display_value)
+		{
+			if ((count($aAllowedValues) == 1) && ($bMandatory == 'true') )
+			{
+				// When there is only once choice, select it by default
+				$sSelected = ' checked';
+			}
+			else
+			{
+				$sSelected = ($value == $key) ? ' checked' : '';
+			}
+			$sHTMLValue .= "<input type=\"radio\" id=\"{$iId}_{$key}\" name=\"radio_$sFieldName\" onChange=\"$('#{$iId}').val(this.value).trigger('change');\" value=\"$key\"$sSelected><label class=\"radio\" for=\"{$iId}_{$key}\">&nbsp;$display_value</label>&nbsp;";
+			if ($bVertical)
+			{
+				if ($idx == 0)
+				{
+					// Validation icon at the end of the first line
+					$sHTMLValue .= "&nbsp;{$sValidationField}\n";							
+				}
+				$sHTMLValue .= "<br>\n";
+			}
+			$idx++;
+		}
+		$sHTMLValue .= "<input type=\"hidden\" id=\"$iId\" name=\"$sFieldName\" value=\"$value\"/>";
+		if (!$bVertical)					
+		{
+			// Validation icon at the end of the line
+			$sHTMLValue .= "&nbsp;{$sValidationField}\n";
+		}
+		return $sHTMLValue;
+	}
 	
 	/**
 	 * Outputs (via some echo) the complete HTML page by assembling all its elements
@@ -279,11 +365,21 @@ class WebPage
         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";
-         echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-        echo "<title>{$this->s_title}</title>\n";
+		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
+        echo "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
         echo $this->get_base_tag();
         foreach($this->a_linked_scripts as $s_script)
         {
+        	// Make sure that the URL to the script contains the application's version number
+        	// so that the new script do NOT get reloaded from the cache when the application is upgraded
+        	if (strpos($s_script, '?') === false)
+        	{
+        		$s_script .= "?itopversion=".ITOP_VERSION;
+        	}
+        	else
+        	{
+        		$s_script .= "&itopversion=".ITOP_VERSION;
+        	}
             echo "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
         }
         if (count($this->a_scripts)>0)
@@ -317,14 +413,18 @@ class WebPage
             }
             echo "</style>\n";
         }
+        if (class_exists('MetaModel') && MetaModel::GetConfig())
+        {
+ 			echo "<link rel=\"shortcut icon\" href=\"".utils::GetAbsoluteUrlAppRoot()."images/favicon.ico\" />\n";
+        }
         echo "</head>\n";
         echo "<body>\n";
-        echo $this->s_content;
+        echo self::FilterXSS($this->s_content);
         if (trim($s_captured_output) != "")
         {
-            echo "<div class=\"raw_output\">$s_captured_output</div>\n";
+            echo "<div class=\"raw_output\">".self::FilterXSS($s_captured_output)."</div>\n";
         }
-        echo $this->s_deferred_content;
+        echo '<div id="at_the_end">'.self::FilterXSS($this->s_deferred_content).'</div>';
         echo "</body>\n";
         echo "</html>\n";
     }
@@ -369,5 +469,51 @@ class WebPage
 	{
 		return $this->iNextId++;
 	}
+
+	/**
+	 * Set the content-type (mime type) for the page's content
+	 * @param $sContentType string
+	 * @return void
+	 */
+	public function SetContentType($sContentType)
+	{
+		$this->sContentType = $sContentType;
+	}
+		
+	/**
+	 * Set the content-disposition (mime type) for the page's content
+	 * @param $sDisposition string The disposition: 'inline' or 'attachment'
+	 * @param $sFileName string The original name of the file
+	 * @return void
+	 */
+	public function SetContentDisposition($sDisposition, $sFileName)
+	{
+		$this->sContentDisposition = $sDisposition;
+		$this->sContentFileName = $sFileName;
+	}
+		
+	/**
+	 * Set the transactionId of the current form
+	 * @param $iTransactionId integer
+	 * @return void
+	 */
+	public function SetTransactionId($iTransactionId)
+	{
+		$this->iTransactionId = $iTransactionId;
+	}
+	
+	/**
+	 * Returns the transactionId of the current form
+	 * @return integer The current transactionID
+	 */
+	public function GetTransactionId()
+	{
+		return $this->iTransactionId;
+	}
+	
+	public static function FilterXSS($sHTML)
+	{
+		return str_ireplace('<script', '&lt;script', $sHTML);
+	}
 }
 ?>

application/wizardhelper.class.inc.php

@@ -98,7 +98,7 @@ class WizardHelper
 				{
 					if ($bReadUploadedFiles)
 					{
-						$oDocument = utils::ReadPostedDocument('file_'.$sAttCode);
+						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
 						$oObj->Set($sAttCode, $oDocument);
 					}
 					else
@@ -121,6 +121,11 @@ class WizardHelper
 				}	
 			}
 		}
+		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
+		{
+			$oObj->Set(MetaModel::GetStateAttributeCode($this->m_aData['m_sClass']), $this->m_aData['m_sState']);
+		}
+		$oObj->DoComputeValues();
 		return $oObj;
 	}
 	

approot.inc.php

@@ -1,3 +1,12 @@
 <?php
 define('APPROOT', dirname(__FILE__).'/');
+define('MODULESROOT', APPROOT.'modules/');
+if (function_exists('microtime'))
+{
+	$fItopStarted = microtime(true); 
+}
+else
+{
+	$fItopStarted = 1000 * time();
+}
 ?>

core/MyHelpers.class.inc.php

@@ -443,9 +443,9 @@ class Str
 	public static function pure2html($pure, $maxLength = false)
 	{
 		// Check for HTML entities, but be careful the DB is in UTF-8
-		return $maxLength
-			? htmlentities(substr($pure, 0, $maxLength), ENT_COMPAT, 'UTF-8')
-			: htmlentities($pure, ENT_COMPAT, 'UTF-8');
+		return $maxLength                                         
+			? htmlentities(substr($pure, 0, $maxLength), ENT_QUOTES, 'UTF-8')
+			: htmlentities($pure, ENT_QUOTES, 'UTF-8');
 	}
 	public static function pure2sql($pure, $maxLength = false)
 	{

core/action.class.inc.php

@@ -24,6 +24,7 @@
  */
 
 
+require_once(APPROOT.'/core/asynctask.class.inc.php');
 require_once(APPROOT.'/core/email.class.inc.php');
 
 /**
@@ -41,7 +42,7 @@ abstract class Action extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('name'),
 			"db_table" => "priv_action",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
@@ -105,7 +106,7 @@ abstract class ActionNotification extends Action
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('name'),
 			"db_table" => "priv_action_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -134,11 +135,11 @@ class ActionEmail extends ActionNotification
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "core/cmdb,bizmodel",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('name'),
 			"db_table" => "priv_action_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -162,7 +163,7 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // 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', 'status', 'subject')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 
@@ -182,6 +183,7 @@ class ActionEmail extends ActionNotification
 		try
 		{
 			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$oSearch->AllowAllData();
 		}
 		catch (OQLException $e)
 		{
@@ -219,17 +221,74 @@ class ActionEmail extends ActionNotification
 
 	public function DoExecute($oTrigger, $aContextArgs)
 	{
-		$this->m_iRecipients = 0;
-		$this->m_aMailErrors = array();
-		$bRes = false; // until we do succeed in sending the email
+		if (MetaModel::IsLogEnabledNotification())
+		{
+			$oLog = new EventNotificationEmail();
+			if ($this->IsBeingTested())
+			{
+				$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
+			}
+			else
+			{
+				$oLog->Set('message', 'Notification pending');
+			}
+			$oLog->Set('userinfo', UserRights::GetUser());
+			$oLog->Set('trigger_id', $oTrigger->GetKey());
+			$oLog->Set('action_id', $this->GetKey());
+			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
+			// Must be inserted now so that it gets a valid id that will make the link
+			// between an eventual asynchronous task (queued) and the log
+			$oLog->DBInsertNoReload();
+		}
+		else
+		{
+			$oLog = null;
+		}
+
 		try
 		{
+			$sRes = $this->_DoExecute($oTrigger, $aContextArgs, $oLog);
+
+			if ($this->IsBeingTested())
+			{
+				$sPrefix = 'TEST ('.$this->Get('test_recipient').') - ';
+			}
+			else
+			{
+				$sPrefix = '';
+			}
+			$oLog->Set('message', $sPrefix.$sRes);
+
+		}
+		catch (Exception $e)
+		{
+			if ($oLog)
+			{
+				$oLog->Set('message', 'Error: '.$e->getMessage());
+			}
+		}
+		if ($oLog)
+		{
+			$oLog->DBUpdate();
+		}
+	}
+
+	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
+	{
+		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
+		$aHeaders = array();
+		try
+		{
+			$this->m_iRecipients = 0;
+			$this->m_aMailErrors = array();
+			$bRes = false; // until we do succeed in sending the email
+	
 			// Determine recicipients
 			//
 			$sTo = $this->FindRecipients('to', $aContextArgs);
 			$sCC = $this->FindRecipients('cc', $aContextArgs);
 			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
-
+	
 			$sFrom = $this->Get('from');
 			$sReplyTo = $this->Get('reply_to');
 	
@@ -237,102 +296,18 @@ class ActionEmail extends ActionNotification
 			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
 			
 			$oObj = $aContextArgs['this->object()'];
-			$sServerIP = $_SERVER['SERVER_ADDR']; //gethostbyname(gethostname());
-			$sReference = '<iTop/'.get_class($oObj).'/'.$oObj->GetKey().'@'.$sServerIP.'>';
-
-			$oEmail = new EMail();
-
-			if ($this->IsBeingTested())
-			{
-				$oEmail->SetSubject('TEST['.$sSubject.']');
-				$sTestBody = $sBody;
-				$sTestBody .= "<div style=\"border: dashed;\">\n";
-				$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
-				$sTestBody .= "<p>The email should be sent with the following properties\n";
-				$sTestBody .= "<ul>\n";
-				$sTestBody .= "<li>TO: $sTo</li>\n";
-				$sTestBody .= "<li>CC: $sCC</li>\n";
-				$sTestBody .= "<li>BCC: $sBCC</li>\n";
-				$sTestBody .= "<li>From: $sFrom</li>\n";
-				$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
-				$sTestBody .= "<li>References: $sReference</li>\n";
-				$sTestBody .= "</ul>\n";
-				$sTestBody .= "</p>\n";
-				$sTestBody .= "</div>\n";
-				$oEmail->SetBody($sTestBody);
-				$oEmail->SetRecipientTO($this->Get('test_recipient'));
-				$oEmail->SetRecipientFrom($this->Get('test_recipient'));
-				$oEmail->SetReferences($sReference);
-			}
-			else
-			{
-				$oEmail->SetSubject($sSubject);
-				$oEmail->SetBody($sBody);
-				$oEmail->SetRecipientTO($sTo);
-				$oEmail->SetRecipientCC($sCC);
-				$oEmail->SetRecipientBCC($sBCC);
-				$oEmail->SetRecipientFrom($sFrom);
-				$oEmail->SetRecipientReplyTo($sReplyTo);
-				$oEmail->SetReferences($sReference);
-			}
-	
-			if (empty($this->m_aMailErrors))
-			{
-				if ($this->m_iRecipients == 0)
-				{
-					$this->m_aMailErrors[] = 'No recipient';
-				}
-				else
-				{
-					$oKPI = new ExecutionKPI();
-					$this->m_aMailErrors = array_merge($this->m_aMailErrors, $oEmail->Send());
-					$oKPI->ComputeStats('Send mail', $sTo);
-				}
-			}
+			$sMessageId = sprintf('<iTop_%s_%d_%f@%s.openitop.org>', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetConfig()->Get('session_name'));
+			$sReference = $sMessageId;
+			$aHeaders['Message-ID'] = $sMessageId;
 		}
-		catch (Exception $e)
+		catch(Exception $e)
 		{
-			$this->m_aMailErrors[] = $e->getMessage();
-		}
+  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+  			throw $e;
+  		}
 
-		if (MetaModel::IsLogEnabledNotification())
+		if (!is_null($oLog))
 		{
-			$oLog = new EventNotificationEmail();
-			if (empty($this->m_aMailErrors))
-			{
-				if ($this->IsBeingTested())
-				{
-					$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
-				}
-				else
-				{
-					$oLog->Set('message', 'Notification sent');
-				}
-			}
-			else
-			{
-				if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
-				{
-					$sError = implode(', ', $this->m_aMailErrors);
-				}
-				else
-				{
-					$sError = 'Unknown reason';
-				}
-				if ($this->IsBeingTested())
-				{
-					$oLog->Set('message', 'TEST - Notification was not sent: '.$sError);
-				}
-				else
-				{
-					$oLog->Set('message', 'Notification was not sent: '.$sError);
-				}
-			}
-			$oLog->Set('userinfo', UserRights::GetUser());
-			$oLog->Set('trigger_id', $oTrigger->GetKey());
-			$oLog->Set('action_id', $this->GetKey());
-			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
-
 			// Note: we have to secure this because those values are calculated
 			// inside the try statement, and we would like to keep track of as
 			// many data as we could while some variables may still be undefined
@@ -342,7 +317,77 @@ class ActionEmail extends ActionNotification
 			if (isset($sFrom))     $oLog->Set('from', $sFrom);
 			if (isset($sSubject))  $oLog->Set('subject', $sSubject);
 			if (isset($sBody))     $oLog->Set('body', $sBody);
-			$oLog->DBInsertNoReload();
+		}
+
+		$oEmail = new EMail('', '', '', $aHeaders);
+
+		if ($this->IsBeingTested())
+		{
+			$oEmail->SetSubject('TEST['.$sSubject.']');
+			$sTestBody = $sBody;
+			$sTestBody .= "<div style=\"border: dashed;\">\n";
+			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
+			$sTestBody .= "<p>The email should be sent with the following properties\n";
+			$sTestBody .= "<ul>\n";
+			$sTestBody .= "<li>TO: $sTo</li>\n";
+			$sTestBody .= "<li>CC: $sCC</li>\n";
+			$sTestBody .= "<li>BCC: $sBCC</li>\n";
+			$sTestBody .= "<li>From: $sFrom</li>\n";
+			$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
+			$sTestBody .= "<li>References: $sReference</li>\n";
+			$sTestBody .= "</ul>\n";
+			$sTestBody .= "</p>\n";
+			$sTestBody .= "</div>\n";
+			$oEmail->SetBody($sTestBody);
+			$oEmail->SetRecipientTO($this->Get('test_recipient'));
+			$oEmail->SetRecipientFrom($this->Get('test_recipient'));
+			$oEmail->SetReferences($sReference);
+		}
+		else
+		{
+			$oEmail->SetSubject($sSubject);
+			$oEmail->SetBody($sBody);
+			$oEmail->SetRecipientTO($sTo);
+			$oEmail->SetRecipientCC($sCC);
+			$oEmail->SetRecipientBCC($sBCC);
+			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetRecipientReplyTo($sReplyTo);
+			$oEmail->SetReferences($sReference);
+		}
+
+		if (empty($this->m_aMailErrors))
+		{
+			if ($this->m_iRecipients == 0)
+			{
+				return 'No recipient';
+			}
+			else
+			{
+				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
+				switch ($iRes)
+				{
+					case EMAIL_SEND_OK:
+						return "Sent";
+	
+					case EMAIL_SEND_PENDING:
+						return "Pending";
+	
+					case EMAIL_SEND_ERROR:
+						return "Errors: ".implode(', ', $aErrors);
+				}
+			}
+		}
+		else
+		{
+			if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
+			{
+				$sError = implode(', ', $this->m_aMailErrors);
+			}
+			else
+			{
+				$sError = 'Unknown reason';
+			}
+			return 'Notification was not sent: '.$sError;
 		}
 	}
 }

core/asynctask.class.inc.php

@@ -0,0 +1,192 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Persistent classes (internal): user defined actions
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+
+class ExecAsyncTask implements iBackgroundProcess
+{
+	public function GetPeriodicity()
+	{	
+		return 2; // seconds
+	}
+
+	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());
+		$iProcessed = 0;
+		while ((time() < $iTimeLimit) && ($oTask = $oSet->Fetch()))
+		{
+			$oTask->Set('started', time());
+			$oTask->DBUpdate();
+
+			$oTask->Process();
+			$iProcessed++;
+
+			$oTask->DBDelete();
+		}
+		if ($iProcessed == $oSet->Count())
+		{
+			return "processed $iProcessed tasks";
+		}
+		else
+		{
+			return "processed $iProcessed tasks (remaining: ".($oSet->Count() - $iProcessed).")";
+		}
+	}
+}
+
+/**
+ * A   
+ *
+ * @package     iTopORM
+ */
+abstract class AsyncTask extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => array('created'),
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_task",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"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())));
+		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
+	}
+
+  	protected function OnInsert()
+	{
+		$this->Set('created', time());
+	}
+
+   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();
+		}
+	}
+
+	abstract public function DoProcess();
+}
+
+/**
+ * An email notification  
+ *
+ * @package     iTopORM
+ */
+class AsyncSendEmail extends AsyncTask
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "created",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_send_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		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("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("header", array("allowed_values"=>null, "sql"=>"header", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+//		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
+//		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // 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
+	}
+
+	static public function AddToQueue($sTo, $sSubject, $sBody, $aHeaders, $oLog)
+	{
+		$oNew = MetaModel::NewObject(__class__);
+		if ($oLog)
+		{
+			$oNew->Set('event_id', $oLog->GetKey());
+		}
+		$oNew->Set('to', $sTo);
+		$oNew->Set('subject', $sSubject);
+		$oNew->Set('body', $sBody);
+		$sHeaders = serialize($aHeaders);
+		$oNew->Set('header', $sHeaders);
+		$oNew->DBInsert();
+	}
+
+	public function DoProcess()
+	{
+		$sTo = $this->Get('to');
+		$sSubject = $this->Get('subject');
+		$sBody = $this->Get('body');
+		$sHeaders = $this->Get('header');
+		$aHeaders = unserialize($sHeaders);
+
+		$oEmail = new EMail($sTo, $sSubject, $sBody, $aHeaders);
+		$iRes = $oEmail->Send($aIssues, true /* force synchro !!!!! */);
+		switch ($iRes)
+		{
+		case EMAIL_SEND_OK:
+			return "Sent";
+
+		case EMAIL_SEND_PENDING:
+			return "Bug - the email should be sent in synchronous mode";
+
+		case EMAIL_SEND_ERROR:
+			return "Failed: ".implode(', ', $aIssues);
+		}
+	}
+}
+?>

core/backgroundprocess.inc.php

@@ -0,0 +1,33 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Class BackgroundProcess
+ * Any extension that must be called regularly to be executed in the background 
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+interface iBackgroundProcess
+{
+	public function GetPeriodicity();
+	public function Process($iUnixTimeLimit);
+}
+
+?>

core/bulkchange.class.inc.php

@@ -52,19 +52,13 @@ abstract class CellChangeSpec
 		$this->m_sOql = $sOql;
 	}
 
-	static protected function ValueAsHtml($value)
+	public function GetPureValue()
 	{
-		if (MetaModel::IsValidObject($value))
-		{
-			return $value->GetHyperLink();
-		}
-		else
-		{
-			return htmlentities($value, ENT_QUOTES, 'UTF-8');
-		}
+		// Todo - distinguish both values
+		return $this->m_proposedValue;
 	}
 
-	public function GetValue()
+	public function GetDisplayableValue()
 	{
 		return $this->m_proposedValue;
 	}
@@ -101,10 +95,10 @@ class CellStatus_Modify extends CellChangeSpec
 		return 'Modified';
 	}
 
-	public function GetPreviousValue()
-	{
-		return $this->m_previousValue;
-	}
+	//public function GetPreviousValue()
+	//{
+	//	return $this->m_previousValue;
+	//}
 }
 
 class CellStatus_Issue extends CellStatus_Modify
@@ -258,8 +252,9 @@ class BulkChange
 	protected $m_aReconcilKeys; // attcode (attcode = 'id' for the pkey)
 	protected $m_sSynchroScope; // OQL - if specified, then the missing items will be reported
 	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()
 
-	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null)
+	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null)
 	{
 		$this->m_sClass = $sClass;
 		$this->m_aData = $aData;
@@ -268,8 +263,25 @@ class BulkChange
 		$this->m_aExtKeys = $aExtKeys;
 		$this->m_sSynchroScope = $sSynchroScope;
 		$this->m_aOnDisappear = $aOnDisappear;
+		$this->m_sDateFormat = $sDateFormat;
 	}
 
+	protected $m_bReportHtml = false;
+	protected $m_sReportCsvSep = ',';
+	protected $m_sReportCsvDelimiter = '"';
+
+	public function SetReportHtml()
+	{
+		$this->m_bReportHtml = true;
+	}
+
+	public function SetReportCsv($sSeparator = ',', $sDelimiter = '"')
+	{
+		$this->m_bReportHtml = false;
+		$this->m_sReportCsvSep = $sSeparator;
+		$this->m_sReportCsvDelimiter = $sDelimiter;
+	}
+   
 	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
 	{
 		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
@@ -388,15 +400,31 @@ class BulkChange
 			// skip the private key, if any
 			if ($sAttCode == 'id') continue;
 
-			$res = $oTargetObj->CheckValue($sAttCode, $aRowData[$iCol]);
-			if ($res === true)
+			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+			if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
 			{
-				$oTargetObj->Set($sAttCode, $aRowData[$iCol]);
+				try
+				{
+					$oSet = $oAttDef->MakeValueFromString($aRowData[$iCol]);
+					$oTargetObj->Set($sAttCode, $oSet);
+				}
+				catch(CoreException $e)
+				{
+					$aErrors[$sAttCode] = "Failed to process input: ".$e->getMessage();
+				}
 			}
 			else
 			{
-				// $res is a string with the error description
-				$aErrors[$sAttCode] = "Unexpected value for attribute '$sAttCode': $res";
+				$res = $oTargetObj->CheckValue($sAttCode, $aRowData[$iCol]);
+				if ($res === true)
+				{
+					$oTargetObj->Set($sAttCode, $aRowData[$iCol]);
+				}
+				else
+				{
+					// $res is a string with the error description
+					$aErrors[$sAttCode] = "Unexpected value for attribute '$sAttCode': $res";
+				}
 			}
 		}
 	
@@ -409,25 +437,38 @@ class BulkChange
 			{
 				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
 			}
-			if (isset($aErrors[$sAttCode]))
+			else
 			{
-				$aResults[$iCol]= new CellStatus_Issue($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode), $aErrors[$sAttCode]);
-			}
-			elseif (array_key_exists($sAttCode, $aChangedFields))
-			{
-				if ($oTargetObj->IsNew())
+				if ($this->m_bReportHtml)
 				{
-					$aResults[$iCol]= new CellStatus_Void($oTargetObj->Get($sAttCode));
+					$sCurValue = $oTargetObj->GetAsHTML($sAttCode);
+					$sOrigValue = $oTargetObj->GetOriginalAsHTML($sAttCode);
 				}
 				else
 				{
-					$aResults[$iCol]= new CellStatus_Modify($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode));
+					$sCurValue = $oTargetObj->GetAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter);
+					$sOrigValue = $oTargetObj->GetOriginalAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter);
+				}
+				if (isset($aErrors[$sAttCode]))
+				{
+					$aResults[$iCol]= new CellStatus_Issue($sCurValue, $sOrigValue, $aErrors[$sAttCode]);
+				}
+				elseif (array_key_exists($sAttCode, $aChangedFields))
+				{
+					if ($oTargetObj->IsNew())
+					{
+						$aResults[$iCol]= new CellStatus_Void($sCurValue);
+					}
+					else
+					{
+						$aResults[$iCol]= new CellStatus_Modify($sCurValue, $sOrigValue);
+					}
+				}
+				else
+				{
+					// By default... nothing happens
+					$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
 				}
-			}
-			else
-			{
-				// By default... nothing happens
-				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
 			}
 		}
 	
@@ -581,7 +622,14 @@ class BulkChange
 			//
 			if ($oChange)
 			{
-				$oTargetObj->DBUpdateTracked($oChange);
+				try
+				{
+					$oTargetObj->DBUpdateTracked($oChange);
+				}
+				catch(CoreException $e)
+				{
+					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue($e->getMessage());
+				}
 			}
 		}
 		else
@@ -610,12 +658,19 @@ class BulkChange
 		if (count($aChangedFields) > 0)
 		{
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Disappeared(count($aChangedFields));
-	
+
 			// Optionaly record the results
 			//
 			if ($oChange)
 			{
-				$oTargetObj->DBUpdateTracked($oChange);
+				try
+				{
+					$oTargetObj->DBUpdateTracked($oChange);
+				}
+				catch(CoreException $e)
+				{
+					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue($e->getMessage());
+				}
 			}
 		}
 		else
@@ -649,6 +704,35 @@ class BulkChange
 			exit;
 		}
 
+		$aResult = array();
+
+		if (!is_null($this->m_sDateFormat) && (strlen($this->m_sDateFormat) > 0))
+		{
+			// Translate dates from the source data
+			//
+			foreach ($this->m_aAttList as $sAttCode => $iCol)
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+				if ($oAttDef instanceof AttributeDateTime)
+				{
+					foreach($this->m_aData as $iRow => $aRowData)
+					{
+						$sNewDate = utils::StringToTime($this->m_aData[$iRow][$iCol], $this->m_sDateFormat);
+						if ($sNewDate !== false)
+						{
+							// Todo - improve the reporting
+							$this->m_aData[$iRow][$iCol] = $sNewDate;
+						}
+						else
+						{
+							// Leave the cell unchanged
+							$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue("wrong date format");
+							$aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, $this->m_aData[$iRow][$iCol], 'Wrong date format');
+						}
+					}
+				}
+			}
+		}
 
 		// Compute the results
 		//
@@ -656,9 +740,13 @@ class BulkChange
 		{
 			$aVisited = array();
 		}
-		$aResult = array();
 		foreach($this->m_aData as $iRow => $aRowData)
 		{
+			if (isset($aResult[$iRow]["__STATUS__"]))
+			{
+				// An issue at the earlier steps - skip the rest
+				continue;
+			}
 			$oReconciliationFilter = new CMDBSearchFilter($this->m_sClass);
 			$bSkipQuery = false;
 			foreach($this->m_aReconcilKeys as $sAttCode)
@@ -745,8 +833,28 @@ class BulkChange
 					$aResult[$iRow]["finalclass"]= 'n/a';
 				}
 			}
-	
-			// Whatever happened, do report the reconciliation values
+		}
+
+		if (!is_null($this->m_sSynchroScope))
+		{
+			// Compute the delta between the scope and visited objects
+			$oScopeSearch = DBObjectSearch::FromOQL($this->m_sSynchroScope);
+			$oScopeSet = new DBObjectSet($oScopeSearch);
+			while ($oObj = $oScopeSet->Fetch())
+			{
+				$iObj = $oObj->GetKey();
+				if (!in_array($iObj, $aVisited))
+				{
+					$iRow++;
+					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
+				}
+			}
+		}
+
+		// Fill in the blanks - the result matrix is expected to be 100% complete
+		//
+		foreach($this->m_aData as $iRow => $aRowData)
+		{
 			foreach($this->m_aAttList as $iCol)
 			{
 				if (!array_key_exists($iCol, $aResult[$iRow]))
@@ -771,22 +879,6 @@ class BulkChange
 			}
 		}
 
-		if (!is_null($this->m_sSynchroScope))
-		{
-			// Compute the delta between the scope and visited objects
-			$oScopeSearch = DBObjectSearch::FromOQL($this->m_sSynchroScope);
-			$oScopeSet = new DBObjectSet($oScopeSearch);
-			while ($oObj = $oScopeSet->Fetch())
-			{
-				$iObj = $oObj->GetKey();
-				if (!in_array($iObj, $aVisited))
-				{
-					$iRow++;
-					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
-				}
-			}
-		}
-
 		return $aResult;
 	}
 
@@ -806,7 +898,7 @@ class BulkChange
 		$oBulkChangeSearch = DBObjectSearch::FromOQL("SELECT CMDBChange WHERE userinfo LIKE '%(CSV)'");
 
 		$iQueryLimit = $bShowAll ? 0 : MetaModel::GetConfig()->GetMaxDisplayLimit() + 1;
-		$oBulkChanges = new DBObjectSet($oBulkChangeSearch, array('date' => false), array(), $iQueryLimit);
+		$oBulkChanges = new DBObjectSet($oBulkChangeSearch, array('date' => false), array(), null, $iQueryLimit);
 
 		$oAppContext = new ApplicationContext();
 
@@ -865,8 +957,10 @@ class BulkChange
 
 			// Assumption: there is only one class of objects being loaded
 			// Then the last class found gives us the class for every object
-
-			$aDetails[] = array('date' => $sDate, 'user' => $sUser, 'class' => $sClass, 'created' => $iCreated, 'modified' => $iModified);
+			if ( ($iModified > 0) || ($iCreated > 0))
+			{
+				$aDetails[] = array('date' => $sDate, 'user' => $sUser, 'class' => $sClass, 'created' => $iCreated, 'modified' => $iModified);
+			}
 
 		}
 
@@ -905,7 +999,7 @@ EOF
 <<<EOF
 	function OnTruncatedHistoryToggle(bShowAll)
 	{
-		$.get('../pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
+		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
 			{
 				$('#$sAjaxDivId').html(data);
 				var table = $('#$sAjaxDivId .listResults');
@@ -968,7 +1062,7 @@ EOF
 			{
 				$aObjects[$iObjId]['__created__'] = true;
 			}
-			elseif (is_subclass_of($oOperation, 'CMDBChangeOpSetAttribute'))
+			elseif ($oOperation instanceof CMDBChangeOpSetAttribute)
 			{
 				$sAttCode = $oOperation->Get('attcode');
 
@@ -977,10 +1071,19 @@ EOF
 					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 					if ($oAttDef->IsExternalKey())
 					{
-						$oOldTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('oldvalue'));
-						$oNewTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('newvalue'));
-						$sOldValue = $oOldTarget->GetHyperlink();
-						$sNewValue = $oNewTarget->GetHyperlink();
+						$sOldValue = Dict::S('UI:UndefinedObject');
+						if ($oOperation->Get('oldvalue') != 0)
+						{
+							$oOldTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('oldvalue'));
+							$sOldValue = $oOldTarget->GetHyperlink();
+						}
+						
+						$sNewValue = Dict::S('UI:UndefinedObject');
+						if ($oOperation->Get('newvalue') != 0)
+						{
+							$oNewTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('newvalue'));
+							$sNewValue = $oNewTarget->GetHyperlink();
+						}
 					}
 					else
 					{
@@ -1057,6 +1160,49 @@ EOF
 		}
 		$oPage->table($aConfig, $aDetails);
 	}	
+
+	/**
+	 * Get the user friendly name for an 'extended' attribute code i.e 'name', becomes 'Name' and 'org_id->name' becomes 'Organization->Name'
+	 * @param string $sClassName The name of the class
+	 * @param string $sAttCodeEx Either an attribute code or ext_key_name->att_code
+	 * @return string A user friendly format of the string: AttributeName or AttributeName->ExtAttributeName
+	 */
+	public static function GetFriendlyAttCodeName($sClassName, $sAttCodeEx)
+	{
+		$sFriendlyName = '';
+		if (preg_match('/(.+)->(.+)/', $sAttCodeEx, $aMatches) > 0)
+		{
+			$sAttribute = $aMatches[1];
+			$sField = $aMatches[2];
+			$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttribute);
+			if ($oAttDef->IsExternalKey())
+			{
+				$sTargetClass = $oAttDef->GetTargetClass();
+				$oTargetAttDef = MetaModel::GetAttributeDef($sTargetClass, $sField);
+				$sFriendlyName = $oAttDef->GetLabel().'->'.$oTargetAttDef->GetLabel();
+			}
+			else
+			{
+				 // hum, hum... should never happen, we'd better raise an exception
+				 throw(new Exception(Dict::Format('UI:CSVImport:ErrorExtendedAttCode', $sAttCodeEx, $sAttribute, $sClassName)));
+			}
+	
+		}
+		else
+		{
+			if ($sAttCodeEx == 'id')
+			{
+				$sFriendlyName = Dict::S('UI:CSVImport:idField');
+			}
+			else
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCodeEx);
+				$sFriendlyName = $oAttDef->GetLabel();
+			}
+		}
+		return $sFriendlyName;
+	}
+	
 }
 
 

core/cmdbchangeop.class.inc.php

@@ -212,11 +212,27 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
 		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
 		{
+			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
+
 			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
 			$sAttName = $oAttDef->GetLabel();
 			$sNewValue = $this->Get('newvalue');
 			$sOldValue = $this->Get('oldvalue');
-			if ( (($oAttDef->GetType() == 'String') || ($oAttDef->GetType() == 'Text')) &&
+			if ($oAttDef instanceof AttributeEnum)
+			{
+				// translate the enum values
+				$sOldValue = $oAttDef->GetAsHTML($sOldValue);
+				$sNewValue = $oAttDef->GetAsHTML($sNewValue);
+				if (strlen($sOldValue) == 0)
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo', $sAttName, $sNewValue);
+				}
+				else
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+				}				
+			}
+			elseif ( (($oAttDef->GetType() == 'String') || ($oAttDef->GetType() == 'Text')) &&
 				 (strlen($sNewValue) > strlen($sOldValue)) )
 			{
 				// Check if some text was not appended to the field
@@ -232,7 +248,14 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 				}
 				else
 				{
-					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+					if (strlen($sOldValue) == 0)
+					{
+						$sResult = Dict::Format('Change:AttName_SetTo', $sAttName, $sNewValue);
+					}
+					else
+					{
+						$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+					}
 				}
 			}
 			elseif($bIsHtml && $oAttDef->IsExternalKey())
@@ -241,6 +264,14 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 				$sFrom = MetaModel::GetHyperLink($sTargetClass, $sOldValue);
 				$sTo = MetaModel::GetHyperLink($sTargetClass, $sNewValue);
 				$sResult = "$sAttName set to $sTo (previous: $sFrom)";
+				if (strlen($sFrom) == 0)
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo', $sAttName, $sTo);
+				}
+				else
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sTo, $sFrom);
+				}
 			}
 			elseif ($oAttDef instanceOf AttributeBlob)
 			{
@@ -248,7 +279,14 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 			}
 			else
 			{
-				$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+				if (strlen($sOldValue) == 0)
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo', $sAttName, $sNewValue);
+				}
+				else
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+				}
 			}
 		}
 		return $sResult;
@@ -475,4 +513,98 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 	}
 }
 
+/**
+ * Record the modification of a caselog (text)
+ * since the caselog itself stores the history
+ * of its entries, there is no need to duplicate
+ * the text here
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_log",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeInteger("lastentry", array("allowed_values"=>null, "sql"=>"lastentry", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+			$sAttName = $oAttDef->GetLabel();
+			$sResult = Dict::Format('Change:AttName_EntryAdded', $sAttName);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record an action made by a plug-in  
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpPlugin extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_plugin",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+		/* May be used later when implementing an extension mechanism that will allow the plug-ins to store some extra information and still degrades gracefully when the plug-in is desinstalled
+		MetaModel::Init_AddAttribute(new AttributeString("extension_class", array("allowed_values"=>null, "sql"=>"extension_class", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("extension_id", array("allowed_values"=>null, "sql"=>"extension_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		*/
+		MetaModel::Init_InheritAttributes();
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		return $this->Get('description');
+	}
+}
 ?>

core/cmdbobject.class.inc.php

@@ -59,6 +59,8 @@ require_once('dbobject.class.php');
 require_once('dbobjectsearch.class.php');
 require_once('dbobjectset.class.php');
 
+require_once('backgroundprocess.inc.php');
+require_once('asynctask.class.inc.php');
 require_once('dbproperty.class.inc.php');
 
 // db change tracking data model
@@ -74,6 +76,7 @@ require_once('cmdbchangeop.class.inc.php');
 // Romain: temporary moved into application.inc.php (see explanations there)
 //require_once('event.class.inc.php');
 
+require_once('templatestring.class.inc.php');
 require_once('csvparser.class.inc.php');
 require_once('bulkchange.class.inc.php');
 
@@ -175,6 +178,17 @@ abstract class CMDBObject extends DBObject
 				$oMyChangeOp->Set("prevdata", $original);
 				$iId = $oMyChangeOp->DBInsertNoReload();
 			}
+			elseif ($oAttDef instanceOf AttributeCaseLog)
+			{
+				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeCaseLog");
+				$oMyChangeOp->Set("change", $oChange->GetKey());
+				$oMyChangeOp->Set("objclass", get_class($this));
+				$oMyChangeOp->Set("objkey", $this->GetKey());
+				$oMyChangeOp->Set("attcode", $sAttCode);
+
+				$oMyChangeOp->Set("lastentry", $value->GetLatestEntryIndex());
+				$iId = $oMyChangeOp->DBInsertNoReload();
+			}
 			elseif ($oAttDef instanceOf AttributeText)
 			{
 				// Data blobs
@@ -187,6 +201,10 @@ abstract class CMDBObject extends DBObject
 				if (array_key_exists($sAttCode, $aOrigValues))
 				{
 					$original = $aOrigValues[$sAttCode];
+					if ($original instanceof ormCaseLog)
+					{
+						$original = $original->GetText();
+					}
 				}
 				else
 				{
@@ -262,9 +280,10 @@ abstract class CMDBObject extends DBObject
 	{
 		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
 
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
 		$ret = $this->DBInsertTracked_Internal();
-		self::$m_oCurrChange = null;
+		self::$m_oCurrChange = $oPreviousChange;
 		return $ret;
 	}
 
@@ -272,9 +291,10 @@ abstract class CMDBObject extends DBObject
 	{
 		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
 
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
 		$ret = $this->DBInsertTracked_Internal(true);
-		self::$m_oCurrChange = null;
+		self::$m_oCurrChange = $oPreviousChange;
 		return $ret;
 	}
 
@@ -303,9 +323,10 @@ abstract class CMDBObject extends DBObject
 
 	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
 	{
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
 		$this->DBCloneTracked_Internal($newKey);
-		self::$m_oCurrChange = null;
+		self::$m_oCurrChange = $oPreviousChange;
 	}
 
 	protected function DBCloneTracked_Internal($newKey = null)
@@ -330,9 +351,10 @@ abstract class CMDBObject extends DBObject
 	{
 		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
 
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
 		$this->DBUpdateTracked_Internal();
-		self::$m_oCurrChange = null;
+		self::$m_oCurrChange = $oPreviousChange;
 	}
 
 	protected function DBUpdateTracked_Internal()
@@ -352,28 +374,29 @@ abstract class CMDBObject extends DBObject
 		return $ret;
 	}
 
-	public function DBDelete()
+	public function DBDelete(&$oDeletionPlan = null)
 	{
 		if(!self::$m_oCurrChange)
 		{
 			throw new CoreException("DBDelete() could not be used here, please use DBDeleteTracked() instead");
 		}
-		return $this->DBDeleteTracked_Internal();
+		return $this->DBDeleteTracked_Internal($oDeletionPlan);
 	}
 
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
 	{
 		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE);
 
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
-		$this->DBDeleteTracked_Internal();
-		self::$m_oCurrChange = null;
+		$this->DBDeleteTracked_Internal($oDeletionPlan);
+		self::$m_oCurrChange = $oPreviousChange;
 	}
 
-	protected function DBDeleteTracked_Internal()
+	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
 	{
 		$prevkey = $this->GetKey();
-		$ret = parent::DBDelete();
+		$ret = parent::DBDelete($oDeletionPlan);
 		$this->RecordObjDeletion(self::$m_oCurrChange, $prevkey);
 		return $ret;
 	}
@@ -389,9 +412,10 @@ abstract class CMDBObject extends DBObject
 
 	public static function BulkDeleteTracked(CMDBChange $oChange, DBObjectSearch $oFilter)
 	{
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
 		$this->BulkDeleteTracked_Internal($oFilter);
-		self::$m_oCurrChange = null;
+		self::$m_oCurrChange = $oPreviousChange;
 	}
 
 	protected static function BulkDeleteTracked_Internal(DBObjectSearch $oFilter)
@@ -428,9 +452,10 @@ abstract class CMDBObject extends DBObject
 
 	public static function BulkUpdateTracked(CMDBChange $oChange, DBObjectSearch $oFilter, array $aValues)
 	{
+		$oPreviousChange = self::$m_oCurrChange;
 		self::$m_oCurrChange = $oChange;
 		$this->BulkUpdateTracked_Internal($oFilter, $aValues);
-		self::$m_oCurrChange = null;
+		self::$m_oCurrChange = $oPreviousChange;
 	}
 
 	protected static function BulkUpdateTracked_Internal(DBObjectSearch $oFilter, array $aValues)
@@ -481,24 +506,22 @@ class CMDBObjectSet extends DBObjectSet
 	static public function FromScratch($sClass)
 	{
 		$oFilter = new CMDBSearchFilter($sClass);
-		$oRetSet = new CMDBObjectSet($oFilter); // THE ONLY DIFF IS HERE
-		// NOTE: THIS DOES NOT WORK IF m_bLoaded is private...
-		// BUT IT THAT CASE YOU DO NOT GET ANY ERROR !!!!!
+		$oFilter->AddConditionExpression(new FalseExpression());
+		$oRetSet = new self($oFilter);
+		// NOTE: THIS DOES NOT WORK IF m_bLoaded is private in the base class (and you will not get any error message)
 		$oRetSet->m_bLoaded = true; // no DB load
 		return $oRetSet;
 	} 
 
+	// create an object set ex nihilo
+	// input = array of objects
 	static public function FromArray($sClass, $aObjects)
 	{
-		$oFilter = new CMDBSearchFilter($sClass);
-		$oRetSet = new CMDBObjectSet($oFilter); // THE ONLY DIFF IS HERE
-		// NOTE: THIS DOES NOT WORK IF m_bLoaded is private...
-		// BUT IT THAT CASE YOU DO NOT GET ANY ERROR !!!!!
-		$oRetSet->m_bLoaded = true; // no DB load
-		$oRetSet->AddObjectArray($aObjects);
+		$oRetSet = self::FromScratch($sClass);
+		$oRetSet->AddObjectArray($aObjects, $sClass);
 		return $oRetSet;
 	} 
-	
+
 	static public function FromArrayAssoc($aClasses, $aObjects)
 	{
 		// In a perfect world, we should create a complete tree of DBObjectSearch,

core/cmdbsource.class.inc.php

@@ -56,7 +56,7 @@ class CMDBSource
 		self::$m_sDBUser = $sUser;
 		self::$m_sDBPwd = $sPwd;
 		self::$m_sDBName = $sSource;
-		if (!self::$m_resDBLink = @mysql_pconnect($sServer, $sUser, $sPwd))
+		if (!self::$m_resDBLink = mysql_connect($sServer, $sUser, $sPwd))
 		{
 			throw new MySQLException('Could not connect to the DB server', array('host'=>$sServer, 'user'=>$sUser));
 		}
@@ -84,6 +84,17 @@ class CMDBSource
 		}
 	}
 
+	public static function SetTimezone($sTimezone = null)
+	{
+		// Note: requires the installation of MySQL special tables,
+		//       otherwise, only 'SYSTEM' or "+10:00' may be specified which is NOT sufficient because of day light saving times
+		if (!is_null($sTimezone))
+		{
+			$sQuotedTimezone = self::Quote($sTimezone);
+			self::Query("SET time_zone = $sQuotedTimezone");
+		}
+	}
+
 	public static function ListDB()
 	{
 		$aDBs = self::QueryToCol('SHOW DATABASES', 'Database');
@@ -243,6 +254,31 @@ class CMDBSource
 		return false;
 	}
 
+	public static function DeleteFrom($sSQLQuery)
+	{
+		self::Query($sSQLQuery);
+	}
+
+	public static function QueryToScalar($sSql)
+	{
+		$result = mysql_query($sSql, self::$m_resDBLink);
+		if (!$result)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
+		}
+		if ($aRow = mysql_fetch_array($result, MYSQL_BOTH))
+		{
+			$res = $aRow[0];
+		}
+		else
+		{
+			mysql_free_result($result);
+			throw new MySQLException('Found no result for query', array('query' => $sSql));
+		}
+		mysql_free_result($result);
+		return $res;
+	}
+
 	public static function QueryToArray($sSql)
 	{
 		$aData = array();

core/config.class.inc.php

@@ -14,6 +14,7 @@
 //   along with this program; if not, write to the Free Software
 //   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+define('ITOP_APPLICATION', 'iTop');
 define('ITOP_VERSION', '$ITOP_VERSION$');
 define('ITOP_REVISION', '$WCREV$');
 define('ITOP_BUILD_DATE', '$WCNOW$');
@@ -39,7 +40,7 @@ class ConfigException extends CoreException
 }
 
 define ('DEFAULT_CHARACTER_SET', 'utf8');
-define ('DEFAULT_COLLATION', 'utf8_general_ci');
+define ('DEFAULT_COLLATION', 'utf8_unicode_ci');
 
 define ('DEFAULT_LOG_GLOBAL', true);
 define ('DEFAULT_LOG_NOTIFICATION', true);
@@ -57,7 +58,6 @@ define ('DEFAULT_MAX_DISPLAY_LIMIT', 15);
 define ('DEFAULT_STANDARD_RELOAD_INTERVAL', 5*60);
 define ('DEFAULT_FAST_RELOAD_INTERVAL', 1*60);
 define ('DEFAULT_SECURE_CONNECTION_REQUIRED', false);
-define ('DEFAULT_HTTPS_HYPERLINKS', false);
 define ('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|basic|external');
 define ('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
 define ('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random value, later...
@@ -84,6 +84,14 @@ class Config
 	// New way to store the settings !
 	//
 	protected $m_aSettings = array(
+		'app_root_url' => array(
+			'type' => 'string',
+			'description' => 'Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server\'s name)',
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
 		'skip_check_to_write' => array(
 			'type' => 'bool',
 			'description' => 'Disable data format and integrity checks to boost up data load (insert or update)',
@@ -94,7 +102,7 @@ class Config
 		),
 		'skip_check_ext_keys' => array(
 			'type' => 'bool',
-			'description' => 'Disable external key check when checking the value of attribtutes',
+			'description' => 'Disable external key check when checking the value of attributes',
 			'default' => false,
 			'value' => false,
 			'source_of_value' => '',
@@ -116,6 +124,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
+		'php_path' => array(
+			'type' => 'string',
+			'description' => 'Path to the php executable in CLI mode',
+			'default' => 'php',
+			'value' => 'php',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
 		'session_name' => array(
 			'type' => 'string',
 			'description' => 'The name of the cookie used to store the PHP session id',
@@ -125,7 +141,7 @@ class Config
 			'show_in_conf_sample' => true,
 		),
 		'max_combo_length' => array(
-			'type' => 'int',
+			'type' => 'integer',
 			'description' => 'The maximum number of elements in a drop-down list. If more then an autocomplete will be used',
 			'default' => 50,
 			'value' => 50,
@@ -133,7 +149,7 @@ class Config
 			'show_in_conf_sample' => false,
 		),
 		'min_autocomplete_chars' => array(
-			'type' => 'int',
+			'type' => 'integer',
 			'description' => 'The minimum number of characters to type in order to trigger the "autocomplete" behavior',
 			'default' => 3,
 			'value' => 3,
@@ -205,12 +221,240 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
+		'log_usage' => array(
+			'type' => 'bool',
+			'description' => 'Log the usage of the application (i.e. the date/time and the user name of each login)',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'synchro_trace' => array(
+			'type' => 'string',
+			'description' => 'Synchronization details: none, display, save (includes \'display\')',
+			'default' => 'none',
+			'value' => 'none',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_item_separator' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: line separator',
+			'default' => '|',
+			'value' => '|',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_attribute_separator' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: attribute separator',
+			'default' => ';',
+			'value' => ';',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_value_separator' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: value separator (between the attcode and the value itself',
+			'default' => ':',
+			'value' => ':',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_attribute_qualifier' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: attribute qualifier (encloses both the attcode and the value)',
+			'default' => "'",
+			'value' => "'",
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cron_max_execution_time' => array(
+			'type' => 'integer',
+			'description' => 'Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout',
+			'default' => 600,
+			'value' => 600,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cron_sleep' => array(
+			'type' => 'integer',
+			'description' => 'Duration (seconds) before cron.php checks again if something must be done',
+			'default' => 2,
+			'value' => 2,
+			'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',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'apc_cache.enabled' => array(
+			'type' => 'bool',
+			'description' => 'If set, the APC cache is allowed (the PHP extension must also be active)',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'apc_cache.query_ttl' => array(
+			'type' => 'integer',
+			'description' => 'Time to live set in APC for the prepared queries (seconds - 0 means no timeout)',
+			'default' => 3600,
+			'value' => 3600,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'timezone' => array(
+			'type' => 'string',
+			'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitely configured in PHP',
+			// examples... not used (nor 'description')
+			'examples' => array('America/Sao_Paulo', 'America/New_York (standing for EDT)', 'America/Los_Angeles (standing for PDT)', 'Asia/Istanbul', 'Asia/Singapore', 'Africa/Casablanca', 'Australia/Sydney'),
+			'default' => 'Europe/Paris',
+			'value' => 'Europe/Paris',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_include_path' => array(
+			'type' => 'string',
+			'description' => 'The path where to find the phpCAS library',
+			// examples... not used (nor 'description')
+			'default' => '/usr/share/php',
+			'value' => '/usr/share/php',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_version' => array(
+			'type' => 'string',
+			'description' => 'The CAS protocol version to use: "1.0" (CAS v1), "2.0" (CAS v2) or "S1" (SAML V1) )',
+			// examples... not used (nor 'description')
+			'default' => '2.0',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_host' => array(
+			'type' => 'string',
+			'description' => 'The name of the CAS host',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_port' => array(
+			'type' => 'integer',
+			'description' => 'The port used by the CAS server',
+			// examples... not used (nor 'description')
+			'default' => 443,
+			'value' => 443,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_context' => array(
+			'type' => 'string',
+			'description' => 'The CAS context',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_server_ca_cert_path' => array(
+			'type' => 'string',
+			'description' => 'The path where to find the certificate of the CA for validating the certificate of the CAS server',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_logout_redirect_service' => array(
+			'type' => 'string',
+			'description' => 'The redirect service (URL) to use when logging-out with CAS',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_memberof' => array(
+			'type' => 'string',
+			'description' => 'A semicolon separated list of group names that the user must be member of (works only with SAML - e.g. cas_version=> "S1")',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_user_synchro' => array(
+			'type' => 'bool',
+			'description' => 'Whether or not to synchronize users with CAS/LDAP',
+			// examples... not used (nor 'description')
+			'default' => 0,
+			'value' => 0,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_profile_pattern' => array(
+			'type' => 'string',
+			'description' => 'A regular expression pattern to extract the name of the iTop profile from the name of an LDAP/CAS group',
+			// examples... not used (nor 'description')
+			'default' => '/^cn=([^,]+),/',
+			'value' => '/^cn=([^,]+),/',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_debug' => array(
+			'type' => 'bool',
+			'description' => 'Activate the CAS debug',
+			// examples... not used (nor 'description')
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'deadline_format' => array(
+			'type' => 'string',
+			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
+			// examples... $date$ ($deadline$)
+			'default' => '$difference$',
+			'value' => '$difference$',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'buttons_position' => array(
+			'type' => 'string',
+			'description' => 'Position of the forms buttons: bottom | top | both',
+			// examples... not used
+			'default' => 'both',
+			'value' => 'both',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'shortcut_actions' => array(
+			'type' => 'string',
+			'description' => 'Actions that are available as direct buttons next to the "Actions" menu',
+			// examples... not used
+			'default' => 'UI:Menu:Modify,UI:Menu:New',
+			'value' => 'UI:Menu:Modify',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
 	);
 
 	public function IsProperty($sPropCode)
 	{
 		return (array_key_exists($sPropCode, $this->m_aSettings));
 	}
+	public function GetDescription($sPropCode)
+	{
+		return $this->m_aSettings[$sPropCode];
+	}
 
 	public function Set($sPropCode, $value, $sSourceDesc = 'unknown')
 	{
@@ -289,13 +533,6 @@ class Config
 	 */	 	
 	protected $m_bSecureConnectionRequired;
 
-	/**
-	 * @var boolean Forces iTop to output hyperlinks starting with https:// even
-	 *              if the current page is not using https. This can be useful when
-	 *              the application runs behind a SSL gateway
-	 */	 	
-	protected $m_bHttpsHyperlinks;
-
 	/**
 	 * @var string Langage code, default if the user language is undefined
 	 */	 	
@@ -333,7 +570,8 @@ class Config
 			'application/menunode.class.inc.php',
 			'application/user.preferences.class.inc.php',
 			'application/audit.rule.class.inc.php',
-// Romain - That's dirty, because those 3 classes are in fact part of the core
+			'application/query.class.inc.php',
+// Romain - That's dirty, because those classes are in fact part of the core
 //          but I needed those classes to be derived from cmdbAbstractObject
 //          (to be managed via the GUI) and this class in not really known from
 //          the core, PLUS I needed the includes to be there also for the setup
@@ -341,6 +579,7 @@ class Config
 			'core/event.class.inc.php',
 			'core/action.class.inc.php',
 			'core/trigger.class.inc.php',
+			'synchro/synchrodatasource.class.inc.php',
 		);
 		$this->m_aDataModels = array();
 		$this->m_aWebServiceCategories = array(
@@ -350,25 +589,8 @@ class Config
 			// Default AddOn, always present can be moved to an official iTop Module later if needed
 			'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
 		);
-		$this->m_aDictionaries = array(
-			// Default dictionaries, always present can be moved to an official iTop Module later if needed
-			'dictionaries/dictionary.itop.core.php',
-			'dictionaries/dictionary.itop.ui.php',		// Support for English
-			'dictionaries/fr.dictionary.itop.ui.php',	// Support for French
-			'dictionaries/fr.dictionary.itop.core.php',	// Support for French
-			'dictionaries/es_cr.dictionary.itop.ui.php',	// Support for Spanish (from Costa Rica)
-			'dictionaries/es_cr.dictionary.itop.core.php',	// Support for Spanish (from Costa Rica)
-			'dictionaries/de.dictionary.itop.ui.php',	// Support for German
-			'dictionaries/de.dictionary.itop.core.php',	// Support for German
-			'dictionaries/pt_br.dictionary.itop.ui.php',	// Support for Brazilian Portuguese
-			'dictionaries/pt_br.dictionary.itop.core.php',	// Support for Brazilian Portuguese
-			'dictionaries/ru.dictionary.itop.ui.php',	// Support for Russian
-			'dictionaries/ru.dictionary.itop.core.php',	// Support for Russian
-			'dictionaries/tr.dictionary.itop.ui.php',	// Support for Turkish
-			'dictionaries/tr.dictionary.itop.core.php',	// Support for Turkish
-			'dictionaries/zh.dictionary.itop.ui.php',	// Support for Chinese
-			'dictionaries/zh.dictionary.itop.core.php',	// Support for Chinese
-		);
+		$this->m_aDictionaries = self::ScanDictionariesDir();
+		
 		foreach($this->m_aSettings as $sPropCode => $aSettingInfo)
 		{
 			$this->m_aSettings[$sPropCode]['value'] = $aSettingInfo['default'];
@@ -392,7 +614,6 @@ class Config
 		$this->m_iStandardReloadInterval = DEFAULT_STANDARD_RELOAD_INTERVAL;
 		$this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL;
 		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
-		$this->m_bHttpsHyperlinks = DEFAULT_HTTPS_HYPERLINKS;
 		$this->m_sDefaultLanguage = 'EN US';
 		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
 		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
@@ -406,6 +627,18 @@ class Config
 			$this->Load($sConfigFile);
 			$this->Verify();
 		}
+
+      // Application root url: set a default value, then normalize it
+      $sAppRootUrl = trim($this->Get('app_root_url'));
+		if (strlen($sAppRootUrl) == 0)
+      {
+			$sAppRootUrl = utils::GetDefaultUrlAppRoot();
+		}
+		if (substr($sAppRootUrl, -1, 1) != '/')
+		{
+			$sAppRootUrl .= '/';
+		}
+		$this->Set('app_root_url', $sAppRootUrl);
 	}
 
 	protected function CheckFile($sPurpose, $sFileName)
@@ -414,6 +647,10 @@ class Config
 		{
 			throw new ConfigException("Could not find $sPurpose file", array('file' => $sFileName));
 		}
+		if (!is_readable($sFileName))
+		{
+			throw new ConfigException("Could not read $sPurpose file (the file exists but cannot be read). Do you have the rights to access this file?", array('file' => $sFileName));			
+		}
 	}
 
 	protected function Load($sConfigFile)
@@ -441,7 +678,7 @@ class Config
 		if (strlen($sNoise) > 0)
 		{
 			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
-			throw new ConfigException('Syntax error in configuration file', array('file' => $sConfigFile, 'error' => '<tt>'.htmlentities($sNoise).'</tt>'));
+			throw new ConfigException('Syntax error in configuration file', array('file' => $sConfigFile, 'error' => '<tt>'.htmlentities($sNoise, ENT_QUOTES, 'UTF-8').'</tt>'));
 		}
 
 		if (!isset($MySettings) || !is_array($MySettings))
@@ -514,7 +751,6 @@ class Config
 		$this->m_iStandardReloadInterval = isset($MySettings['standard_reload_interval']) ? trim($MySettings['standard_reload_interval']) : DEFAULT_STANDARD_RELOAD_INTERVAL;
 		$this->m_iFastReloadInterval = isset($MySettings['fast_reload_interval']) ? trim($MySettings['fast_reload_interval']) : DEFAULT_FAST_RELOAD_INTERVAL;
 		$this->m_bSecureConnectionRequired = isset($MySettings['secure_connection_required']) ? (bool) trim($MySettings['secure_connection_required']) : DEFAULT_SECURE_CONNECTION_REQUIRED;
-		$this->m_bHttpsHyperlinks = isset($MySettings['https_hyperlinks']) ? (bool) trim($MySettings['https_hyperlinks']) : DEFAULT_HTTPS_HYPERLINKS;
 
 		$this->m_aModuleSettings = isset($MyModuleSettings) ?  $MyModuleSettings : array();
 
@@ -690,11 +926,6 @@ class Config
 		return $this->m_bSecureConnectionRequired;
 	}
 
-	public function GetHttpsHyperlinks()
-	{
-		return $this->m_bHttpsHyperlinks;
-	}
-
 	public function GetDefaultLanguage()
 	{
 		return $this->m_sDefaultLanguage;
@@ -800,11 +1031,6 @@ class Config
 		$this->m_bSecureConnectionRequired = $bSecureConnectionRequired;
 	}
 
-	public function SetHttpsHyperlinks($bHttpsHyperlinks)
-	{
-		$this->m_bHttpsHyperlinks = $bHttpsHyperlinks;
-	}
-
 	public function SetDefaultLanguage($sLanguageCode)
 	{
 		$this->m_sDefaultLanguage = $sLanguageCode;
@@ -870,7 +1096,6 @@ class Config
 		$aSettings['standard_reload_interval'] = $this->m_iStandardReloadInterval;
 		$aSettings['fast_reload_interval'] = $this->m_iFastReloadInterval;
 		$aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired;
-		$aSettings['https_hyperlinks'] = $this->m_bHttpsHyperlinks;
 		$aSettings['default_language'] = $this->m_sDefaultLanguage;
 		$aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes;
 		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
@@ -943,7 +1168,7 @@ class Config
 						$sSeenAs = $aSettingInfo['value'] ? '1' : '0';
 						break;
 					default:
-						$sSeenAs = "'".$aSettingInfo['value']."'";
+						$sSeenAs = "'".addslashes($aSettingInfo['value'])."'";
 					}
 					fwrite($hFile, "\t'$sPropCode' => $sSeenAs,\n");
 				}
@@ -965,7 +1190,6 @@ class Config
 			fwrite($hFile, "\t'standard_reload_interval' => {$this->m_iStandardReloadInterval},\n");
 			fwrite($hFile, "\t'fast_reload_interval' => {$this->m_iFastReloadInterval},\n");
 			fwrite($hFile, "\t'secure_connection_required' => ".($this->m_bSecureConnectionRequired ? 'true' : 'false').",\n");
-			fwrite($hFile, "\t'https_hyperlinks' => ".($this->m_bHttpsHyperlinks ? 'true' : 'false').",\n");
 			fwrite($hFile, "\t'default_language' => '{$this->m_sDefaultLanguage}',\n");
 			fwrite($hFile, "\t'allowed_login_types' => '{$this->m_sAllowedLoginTypes}',\n");
 			fwrite($hFile, "\t'encryption_key' => '{$this->m_sEncryptionKey}',\n");
@@ -990,7 +1214,7 @@ class Config
 			
 			fwrite($hFile, "\n/**\n");
 			fwrite($hFile, " *\n");
-			fwrite($hFile, " * Data model modules to be loaded. Names should be specified as absolute paths\n");
+			fwrite($hFile, " * Data model modules to be loaded. Names are specified as relative paths\n");
 			fwrite($hFile, " *\n");
 			fwrite($hFile, " */\n");
 			fwrite($hFile, "\$MyModules = array(\n");
@@ -1033,5 +1257,25 @@ class Config
 			throw new ConfigException("Could not write to configuration file", array('file' => $sFileName));
 		}
 	}
+	
+	protected static function ScanDictionariesDir()
+	{
+		$aResult = array();
+		// Populate automatically the list of dictionary files
+		$sDir = APPROOT.'/dictionaries';
+		if ($hDir = @opendir($sDir))
+		{
+			while (($sFile = readdir($hDir)) !== false)
+			{
+				$aMatches = array();
+				if (preg_match("/^([^\.]+\.)?dictionary\.itop\.(ui|core)\.php$/i", $sFile, $aMatches)) // Dictionary files named like [<Lang>.]dictionary.[core|ui].php are loaded automatically
+				{
+					$aResult[] = 'dictionaries/'.$sFile;
+				}
+			}
+			closedir($hDir);
+		}
+		return $aResult;
+	}
 }
 ?>

core/csvparser.class.inc.php

@@ -40,6 +40,8 @@ define('evTEXTQUAL', 3); // used for escaping as well
 define('evOTHERCHAR', 4);
 define('evEND', 5);
 
+define('NULL_VALUE', '<NULL>');
+
 
 /**
  * CSVParser
@@ -82,6 +84,10 @@ class CSVParser
 		{
 			$sCell = $this->m_sCurrCell;
 		}
+		if ($sCell == NULL_VALUE)
+		{
+			$sCell = null;
+		}
 
 		if (!is_null($aFieldMap))
 		{
@@ -178,6 +184,7 @@ class CSVParser
 		{
 			if ($i == $iDataLength)
 			{
+				$c = null;
 				$iEvent = evEND;
 			}
 			else

core/dbobjectsearch.class.php

@@ -22,6 +22,16 @@
  * @author      Denis Flaven <denis.flaven@combodo.com>
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
+ 
+define('TREE_OPERATOR_EQUALS', 0);
+define('TREE_OPERATOR_BELOW', 1);
+define('TREE_OPERATOR_BELOW_STRICT', 2);
+define('TREE_OPERATOR_NOT_BELOW', 3);
+define('TREE_OPERATOR_NOT_BELOW_STRICT', 4);
+define('TREE_OPERATOR_ABOVE', 5);
+define('TREE_OPERATOR_ABOVE_STRICT', 6);
+define('TREE_OPERATOR_NOT_ABOVE', 7);
+define('TREE_OPERATOR_NOT_ABOVE_STRICT', 8);
 
 class DBObjectSearch
 {
@@ -33,6 +43,7 @@ class DBObjectSearch
 	private $m_aPointingTo;
 	private $m_aReferencedBy;
 	private $m_aRelatedTo;
+	private $m_bDataFiltered;
 
 	// By default, some information may be hidden to the current user
 	// But it may happen that we need to disable that feature
@@ -53,12 +64,27 @@ class DBObjectSearch
 		$this->m_aPointingTo = array();
 		$this->m_aReferencedBy = array();
 		$this->m_aRelatedTo = array();
+		$this->m_bDataFiltered = false;
+		$this->m_aParentConditions = array();
 	}
 
 	public function AllowAllData() {$this->m_bAllowAllData = true;}
 	public function IsAllDataAllowed() {return $this->m_bAllowAllData;}
+	public function IsDataFiltered() {return $this->m_bDataFiltered; }
+	public function SetDataFiltered() {$this->m_bDataFiltered = true;}
+
+	public function GetClassName($sAlias)
+	{
+		if (array_key_exists($sAlias, $this->m_aClasses))
+		{
+			return $this->m_aClasses[$sAlias];
+		}
+		else
+		{
+			throw new CoreException("Invalid class alias '$sAlias'");
+		}
+	}
 
-	public function GetClassName($sAlias) {return $this->m_aClasses[$sAlias];}
 	public function GetJoinedClasses() {return $this->m_aClasses;}
 
 	public function GetClass()
@@ -107,6 +133,7 @@ class DBObjectSearch
 		if (count($this->m_aPointingTo) > 0) return false;
 		if (count($this->m_aReferencedBy) > 0) return false;
 		if (count($this->m_aRelatedTo) > 0) return false;
+		if (count($this->m_aParentConditions) > 0) return false;
 		return true;
 	}
 	
@@ -115,13 +142,55 @@ class DBObjectSearch
 		// To replace __Describe
 	}
 
-	public function DescribeConditionPointTo($sExtKeyAttCode)
+	public function DescribeConditionPointTo($sExtKeyAttCode, $aPointingTo)
 	{
-		if (!isset($this->m_aPointingTo[$sExtKeyAttCode])) return "";
-		$oFilter = $this->m_aPointingTo[$sExtKeyAttCode];
-		if ($oFilter->IsAny()) return "";
-		$oAtt = MetaModel::GetAttributeDef($this->GetClass(), $sExtKeyAttCode);
-		return $oAtt->GetLabel()." having ({$oFilter->DescribeConditions()})";
+		if (empty($aPointingTo)) return "";
+		foreach($aPointingTo as $iOperatorCode => $oFilter)
+		{
+			if ($oFilter->IsAny()) break;
+			$oAtt = MetaModel::GetAttributeDef($this->GetClass(), $sExtKeyAttCode);
+			$sOperator = '';
+			switch($iOperatorCode)
+			{
+				case TREE_OPERATOR_EQUALS:
+				$sOperator = 'having';
+				break;
+	
+				case TREE_OPERATOR_BELOW:
+				$sOperator = 'below';
+				break;
+	
+				case TREE_OPERATOR_BELOW_STRICT:
+				$sOperator = 'strictly below';
+				break;
+	
+				case TREE_OPERATOR_NOT_BELOW:
+				$sOperator = 'not below';
+				break;
+	
+				case TREE_OPERATOR_NOT_BELOW_STRICT:
+				$sOperator = 'strictly not below';
+				break;
+
+				case TREE_OPERATOR_ABOVE:
+				$sOperator = 'above';
+				break;
+	
+				case TREE_OPERATOR_ABOVE_STRICT:
+				$sOperator = 'strictly above';
+				break;
+	
+				case TREE_OPERATOR_NOT_ABOVE:
+				$sOperator = 'not above';
+				break;
+	
+				case TREE_OPERATOR_NOT_ABOVE_STRICT:
+				$sOperator = 'strictly not above';
+				break;
+			}
+			$aDescription[] = $oAtt->GetLabel()."$sOperator ({$oFilter->DescribeConditions()})";
+		}
+		return implode(' and ', $aDescription);
 	}
 
 	public function DescribeConditionRefBy($sForeignClass, $sForeignExtKeyAttCode)
@@ -141,6 +210,7 @@ class DBObjectSearch
 		return "related ($sRelCode... peut mieux faire !, $iMaxDepth dig depth) to a {$oFilter->GetClass()} ({$oFilter->DescribeConditions()})";
 	}
 
+
 	public function DescribeConditions()
 	{
 		$aConditions = array();
@@ -159,10 +229,9 @@ class DBObjectSearch
 		$aConditions[] = $this->RenderCondition();
 
 		$aCondPoint = array();
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$oFilter)
+		foreach($this->m_aPointingTo as $sExtKeyAttCode => $aPointingTo)
 		{
-			if ($oFilter->IsAny()) continue;
-			$aCondPoint[] = $this->DescribeConditionPointTo($sExtKeyAttCode);
+			$aCondPoint[] = $this->DescribeConditionPointTo($sExtKeyAttCode, $aPointingTo);
 		}
 		if (count($aCondPoint) > 0)
 		{
@@ -187,6 +256,11 @@ class DBObjectSearch
 			$aConditions[] = implode(" and ", $aCondReferred);
 		}
 
+		foreach ($this->m_aParentConditions as $aRelInfo)
+		{
+			$aCondReferred[] = $this->DescribeConditionParent($aRelInfo);
+		}
+
 		return implode(" and ", $aConditions);		
 	}
 	
@@ -209,23 +283,88 @@ class DBObjectSearch
 
 	protected function TransferConditionExpression($oFilter, $aTranslation)
 	{
-		$oTranslated = $oFilter->GetCriteria()->Translate($aTranslation, false);
+		// Prevent collisions in the parameter names by renaming them if needed
+		foreach($this->m_aParams as $sParam => $value)
+		{
+			if (array_key_exists($sParam, $oFilter->m_aParams) && ($value != $oFilter->m_aParams[$sParam]))
+			{
+				// Generate a new and unique name for the collinding parameter
+				$index = 1;
+				while(array_key_exists($sParam.$index, $oFilter->m_aParams))
+				{
+					$index++;
+				}
+				$secondValue = $oFilter->m_aParams[$sParam];
+				$oFilter->RenameParam($sParam, $sParam.$index);
+				unset($oFilter->m_aParams[$sParam]);
+				$oFilter->m_aParams[$sParam.$index] = $secondValue;
+			}
+		}
+//echo "<p>TransferConditionExpression:<br/>";
+//echo "Adding Conditions:<br/><pre>oFilter:\n".print_r($oFilter, true)."\naTranslation:\n".print_r($aTranslation, true)."</pre>\n";
+//echo "</p>";
+		$oTranslated = $oFilter->GetCriteria()->Translate($aTranslation, false, false /* leave unresolved fields */);
+//echo "Adding Conditions (translated):<br/><pre>".print_r($oTranslated, true)."</pre>\n";
 		$this->AddConditionExpression($oTranslated);
-		// #@# what about collisions in parameter names ???
 		$this->m_aParams = array_merge($this->m_aParams, $oFilter->m_aParams);
 	}
 
+	protected function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oSearchCondition->RenameParam($sOldName, $sNewName);
+		foreach($this->m_aRelatedTo as $aRelatedTo)
+		{
+			$aRelatedTo['flt']->RenameParam($sOldName, $sNewName);
+		}
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $sAlias => $oExtFilter)
+				{
+					$oExtFilter->RenameParam($sOldName, $sNewName);
+				}
+			}
+		}
+		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $oForeignFilter)
+			{
+				$oForeignFilter->RenameParam($sOldName, $sNewName);
+			}
+		}
+
+		foreach($this->m_aParentConditions as $aParent)
+		{
+			$aParent['expression']->RenameParam($sOldName, $sNewName);	
+		}
+	}
+	
 	public function ResetCondition()
 	{
 		$this->m_oSearchCondition = new TrueExpression();
+		$this->m_aParentConditions = array();
 		// ? is that usefull/enough, do I need to rebuild the list after the subqueries ?
 	}
 
+	public function MergeConditionExpression($oExpression)
+	{
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression); 
+	}
+
 	public function AddConditionExpression($oExpression)
 	{
 		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression); 
 	}
 
+  	public function AddNameCondition($sName)
+	{
+		$oValueExpr = new ScalarExpression($sName);
+		$oNameExpr = new FieldExpression('friendlyname', $this->GetClassAlias());
+		$oNewCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
+		$this->AddConditionExpression($oNewCondition);
+	}
+
 	public function AddCondition($sFilterCode, $value, $sOpCode = null)
 	{
 		MyHelpers::CheckKeyInArray('filter code', $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
@@ -312,30 +451,113 @@ class DBObjectSearch
 		$this->AddConditionExpression($oNewCondition);
 	}
 
+	/**
+	 * Specify a condition on external keys or link sets
+	 * @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
+	 *                 Example: infra_list->ci_id->location_id->country	 
+	 * @param value The value to match
+	 * @return void
+	 */
+	public function AddConditionAdvanced($sAttSpec, $value)
+	{
+		$sClass = $this->GetClass();
+
+		$iPos = strpos($sAttSpec, '->');
+		if ($iPos !== false)
+		{
+			$sAttCode = substr($sAttSpec, 0, $iPos);
+			$sSubSpec = substr($sAttSpec, $iPos + 2);
+
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				throw new Exception("Invalid attribute code '$sClass/$sAttCode' in condition specification '$sAttSpec'");
+			}
+
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef->IsLinkSet())
+			{
+				$sTargetClass = $oAttDef->GetLinkedClass();
+				$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+
+				$oNewFilter = new DBObjectSearch($sTargetClass);
+				$oNewFilter->AddConditionAdvanced($sSubSpec, $value);
+
+				$this->AddCondition_ReferencedBy($oNewFilter, $sExtKeyToMe);
+			}
+			elseif ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+			{
+				$sTargetClass = $oAttDef->GetTargetClass(EXTKEY_ABSOLUTE);
+
+				$oNewFilter = new DBObjectSearch($sTargetClass);
+				$oNewFilter->AddConditionAdvanced($sSubSpec, $value);
+
+				$this->AddCondition_PointingTo($oNewFilter, $sAttCode);
+			}
+			else
+			{
+				throw new Exception("Attribute specification '$sAttSpec', '$sAttCode' should be either a link set or an external key");
+			}
+		}
+		else
+		{
+			// $sAttSpec is an attribute code
+			//
+			$this->AddCondition($sAttSpec, $value);
+		}
+	}
+
 	public function AddCondition_FullText($sFullText)
 	{
 		$this->m_aFullText[] = $sFullText;
 	}
 
-	protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation)
+	public function AddCondition_Parent($sAttCode, $iOperatorCode, $oExpression)
 	{
-		$sOrigAlias = $this->GetClassAlias();
-		if (array_key_exists($sOrigAlias, $aClassAliases))
+		$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sAttCode);
+		if (!$oAttDef instanceof AttributeHierarchicalKey)
 		{
-			$sNewAlias = MetaModel::GenerateUniqueAlias($aClassAliases, $sOrigAlias, $this->GetClass());
-			$this->m_aSelectedClasses[$sNewAlias] = $this->GetClass();
-			unset($this->m_aSelectedClasses[$sOrigAlias]);
-
-			// Translate the condition expression with the new alias
-			$aAliasTranslation[$sOrigAlias]['*'] = $sNewAlias;
+			throw new Exception("AddCondition_Parent can only be used on hierarchical keys. '$sAttCode' is not a hierarchical key.");
 		}
-
-		// add the alias into the filter aliases list
-		$aClassAliases[$this->GetClassAlias()] = $this->GetClass();
-		
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$oFilter)
+		$this->m_aParentConditions[] = array(
+			'attCode' => $sAttCode,
+			'operator' => $iOperatorCode,
+			'expression' => $oExpression,
+		);
+	}
+	
+	protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation, $bTranslateMainAlias = true)
+	{
+		if ($bTranslateMainAlias)
 		{
-			$oFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
+			$sOrigAlias = $this->GetClassAlias();
+			if (array_key_exists($sOrigAlias, $aClassAliases))
+			{
+				$sNewAlias = MetaModel::GenerateUniqueAlias($aClassAliases, $sOrigAlias, $this->GetClass());
+//echo "<p>Generating a new alias for $sOrigAlias (already used). It is now: $sNewAlias</p>\n";
+				$this->m_aSelectedClasses[$sNewAlias] = $this->GetClass();
+				unset($this->m_aSelectedClasses[$sOrigAlias]);
+	
+				$this->m_aClasses[$sNewAlias] = $this->GetClass();
+				unset($this->m_aClasses[$sOrigAlias]);
+	
+				// Translate the condition expression with the new alias
+				$aAliasTranslation[$sOrigAlias]['*'] = $sNewAlias;
+			}
+	
+//echo "<p>Adding the alias ".$this->GetClass()." as ".$this->GetClassAlias()."</p>\n";
+			// add the alias into the filter aliases list
+			$aClassAliases[$this->GetClassAlias()] = $this->GetClass();
+		}
+		
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $sAlias => $oFilter)
+				{
+					$oFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
+				}
+			}
 		}
 
 		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
@@ -347,16 +569,17 @@ class DBObjectSearch
 		}
 	}
 
-	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode)
+	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS)
 	{
 		$aAliasTranslation = array();
-		$res = $this->AddCondition_PointingTo_InNameSpace($oFilter, $sExtKeyAttCode, $this->m_aClasses, $aAliasTranslation);
+		$res = $this->AddCondition_PointingTo_InNameSpace($oFilter, $sExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
 		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
 		return $res;
 	}
 
-	protected function AddCondition_PointingTo_InNameSpace(DBObjectSearch $oFilter, $sExtKeyAttCode, &$aClassAliases, &$aAliasTranslation)
+	protected function AddCondition_PointingTo_InNameSpace(DBObjectSearch $oFilter, $sExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
 	{
+//echo "<p style=\"color:green\">Calling: AddCondition_PointingTo_InNameSpace([<pre>".print_r($aClassAliases, true)."</pre></br>], [<pre>".print_r($aAliasTranslation, true)."</pre>]);</p>";
 		if (!MetaModel::IsValidKeyAttCode($this->GetClass(), $sExtKeyAttCode))
 		{
 			throw new CoreWarning("The attribute code '$sExtKeyAttCode' is not an external key of the class '{$this->GetClass()}' - the condition will be ignored");
@@ -366,20 +589,41 @@ class DBObjectSearch
 		{
 			throw new CoreException("The specified filter (pointing to {$oFilter->GetClass()}) is not compatible with the key '{$this->GetClass()}::$sExtKeyAttCode', which is pointing to {$oAttExtKey->GetTargetClass()}");
 		}
+		if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !($oAttExtKey instanceof AttributeHierarchicalKey))
+		{
+			throw new CoreException("The specified tree operator $isOperatorCode is not applicable to the key '{$this->GetClass()}::$sExtKeyAttCode', which is not a HierarchicalKey");
+		}
 
+		$bSamePointingTo = false;
 		if (array_key_exists($sExtKeyAttCode, $this->m_aPointingTo))
 		{
-			$this->m_aPointingTo[$sExtKeyAttCode]->MergeWith_InNamespace($oFilter, $aClassAliases, $aAliasTranslation);
+			if (array_key_exists($iOperatorCode, $this->m_aPointingTo[$sExtKeyAttCode]))
+			{
+				if (array_key_exists($oFilter->GetClassAlias(), $this->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode]))
+				{
+//echo "<p style=\"color:red\">[".__LINE__."]this->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode][".$oFilter->GetFirstJoinedClassAlias()."]:<pre>\n".print_r($this->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode], true)."</pre>;</p>";
+					$bSamePointingTo = true;
+				}
+			}
+		}
+
+//echo "<p style=\"color:red\">[".__LINE__."]Calling: AddToNameSpace([".implode(',', $aClassAliases)."], [".implode(',', $aAliasTranslation)."]);</p>";
+		if ($bSamePointingTo)
+		{
+//echo "<p style=\"color:red\">[".__LINE__."]AddPointingTo: Merging filters for [$sExtKeyAttCode][$iOperatorCode][".$oFilter->GetClassAlias()."]</p>";
+			// Same ext key, alias and same operator, merge the filters together
+//			$sAlias = $oFilter->GetClassAlias();
+//echo "<p style=\"color:red\">[".__LINE__."]before: AddToNameSpace(aClassAliases[<pre>\n".print_r($aClassAliases, true)."</pre>], aAliasTranslation[<pre>\n".print_r($aAliasTranslation, true)."</pre>]);</p>";
+			$oFilter->AddToNamespace($aClassAliases, $aAliasTranslation, true /* Don't translate the main alias */);
+//echo "<p style=\"color:blue\">[".__LINE__."]after: AddToNameSpace(aClassAliases[<pre>\n".print_r($aClassAliases, true)."</pre>], aAliasTranslation[<pre>\n".print_r($aAliasTranslation, true)."</pre>]);</p>";
+//			$this->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode][$sAlias]->MergeWith($oFilter, $aClassAliases, $aAliasTranslation);
+			$this->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode][$oFilter->GetClassAlias()] = $oFilter;
 		}
 		else
 		{
+//echo "<p style=\"color:red\">[".__LINE__."]AddPointingTo: Adding a new PointingTo filter for [$sExtKeyAttCode][$iOperatorCode][".$oFilter->GetClassAlias()."]</p>";
 			$oFilter->AddToNamespace($aClassAliases, $aAliasTranslation);
-
-			// #@# The condition expression found in that filter should not be used - could be another kind of structure like a join spec tree !!!!
-			// $oNewFilter = clone $oFilter;
-			// $oNewFilter->ResetCondition();
-
-			$this->m_aPointingTo[$sExtKeyAttCode] = $oFilter;
+			$this->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode][$oFilter->GetClassAlias()] = $oFilter;
 		}
 	}
 
@@ -423,6 +667,7 @@ class DBObjectSearch
 	public function AddCondition_LinkedTo(DBObjectSearch $oLinkFilter, $sExtKeyAttCodeToMe, $sExtKeyAttCodeTarget, DBObjectSearch $oFilterTarget)
 	{
 		$oLinkFilterFinal = clone $oLinkFilter;
+		// todo : new function prototype
 		$oLinkFilterFinal->AddCondition_PointingTo($sExtKeyAttCodeToMe);
 
 		$this->AddCondition_ReferencedBy($oLinkFilterFinal, $sExtKeyAttCodeToMe);
@@ -455,9 +700,15 @@ class DBObjectSearch
 		$this->m_aFullText = array_merge($this->m_aFullText, $oFilter->m_aFullText);
 		$this->m_aRelatedTo = array_merge($this->m_aRelatedTo, $oFilter->m_aRelatedTo);
 
-		foreach($oFilter->m_aPointingTo as $sExtKeyAttCode=>$oExtFilter)
+		foreach($oFilter->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
 		{
-			$this->AddCondition_PointingTo_InNamespace($oExtFilter, $sExtKeyAttCode, $aClassAliases, $aAliasTranslation);
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $sAlias => $oExtFilter)
+				{
+					$this->AddCondition_PointingTo_InNamespace($oExtFilter, $sExtKeyAttCode, $aClassAliases, $aAliasTranslation, $iOperatorCode);
+				}
+			}
 		}
 		foreach($oFilter->m_aReferencedBy as $sForeignClass => $aReferences)
 		{
@@ -476,7 +727,7 @@ class DBObjectSearch
 		{
 			return $this->m_aPointingTo;
 		}
-		if (!array_key_exists($sKeyAttCode, $this->m_aPointingTo)) return null;
+		if (!array_key_exists($sKeyAttCode, $this->m_aPointingTo)) return array();
 		return $this->m_aPointingTo[$sKeyAttCode];
 	}
 	public function GetCriteria_ReferencedBy($sRemoteClass = "", $sForeignExtKeyAttCode = "")
@@ -497,16 +748,43 @@ class DBObjectSearch
 	{
 		return $this->m_aRelatedTo;
 	}
+
+	public function SetInternalParams($aParams)
+	{
+		return $this->m_aParams = $aParams;
+	}
+
 	public function GetInternalParams()
 	{
 		return $this->m_aParams;
 	}
 
+	public function GetQueryParams()
+	{
+		$aParams = array();
+		$this->m_oSearchCondition->Render($aParams, true);
+		return $aParams;
+	}
+
+	public function ListConstantFields()
+	{
+		return $this->m_oSearchCondition->ListConstantFields();
+	}
+	
 	public function RenderCondition()
 	{
 		return $this->m_oSearchCondition->Render($this->m_aParams, false);
 	}
 
+	/**
+	 * Turn the parameters (:xxx) into scalar values in order to easily
+	 * serialize a search
+	 */
+	public function ApplyParameters($aArgs)
+	{
+		return $this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
+	}
+	
 	public function serialize($bDevelopParams = false, $aContextParams = null)
 	{
 		$sOql = $this->ToOql($bDevelopParams, $aContextParams);
@@ -642,10 +920,55 @@ class DBObjectSearch
 	protected function ToOQL_Joins()
 	{
 		$sRes = '';
-		foreach($this->m_aPointingTo as $sExtKey=>$oFilter)
+		foreach($this->m_aPointingTo as $sExtKey => $aPointingTo)
 		{
-			$sRes .= ' JOIN '.$oFilter->GetClass().' AS '.$oFilter->GetClassAlias().' ON '.$this->GetClassAlias().'.'.$sExtKey.' = '.$oFilter->GetClassAlias().'.id';
-			$sRes .= $oFilter->ToOQL_Joins();
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $sAlias => $oFilter)
+				{
+					switch($iOperatorCode)
+					{
+						case TREE_OPERATOR_EQUALS:
+						$sOperator = ' = ';
+						break;
+						
+						case TREE_OPERATOR_BELOW:
+						$sOperator = ' BELOW ';
+						break;
+						
+						case TREE_OPERATOR_BELOW_STRICT:
+						$sOperator = ' BELOW STRICT ';
+						break;
+						
+						case TREE_OPERATOR_NOT_BELOW:
+						$sOperator = ' NOT BELOW ';
+						break;
+						
+						case TREE_OPERATOR_NOT_BELOW_STRICT:
+						$sOperator = ' NOT BELOW STRICT ';
+						break;
+						
+						case TREE_OPERATOR_ABOVE:
+						$sOperator = ' ABOVE ';
+						break;
+						
+						case TREE_OPERATOR_ABOVE_STRICT:
+						$sOperator = ' ABOVE STRICT ';
+						break;
+						
+						case TREE_OPERATOR_NOT_ABOVE:
+						$sOperator = ' NOT ABOVE ';
+						break;
+						
+						case TREE_OPERATOR_NOT_ABOVE_STRICT:
+						$sOperator = ' NOT ABOVE STRICT ';
+						break;
+						
+					}
+					$sRes .= ' JOIN '.$oFilter->GetClass().' AS '.$oFilter->GetClassAlias().' ON '.$this->GetClassAlias().'.'.$sExtKey.$sOperator.$oFilter->GetClassAlias().'.id';
+					$sRes .= $oFilter->ToOQL_Joins();				
+				}
+			}
 		}
 		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
 		{
@@ -858,7 +1181,38 @@ class DBObjectSearch
 				}
 				else
 				{
-					$aJoinItems[$sFromClass]->AddCondition_PointingTo($aJoinItems[$sToClass], $sExtKeyAttCode);
+					$sOperator = $oJoinSpec->GetOperator();
+					switch($sOperator)
+					{
+						case '=':
+						$iOperatorCode = TREE_OPERATOR_EQUALS;
+						break;
+						case 'BELOW':
+						$iOperatorCode = TREE_OPERATOR_BELOW;
+						break;
+						case 'BELOW_STRICT':
+						$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
+						break;
+						case 'NOT_BELOW':
+						$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
+						break;
+						case 'NOT_BELOW_STRICT':
+						$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
+						break;
+						case 'ABOVE':
+						$iOperatorCode = TREE_OPERATOR_ABOVE;
+						break;
+						case 'ABOVE_STRICT':
+						$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
+						break;
+						case 'NOT_ABOVE':
+						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
+						break;
+						case 'NOT_ABOVE_STRICT':
+						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
+						break;
+					}
+					$aJoinItems[$sFromClass]->AddCondition_PointingTo($aJoinItems[$sToClass], $sExtKeyAttCode, $iOperatorCode);
 				}
 			}
 		}

core/dbobjectset.class.php

@@ -32,23 +32,28 @@
 class DBObjectSet
 {
 	private $m_oFilter;
+	private $m_aAddedIds; // Ids of objects added (discrete lists)
 	private $m_aOrderBy;
 	public $m_bLoaded;
 	private $m_aData;
 	private $m_aId2Row;
 	private $m_iCurrRow;
 
-	public function __construct(DBObjectSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0)
+	public function __construct(DBObjectSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0)
 	{
 		$this->m_oFilter = $oFilter;
+		$this->m_aAddedIds = array();
 		$this->m_aOrderBy = $aOrderBy;
 		$this->m_aArgs = $aArgs;
+		$this->m_aAttToLoad = null;
+		$this->m_aExtendedDataSpec = $aExtendedDataSpec;
 		$this->m_iLimitCount = $iLimitCount;
 		$this->m_iLimitStart = $iLimitStart;
 
-		$this->m_bLoaded = false;
-		$this->m_aData = array(); // array of (row => array of (classalias) => object)
-		$this->m_aId2Row = array();
+		$this->m_iCount = null; // null if unknown yet
+		$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_iCurrRow = 0;
 	}
 
@@ -76,6 +81,46 @@ class DBObjectSet
 		return $sRet;
 	}
 
+	public function OptimizeColumnLoad($aAttToLoad)
+	{
+		if (is_null($aAttToLoad))
+		{
+			$this->m_aAttToLoad = null;
+		}
+		else
+		{
+			// Complete the attribute list with the attribute codes
+			$aAttToLoadWithAttDef = array();
+			foreach($aAttToLoad as $sClassAlias => $aAttList)
+			{
+				$aSelectedClasses = $this->m_oFilter->GetSelectedClasses();
+				$sClass = $aSelectedClasses[$sClassAlias];
+				foreach($aAttList as $sAttToLoad)
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad);
+					$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad] = $oAttDef;
+					if ($oAttDef->IsExternalKey())
+					{
+						// Add the external key friendly name anytime
+						$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_friendlyname');
+						$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_friendlyname'] = $oFriendlyNameAttDef;
+					}
+				}
+				// Add the friendly name anytime
+				$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
+				$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
+
+				// Make sure that the final class is requested anytime, whatever the specification (needed for object construction!)
+				if (!MetaModel::IsStandaloneClass($sClass) && !array_key_exists('finalclass', $aAttList))
+				{
+					$aAttToLoadWithAttDef[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
+				}
+			}
+
+			$this->m_aAttToLoad = $aAttToLoadWithAttDef;
+		}
+	}
+
 	static public function FromObject($oObject)
 	{
 		$oRetSet = self::FromScratch(get_class($oObject));
@@ -85,7 +130,8 @@ class DBObjectSet
 
 	static public function FromScratch($sClass)
 	{
-		$oFilter = new CMDBSearchFilter($sClass);
+		$oFilter = new DBObjectSearch($sClass);
+		$oFilter->AddConditionExpression(new FalseExpression());
 		$oRetSet = new self($oFilter);
 		$oRetSet->m_bLoaded = true; // no DB load
 		return $oRetSet;
@@ -95,9 +141,7 @@ class DBObjectSet
 	// input = array of objects
 	static public function FromArray($sClass, $aObjects)
 	{
-		$oFilter = new CMDBSearchFilter($sClass);
-		$oRetSet = new self($oFilter);
-		$oRetSet->m_bLoaded = true; // no DB load
+		$oRetSet = self::FromScratch($sClass);
 		$oRetSet->AddObjectArray($aObjects, $sClass);
 		return $oRetSet;
 	} 
@@ -162,19 +206,42 @@ class DBObjectSet
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
+		$aSelectedClasses = $this->m_oFilter->GetSelectedClasses();
+
 		$aRet = array();
 		foreach($this->m_aData as $iRow => $aObjects)
 		{
 			foreach($aObjects as $sClassAlias => $oObject)
 			{
-				$aRet[$iRow][$sClassAlias.'.'.'id'] = $oObject->GetKey(); 
-				$sClass = get_class($oObject);
+				if (is_null($oObject))
+				{
+					$aRet[$iRow][$sClassAlias.'.'.'id'] = null;
+				}
+				else
+				{
+					$aRet[$iRow][$sClassAlias.'.'.'id'] = $oObject->GetKey();
+				} 
+				if (is_null($oObject))
+				{
+					$sClass = $aSelectedClasses[$sClassAlias];
+				}
+				else
+				{
+					$sClass = get_class($oObject);
+				}
 				foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 				{
 					if ($oAttDef->IsScalar())
 					{
 						$sAttName = $sClassAlias.'.'.$sAttCode;
-						$aRet[$iRow][$sAttName] = $oObject->Get($sAttCode);
+						if (is_null($oObject))
+						{
+							$aRet[$iRow][$sAttName] = null;
+						}
+						else
+						{
+							$aRet[$iRow][$sAttName] = $oObject->Get($sAttCode);
+						}
 					}
 				}
 			}
@@ -202,7 +269,20 @@ class DBObjectSet
 
 	public function GetFilter()
 	{
-		return $this->m_oFilter;
+		if (count($this->m_aAddedIds) == 0)
+		{
+			return $this->m_oFilter;
+		}
+		else
+		{
+			$oFilter = clone $this->m_oFilter;
+
+			$oIdListExpr = ListExpression::FromScalars(array_keys($this->m_aAddedIds));
+			$oIdExpr = new FieldExpression('id', $oFilter->GetClassAlias());
+			$oIdInList = new BinaryExpression($oIdExpr, 'IN', $oIdListExpr);
+			$oFilter->MergeConditionExpression($oIdInList);
+			return $oFilter;
+		}
 	}
 
 	public function GetClass()
@@ -220,6 +300,11 @@ class DBObjectSet
 		return MetaModel::GetRootClass($this->GetClass());
 	}
 
+	public function GetArgs()
+	{
+		return $this->m_aArgs;
+	}
+
 	public function SetLimit($iLimitCount, $iLimitStart = 0)
 	{
 		$this->m_iLimitCount = $iLimitCount;
@@ -239,13 +324,16 @@ class DBObjectSet
 	public function Load()
 	{
 		if ($this->m_bLoaded) return;
+		// Note: it is mandatory to set this value now, to protect against reentrance
+		$this->m_bLoaded = true;
+
 		if ($this->m_iLimitCount > 0)
 		{
-			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs, $this->m_iLimitCount, $this->m_iLimitStart);
+			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs, $this->m_aAttToLoad, $this->m_aExtendedDataSpec, $this->m_iLimitCount, $this->m_iLimitStart);
 		}
 		else
 		{
-			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs);
+			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
 		}
 		$resQuery = CMDBSource::Query($sSQL);
 		if (!$resQuery) return;
@@ -256,25 +344,42 @@ class DBObjectSet
 			$aObjects = array();
 			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
 			{
-				$oObject = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias);
+				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);
+			$this->AddObjectExtended($aObjects, true /* internal load */);
 		}
 		CMDBSource::FreeResult($resQuery);
-
-		$this->m_bLoaded = true;
 	}
 
 	public function Count()
 	{
-		$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs, 0, 0, true);
-		$resQuery = CMDBSource::Query($sSQL);
-		if (!$resQuery) return 0;
-
-		$aRow = CMDBSource::FetchArray($resQuery);
-		CMDBSource::FreeResult($resQuery);
-		return $aRow['COUNT'];
+		if ($this->m_bLoaded && ($this->m_iLimitCount == 0) && ($this->m_iLimitStart == 0))
+		{
+			return count($this->m_aData);
+		}
+		else
+		{
+			if (is_null($this->m_iCount))
+			{
+				$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $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;
+		}
 	}
 
 	public function Fetch($sClassAlias = '')
@@ -313,7 +418,10 @@ class DBObjectSet
 
 	public function Rewind()
 	{
-		$this->Seek(0);
+		if ($this->m_bLoaded)
+		{
+			$this->Seek(0);
+		}
 	}
 
 	public function Seek($iRow)
@@ -326,6 +434,8 @@ class DBObjectSet
 
 	public function AddObject($oObject, $sClassAlias = '')
 	{
+		if (!$this->m_bLoaded) $this->Load();
+
 		if (strlen($sClassAlias) == 0)
 		{
 			$sClassAlias = $this->m_oFilter->GetClassAlias();
@@ -333,22 +443,37 @@ class DBObjectSet
 
 		$iNextPos = count($this->m_aData);
 		$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
-		$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
+		if (!is_null($oObject))
+		{
+			$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
+			$this->m_aAddedIds[$oObject->GetKey()] = true;
+		}
 	}
 
-	protected function AddObjectExtended($aObjectArray)
+	protected function AddObjectExtended($aObjectArray, $bInternalLoad = false)
 	{
+		if (!$this->m_bLoaded) $this->Load();
+
 		$iNextPos = count($this->m_aData);
 
 		foreach ($aObjectArray as $sClassAlias => $oObject)
 		{
 			$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
-			$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
+			if (!is_null($oObject))
+			{
+				$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
+				if (!$bInternalLoad)
+				{
+					$this->m_aAddedIds[$oObject->GetKey()] = true;
+				}
+			}
 		}
 	}
 
 	public function AddObjectArray($aObjects, $sClassAlias = '')
 	{
+		if (!$this->m_bLoaded) $this->Load();
+
 		// #@# todo - add a check on the object class ?
 		foreach ($aObjects as $oObj)
 		{
@@ -393,6 +518,43 @@ class DBObjectSet
 		return $oNewSet;
 	}
 
+	// Note: This verb works only with objects existing in the database
+	//
+	public function HasSameContents($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();
+		$oObjectSet->Rewind();
+		while ($oObject = $oObjectSet->Fetch())
+		{
+			$iObjectKey = $oObject->GetKey();
+			if ($iObjectKey < 0)
+			{
+				return false;
+			}
+			if (!array_key_exists($iObjectKey, $this->m_aId2Row[$sClassAlias]))
+			{
+				return false;
+			}
+			$iRow = $this->m_aId2Row[$sClassAlias][$iObjectKey];
+			$oSibling = $this->m_aData[$iRow][$sClassAlias];
+			if (!$oObject->Equals($oSibling))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
 	public function CreateDelta($oObjectSet)
 	{
 		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
@@ -437,6 +599,156 @@ class DBObjectSet
 		}
 		return $aRelatedObjs;
 	}
+	
+	/**
+	 * Builds an object that contains the values that are common to all the objects
+	 * 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
+	 */
+	public function ComputeCommonObject(&$aValues)
+	{
+		$sClass = $this->GetClass();
+		$aList = MetaModel::ListAttributeDefs($sClass);
+		$aValues = array();
+		foreach($aList as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef->IsScalar())
+			{
+				$aValues[$sAttCode] = array();
+			}
+		}
+		$this->Rewind();
+		while($oObj = $this->Fetch())
+		{
+			foreach($aList as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
+				{
+					$currValue = $oObj->Get($sAttCode);
+					if (is_object($currValue)) continue; // Skip non scalar values...
+					if(!array_key_exists($currValue, $aValues[$sAttCode]))
+					{
+						$aValues[$sAttCode][$currValue] = array('count' => 1, 'display' => $oObj->GetAsHTML($sAttCode)); 
+					}
+					else
+					{
+						$aValues[$sAttCode][$currValue]['count']++; 
+					}
+				}
+			}
+		}
+		
+		foreach($aValues as $sAttCode => $aMultiValues)
+		{
+			if (count($aMultiValues) > 1)
+			{
+				uasort($aValues[$sAttCode], 'HashCountComparison');
+			}
+		}
+						
+		
+		// Now create an object that has values for the homogenous values only				
+		$oCommonObj = new $sClass(); // @@ What if the class is abstract ?
+		$aComments = array();
+
+		$iFormId = cmdbAbstractObject::GetNextFormId(); // Identifier that prefixes all the form fields
+		$sReadyScript = '';
+		$aDependsOn = array();
+		$sFormPrefix = '2_';
+		foreach($aList as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
+			{
+				if ($oAttDef->GetEditClass() == 'One Way Password')
+				{
+					$oCommonObj->Set($sAttCode, null);
+				}
+				else
+				{
+					$iCount = count($aValues[$sAttCode]);
+					if ($iCount == 1)
+					{
+						// Homogenous value
+						reset($aValues[$sAttCode]);
+						$aKeys = array_keys($aValues[$sAttCode]);
+						$currValue = $aKeys[0]; // The only value is the first key
+						$oCommonObj->Set($sAttCode, $currValue);
+					}
+					else
+					{
+						// Non-homogenous value
+						$oCommonObj->Set($sAttCode, null);
+					}
+				}
+			}
+		}
+		$this->Rewind();
+		return $oCommonObj;
+	}
+
+	/**
+	 * List the constant fields (and their value) in the given query
+	 * @return Hash [Alias][AttCode] => value
+	 */
+	public function ListConstantFields()
+	{
+		$aScalarArgs = $this->ExpandArgs();
+		$aConst = $this->m_oFilter->ListConstantFields();
+				
+		foreach($aConst as $sClassAlias => $aVals)
+		{
+			foreach($aVals as $sCode => $oExpr)
+			{
+				if ($oExpr instanceof ScalarExpression)
+				{
+					$aConst[$sClassAlias][$sCode] = $oExpr->GetValue();
+				}
+				else //Variable
+				{
+					$aConst[$sClassAlias][$sCode] = $aScalarArgs[$oExpr->GetName()];
+				}
+			}
+		}
+		return $aConst;		
+	}
+	
+	protected function ExpandArgs()
+	{
+		$aScalarArgs = $this->m_oFilter->GetInternalParams();
+		foreach($this->m_aArgs as $sArgName => $value)
+		{
+			if (MetaModel::IsValidObject($value))
+			{
+				$aScalarArgs = array_merge($aScalarArgs, $value->ToArgs($sArgName));
+			}
+			else
+			{
+				$aScalarArgs[$sArgName] = (string) $value;
+			}
+		}
+		$aScalarArgs['current_contact_id'] = UserRights::GetContactId();
+		return $aScalarArgs;		
+	}
+	
+	public function ApplyParameters()
+	{
+		$aScalarArgs = $this->ExpandArgs();
+		$this->m_oFilter->ApplyParameters($aScalarArgs);
+	}
+}
+
+/**
+ * Helper function to perform a custom sort of a hash array
+ */
+function HashCountComparison($a, $b) // Sort descending on 'count'
+{
+    if ($a['count'] == $b['count'])
+    {
+        return 0;
+    }
+    return ($a['count'] > $b['count']) ? -1 : 1;
 }
 
 ?>

core/deletionplan.class.inc.php

@@ -0,0 +1,288 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Class dbObject: the root of persistent classes
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+class DeleteException extends CoreException
+{
+}
+
+/**
+ * Deletion plan (other objects to be deleted/modified, eventual issues, etc.) 
+ *
+ * @package     iTopORM
+ */
+class DeletionPlan
+{
+	//protected $m_aIssues;
+
+	protected $m_bFoundStopper;
+	protected $m_bFoundSecurityIssue;
+	protected $m_bFoundManualDelete;
+	protected $m_bFoundManualOperation;
+
+	protected $m_iToDelete;
+	protected $m_iToUpdate;
+
+  	protected $m_aToDelete;
+  	protected $m_aToUpdate;
+
+	protected static $m_aModeUpdate = array(
+		DEL_SILENT => array(
+			DEL_SILENT => DEL_SILENT,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_MANUAL
+		),
+		DEL_MANUAL => array(
+			DEL_SILENT => DEL_MANUAL,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_MANUAL
+		),
+		DEL_AUTO => array(
+			DEL_SILENT => DEL_AUTO,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_AUTO
+		)
+	);
+
+	public function __construct()
+	{
+		$this->m_iToDelete = 0;
+		$this->m_iToUpdate = 0;
+
+		$this->m_aToDelete = array();
+		$this->m_aToUpdate = array();
+
+		$this->m_bFoundStopper = false;
+		$this->m_bFoundSecurityIssue = false;
+		$this->m_bFoundManualDelete = false;
+		$this->m_bFoundManualOperation = false;
+	}
+
+	public function ComputeResults()
+	{
+		foreach($this->m_aToDelete as $sClass => $aToDelete)
+		{
+			foreach($aToDelete as $iId => $aData)
+			{
+				$this->m_iToDelete++;
+				if (isset($aData['issue']))
+				{
+					$this->m_bFoundStopper = true;
+					$this->m_bFoundManualOperation = true;
+					if (isset($aData['issue_security']))
+					{
+						$this->m_bFoundSecurityIssue = true;
+					}
+				}
+				if ($aData['mode'] == DEL_MANUAL)
+				{
+					$this->m_bFoundStopper = true;
+					$this->m_bFoundManualDelete = true;
+				}
+			}
+		}
+
+		foreach($this->m_aToUpdate as $sClass => $aToUpdate)
+		{
+			foreach($aToUpdate as $iId => $aData)
+			{
+				$this->m_iToUpdate++;
+
+				$oObject = $aData['to_reset'];
+				$aExtKeyLabels = array();
+				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+				{
+					$oObject->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+					$aExtKeyLabels[] = $aRemoteAttDef->GetLabel();
+				}
+				$this->m_aToUpdate[$sClass][$iId]['attributes_list'] = implode(', ', $aExtKeyLabels); 
+
+				list($bRes, $aIssues, $bSecurityIssues) = $oObject->CheckToWrite();
+				if (!$bRes)
+				{
+					$this->m_aToUpdate[$sClass][$iId]['issue'] = implode(', ', $aIssues);
+					$this->m_bFoundStopper = true;
+
+					if ($bSecurityIssues)
+					{
+						$this->m_aToUpdate[$sClass][$iId]['issue_security'] = true;
+						$this->m_bFoundSecurityIssue = true;
+					}
+				}
+
+			}
+		}
+	}
+
+	public function GetIssues()
+	{
+		$aIssues = array();
+		foreach ($this->m_aToDelete as $sClass => $aToDelete)
+		{
+			foreach ($aToDelete as $iId => $aData)
+			{
+				if (isset($aData['issue']))
+				{
+					$aIssues[] = $aData['issue'];
+				}
+			}
+		}
+		foreach ($this->m_aToUpdate as $sClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $iId => $aData)
+			{
+				if (isset($aData['issue']))
+				{
+					$aIssues[] = $aData['issue'];
+				}
+			}
+		}
+		return $aIssues;
+	}
+
+	public function ListDeletes()
+	{
+		return $this->m_aToDelete;
+	}
+
+	public function ListUpdates()
+	{
+		return $this->m_aToUpdate;
+	}
+
+	public function GetTargetCount()
+	{
+		return $this->m_iToDelete + $this->m_iToUpdate;
+	}
+
+	public function FoundStopper()
+	{
+		return $this->m_bFoundStopper;
+	}
+
+	public function FoundSecurityIssue()
+	{
+		return $this->m_bFoundSecurityIssue;
+	}
+
+	public function FoundManualOperation()
+	{
+		return $this->m_bFoundManualOperation;
+	}
+
+	public function FoundManualDelete()
+	{
+		return $this->m_bFoundManualDelete;
+	}
+
+	public function FoundManualUpdate()
+	{
+	}
+
+	public function AddToDelete($oObject, $iDeletionMode = null)
+	{
+		if (is_null($iDeletionMode))
+		{
+			$bRequestedExplicitely = true;
+			$iDeletionMode = DEL_AUTO;
+		}
+		else
+		{
+			$bRequestedExplicitely = false;
+		}
+
+		$sClass = get_class($oObject);
+		$iId = $oObject->GetKey();
+
+		if (isset($this->m_aToUpdate[$sClass][$iId]))
+		{
+			unset($this->m_aToUpdate[$sClass][$iId]);
+		}
+
+		if (isset($this->m_aToDelete[$sClass][$iId]))
+		{
+			if ($this->m_aToDelete[$sClass][$iId]['requested_explicitely'])
+			{
+				// No change: let it in mode DEL_AUTO
+			}
+			else
+			{
+				$iPrevDeletionMode = $this->m_aToDelete[$sClass][$iId]['mode'];
+				$iNewDeletionMode = self::$m_aModeUpdate[$iPrevDeletionMode][$iDeletionMode];
+				$this->m_aToDelete[$sClass][$iId]['mode'] = $iNewDeletionMode;
+	
+				if ($bRequestedExplicitely)
+				{
+					// This object was in the root list
+					$this->m_aToDelete[$sClass][$iId]['requested_explicitely'] = true;
+					$this->m_aToDelete[$sClass][$iId]['mode'] = DEL_AUTO;
+				}
+			}
+		}
+		else
+		{
+			$this->m_aToDelete[$sClass][$iId] = array(
+				'to_delete' => $oObject,
+				'mode' => $iDeletionMode,
+				'requested_explicitely' => $bRequestedExplicitely,
+			);
+		}
+	}
+
+	public function SetDeletionIssues($oObject, $aIssues, $bSecurityIssue)
+	{
+		if (count($aIssues) > 0)
+		{
+			$sClass = get_class($oObject);
+			$iId = $oObject->GetKey();
+			$this->m_aToDelete[$sClass][$iId]['issue'] = implode(', ', $aIssues);
+			if ($bSecurityIssue)
+			{
+				$this->m_aToDelete[$sClass][$iId]['issue_security'] = true;
+			}
+		}
+	}
+
+	public function AddToUpdate($oObject, $oAttDef, $value = 0)
+	{
+		$sClass = get_class($oObject);
+		$iId = $oObject->GetKey();
+		if (isset($this->m_aToDelete[$sClass][$iId]))
+		{
+			// skip... it should be deleted anyhow !
+		}
+		else
+		{
+			if (!isset($this->m_aToUpdate[$sClass][$iId]))
+			{
+				$this->m_aToUpdate[$sClass][$iId] = array(
+					'to_reset' => $oObject,
+				);
+			}
+			$this->m_aToUpdate[$sClass][$iId]['attributes'][$oAttDef->GetCode()] = $oAttDef;
+			$this->m_aToUpdate[$sClass][$iId]['values'][$oAttDef->GetCode()] = $value;
+		}
+	}
+}
+?>

core/dict.class.inc.php

@@ -1,235 +1,318 @@
-<?php
-// Copyright (C) 2010 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
-
-/**
- * Class Dict
- * Management of localizable strings 
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-class DictException extends CoreException
-{
-}
-
-class DictExceptionUnknownLanguage extends DictException
-{
-	public function __construct($sLanguageCode)
-	{
-		$aContext = array();
-		$aContext['language_code'] = $sLanguageCode;
-		parent::__construct('Unknown localization language', $aContext);
-	}
-}
-
-class DictExceptionMissingString extends DictException
-{
-	public function __construct($sLanguageCode, $sStringCode)
-	{
-		$aContext = array();
-		$aContext['language_code'] = $sLanguageCode;
-		$aContext['string_code'] = $sStringCode;
-		parent::__construct('Missing localized string', $aContext);
-	}
-}
-
-
-define('DICT_ERR_STRING', 1); // when a string is missing, return the identifier
-define('DICT_ERR_EXCEPTION', 2); // when a string is missing, throw an exception
-//define('DICT_ERR_LOG', 3); // when a string is missing, log an error
-
-
-class Dict
-{
-	protected static $m_iErrorMode = DICT_ERR_STRING;
-	protected static $m_sDefaultLanguage = 'EN US';
-	protected static $m_sCurrentLanguage = null; // No language selected by default
-
-	protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...)
-	protected static $m_aData = array();
-
-
-	public static function SetDefaultLanguage($sLanguageCode)
-	{
-		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
-		{
-			throw new DictExceptionUnknownLanguage($sLanguageCode);
-		}
-		self::$m_sDefaultLanguage = $sLanguageCode;
-	}
-
-	public static function SetUserLanguage($sLanguageCode)
-	{
-		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
-		{
-			throw new DictExceptionUnknownLanguage($sLanguageCode);
-		}
-		self::$m_sCurrentLanguage = $sLanguageCode;
-	}
-
-
-	public static function GetCurrentLanguage()
-	{
-		if (self::$m_sCurrentLanguage == null) // May happen when no user is logged in (i.e login screen, non authentifed page)
-		{
-			// In which case let's use the default language
-			return self::$m_sDefaultLanguage;
-		}
-		return self::$m_sCurrentLanguage;
-	}
-
-	//returns a hash array( code => array( 'description' => '...', 'localized_description' => '...') ...)
-	public static function GetLanguages()
-	{
-		return self::$m_aLanguages;
-	}
-
-	// iErrorMode from {DICT_ERR_STRING, DICT_ERR_EXCEPTION}
-	public static function SetErrorMode($iErrorMode)
-	{
-		self::$m_iErrorMode = $iErrorMode;
-	}
-
-
-	public static function S($sStringCode, $sDefault = null)
-	{
-		// Attempt to find the string in the user language
-		//
-		if (!array_key_exists(self::GetCurrentLanguage(), self::$m_aData))
-		{
-			// It may happen, when something happens before the dictionnaries get loaded
-			return $sStringCode;
-		}
-		$aCurrentDictionary = self::$m_aData[self::GetCurrentLanguage()];
-		if (array_key_exists($sStringCode, $aCurrentDictionary))
-		{
-			return $aCurrentDictionary[$sStringCode];
-		}
-		// Attempt to find the string in the default language
-		//
-		$aDefaultDictionary = self::$m_aData[self::$m_sDefaultLanguage];
-		if (array_key_exists($sStringCode, $aDefaultDictionary))
-		{
-			return $aDefaultDictionary[$sStringCode];
-		}
-		// Attempt to find the string in english
-		//
-		$aDefaultDictionary = self::$m_aData['EN US'];
-		if (array_key_exists($sStringCode, $aDefaultDictionary))
-		{
-			return $aDefaultDictionary[$sStringCode];
-		}
-		// Could not find the string...
-		//
-		switch (self::$m_iErrorMode)
-		{
-			case DICT_ERR_STRING:
-				if (is_null($sDefault))
-				{
-					return $sStringCode;
-				}
-				else
-				{
-					return $sDefault;
-				}
-				break;
-
-			case DICT_ERR_EXCEPTION:
-			default:
-				throw new DictExceptionMissingString(self::$m_sCurrentLanguage, $sStringCode);
-				break;
-		}
-		return 'bug!';
-	}
-
-
-	public static function Format($sFormatCode /*, ... arguments ....*/)
-	{
-		$sLocalizedFormat = self::S($sFormatCode);
-		$aArguments = func_get_args();
-		
-		if ($sLocalizedFormat == $sFormatCode)
-		{
-			// Make sure the information will be displayed (ex: an error occuring before the dictionary gets loaded)
-			return $sFormatCode.' - '.implode(', ', $aArguments);
-		}
-
-		array_shift($aArguments);
-		return vsprintf($sLocalizedFormat, $aArguments);
-	}
-
-
-	// sLanguageCode: Code identifying the language i.e. FR-FR
-	// sEnglishLanguageDesc: Description of the language code, in English. i.e. French (France)
-	// sLocalizedLanguageDesc: Description of the language code, in its own language. i.e. Français (France)
-	// aEntries: Hash array of dictionnary entries
-	public static function Add($sLanguageCode, $sEnglishLanguageDesc, $sLocalizedLanguageDesc, $aEntries)
-	{
-		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
-		{
-			self::$m_aLanguages[$sLanguageCode] = array('description' => $sEnglishLanguageDesc, 'localized_description' => $sLocalizedLanguageDesc);
-			self::$m_aData[$sLanguageCode] = array();
-		}
-		self::$m_aData[$sLanguageCode] = array_merge(self::$m_aData[$sLanguageCode], $aEntries);
-	}
-
-	public static function MakeStats($sLanguageCode, $sLanguageRef = 'EN US')
-	{
-		$aMissing = array(); // Strings missing for the target language
-		$aUnexpected = array(); // Strings defined for the target language, but not found in the reference dictionary
-		$aNotTranslated = array(); // Strings having the same value in both dictionaries
-		$aOK = array(); // Strings having different values in both dictionaries
-
-		foreach (self::$m_aData[$sLanguageRef] as $sStringCode => $sValue)
-		{
-			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageCode]))
-			{
-				$aMissing[$sStringCode] = $sValue;
-			}
-		}
-
-		foreach (self::$m_aData[$sLanguageCode] as $sStringCode => $sValue)
-		{
-			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageRef]))
-			{
-				$aUnexpected[$sStringCode] = $sValue;
-			}
-			else
-			{
-				// The value exists in the reference
-				$sRefValue = self::$m_aData[$sLanguageRef][$sStringCode];
-				if ($sValue == $sRefValue)
-				{
-					$aNotTranslated[$sStringCode] = $sValue;
-				}
-				else
-				{
-					$aOK[$sStringCode] = $sValue;
-				}
-			}
-		}
-		return array($aMissing, $aUnexpected, $aNotTranslated, $aOK);
-	}
-	
-	public static function Dump()
-	{
-		MyHelpers::var_dump_html(self::$m_aData);
-	}
-}
-?>
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Class Dict
+ * Management of localizable strings 
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+class DictException extends CoreException
+{
+}
+
+class DictExceptionUnknownLanguage extends DictException
+{
+	public function __construct($sLanguageCode)
+	{
+		$aContext = array();
+		$aContext['language_code'] = $sLanguageCode;
+		parent::__construct('Unknown localization language', $aContext);
+	}
+}
+
+class DictExceptionMissingString extends DictException
+{
+	public function __construct($sLanguageCode, $sStringCode)
+	{
+		$aContext = array();
+		$aContext['language_code'] = $sLanguageCode;
+		$aContext['string_code'] = $sStringCode;
+		parent::__construct('Missing localized string', $aContext);
+	}
+}
+
+
+define('DICT_ERR_STRING', 1); // when a string is missing, return the identifier
+define('DICT_ERR_EXCEPTION', 2); // when a string is missing, throw an exception
+//define('DICT_ERR_LOG', 3); // when a string is missing, log an error
+
+
+class Dict
+{
+	protected static $m_bTraceFiles = false;
+	protected static $m_aEntryFiles = array();
+
+	protected static $m_iErrorMode = DICT_ERR_STRING;
+	protected static $m_sDefaultLanguage = 'EN US';
+	protected static $m_sCurrentLanguage = null; // No language selected by default
+
+	protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...)
+	protected static $m_aData = array();
+
+
+	public static function EnableTraceFiles()
+	{
+		self::$m_bTraceFiles = true;
+	}
+
+	public static function GetEntryFiles()
+	{
+		return self::$m_aEntryFiles;
+	}
+
+	public static function SetDefaultLanguage($sLanguageCode)
+	{
+		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
+		{
+			throw new DictExceptionUnknownLanguage($sLanguageCode);
+		}
+		self::$m_sDefaultLanguage = $sLanguageCode;
+	}
+
+	public static function SetUserLanguage($sLanguageCode)
+	{
+		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
+		{
+			throw new DictExceptionUnknownLanguage($sLanguageCode);
+		}
+		self::$m_sCurrentLanguage = $sLanguageCode;
+	}
+
+
+	public static function GetUserLanguage()
+	{
+		if (self::$m_sCurrentLanguage == null) // May happen when no user is logged in (i.e login screen, non authentifed page)
+		{
+			// In which case let's use the default language
+			return self::$m_sDefaultLanguage;
+		}
+		return self::$m_sCurrentLanguage;
+	}
+
+	//returns a hash array( code => array( 'description' => '...', 'localized_description' => '...') ...)
+	public static function GetLanguages()
+	{
+		return self::$m_aLanguages;
+	}
+
+	// iErrorMode from {DICT_ERR_STRING, DICT_ERR_EXCEPTION}
+	public static function SetErrorMode($iErrorMode)
+	{
+		self::$m_iErrorMode = $iErrorMode;
+	}
+
+
+	public static function S($sStringCode, $sDefault = null)
+	{
+		// Attempt to find the string in the user language
+		//
+		if (!array_key_exists(self::GetUserLanguage(), self::$m_aData))
+		{
+			// It may happen, when something happens before the dictionnaries get loaded
+			return $sStringCode;
+		}
+		$aCurrentDictionary = self::$m_aData[self::GetUserLanguage()];
+		if (array_key_exists($sStringCode, $aCurrentDictionary))
+		{
+			return $aCurrentDictionary[$sStringCode];
+		}
+		// Attempt to find the string in the default language
+		//
+		$aDefaultDictionary = self::$m_aData[self::$m_sDefaultLanguage];
+		if (array_key_exists($sStringCode, $aDefaultDictionary))
+		{
+			return $aDefaultDictionary[$sStringCode];
+		}
+		// Attempt to find the string in english
+		//
+		$aDefaultDictionary = self::$m_aData['EN US'];
+		if (array_key_exists($sStringCode, $aDefaultDictionary))
+		{
+			return $aDefaultDictionary[$sStringCode];
+		}
+		// Could not find the string...
+		//
+		switch (self::$m_iErrorMode)
+		{
+			case DICT_ERR_STRING:
+				if (is_null($sDefault))
+				{
+					return $sStringCode;
+				}
+				else
+				{
+					return $sDefault;
+				}
+				break;
+
+			case DICT_ERR_EXCEPTION:
+			default:
+				throw new DictExceptionMissingString(self::$m_sCurrentLanguage, $sStringCode);
+				break;
+		}
+		return 'bug!';
+	}
+
+
+	public static function Format($sFormatCode /*, ... arguments ....*/)
+	{
+		$sLocalizedFormat = self::S($sFormatCode);
+		$aArguments = func_get_args();
+		array_shift($aArguments);
+		
+		if ($sLocalizedFormat == $sFormatCode)
+		{
+			// Make sure the information will be displayed (ex: an error occuring before the dictionary gets loaded)
+			return $sFormatCode.' - '.implode(', ', $aArguments);
+		}
+
+		return vsprintf($sLocalizedFormat, $aArguments);
+	}
+
+
+	// sLanguageCode: Code identifying the language i.e. FR-FR
+	// sEnglishLanguageDesc: Description of the language code, in English. i.e. French (France)
+	// sLocalizedLanguageDesc: Description of the language code, in its own language. i.e. Français (France)
+	// aEntries: Hash array of dictionnary entries
+	// ~~ or ~* can be used to indicate entries still to be translated. 
+	public static function Add($sLanguageCode, $sEnglishLanguageDesc, $sLocalizedLanguageDesc, $aEntries)
+	{
+		if (self::$m_bTraceFiles)
+		{
+			$aBacktrace = debug_backtrace();
+			$sFile = $aBacktrace[0]["file"];
+
+			foreach($aEntries as $sKey => $sValue)
+			{
+				self::$m_aEntryFiles[$sLanguageCode][$sKey] = array(
+					'file' => $sFile,
+					'value' => $sValue
+				);
+			}
+		}
+
+		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
+		{
+			self::$m_aLanguages[$sLanguageCode] = array('description' => $sEnglishLanguageDesc, 'localized_description' => $sLocalizedLanguageDesc);
+			self::$m_aData[$sLanguageCode] = array();
+		}
+		foreach($aEntries as $sCode => $sValue)
+		{
+			self::$m_aData[$sLanguageCode][$sCode] = self::FilterString($sValue);
+		}
+	}
+
+	public static function MakeStats($sLanguageCode, $sLanguageRef = 'EN US')
+	{
+		$aMissing = array(); // Strings missing for the target language
+		$aUnexpected = array(); // Strings defined for the target language, but not found in the reference dictionary
+		$aNotTranslated = array(); // Strings having the same value in both dictionaries
+		$aOK = array(); // Strings having different values in both dictionaries
+
+		foreach (self::$m_aData[$sLanguageRef] as $sStringCode => $sValue)
+		{
+			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageCode]))
+			{
+				$aMissing[$sStringCode] = $sValue;
+			}
+		}
+
+		foreach (self::$m_aData[$sLanguageCode] as $sStringCode => $sValue)
+		{
+			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageRef]))
+			{
+				$aUnexpected[$sStringCode] = $sValue;
+			}
+			else
+			{
+				// The value exists in the reference
+				$sRefValue = self::$m_aData[$sLanguageRef][$sStringCode];
+				if ($sValue == $sRefValue)
+				{
+					$aNotTranslated[$sStringCode] = $sValue;
+				}
+				else
+				{
+					$aOK[$sStringCode] = $sValue;
+				}
+			}
+		}
+		return array($aMissing, $aUnexpected, $aNotTranslated, $aOK);
+	}
+	
+	public static function Dump()
+	{
+		MyHelpers::var_dump_html(self::$m_aData);
+	}
+	
+	public static function InCache($sApplicationPrefix)
+	{
+		if (function_exists('apc_fetch'))
+		{
+			$bResult = false;
+			// Note: For versions of APC older than 3.0.17, fetch() accepts only one parameter
+			//
+			self::$m_aData = apc_fetch($sApplicationPrefix.'-dict');
+			if (is_bool(self::$m_aData) && (self::$m_aData === false))
+			{
+				self::$m_aData = array();
+			}
+			else
+			{
+				self::$m_aLanguages = apc_fetch($sApplicationPrefix.'-languages');
+				if (is_bool(self::$m_aLanguages) && (self::$m_aLanguages === false))
+				{
+					self::$m_aLanguages = array();
+				}
+				else
+				{
+					$bResult = true;
+				}
+			}
+			return $bResult;
+		}
+		return false;
+	}
+	
+	public static function InitCache($sApplicationPrefix)
+	{
+		if (function_exists('apc_store'))
+		{
+			apc_store($sApplicationPrefix.'-languages', self::$m_aLanguages);
+			apc_store($sApplicationPrefix.'-dict', self::$m_aData);
+		}
+	}
+
+	public static function ResetCache($sApplicationPrefix)
+	{
+		if (function_exists('apc_delete'))
+		{
+			apc_delete($sApplicationPrefix.'-languages');
+			apc_delete($sApplicationPrefix.'-dict');
+		}
+	}
+	
+	protected static function FilterString($s)
+	{
+		return str_replace(array('~~', '~*'), '', $s);
+	}
+}
+?>

core/email.class.inc.php

@@ -24,22 +24,28 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
+define ('EMAIL_SEND_OK', 0);
+define ('EMAIL_SEND_PENDING', 1);
+define ('EMAIL_SEND_ERROR', 2);
+
+
 class EMail
 {
 	protected $m_sBody;
 	protected $m_sSubject;
 	protected $m_sTo;
 	protected $m_aHeaders; // array of key=>value
+	protected $m_aAttachments;
 
-	public function __construct()
+	public function __construct($sTo = '', $sSubject = '', $sBody = '', $aHeaders = array())
 	{
-		$this->m_sTo = '';
-		$this->m_sSubject = '';
-		$this->m_sBody = '';
-		$this->m_aHeaders = array();
+		$this->m_sTo = $sTo;
+		$this->m_sSubject = $sSubject;
+		$this->m_sBody = $sBody;
+		$this->m_aHeaders = $aHeaders;
+		$this->m_aAttachments = array();
 	}
 
-
 	// Errors management : not that simple because we need that function to be
 	// executed in the background, while making sure that any issue would be reported clearly
 	protected $m_aMailErrors; //array of strings explaining the issues
@@ -50,14 +56,33 @@ class EMail
 		$this->m_aMailErrors[] = $sCleanMessage;
 	}
 
+  	protected function SendAsynchronous(&$aIssues, $oLog = null)
+	{
+		try
+		{
+			AsyncSendEmail::AddToQueue($this->m_sTo, $this->m_sSubject, $this->m_sBody, $this->m_aHeaders, $oLog);
+		}
+		catch(Exception $e)
+		{
+			$aIssues = array($e->GetMessage());
+			return EMAIL_SEND_ERROR;
+		}
+		$aIssues = array();
+		return EMAIL_SEND_PENDING;
+	}
 
-	// returns a list of issues if any
-	public function Send()
+	protected function SendSynchronous(&$aIssues, $oLog = null)
 	{
 		$sHeaders  = 'MIME-Version: 1.0' . "\r\n";
 		// ! the case is important for MS-Outlook
-		$sHeaders .= 'Content-Type: text/html; charset=UTF-8' . "\r\n";
-		$sHeaders .= 'Content-Transfer-Encoding: 8bit' . "\r\n";
+		if (!array_key_exists('Content-Type', $this->m_aHeaders))
+		{
+			$sHeaders .= 'Content-Type: text/html; charset=UTF-8' . "\r\n";
+		}
+		if (!array_key_exists('Content-Transfer-Encoding', $this->m_aHeaders))
+		{
+			$sHeaders .= 'Content-Transfer-Encoding: 8bit' . "\r\n";
+		}
 		foreach ($this->m_aHeaders as $sKey => $sValue)
 		{
 			$sHeaders .= "$sKey: $sValue\r\n";
@@ -69,8 +94,8 @@ class EMail
 		set_error_handler(array($this, 'mail_error_handler'));
 		$bRes = mail
 		(
-			$this->m_sTo,
-			$this->m_sSubject,
+			str_replace(array("\n", "\r"), ' ', $this->m_sTo), // Prevent header injection
+			$this->EncodeHeaderField($this->m_sSubject), // Prevent header injection & MIME Encode charsets
 			$this->m_sBody,
 			$sHeaders
 		);
@@ -79,7 +104,37 @@ class EMail
 		{
 			$this->m_aMailErrors[] = 'Unknown reason';
 		}
-		return $this->m_aMailErrors;
+		if (count($this->m_aMailErrors) > 0)
+		{
+			$aIssues = $this->m_aMailErrors;
+			return EMAIL_SEND_ERROR;
+		}
+		else
+		{
+			$aIssues = array();
+			return EMAIL_SEND_OK;
+		}
+	}
+
+	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
+	{	
+		$this->BuildMessage(); // assemble the attachments into the header/body structure
+		if ($bForceSynchronous)
+		{
+			return $this->SendSynchronous($aIssues, $oLog);
+		}
+		else
+		{
+			$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
+			if ($bConfigASYNC)
+			{
+				return $this->SendAsynchronous($aIssues, $oLog);
+			}
+			else
+			{
+				return $this->SendSynchronous($aIssues, $oLog);
+			}
+		}
 	}
 
 	protected function AddToHeader($sKey, $sValue)
@@ -89,6 +144,11 @@ class EMail
 			$this->m_aHeaders[$sKey] = $sValue;
 		}
 	}
+
+	public function SetMessageId($sId)
+	{
+		$this->AddToHeader('Message-ID', $sId);
+	}
 	
 	public function SetReferences($sReferences)
 	{
@@ -135,6 +195,48 @@ class EMail
 		$this->AddToHeader('Reply-To', $sAddress);
 	}
 
+	public function AddAttachment($data, $sFileName, $sMimeType)
+	{
+		$this->m_aAttachments[] = array('data' => $data, 'filename' => $sFileName, 'mimeType' => $sMimeType);
+	}
+	
+	/**
+	 * Takes care of the attachments (if any) to build the header/body of the message before storing or sending it
+	 */
+	protected function BuildMessage()
+	{
+		if (count($this->m_aAttachments) == 0) return; // Nothing to do if there are no attachments
+
+		$sDelimiter = '== iTopEmailPart---'.md5(date('r', time()))." ==";
+ 		$sContentType = isset($this->m_aHeaders['Content-Type']) ? $this->m_aHeaders['Content-Type'] : 'text/html; charset="UTF-8"';
+ 		$sContentHeader = "Content-Type: $sContentType\r\n";
+ 		$this->m_aHeaders['Content-Type'] = "multipart/mixed; boundary=\"{$sDelimiter}\"";
+
+		$aAttachments = array();
+ 		foreach($this->m_aAttachments as $aAttach)
+ 		{
+	 		$sAttachmentHeader = "Content-Type: {$aAttach['mimeType']};\r\n Name=\"{$aAttach['filename']}\"\r\n";
+	  		$sAttachmentHeader .= "Content-Transfer-Encoding: base64\r\nContent-Disposition: attachment;\r\n filename=\"{$aAttach['filename']}\"\r\n";
+	  		$sAttachmentHeader .= "\r\n";
+			$sAttachment = chunk_split(base64_encode($aAttach['data']));
+			$aAttachments[] = $sAttachmentHeader.$sAttachment."\r\n";
+ 		}
+	  	$this->m_sBody = "This is a multi-part message in MIME format.\r\n--".$sDelimiter."\r\n".$sContentHeader."\r\n".$this->m_sBody."\r\n--".$sDelimiter."\r\n";
+	  	$this->m_sBody .= implode("--".$sDelimiter."\r\n", $aAttachments);
+	  	$this->m_sBody .= "--".$sDelimiter."--";
+	}
+	
+	/**
+	 * MIME encode the content of a header field according to RFC2047
+	 * @param string $sFieldContent the content of the header to encode
+	 * @return string The encoded string
+	 */
+	protected function EncodeHeaderField($sFieldContent)
+	{
+		$sTemp = str_replace(array("\n", "\r"), ' ', $sFieldContent);
+		$sTemp = iconv_mime_encode('Tagada', $sTemp, array('scheme' => 'Q', 'input-charset' => 'UTF-8', 'output-charset' => 'UTF-8'));
+		return preg_replace('/^Tagada: /', '', $sTemp);
+	}
 }
 
 ?>

core/event.class.inc.php

@@ -25,7 +25,7 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
-class Event extends cmdbAbstractObject
+class Event extends DBObject implements iDisplay
 {
 	public static function Init()
 	{
@@ -46,14 +46,77 @@ class Event extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 		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 AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('message', 'date', 'userinfo')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'finalclass', 'message')); // 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
 	}
+
+	/**
+	 * 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)
+	{
+		if ($sContextParam == 'menu')
+		{
+			return null;
+		}
+		else
+		{
+			return $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()
+	{
+		// Possible return values are:
+		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
+		return HILIGHT_CLASS_NONE; // Not hilighted by default
+	}
+
+	public static function GetUIPage()
+	{
+		return 'UI.php';
+	}
+
+	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+		// Object's details
+		//$this->DisplayBareHeader($oPage, $bEditMode);
+		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$this->DisplayBareProperties($oPage, $bEditMode);
+	}
+	
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		if ($bEditMode) return; // Not editable
+		
+		$aDetails = array();
+		$sClass = get_class($this);
+		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
+		foreach( $aZList as $sAttCode)
+		{
+			$sDisplayValue = $this->GetAsHTML($sAttCode);	
+			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
+		}
+		$oPage->Details($aDetails);
+	}
 }
 
 class EventNotification extends Event
@@ -79,8 +142,8 @@ class EventNotification extends Event
 		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'message')); // 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
@@ -115,7 +178,7 @@ class EventNotificationEmail extends EventNotification
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'message', 'to', 'subject')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject')); // Attributes to be displayed for a list
 
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -258,4 +321,35 @@ class EventWebService extends Event
 	}
 }
 
+class EventLoginUsage extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_loginusage",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		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 AttributeExternalField("contact_name", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"contactid", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contact_email", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'user_id', 'contact_name', 'contact_email', 'userinfo', 'message')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'user_id', 'contact_name', 'contact_email', 'userinfo')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('date', 'user_id', 'contact_name', 'contact_email')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
 ?>

core/expression.class.inc.php

@@ -30,16 +30,22 @@ class MissingQueryArgument extends CoreException
 abstract class Expression
 {
 	// recursive translation of identifiers
-	abstract public function Translate($aTranslationData, $bMatchAll = true);
+	abstract public function GetUnresolvedFields($sAlias, &$aUnresolved);
+	abstract public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);
 
 	// recursive rendering (aArgs used as input by default, or used as output if bRetrofitParams set to True
 	abstract public function Render(&$aArgs = null, $bRetrofitParams = false);
 
+	abstract public function ApplyParameters($aArgs);
+	
 	// recursively builds an array of class => fieldname
 	abstract public function ListRequiredFields();
 
 	abstract public function IsTrue();
-
+	
+	// recursively builds an array of [classAlias][fieldName] => value
+	abstract public function ListConstantFields();
+	
 	public function RequiresField($sClass, $sFieldName)
 	{
 		// #@# todo - optimize : this is called quite often when building a single query !
@@ -66,6 +72,12 @@ abstract class Expression
 		return $oExpression;
 	}
 
+	static public function FromSQL($sSQL)
+	{
+		$oSql = new SQLExpression($sSQL);
+		return $oSql;
+	}
+
 	public function LogAnd($oExpr)
 	{
 		if ($this->IsTrue()) return clone $oExpr;
@@ -77,8 +89,60 @@ abstract class Expression
 	{
 		return new BinaryExpression($this, 'OR', $oExpr);
 	}
+	
+	abstract public function RenameParam($sOldName, $sNewName);
 }
 
+class SQLExpression extends Expression
+{
+	protected $m_sSQL;
+
+	public function __construct($sSQL)
+	{
+		$this->m_sSQL  = $sSQL;
+	}
+
+	public function IsTrue()
+	{
+		return false;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return $this->m_sSQL;
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+	}
+	
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return clone $this;
+	}
+
+	public function ListRequiredFields()
+	{
+		return array();
+	}
+	
+	public function ListConstantFields()
+	{
+		return array();
+	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		// Do nothing, since there is nothing to rename
+	}
+}
+
+
 
 class BinaryExpression extends Expression
 {
@@ -114,11 +178,11 @@ class BinaryExpression extends Expression
 		// return true if we are certain that it will be true
 		if ($this->m_sOperator == 'AND')
 		{
-			if ($this->m_oLeftExpr->IsTrue() && $this->m_oLeftExpr->IsTrue()) return true;
+			if ($this->m_oLeftExpr->IsTrue() && $this->m_oRightExpr->IsTrue()) return true;
 		}
 		return false;
 	}
-
+	
 	public function GetLeftExpr()
 	{
 		return $this->m_oLeftExpr;
@@ -142,11 +206,37 @@ class BinaryExpression extends Expression
 		$sRight = $this->GetRightExpr()->Render($aArgs, $bRetrofitParams);
 		return "($sLeft $sOperator $sRight)";
 	}
-
-	public function Translate($aTranslationData, $bMatchAll = true)
+	
+	public function ApplyParameters($aArgs)
 	{
-		$oLeft = $this->GetLeftExpr()->Translate($aTranslationData, $bMatchAll);
-		$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll);
+		if ($this->m_oLeftExpr instanceof VariableExpression)
+		{
+			$this->m_oLeftExpr = $this->m_oLeftExpr->GetAsScalar($aArgs);
+		}
+		else //if ($this->m_oLeftExpr instanceof Expression)
+		{
+			$this->m_oLeftExpr->ApplyParameters($aArgs);
+		}
+		if ($this->m_oRightExpr instanceof VariableExpression)
+		{
+			$this->m_oRightExpr = $this->m_oRightExpr->GetAsScalar($aArgs);
+		}
+		else //if ($this->m_oRightExpr instanceof Expression)
+		{
+			$this->m_oRightExpr->ApplyParameters($aArgs);
+		}
+	}
+	
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->GetLeftExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
+		$this->GetRightExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$oLeft = $this->GetLeftExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		return new BinaryExpression($oLeft, $this->GetOperator(), $oRight);
 	}
 
@@ -156,6 +246,50 @@ class BinaryExpression extends Expression
 		$aRight = $this->GetRightExpr()->ListRequiredFields();
 		return array_merge($aLeft, $aRight);
 	}
+	
+	
+	/**
+	 * List all constant expression of the form <field> = <scalar> or <field> = :<variable>
+	 * Could be extended to support <field> = <function><constant_expression>
+	 */
+	public function ListConstantFields()
+	{
+		$aResult = array();
+		if ($this->m_sOperator == '=')
+		{
+			if (($this->m_oLeftExpr instanceof FieldExpression) && ($this->m_oRightExpr instanceof ScalarExpression))
+			{
+				$aResult[$this->m_oLeftExpr->GetParent()][$this->m_oLeftExpr->GetName()] = $this->m_oRightExpr;
+			}
+			else if (($this->m_oRightExpr instanceof FieldExpression) && ($this->m_oLeftExpr instanceof ScalarExpression))
+			{
+				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
+			}
+			else if (($this->m_oLeftExpr instanceof FieldExpression) && ($this->m_oRightExpr instanceof VariableExpression))
+			{
+				$aResult[$this->m_oLeftExpr->GetParent()][$this->m_oLeftExpr->GetName()] = $this->m_oRightExpr;
+			}
+			else if (($this->m_oRightExpr instanceof FieldExpression) && ($this->m_oLeftExpr instanceof VariableExpression))
+			{
+				$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
+		{
+			$aResult = array_merge($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()) ;
+		}
+		return $aResult;
+	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->GetLeftExpr()->RenameParam($sOldName, $sNewName);
+		$this->GetRightExpr()->RenameParam($sOldName, $sNewName);
+	}
 }
 
 
@@ -182,19 +316,18 @@ class UnaryExpression extends Expression
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
-		if ($bRetrofitParams)
-		{
-			$iParamIndex = count($aArgs) + 1; // 1-based indexation
-			$aArgs['param'.$iParamIndex] = $this->m_value;
-			return ':param'.$iParamIndex;
-		}
-		else
-		{
-			return CMDBSource::Quote($this->m_value);
-		}
+		return CMDBSource::Quote($this->m_value);
 	}
 
-	public function Translate($aTranslationData, $bMatchAll = true)
+	public function ApplyParameters($aArgs)
+	{
+	}
+	
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		return clone $this;
 	}
@@ -203,6 +336,17 @@ class UnaryExpression extends Expression
 	{
 		return array();
 	}
+
+	public function ListConstantFields()
+	{
+		return array();
+	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		// Do nothing
+		// really ? what about :param{$iParamIndex} ??
+	}
 }
 
 class ScalarExpression extends UnaryExpression
@@ -275,7 +419,21 @@ class FieldExpression extends UnaryExpression
 		return "`{$this->m_sParent}`.`{$this->m_sName}`";
 	}
 
-	public function Translate($aTranslationData, $bMatchAll = true)
+	public function ListRequiredFields()
+	{
+		return array($this->m_sParent.'.'.$this->m_sName);
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		if ($this->m_sParent == $sAlias)
+		{
+			// Add a reference to the field
+			$aUnresolved[$this->m_sName] = $this;
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		if (!array_key_exists($this->m_sParent, $aTranslationData))
 		{
@@ -292,21 +450,35 @@ class FieldExpression extends UnaryExpression
 			}
 			$sNewParent = $aTranslationData[$this->m_sParent]['*'];
 			$sNewName = $this->m_sName;
+			if ($bMarkFieldsAsResolved)
+			{
+				$oRet = new FieldExpressionResolved($sNewName, $sNewParent);
+			}
+			else
+			{
+				$oRet = new FieldExpression($sNewName, $sNewParent);
+			}
 		}
 		else
 		{
-			$sNewParent = $aTranslationData[$this->m_sParent][$this->m_sName][0];
-			$sNewName = $aTranslationData[$this->m_sParent][$this->m_sName][1];
+			$oRet = $aTranslationData[$this->m_sParent][$this->m_sName];
 		}
-		return new FieldExpression($sNewName, $sNewParent);
-	}
-
-	public function ListRequiredFields()
-	{
-		return array($this->m_sParent.'.'.$this->m_sName);
+		return $oRet;
 	}
 }
 
+// Has been resolved into an SQL expression
+class FieldExpressionResolved extends FieldExpression
+{
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return clone $this;
+	}
+}
 
 class VariableExpression extends UnaryExpression
 {
@@ -340,7 +512,7 @@ class VariableExpression extends UnaryExpression
 		}
 		elseif ($bRetrofitParams)
 		{
-			//$aArgs[$this->m_sName] = null;
+			$aArgs[$this->m_sName] = null;
 			return ':'.$this->m_sName;
 		}
 		else
@@ -348,6 +520,28 @@ class VariableExpression extends UnaryExpression
 			throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>$aArgs));
 		}
 	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		if ($this->m_sName == $sOldName)
+		{
+			$this->m_sName = $sNewName;
+		}
+	}
+	
+	public function GetAsScalar($aArgs)
+	{
+		$value = '';
+		if (array_key_exists($this->m_sName, $aArgs))
+		{
+			$value = $aArgs[$this->m_sName];
+		}
+		else
+		{
+			throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>array_keys($aArgs)));
+		}
+		return new ScalarExpression($value);
+	}
 }
 
 // Temporary, until we implement functions and expression casting!
@@ -393,12 +587,36 @@ class ListExpression extends Expression
 		return '('.implode(', ', $aRes).')';
 	}
 
-	public function Translate($aTranslationData, $bMatchAll = true)
+	public function ApplyParameters($aArgs)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $idx => $oExpr)
+		{
+			if ($oExpr instanceof VariableExpression)
+			{
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
+			}
+			else
+			{
+				$oExpr->ApplyParameters($aArgs);
+			}
+		}
+	}
+	
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		$aRes = array();
 		foreach ($this->m_aExpressions as $oExpr)
 		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll);
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		}
 		return new ListExpression($aRes);
 	}
@@ -412,6 +630,25 @@ class ListExpression extends Expression
 		}
 		return $aRes;
 	}
+	
+	public function ListConstantFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
+		}
+		return $aRes;
+	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $key => $oExpr)
+		{
+			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+	}	
 }
 
 
@@ -453,12 +690,36 @@ class FunctionExpression extends Expression
 		return $this->m_sVerb.'('.implode(', ', $aRes).')';
 	}
 
-	public function Translate($aTranslationData, $bMatchAll = true)
+	public function ApplyParameters($aArgs)
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $idx => $oExpr)
+		{
+			if ($oExpr instanceof VariableExpression)
+			{
+				$this->m_aArgs[$idx] = $oExpr->GetAsScalar($aArgs);
+			}
+			else
+			{
+				$oExpr->ApplyParameters($aArgs);
+			}
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		$aRes = array();
 		foreach ($this->m_aArgs as $oExpr)
 		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll);
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		}
 		return new FunctionExpression($this->m_sVerb, $aRes);
 	}
@@ -472,6 +733,24 @@ class FunctionExpression extends Expression
 		}
 		return $aRes;
 	}
+	
+	public function ListConstantFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
+		}
+		return $aRes;
+	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		foreach ($this->m_aArgs as $key => $oExpr)
+		{
+			$this->m_aArgs[$key] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+	}	
 }
 
 class IntervalExpression extends Expression
@@ -507,15 +786,42 @@ class IntervalExpression extends Expression
 		return 'INTERVAL '.$this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
 	}
 
-	public function Translate($aTranslationData, $bMatchAll = true)
+	public function ApplyParameters($aArgs)
 	{
-		return new IntervalExpression($this->m_oValue->Translate($aTranslationData, $bMatchAll), $this->m_sUnit);
+		if ($this->m_oValue instanceof VariableExpression)
+		{
+			$this->m_oValue = $this->m_oValue->GetAsScalar($aArgs);
+		}
+		else
+		{
+			$this->m_oValue->ApplyParameters($aArgs);
+		}
+	}
+		
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->m_oValue->GetUnresolvedFields($sAlias, $aUnresolved);
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return new IntervalExpression($this->m_oValue->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved), $this->m_sUnit);
 	}
 
 	public function ListRequiredFields()
 	{
 		return array();
 	}
+
+	public function ListConstantFields()
+	{
+		return array();
+	}
+	
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oValue->RenameParam($sOldName, $sNewName);
+	}	
 }
 
 class CharConcatExpression extends Expression
@@ -551,12 +857,36 @@ class CharConcatExpression extends Expression
 		return "CAST(CONCAT(".implode(', ', $aRes).") AS CHAR)";
 	}
 
-	public function Translate($aTranslationData, $bMatchAll = true)
+	public function ApplyParameters($aArgs)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $idx => $oExpr)
+		{
+			if ($oExpr instanceof VariableExpression)
+			{
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
+			}
+			else
+			{
+				$this->m_aExpressions->ApplyParameters($aArgs);
+			}
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
 	{
 		$aRes = array();
 		foreach ($this->m_aExpressions as $oExpr)
 		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll);
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
 		}
 		return new CharConcatExpression($aRes);
 	}
@@ -570,6 +900,135 @@ class CharConcatExpression extends Expression
 		}
 		return $aRes;
 	}
+
+	public function ListConstantFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
+		}
+		return $aRes;
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		foreach ($this->m_aExpressions as $key => $oExpr)
+		{
+			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+	}	
+}
+
+
+class CharConcatWSExpression extends CharConcatExpression
+{
+	protected $m_separator;
+
+	public function __construct($separator, $aExpressions)
+	{
+		$this->m_separator = $separator;
+		parent::__construct($aExpressions);
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
+			// Concat will be globally NULL if one single argument is null ! 
+			$aRes[] = "COALESCE($sCol, '')";
+		}
+		$sSep = CMDBSource::Quote($this->m_separator);
+		return "CAST(CONCAT_WS($sSep, ".implode(', ', $aRes).") AS CHAR)";
+	}
+}
+
+
+class QueryBuilderExpressions
+{
+	protected $m_oConditionExpr;
+	protected $m_aSelectExpr;
+	protected $m_aJoinFields;
+
+	public function __construct($aSelect, $oCondition)
+	{
+		$this->m_oConditionExpr = $oCondition;
+		$this->m_aSelectExpr = $aSelect;
+		$this->m_aJoinFields = array();
+	}
+
+	public function GetSelect()
+	{
+		return $this->m_aSelectExpr;
+	}
+
+	public function GetCondition()
+	{
+		return $this->m_oConditionExpr;
+	}
+
+	public function PopJoinField()
+	{
+		return array_pop($this->m_aJoinFields);
+	}
+
+	public function AddSelect($sAttAlias, $oExpression)
+	{
+		$this->m_aSelectExpr[$sAttAlias] = $oExpression;
+	}
+
+			//$oConditionTree = $oConditionTree->LogAnd($oFinalClassRestriction);
+	public function AddCondition($oExpression)
+	{
+		$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oExpression);
+	}
+
+	public function PushJoinField($oExpression)
+	{
+		array_push($this->m_aJoinFields, $oExpression);
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->m_oConditionExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+		foreach($this->m_aJoinFields as $oExpression)
+		{
+			$oExpression->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$this->m_oConditionExpr = $this->m_oConditionExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$this->m_aSelectExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		foreach($this->m_aJoinFields as $index => $oExpression)
+		{
+			$this->m_aJoinFields[$index] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oConditionExpr->RenameParam($sOldName, $sNewName);
+		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$this->m_aSelectExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+		foreach($this->m_aJoinFields as $index => $oExpression)
+		{
+			$this->m_aJoinFields[$index] = $oExpression->RenameParam($sOldName, $sNewName);
+		}
+	}
 }
 
 ?>

core/kpi.class.inc.php

@@ -191,6 +191,25 @@ class ExecutionKPI
 			return $output[1] * 1024;
 		}
 	}
+
+	static public function memory_get_peak_usage($bRealUsage = false)
+	{
+		if (function_exists('memory_get_peak_usage'))
+		{
+			return memory_get_peak_usage($bRealUsage);
+		}
+		// PHP > 5.2.1 - this verb depends on a compilation option
+		return 0;
+	}
 }
 
+class ApplicationStartupKPI extends ExecutionKPI
+{
+	public function __construct()
+	{
+		global $fItopStarted;
+		$this->m_fStarted	= $fItopStarted;
+	}
+} 
+
 ?>

core/oql/build.bash

@@ -0,0 +1,4 @@
+#!/bin/bash
+php /usr/share/php/PHP/LexerGenerator/cli.php oql-lexer.plex
+php /usr/share/php/PHP/ParserGenerator/cli.php oql-parser.y
+

core/oql/exclude.txt

@@ -3,5 +3,6 @@
 # since they are used solely for constructing other files during the build process
 #
 build.cmd
+build.bash
 oql-lexer.plex
-oql-parser.y
+oql-parser.y

core/oql/oql-lexer.php

@@ -1,5 +1,29 @@
 <?php
 
+// Copyright (C) 2010 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
+
+/**
+ * OQL syntax analyzer, to be used prior to run the lexical analyzer
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
 // Notes (from the source file: oql-lexer.plex) - Romain
 //
 // The strval rule is a little bit cryptic.
@@ -80,153 +104,163 @@ class OQLLexerRaw
         if ($this->count >= strlen($this->data)) {
             return false; // end of input
         }
-    	do {
-	    	$rules = array(
-    			'/^[ \t\n\r]+/',
-    			'/^SELECT/',
-    			'/^FROM/',
-    			'/^AS/',
-    			'/^WHERE/',
-    			'/^JOIN/',
-    			'/^ON/',
-    			'/^\//',
-    			'/^\\*/',
-    			'/^\\+/',
-    			'/^-/',
-    			'/^AND/',
-    			'/^OR/',
-    			'/^,/',
-    			'/^\\(/',
-    			'/^\\)/',
-    			'/^=/',
-    			'/^!=/',
-    			'/^>/',
-    			'/^</',
-    			'/^>=/',
-    			'/^<=/',
-    			'/^LIKE/',
-    			'/^NOT LIKE/',
-    			'/^IN/',
-    			'/^NOT IN/',
-    			'/^INTERVAL/',
-    			'/^IF/',
-    			'/^ELT/',
-    			'/^COALESCE/',
-    			'/^CONCAT/',
-    			'/^SUBSTR/',
-    			'/^TRIM/',
-    			'/^DATE/',
-    			'/^DATE_FORMAT/',
-    			'/^CURRENT_DATE/',
-    			'/^NOW/',
-    			'/^TIME/',
-    			'/^TO_DAYS/',
-    			'/^FROM_DAYS/',
-    			'/^YEAR/',
-    			'/^MONTH/',
-    			'/^DAY/',
-    			'/^HOUR/',
-    			'/^MINUTE/',
-    			'/^SECOND/',
-    			'/^DATE_ADD/',
-    			'/^DATE_SUB/',
-    			'/^ROUND/',
-    			'/^FLOOR/',
-    			'/^INET_ATON/',
-    			'/^INET_NTOA/',
-    			'/^[0-9]+|0x[0-9a-fA-F]+/',
-    			'/^\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/',
-    			'/^([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/',
-    			'/^:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/',
-    			'/^\\./',
-	    	);
-	    	$match = false;
-	    	foreach ($rules as $index => $rule) {
-	    		if (preg_match($rule, substr($this->data, $this->count), $yymatches)) {
-	            	if ($match) {
-	            	    if (strlen($yymatches[0]) > strlen($match[0][0])) {
-	            	    	$match = array($yymatches, $index); // matches, token
-	            	    }
-	            	} else {
-	            		$match = array($yymatches, $index);
-	            	}
-	            }
-	    	}
-	    	if (!$match) {
-	            throw new Exception('Unexpected input at line' . $this->line .
-	                ': ' . $this->data[$this->count]);
-	    	}
-	    	$this->token = $match[1];
-	    	$this->value = $match[0][0];
-	    	$yysubmatches = $match[0];
-	    	array_shift($yysubmatches);
-	    	if (!$yysubmatches) {
-	    		$yysubmatches = array();
-	    	}
-	        $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
-	        if ($r === null) {
-	            $this->count += strlen($this->value);
-	            $this->line += substr_count($this->value, "\n");
-	            // accept this token
-	            return true;
-	        } elseif ($r === true) {
-	            // we have changed state
-	            // process this token in the new state
-	            return $this->yylex();
-	        } elseif ($r === false) {
-	            $this->count += strlen($this->value);
-	            $this->line += substr_count($this->value, "\n");
-	            if ($this->count >= strlen($this->data)) {
-	                return false; // end of input
-	            }
-	            // skip this token
-	            continue;
-	        } else {
-	            $yy_yymore_patterns = array_slice($rules, $this->token, true);
-	            // yymore is needed
-	            do {
-	                if (!isset($yy_yymore_patterns[$this->token])) {
-	                    throw new Exception('cannot do yymore for the last token');
-	                }
-			    	$match = false;
-	                foreach ($yy_yymore_patterns[$this->token] as $index => $rule) {
-	                	if (preg_match('/' . $rule . '/',
-	                      	  substr($this->data, $this->count), $yymatches)) {
-	                    	$yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
-			            	if ($match) {
-			            	    if (strlen($yymatches[0]) > strlen($match[0][0])) {
-			            	    	$match = array($yymatches, $index); // matches, token
-			            	    }
-			            	} else {
-			            		$match = array($yymatches, $index);
-			            	}
-			            }
-			    	}
-			    	if (!$match) {
-			            throw new Exception('Unexpected input at line' . $this->line .
-			                ': ' . $this->data[$this->count]);
-			    	}
-			    	$this->token = $match[1];
-			    	$this->value = $match[0][0];
-			    	$yysubmatches = $match[0];
-			    	array_shift($yysubmatches);
-			    	if (!$yysubmatches) {
-			    		$yysubmatches = array();
-			    	}
-	                $this->line = substr_count($this->value, "\n");
-	                $r = $this->{'yy_r1_' . $this->token}();
-	            } while ($r !== null || !$r);
-		        if ($r === true) {
-		            // we have changed state
-		            // process this token in the new state
-		            return $this->yylex();
-		        } else {
-	                // accept
-	                $this->count += strlen($this->value);
-	                $this->line += substr_count($this->value, "\n");
-	                return true;
-		        }
-	        }
+        do {
+            $rules = array(
+                '/\G[ \t\n\r]+/ ',
+                '/\GSELECT/ ',
+                '/\GFROM/ ',
+                '/\GAS/ ',
+                '/\GWHERE/ ',
+                '/\GJOIN/ ',
+                '/\GON/ ',
+                '/\G\// ',
+                '/\G\\*/ ',
+                '/\G\\+/ ',
+                '/\G-/ ',
+                '/\GAND/ ',
+                '/\GOR/ ',
+                '/\G,/ ',
+                '/\G\\(/ ',
+                '/\G\\)/ ',
+                '/\GREGEXP/ ',
+                '/\G=/ ',
+                '/\G!=/ ',
+                '/\G>/ ',
+                '/\G</ ',
+                '/\G>=/ ',
+                '/\G<=/ ',
+                '/\GLIKE/ ',
+                '/\GNOT LIKE/ ',
+                '/\GIN/ ',
+                '/\GNOT IN/ ',
+                '/\GINTERVAL/ ',
+                '/\GIF/ ',
+                '/\GELT/ ',
+                '/\GCOALESCE/ ',
+                '/\GISNULL/ ',
+                '/\GCONCAT/ ',
+                '/\GSUBSTR/ ',
+                '/\GTRIM/ ',
+                '/\GDATE/ ',
+                '/\GDATE_FORMAT/ ',
+                '/\GCURRENT_DATE/ ',
+                '/\GNOW/ ',
+                '/\GTIME/ ',
+                '/\GTO_DAYS/ ',
+                '/\GFROM_DAYS/ ',
+                '/\GYEAR/ ',
+                '/\GMONTH/ ',
+                '/\GDAY/ ',
+                '/\GHOUR/ ',
+                '/\GMINUTE/ ',
+                '/\GSECOND/ ',
+                '/\GDATE_ADD/ ',
+                '/\GDATE_SUB/ ',
+                '/\GROUND/ ',
+                '/\GFLOOR/ ',
+                '/\GINET_ATON/ ',
+                '/\GINET_NTOA/ ',
+                '/\GBELOW/ ',
+                '/\GBELOW STRICT/ ',
+                '/\GNOT BELOW/ ',
+                '/\GNOT BELOW STRICT/ ',
+                '/\GABOVE/ ',
+                '/\GABOVE STRICT/ ',
+                '/\GNOT ABOVE/ ',
+                '/\GNOT ABOVE STRICT/ ',
+                '/\G[0-9]+|0x[0-9a-fA-F]+/ ',
+                '/\G\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/ ',
+                '/\G([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/ ',
+                '/\G:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/ ',
+                '/\G\\./ ',
+            );
+            $match = false;
+            foreach ($rules as $index => $rule) {
+                if (preg_match($rule, substr($this->data, $this->count), $yymatches)) {
+                    if ($match) {
+                        if (strlen($yymatches[0]) > strlen($match[0][0])) {
+                            $match = array($yymatches, $index); // matches, token
+                        }
+                    } else {
+                        $match = array($yymatches, $index);
+                    }
+                }
+            }
+            if (!$match) {
+                throw new Exception('Unexpected input at line ' . $this->line .
+                    ': ' . $this->data[$this->count]);
+            }
+            $this->token = $match[1];
+            $this->value = $match[0][0];
+            $yysubmatches = $match[0];
+            array_shift($yysubmatches);
+            if (!$yysubmatches) {
+                $yysubmatches = array();
+            }
+            $r = $this->{'yy_r1_' . $this->token}($yysubmatches);
+            if ($r === null) {
+                $this->count += strlen($this->value);
+                $this->line += substr_count($this->value, "\n");
+                // accept this token
+                return true;
+            } elseif ($r === true) {
+                // we have changed state
+                // process this token in the new state
+                return $this->yylex();
+            } elseif ($r === false) {
+                $this->count += strlen($this->value);
+                $this->line += substr_count($this->value, "\n");
+                if ($this->count >= strlen($this->data)) {
+                    return false; // end of input
+                }
+                // skip this token
+                continue;
+            } else {
+                $yy_yymore_patterns = array_slice($rules, $this->token, true);
+                // yymore is needed
+                do {
+                    if (!isset($yy_yymore_patterns[$this->token])) {
+                        throw new Exception('cannot do yymore for the last token');
+                    }
+                    $match = false;
+                    foreach ($yy_yymore_patterns[$this->token] as $index => $rule) {
+                        if (preg_match('/' . $rule . '/',
+                                $this->data, $yymatches, null, $this->count)) {
+                            $yymatches = array_filter($yymatches, 'strlen'); // remove empty sub-patterns
+                            if ($match) {
+                                if (strlen($yymatches[0]) > strlen($match[0][0])) {
+                                    $match = array($yymatches, $index); // matches, token
+                                }
+                            } else {
+                                $match = array($yymatches, $index);
+                            }
+                        }
+                    }
+                    if (!$match) {
+                        throw new Exception('Unexpected input at line ' . $this->line .
+                            ': ' . $this->data[$this->count]);
+                    }
+                    $this->token = $match[1];
+                    $this->value = $match[0][0];
+                    $yysubmatches = $match[0];
+                    array_shift($yysubmatches);
+                    if (!$yysubmatches) {
+                        $yysubmatches = array();
+                    }
+                    $this->line = substr_count($this->value, "\n");
+                    $r = $this->{'yy_r1_' . $this->token}();
+                } while ($r !== null || !$r);
+                if ($r === true) {
+                    // we have changed state
+                    // process this token in the new state
+                    return $this->yylex();
+                } else {
+                    // accept
+                    $this->count += strlen($this->value);
+                    $this->line += substr_count($this->value, "\n");
+                    return true;
+                }
+            }
         } while (true);
 
     } // end function
@@ -314,204 +348,254 @@ class OQLLexerRaw
     function yy_r1_16($yy_subpatterns)
     {
 
-	$this->token = OQLParser::EQ;
+	$this->token = OQLParser::REGEXP;
     }
     function yy_r1_17($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_EQ;
+	$this->token = OQLParser::EQ;
     }
     function yy_r1_18($yy_subpatterns)
     {
 
-	$this->token = OQLParser::GT;
+	$this->token = OQLParser::NOT_EQ;
     }
     function yy_r1_19($yy_subpatterns)
     {
 
-	$this->token = OQLParser::LT;
+	$this->token = OQLParser::GT;
     }
     function yy_r1_20($yy_subpatterns)
     {
 
-	$this->token = OQLParser::GE;
+	$this->token = OQLParser::LT;
     }
     function yy_r1_21($yy_subpatterns)
     {
 
-	$this->token = OQLParser::LE;
+	$this->token = OQLParser::GE;
     }
     function yy_r1_22($yy_subpatterns)
     {
 
-	$this->token = OQLParser::LIKE;
+	$this->token = OQLParser::LE;
     }
     function yy_r1_23($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_LIKE;
+	$this->token = OQLParser::LIKE;
     }
     function yy_r1_24($yy_subpatterns)
     {
 
-	$this->token = OQLParser::IN;
+	$this->token = OQLParser::NOT_LIKE;
     }
     function yy_r1_25($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_IN;
+	$this->token = OQLParser::IN;
     }
     function yy_r1_26($yy_subpatterns)
     {
 
-	$this->token = OQLParser::INTERVAL;
+	$this->token = OQLParser::NOT_IN;
     }
     function yy_r1_27($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_IF;
+	$this->token = OQLParser::INTERVAL;
     }
     function yy_r1_28($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_ELT;
+	$this->token = OQLParser::F_IF;
     }
     function yy_r1_29($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_COALESCE;
+	$this->token = OQLParser::F_ELT;
     }
     function yy_r1_30($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_CONCAT;
+	$this->token = OQLParser::F_COALESCE;
     }
     function yy_r1_31($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_SUBSTR;
+	$this->token = OQLParser::F_ISNULL;
     }
     function yy_r1_32($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_TRIM;
+	$this->token = OQLParser::F_CONCAT;
     }
     function yy_r1_33($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE;
+	$this->token = OQLParser::F_SUBSTR;
     }
     function yy_r1_34($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE_FORMAT;
+	$this->token = OQLParser::F_TRIM;
     }
     function yy_r1_35($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_CURRENT_DATE;
+	$this->token = OQLParser::F_DATE;
     }
     function yy_r1_36($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_NOW;
+	$this->token = OQLParser::F_DATE_FORMAT;
     }
     function yy_r1_37($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_TIME;
+	$this->token = OQLParser::F_CURRENT_DATE;
     }
     function yy_r1_38($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_TO_DAYS;
+	$this->token = OQLParser::F_NOW;
     }
     function yy_r1_39($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_FROM_DAYS;
+	$this->token = OQLParser::F_TIME;
     }
     function yy_r1_40($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_YEAR;
+	$this->token = OQLParser::F_TO_DAYS;
     }
     function yy_r1_41($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_MONTH;
+	$this->token = OQLParser::F_FROM_DAYS;
     }
     function yy_r1_42($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DAY;
+	$this->token = OQLParser::F_YEAR;
     }
     function yy_r1_43($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_HOUR;
+	$this->token = OQLParser::F_MONTH;
     }
     function yy_r1_44($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_MINUTE;
+	$this->token = OQLParser::F_DAY;
     }
     function yy_r1_45($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_SECOND;
+	$this->token = OQLParser::F_HOUR;
     }
     function yy_r1_46($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE_ADD;
+	$this->token = OQLParser::F_MINUTE;
     }
     function yy_r1_47($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE_SUB;
+	$this->token = OQLParser::F_SECOND;
     }
     function yy_r1_48($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_ROUND;
+	$this->token = OQLParser::F_DATE_ADD;
     }
     function yy_r1_49($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_FLOOR;
+	$this->token = OQLParser::F_DATE_SUB;
     }
     function yy_r1_50($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_INET_ATON;
+	$this->token = OQLParser::F_ROUND;
     }
     function yy_r1_51($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_INET_NTOA;
+	$this->token = OQLParser::F_FLOOR;
     }
     function yy_r1_52($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NUMVAL;
+	$this->token = OQLParser::F_INET_ATON;
     }
     function yy_r1_53($yy_subpatterns)
     {
 
-	$this->token = OQLParser::STRVAL;
+	$this->token = OQLParser::F_INET_NTOA;
     }
     function yy_r1_54($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NAME;
+	$this->token = OQLParser::BELOW;
     }
     function yy_r1_55($yy_subpatterns)
     {
 
-	$this->token = OQLParser::VARNAME;
+	$this->token = OQLParser::BELOW_STRICT;
     }
     function yy_r1_56($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::NOT_BELOW;
+    }
+    function yy_r1_57($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::NOT_BELOW_STRICT;
+    }
+    function yy_r1_58($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::ABOVE;
+    }
+    function yy_r1_59($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::ABOVE_STRICT;
+    }
+    function yy_r1_60($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::NOT_ABOVE;
+    }
+    function yy_r1_61($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::NOT_ABOVE_STRICT;
+    }
+    function yy_r1_62($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::NUMVAL;
+    }
+    function yy_r1_63($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::STRVAL;
+    }
+    function yy_r1_64($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::NAME;
+    }
+    function yy_r1_65($yy_subpatterns)
+    {
+
+	$this->token = OQLParser::VARNAME;
+    }
+    function yy_r1_66($yy_subpatterns)
     {
 
 	$this->token = OQLParser::DOT;

core/oql/oql-lexer.plex

@@ -94,6 +94,7 @@ math_plus  = "+"
 math_minus = "-"
 log_and    = "AND"
 log_or     = "OR"
+regexp     = "REGEXP"
 eq         = "="
 not_eq     = "!="
 gt         = ">"
@@ -108,6 +109,7 @@ interval   = "INTERVAL"
 f_if       = "IF"
 f_elt      = "ELT"
 f_coalesce = "COALESCE"
+f_isnull   = "ISNULL"
 f_concat   = "CONCAT"
 f_substr   = "SUBSTR"
 f_trim     = "TRIM"
@@ -130,6 +132,14 @@ f_round    = "ROUND"
 f_floor    = "FLOOR"
 f_inet_aton = "INET_ATON"
 f_inet_ntoa = "INET_NTOA"
+below            = "BELOW"
+below_strict     = "BELOW STRICT"
+not_below        = "NOT BELOW"
+not_below_strict = "NOT BELOW STRICT"
+above            = "ABOVE"
+above_strict     = "ABOVE STRICT"
+not_above        = "NOT ABOVE"
+not_above_strict = "NOT ABOVE STRICT"
 numval     = /[0-9]+|0x[0-9a-fA-F]+/
 strval     = /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/
 name       = /([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/
@@ -186,6 +196,9 @@ par_open {
 par_close {
 	$this->token = OQLParser::PAR_CLOSE;
 }
+regexp {
+	$this->token = OQLParser::REGEXP;
+}
 eq {
 	$this->token = OQLParser::EQ;
 }
@@ -228,6 +241,9 @@ f_elt {
 f_coalesce {
 	$this->token = OQLParser::F_COALESCE;
 }
+f_isnull {
+	$this->token = OQLParser::F_ISNULL;
+}
 f_concat {
 	$this->token = OQLParser::F_CONCAT;
 }
@@ -294,6 +310,30 @@ f_inet_aton {
 f_inet_ntoa {
 	$this->token = OQLParser::F_INET_NTOA;
 }
+below {
+	$this->token = OQLParser::BELOW;
+}
+below_strict {
+	$this->token = OQLParser::BELOW_STRICT;
+}
+not_below {
+	$this->token = OQLParser::NOT_BELOW;
+}
+not_below_strict {
+	$this->token = OQLParser::NOT_BELOW_STRICT;
+}
+above {
+	$this->token = OQLParser::ABOVE;
+}
+above_strict {
+	$this->token = OQLParser::ABOVE_STRICT;
+}
+not_above {
+	$this->token = OQLParser::NOT_ABOVE;
+}
+not_above_strict {
+	$this->token = OQLParser::NOT_ABOVE_STRICT;
+}
 numval {
 	$this->token = OQLParser::NUMVAL;
 }

core/oql/oql-parser.y

@@ -78,6 +78,14 @@ join_item(A) ::= JOIN class_name(X) ON join_condition(C).
 }
 
 join_condition(A) ::= field_id(X) EQ field_id(Y). { A = new BinaryOqlExpression(X, '=', Y); }
+join_condition(A) ::= field_id(X) BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW', Y); }
+join_condition(A) ::= field_id(X) BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW_STRICT', Y); }
+join_condition(A) ::= field_id(X) NOT_BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_BELOW', Y); }
+join_condition(A) ::= field_id(X) NOT_BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_BELOW_STRICT', Y); }
+join_condition(A) ::= field_id(X) ABOVE field_id(Y). { A = new BinaryOqlExpression(X, 'ABOVE', Y); }
+join_condition(A) ::= field_id(X) ABOVE_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'ABOVE_STRICT', Y); }
+join_condition(A) ::= field_id(X) NOT_ABOVE field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_ABOVE', Y); }
+join_condition(A) ::= field_id(X) NOT_ABOVE_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_ABOVE_STRICT', Y); }
 
 condition(A) ::= expression_prio4(X). { A = X; }
 
@@ -101,13 +109,13 @@ expression_prio4(A) ::= expression_prio3(X). { A = X; }
 expression_prio4(A) ::= expression_prio4(X) operator4(Y) expression_prio3(Z). { A = new BinaryOqlExpression(X, Y, Z); }
 
 
-list(A) ::= PAR_OPEN scalar_list(X) PAR_CLOSE. {
+list(A) ::= PAR_OPEN list_items(X) PAR_CLOSE. {
 	A = new ListOqlExpression(X);
 }
-scalar_list(A) ::= scalar(X). {
+list_items(A) ::= expression_prio4(X). {
 	A = array(X);
 }
-scalar_list(A) ::= scalar_list(L) COMA scalar(X). {
+list_items(A) ::= list_items(L) COMA expression_prio4(X). {
 	array_push(L, X);
 	A = L;
 }
@@ -164,6 +172,7 @@ str_value(A) ::= STRVAL(X). {A=stripslashes(substr(X, 1, strlen(X) - 2));}
 operator1(A) ::= num_operator1(X). {A=X;}
 operator2(A) ::= num_operator2(X). {A=X;}
 operator2(A) ::= str_operator(X). {A=X;}
+operator2(A) ::= REGEXP(X). {A=X;}
 operator2(A) ::= EQ(X). {A=X;}
 operator2(A) ::= NOT_EQ(X). {A=X;}
 operator3(A) ::= LOG_AND(X). {A=X;}
@@ -187,6 +196,7 @@ list_operator(A) ::= NOT_IN(X). {A=X;}
 func_name(A) ::= F_IF(X). { A=X; }
 func_name(A) ::= F_ELT(X). { A=X; }
 func_name(A) ::= F_COALESCE(X). { A=X; }
+func_name(A) ::= F_ISNULL(X). { A=X; }
 func_name(A) ::= F_CONCAT(X). { A=X; }
 func_name(A) ::= F_SUBSTR(X). { A=X; }
 func_name(A) ::= F_TRIM(X). { A=X; }

core/oql/oqlexception.class.inc.php

@@ -52,19 +52,19 @@ class OQLException extends CoreException
 
 	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
 	{
-		$sRet = htmlentities($this->m_MyIssue.", found '".$this->m_sUnexpected."' in: ");
-		$sRet .= htmlentities(substr($this->m_sInput, 0, $this->m_iCol));
-		$sRet .= $sHighlightHtmlBegin.htmlentities(substr($this->m_sInput, $this->m_iCol, strlen($this->m_sUnexpected))).$sHighlightHtmlEnd;
-		$sRet .= htmlentities(substr($this->m_sInput, $this->m_iCol + strlen($this->m_sUnexpected)));
+		$sRet = htmlentities($this->m_MyIssue.", found '".$this->m_sUnexpected."' in: ", ENT_QUOTES, 'UTF-8');
+		$sRet .= htmlentities(substr($this->m_sInput, 0, $this->m_iCol), ENT_QUOTES, 'UTF-8');
+		$sRet .= $sHighlightHtmlBegin.htmlentities(substr($this->m_sInput, $this->m_iCol, strlen($this->m_sUnexpected)), ENT_QUOTES, 'UTF-8').$sHighlightHtmlEnd;
+		$sRet .= htmlentities(substr($this->m_sInput, $this->m_iCol + strlen($this->m_sUnexpected)), ENT_QUOTES, 'UTF-8');
 
 		if (!is_null($this->m_aExpecting) && (count($this->m_aExpecting) > 0))
 		{
 			$sExpectations = '{'.implode(', ', $this->m_aExpecting).'}';
-			$sRet .= ", expecting ".htmlentities($sExpectations); 
+			$sRet .= ", expecting ".htmlentities($sExpectations, ENT_QUOTES, 'UTF-8'); 
 			$sSuggest = self::FindClosestString($this->m_sUnexpected, $this->m_aExpecting);
 			if (strlen($sSuggest) > 0)
 			{
-				$sRet .= ", I would suggest to use '$sHighlightHtmlBegin".htmlentities($sSuggest)."$sHighlightHtmlEnd'";
+				$sRet .= ", I would suggest to use '$sHighlightHtmlBegin".htmlentities($sSuggest, ENT_QUOTES, 'UTF-8')."$sHighlightHtmlEnd'";
 			}
 		}
 

core/oql/oqlquery.class.inc.php

@@ -59,6 +59,7 @@ class OqlJoinSpec
 	protected $m_oClassAlias;
 	protected $m_oLeftField;
 	protected $m_oRightField;
+	protected $m_sOperator;
 
 	protected $m_oNextJoinspec;
 
@@ -68,6 +69,8 @@ class OqlJoinSpec
 		$this->m_oClassAlias = $oClassAlias;
 		$this->m_oLeftField = $oExpression->GetLeftExpr();
 		$this->m_oRightField = $oExpression->GetRightExpr();
+		$this->m_oRightField = $oExpression->GetRightExpr();
+		$this->m_sOperator = $oExpression->GetOperator();
 	}
 
 	public function GetClass()
@@ -96,6 +99,10 @@ class OqlJoinSpec
 	{
 		return $this->m_oRightField;
 	}
+	public function GetOperator()
+	{
+		return $this->m_sOperator;
+	}
 }
 
 class BinaryOqlExpression extends BinaryExpression

core/ormcaselog.class.inc.php

@@ -0,0 +1,203 @@
+<?php
+// Copyright (C) 2011 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
+
+define('CASELOG_VISIBLE_ITEMS', 2);
+define('CASELOG_SEPARATOR', "\n".'========== %1$s : %2$s (%3$d) ============'."\n\n");
+
+//require_once(APPROOT.'/core/userrights.class.inc.php');
+//require_once(APPROOT.'/application/webpage.class.inc.php');
+
+/**
+ * Class to store a "case log" in a structured way, keeping track of its successive entries
+ */
+class ormCaseLog {
+	protected $m_sLog;
+	protected $m_aIndex;
+	
+	/**
+	 * Initializes the log with the first (initial) entry
+	 * @param $sLog string The text of the whole case log
+	 * @param $aIndex hash The case log index
+	 */
+	public function __construct($sLog = '', $aIndex = array())
+	{
+		$this->m_sLog = $sLog;
+		$this->m_aIndex = $aIndex;
+	}
+	
+	public function GetText()
+	{
+		return $this->m_sLog;
+	}
+	
+	public function GetIndex()
+	{
+		return $this->m_aIndex;
+	}
+
+	public function __toString()
+	{
+		return $this->m_sLog;
+	}
+	
+	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
+		$iPos = 0;
+		for($index=count($this->m_aIndex)-1 ; $index >= 0 ; $index--)
+		{
+			if ($index < count($this->m_aIndex) - CASELOG_VISIBLE_ITEMS)
+			{
+				$sOpen = '';
+				$sDisplay = 'style="display:none;"';
+			}
+			else
+			{
+				$sOpen = ' open';
+				$sDisplay = '';
+			}
+			$iPos += $this->m_aIndex[$index]['separator_length'];
+			$sTextEntry = substr($this->m_sLog, $iPos, $this->m_aIndex[$index]['text_length']);
+			$sTextEntry = str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sTextEntry, ENT_QUOTES, 'UTF-8'));
+			if (!is_null($aTransfoHandler))
+			{
+				$sTextEntry = call_user_func($aTransfoHandler, $sTextEntry);
+			}
+			$iPos += $this->m_aIndex[$index]['text_length'];
+
+			$sEntry = '<div class="caselog_header'.$sOpen.'">';
+			// 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 = '';
+				}
+			}
+			$sEntry .= sprintf(Dict::S('UI:CaseLog:Header_Date_UserName'), $sDate, $this->m_aIndex[$index]['user_name']);
+			$sEntry .= '</div>';
+			$sEntry .= '<div class="caselog_entry"'.$sDisplay.'>';
+			$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 (!is_null($aTransfoHandler))
+			{
+				$sTextEntry = call_user_func($aTransfoHandler, $sTextEntry);
+			}
+
+			if (count($this->m_aIndex) == 0)
+			{
+				$sHtml .= '<div class="caselog_entry open">';
+				$sHtml .= $sTextEntry;
+				$sHtml .= '</div>';
+			}
+			else
+			{
+				if (count($this->m_aIndex) - CASELOG_VISIBLE_ITEMS > 0)
+				{
+					$sOpen = '';
+					$sDisplay = 'style="display:none;"';
+				}
+				else
+				{
+					$sOpen = ' open';
+					$sDisplay = '';
+				}
+				$sHtml .= '<div class="caselog_header'.$sOpen.'">';
+				$sHtml .= Dict::S('UI:CaseLog:InitialValue');
+				$sHtml .= '</div>';
+				$sHtml .= '<div class="caselog_entry"'.$sDisplay.'>';
+				$sHtml .= $sTextEntry;
+				$sHtml .= '</div>';
+			}
+		}
+		$sHtml .= '</td></tr></table>';
+		return $sHtml;
+	}
+	
+	/**
+	 * Add a new entry to the log and updates the internal index
+	 * @param $sText string The text of the new entry 
+	 */
+	public function AddLogEntry($sText, $sOnBehalfOf = '')
+	{
+		$sDate = date(Dict::S('UI:CaseLog:DateFormat'));
+		if ($sOnBehalfOf == '')
+		{
+			$sOnBehalfOf = UserRights::GetUserFriendlyName();
+			$iUserId = UserRights::GetUserId();
+		}
+		else
+		{
+			$iUserId = null;
+		}
+		$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' => time(),	
+			'text_length' => $iTextlength,	
+			'separator_length' => $iSepLength,	
+		);
+	}
+
+	/**
+	 * Get the latest entry from the log
+	 * @return string
+	 */
+	public function GetLatestEntry()
+	{
+		$aLastEntry = end($this->m_aIndex);
+		$sRes = substr($this->m_sLog, $aLastEntry['separator_length'], $aLastEntry['text_length']);
+		return $sRes;
+	}
+
+	/**
+	 * Get the index of the latest entry from the log
+	 * @return integer
+	 */
+	public function GetLatestEntryIndex()
+	{
+		$aKeys = array_keys($this->m_aIndex);
+		$iLast = end($aKeys); // Strict standards: the parameter passed to 'end' must be a variable since it is passed by reference
+		return $iLast;
+	}
+}
+?>

core/ormdocument.class.inc.php

@@ -105,7 +105,7 @@ class ormDocument
 	 */	 	 	
 	public function GetDisplayLink($sClass, $Id, $sAttCode)
 	{
-		return "<a href=\"../pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode\" target=\"_blank\" >".$this->GetFileName()."</a>\n";
+		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode\" target=\"_blank\" >".$this->GetFileName()."</a>\n";
 	}
 	
 	/**
@@ -114,7 +114,7 @@ class ormDocument
 	 */	 	 	
 	public function GetDownloadLink($sClass, $Id, $sAttCode)
 	{
-		return "<a href=\"../pages/ajax.render.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode\">".$this->GetFileName()."</a>\n";
+		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode\">".$this->GetFileName()."</a>\n";
 	}
 }
 ?>

core/sqlquery.class.inc.php

@@ -35,36 +35,19 @@
 require_once('cmdbsource.class.inc.php');
 
 
-class SQLExpression extends BinaryExpression
-{
-}
-class ScalarSQLExpression extends ScalarExpression
-{
-}
-class TrueSQLExpression extends TrueExpression
-{
-}
-class FieldSQLExpression extends FieldExpression
-{
-}
-class VariableSQLExpression extends VariableExpression
-{
-}
-
-
-
 class SQLQuery
 {
+	private $m_SourceOQL = '';
 	private $m_sTable = '';
 	private $m_sTableAlias = '';
 	private $m_aFields = array();
 	private $m_oConditionExpr = null;
-	private $m_aFullTextNeedles = array();
 	private $m_bToDelete = true; // The current table must be listed for deletion ?
 	private $m_aValues = array(); // Values to set in case of an update query
+	private $m_oSelectedIdField = null;
 	private $m_aJoinSelects = array();
 
-	public function __construct($sTable, $sTableAlias, $aFields, $oConditionExpr, $aFullTextNeedles, $bToDelete = true, $aValues = array())
+	public function __construct($sTable, $sTableAlias, $aFields, $bToDelete = true, $aValues = array(), $oSelectedIdField = null)
 	{
 		// This check is not needed but for developping purposes
 		//if (!CMDBSource::IsTable($sTable))
@@ -79,18 +62,20 @@ class SQLQuery
 		$this->m_sTable = $sTable;
 		$this->m_sTableAlias = $sTableAlias;
 		$this->m_aFields = $aFields;
-		$this->m_oConditionExpr = $oConditionExpr;
-		if (is_null($oConditionExpr))
-		{
-			$this->m_oConditionExpr = new TrueExpression;
-		}
-		else if (!$oConditionExpr instanceof Expression)
-		{
-			throw new CoreException('Invalid type for condition, expecting an Expression', array('class' => get_class($oConditionExpr)));
-		}
-		$this->m_aFullTextNeedles = $aFullTextNeedles;
+		$this->m_oConditionExpr = null;
 		$this->m_bToDelete = $bToDelete;
 		$this->m_aValues = $aValues;
+		$this->m_oSelectedIdField = $oSelectedIdField;
+	}
+
+	public function SetSourceOQL($sOQL)
+	{
+		$this->m_SourceOQL = $sOQL;
+	}
+
+	public function GetSourceOQL()
+	{
+		return $this->m_SourceOQL;
 	}
 
 	public function DisplayHtml()
@@ -108,16 +93,6 @@ class SQLQuery
 		echo "<b>$this->m_sTable</b>$sFields<br/>\n";
 		// #@# todo - display html of an expression tree
 		//$this->m_oConditionExpr->DisplayHtml()
-		if (count($this->m_aFullTextNeedles) > 0)
-		{
-			echo "Full text criteria...<br/>\n";
-			echo "<ul class=\"treeview\">\n";
-			foreach ($this->m_aFullTextNeedles as $sFTNeedle)
-			{
-				echo "<li>$sFTNeedle</li>\n";
-			}
-			echo "</ul>";
-		}
 		if (count($this->m_aJoinSelects) > 0)
 		{
 			echo "Joined to...<br/>\n";
@@ -139,13 +114,19 @@ class SQLQuery
 		$oCondition = null;
 		$aDelTables = array();
 		$aSetValues = array();
-		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues);
+		$aSelectedIdFields = array();
+		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues, $aSelectedIdFields);
 		echo "From ...<br/>\n";
 		echo "<pre style=\"font-size: smaller;\">\n";
 		print_r($aFrom);
 		echo "</pre>";
 	}
 
+	public function SetSelect($aExpressions)
+	{
+		$this->m_aFields = $aExpressions;
+	}
+
 	public function SetCondition($oConditionExpr)
 	{
 		$this->m_oConditionExpr = $oConditionExpr;
@@ -153,7 +134,14 @@ class SQLQuery
 
 	public function AddCondition($oConditionExpr)
 	{
-		$this->m_oConditionExpr->LogAnd($oConditionExpr);
+		if (is_null($this->m_oConditionExpr))
+		{
+			$this->m_oConditionExpr = $oConditionExpr;
+		}
+		else
+		{
+			$this->m_oConditionExpr->LogAnd($oConditionExpr);
+		}
 	}
 
 	private function AddJoin($sJoinType, $oSQLQuery, $sLeftField, $sRightField, $sRightTableAlias = '')
@@ -175,7 +163,6 @@ class SQLQuery
 //		{
 //			throw new CoreException("Unknown field '$sRightField' in table '".$sRightTable."'");
 //		}
-
 		$this->m_aJoinSelects[] = array(
 			"jointype" => $sJoinType,
 			"select" => $oSQLQuery,
@@ -184,9 +171,26 @@ class SQLQuery
 			"righttablealias" => $sRightTableAlias
 		);
 	}
-	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRigthtTable = '')
+	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '')
 	{
-		$this->AddJoin("inner", $oSQLQuery, $sLeftField, $sRightField, $sRigthtTable);
+		$this->AddJoin("inner", $oSQLQuery, $sLeftField, $sRightField, $sRightTable);
+	}
+	public function AddInnerJoinTree($oSQLQuery, $sLeftFieldLeft, $sLeftFieldRight, $sRightFieldLeft, $sRightFieldRight, $sRightTableAlias = '', $iOperatorCode = TREE_OPERATOR_BELOW)
+	{
+		assert((get_class($oSQLQuery) == __CLASS__) || is_subclass_of($oSQLQuery, __CLASS__));
+		if (empty($sRightTableAlias))
+		{
+			$sRightTableAlias = $oSQLQuery->m_sTableAlias;
+		}
+		$this->m_aJoinSelects[] = array(
+			"jointype" => 'inner_tree',
+			"select" => $oSQLQuery,
+			"leftfield" => $sLeftFieldLeft,
+			"rightfield" => $sLeftFieldRight,
+			"rightfield_left" => $sRightFieldLeft,
+			"rightfield_right" => $sRightFieldRight,
+			"righttablealias" => $sRightTableAlias,
+			"tree_operator" => $iOperatorCode);
 	}
 	public function AddLeftJoin($oSQLQuery, $sLeftField, $sRightField)
 	{
@@ -202,7 +206,8 @@ class SQLQuery
 		$oCondition = null;
 		$aDelTables = array();
 		$aSetValues = array();
-		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues);
+		$aSelectedIdFields = array();
+		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues, $aSelectedIdFields);
 
 		// Target: DELETE myAlias1, myAlias2 FROM t1 as myAlias1, t2 as myAlias2, t3 as topreserve WHERE ...
 
@@ -216,8 +221,15 @@ class SQLQuery
 			throw new CoreException("Building a request wich will delete every object of a given table -looks suspicious- please use truncate instead...");
 		}
 		*/
-		$sWhere  = self::ClauseWhere($oCondition, $aArgs);
-		return "DELETE $sDelete FROM $sFrom WHERE $sWhere";
+		if (is_null($oCondition))
+		{
+			// Delete all !!!
+		}
+		else
+		{
+			$sWhere  = self::ClauseWhere($oCondition, $aArgs);
+			return "DELETE $sDelete FROM $sFrom WHERE $sWhere";
+		}
 	}
 
 	// Interface, build the SQL query
@@ -229,8 +241,8 @@ class SQLQuery
 		$oCondition = null;
 		$aDelTables = array();
 		$aSetValues = array();
-		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues);
-
+		$aSelectedIdFields = array();
+		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues, $aSelectedIdFields);
 		$sFrom   = self::ClauseFrom($aFrom);
 		$sValues = self::ClauseValues($aSetValues);
 		$sWhere  = self::ClauseWhere($oCondition, $aArgs);
@@ -246,13 +258,22 @@ class SQLQuery
 		$oCondition = null;
 		$aDelTables = array();
 		$aSetValues = array();
-		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues);
+		$aSelectedIdFields = array();
+		$this->privRender($aFrom, $aFields, $oCondition, $aDelTables, $aSetValues, $aSelectedIdFields);
 
 		$sFrom   = self::ClauseFrom($aFrom);
 		$sWhere  = self::ClauseWhere($oCondition, $aArgs);
 		if ($bGetCount)
 		{
-			$sSQL = "SELECT COUNT(*) AS COUNT FROM $sFrom WHERE $sWhere";
+			if (count($aSelectedIdFields) > 0)
+			{
+				$sIDFields = implode(', ', $aSelectedIdFields);
+				$sSQL = "SELECT COUNT(DISTINCT $sIDFields) AS COUNT FROM $sFrom WHERE $sWhere";
+			}
+			else
+			{
+				$sSQL = "SELECT COUNT(*) AS COUNT FROM $sFrom WHERE $sWhere";
+			}
 		}
 		else
 		{
@@ -309,6 +330,7 @@ class SQLQuery
 					$sFrom .= " ".self::ClauseFrom($aJoinInfo["subfrom"]);
 					break;
 				case "inner":
+				case "inner_tree":
 					$sFrom .= " INNER JOIN (`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
 					$sFrom .= " ".self::ClauseFrom($aJoinInfo["subfrom"]);
 					$sFrom .= ") ON ".$aJoinInfo["joincondition"];
@@ -338,7 +360,14 @@ class SQLQuery
 
 	private static function ClauseWhere($oConditionExpr, $aArgs = array())
 	{
-		return $oConditionExpr->Render($aArgs);
+		if (is_null($oConditionExpr))
+		{
+			return '1';
+		}
+		else
+		{
+			return $oConditionExpr->Render($aArgs);
+		}
 	}
 
 	private static function ClauseOrderBy($aOrderBy)
@@ -353,43 +382,14 @@ class SQLQuery
 	}
 
 	// Purpose: prepare the query data, once for all
-	private function privRender(&$aFrom, &$aFields, &$oCondition, &$aDelTables, &$aSetValues)
+	private function privRender(&$aFrom, &$aFields, &$oCondition, &$aDelTables, &$aSetValues, &$aSelectedIdFields)
 	{
-		$sTableAlias = $this->privRenderSingleTable($aFrom, $aFields, $aDelTables, $aSetValues);
-
-		// Add the full text search condition, based on each and every requested field
-		//
-		// To be updated with a real full text search based on the mySQL settings
-		// (then it might move somewhere else !)
-		//
+		$sTableAlias = $this->privRenderSingleTable($aFrom, $aFields, $aDelTables, $aSetValues, $aSelectedIdFields, '', array('jointype' => 'first'));
 		$oCondition = $this->m_oConditionExpr;
-		if ((count($aFields) > 0) && (count($this->m_aFullTextNeedles) > 0))
-		{
-			$aFieldExp = array();
-			foreach ($aFields as $sField)
-			{
-				// This is TEMPORARY (that's why it is weird, actually)
-				// Full text match will be done as an expression in the filter condition
-
-				// $sField is already a string `table`.`column`
-				// Let's make an expression out of it (again !)
-				$aFieldExp[] = Expression::FromOQL($sField);
-			}
-			$oFullTextExpr = new CharConcatExpression($aFieldExp);
-			// The cast is necessary because the CONCAT result in a binary string:
-			// if any of the field is a binary string => case sensitive comparison
-			//
-			foreach($this->m_aFullTextNeedles as $sFTNeedle)
-			{
-				$oNewCond = new BinaryExpression($oFullTextExpr, 'LIKE', new ScalarExpression("%$sFTNeedle%"));
-				$oCondition = $oCondition->LogAnd($oNewCond);
-			}
-		}
-
 		return $sTableAlias; 
 	}
 
-	private function privRenderSingleTable(&$aFrom, &$aFields, &$aDelTables, &$aSetValues, $sJoinType = 'first', $sCallerAlias = '', $sLeftField = '', $sRightField = '', $sRightTableAlias = '')
+	private function privRenderSingleTable(&$aFrom, &$aFields, &$aDelTables, &$aSetValues, &$aSelectedIdFields, $sCallerAlias = '', $aJoinData)
 	{
 		$aActualTableFields = CMDBSource::GetTableFieldsList($this->m_sTable);
 
@@ -397,12 +397,15 @@ class SQLQuery
 
 		// Handle the various kinds of join (or first table in the list)
 		//
-		if (empty($sRightTableAlias))
+		if (empty($aJoinData['righttablealias']))
 		{
 			$sRightTableAlias = $this->m_sTableAlias;
 		}
-		$sJoinCond = "`$sCallerAlias`.`$sLeftField` = `$sRightTableAlias`.`$sRightField`";
-		switch ($sJoinType)
+		else
+		{
+			$sRightTableAlias = $aJoinData['righttablealias'];
+		}
+		switch ($aJoinData['jointype'])
 		{
 			case "first":
 				$aFrom[$this->m_sTableAlias] = array("jointype"=>"first", "tablename"=>$this->m_sTable, "joincondition"=>"");
@@ -410,7 +413,50 @@ class SQLQuery
 			case "inner":
 			case "left":
 			// table or tablealias ???
-				$aFrom[$this->m_sTableAlias] = array("jointype"=>$sJoinType, "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
+				$sJoinCond = "`$sCallerAlias`.`{$aJoinData['leftfield']}` = `$sRightTableAlias`.`{$aJoinData['rightfield']}`";
+				$aFrom[$this->m_sTableAlias] = array("jointype"=>$aJoinData['jointype'], "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
+				break;
+			case "inner_tree":
+				$sNodeLeft = "`$sCallerAlias`.`{$aJoinData['leftfield']}`";
+				$sNodeRight = "`$sCallerAlias`.`{$aJoinData['rightfield']}`";
+				$sRootLeft = "`$sRightTableAlias`.`{$aJoinData['rightfield_left']}`";
+				$sRootRight = "`$sRightTableAlias`.`{$aJoinData['rightfield_right']}`";
+				switch($aJoinData['tree_operator'])
+				{
+					case TREE_OPERATOR_BELOW:
+					$sJoinCond = "$sNodeLeft >= $sRootLeft AND $sNodeLeft <= $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_BELOW_STRICT:
+					$sJoinCond = "$sNodeLeft > $sRootLeft AND $sNodeLeft < $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_BELOW: // Complementary of 'BELOW'
+					$sJoinCond = "$sNodeLeft < $sRootLeft OR $sNodeLeft > $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_BELOW_STRICT: // Complementary of BELOW_STRICT
+					$sJoinCond = "$sNodeLeft <= $sRootLeft OR $sNodeLeft >= $sRootRight";
+					break;
+
+					case TREE_OPERATOR_ABOVE:
+					$sJoinCond = "$sNodeLeft <= $sRootLeft AND $sNodeRight >= $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_ABOVE_STRICT:
+					$sJoinCond = "$sNodeLeft < $sRootLeft AND $sNodeRight > $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_ABOVE: // Complementary of 'ABOVE'
+					$sJoinCond = "$sNodeLeft > $sRootLeft OR $sNodeRight < $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_ABOVE_STRICT: // Complementary of ABOVE_STRICT
+					$sJoinCond = "$sNodeLeft >= $sRootLeft OR $sNodeRight <= $sRootRight";
+					break;
+					
+				}
+				$aFrom[$this->m_sTableAlias] = array("jointype"=>$aJoinData['jointype'], "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
 				break;
 		}
 
@@ -419,31 +465,35 @@ class SQLQuery
 		//
 		foreach($this->m_aFields as $sAlias => $oExpression)
 		{
-			$sTable = $oExpression->GetParent();
-			$sColumn = $oExpression->GetName();
 			$aFields["`$sAlias`"] = $oExpression->Render();
 		}
 		if ($this->m_bToDelete)
 		{
 			$aDelTables[] = "`{$this->m_sTableAlias}`";
 		}
+//echo "<p>in privRenderSingleTable this->m_aValues<pre>".print_r($this->m_aValues, true)."</pre></p>\n";	
 		foreach($this->m_aValues as $sFieldName=>$value)
 		{
 			$aSetValues["`{$this->m_sTableAlias}`.`$sFieldName`"] = $value; // quoted further!
 		}
 
+  		if (!is_null($this->m_oSelectedIdField))
+  		{
+  			$aSelectedIdFields[] = $this->m_oSelectedIdField->Render();
+		}
+
 		// loop on joins, to complete the list of tables/fields/conditions
 		//
 		$aTempFrom = array(); // temporary subset of 'from' specs, to be grouped in the final query
 		foreach ($this->m_aJoinSelects as $aJoinData)
 		{
-			$sJoinType = $aJoinData["jointype"];
 			$oRightSelect = $aJoinData["select"];
-			$sLeftField = $aJoinData["leftfield"];
-			$sRightField = $aJoinData["rightfield"];
-			$sRightTableAlias = $aJoinData["righttablealias"];
+//			$sJoinType = $aJoinData["jointype"];
+//			$sLeftField = $aJoinData["leftfield"];
+//			$sRightField = $aJoinData["rightfield"];
+//			$sRightTableAlias = $aJoinData["righttablealias"];
 
-			$sJoinTableAlias = $oRightSelect->privRenderSingleTable($aTempFrom, $aFields, $aDelTables, $aSetValues, $sJoinType, $this->m_sTableAlias, $sLeftField, $sRightField, $sRightTableAlias);
+			$sJoinTableAlias = $oRightSelect->privRenderSingleTable($aTempFrom, $aFields, $aDelTables, $aSetValues, $aSelectedIdFields, $this->m_sTableAlias, $aJoinData);
 		}
 		$aFrom[$this->m_sTableAlias]['subfrom'] = $aTempFrom;
 

core/templatestring.class.inc.php

@@ -0,0 +1,177 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Simple helper class to interpret and transform a template string
+ *
+ * Usage:
+ *     $oString = new TemplateString("Blah $this->friendlyname$ is in location $this->location_id->name$ ('$this->location_id->org_id->name$)");
+ *     echo $oString->Render(array('this' => $oContact));
+
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+/**
+ * Helper class
+ */
+class TemplateStringPlaceholder
+{
+	public $sToken;
+	public $sAttCode;
+	public $sFunction;
+	public $sParamName;
+	public $bIsValid;
+
+	public function __construct($sToken)
+	{
+		$this->sToken = $sToken;
+		$this->sAttcode = '';
+		$this->sFunction = '';
+		$this->sParamName = '';
+		$this->bIsValid = false; // Validity may be false in general, but it can work anyway (thanks to specialization) when rendering
+	}
+}
+
+/**
+ * Class TemplateString
+ */
+class TemplateString
+{
+	protected $m_sRaw;
+	protected $m_aPlaceholders;
+	    
+	public function __construct($sRaw)
+	{
+		$this->m_sRaw = $sRaw;
+		$this->m_aPlaceholders = null;
+	}
+	
+	/**
+	* Split the string into placholders
+	* @param Hash $aParamTypes Class of the expected parameters: hash array of '<param_id>' => '<class_name>'
+	* @return void
+	*/	  
+	protected function Analyze($aParamTypes = array())
+	{
+		if (!is_null($this->m_aPlaceholders)) return;
+
+		$this->m_aPlaceholders = array();
+		if (preg_match_all('/\\$([a-z0-9_]+(->[a-z0-9_]+)*)\\$/', $this->m_sRaw, $aMatches))
+		{
+			foreach($aMatches[1] as $sPlaceholder)
+			{
+				$oPlaceholder = new TemplateStringPlaceholder($sPlaceholder);
+				$oPlaceholder->bIsValid = false;
+				foreach ($aParamTypes as $sParamName => $sClass)
+				{
+					$sParamPrefix = $sParamName.'->';
+					if (substr($sPlaceholder, 0, strlen($sParamPrefix)) == $sParamPrefix)
+					{
+						// Todo - detect functions (label...)
+						$oPlaceholder->sFunction = '';
+
+						$oPlaceholder->sParamName = $sParamName;
+						$sAttcode = substr($sPlaceholder, strlen($sParamPrefix));
+						$oPlaceholder->sAttcode = $sAttcode;
+						$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttcode, true /* extended */);
+					}
+				}
+
+				$this->m_aPlaceholders[] = $oPlaceholder;
+			}
+		}
+	}
+
+	/**
+	* Return the placeholders (for reporting purposes)
+	* @return void
+	*/	  
+	public function GetPlaceholders()
+	{
+		return $this->m_aPlaceholders;
+	}
+
+	/**
+	* Check the format when possible
+	* @param Hash $aParamTypes Class of the expected parameters: hash array of '<param_id>' => '<class_name>'
+	* @return void
+	*/	  
+	public function IsValid($aParamTypes = array())
+	{
+		$this->Analyze($aParamTypes);
+
+		foreach($this->m_aPlaceholders as $oPlaceholder)
+		{
+			if (!$oPlaceholder->bIsValid)
+			{
+				if (count($aParamTypes) == 0)
+				{
+					return false;
+				}
+				if (array_key_exists($oPlaceholder->sParamName, $aParamTypes))
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	* Apply the given parameters to replace the placeholders
+	* @param Hash $aParamValues Value of the expected parameters: hash array of '<param_id>' => '<value>'
+	* @return void
+	*/	  
+	public function Render($aParamValues = array())
+	{
+		$aParamTypes = array();
+		foreach($aParamValues as $sParamName => $value)
+		{
+			$aParamTypes[$sParamName] = get_class($value);
+		}
+		$this->Analyze($aParamTypes);
+
+		$aSearch = array();
+		$aReplace = array();
+		foreach($this->m_aPlaceholders as $oPlaceholder)
+		{
+			if (array_key_exists($oPlaceholder->sParamName, $aParamValues))
+			{
+				$oRef = $aParamValues[$oPlaceholder->sParamName];
+				try
+				{
+					$value = $oRef->Get($oPlaceholder->sAttcode);
+					$aSearch[] = '$'.$oPlaceholder->sToken.'$';
+					$aReplace[] = $value;
+					$oPlaceholder->bIsValid = true;
+				}
+				catch(Exception $e)
+				{
+					$oPlaceholder->bIsValid = false;
+				}
+			}
+			else
+			{
+				$oPlaceholder->bIsValid = false;
+			}
+		}
+		return str_replace($aSearch, $aReplace, $this->m_sRaw);
+	}
+}
+?>

core/trigger.class.inc.php

@@ -41,7 +41,7 @@ abstract class Trigger extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
@@ -87,7 +87,7 @@ abstract class TriggerOnObject extends Trigger
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onobject",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -105,6 +105,34 @@ abstract class TriggerOnObject extends Trigger
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }
+/**
+ * To trigger notifications when a ticket is updated from the portal
+ */
+class TriggerOnPortalUpdate extends TriggerOnObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onportalupdate",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		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('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
+		// Search criteria
+	}
+}
 
 abstract class TriggerOnStateChange extends TriggerOnObject
 {
@@ -116,7 +144,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onstatechange",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -130,7 +158,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 		MetaModel::Init_SetZListItems('details', array('description', 'target_class', '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('name')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }
@@ -141,11 +169,11 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "core/cmdb,bizmodel",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onstateenter",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -158,7 +186,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 		MetaModel::Init_SetZListItems('details', array('description', 'target_class', '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('name')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }
@@ -169,11 +197,11 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "core/cmdb,bizmodel",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onstateleave",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -186,7 +214,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 		MetaModel::Init_SetZListItems('details', array('description', 'target_class', '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('')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('')); // Criteria of the advanced search form
 	}
 }
@@ -197,11 +225,11 @@ class TriggerOnObjectCreate extends TriggerOnObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "core/cmdb,bizmodel",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onobjcreate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -214,7 +242,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 		MetaModel::Init_SetZListItems('details', array('description', 'target_class', '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('name')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }
@@ -225,11 +253,11 @@ class lnkTriggerAction extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "core/cmdb,bizmodel",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
-			"reconc_keys" => array(""),
+			"reconc_keys" => array('action_id', 'trigger_id'),
 			"db_table" => "priv_link_action_trigger",
 			"db_key_field" => "link_id",
 			"db_finalclass_field" => "",

core/userrights.class.inc.php

@@ -160,8 +160,7 @@ abstract class User extends cmdbAbstractObject
 		}
 		// Check that this user has at least one profile assigned
 		$oSet = $this->Get('profile_list');
-		$aProfileLinks = $oSet->ToArray();
-		if (count($aProfileLinks) == 0)
+		if ($oSet->Count() == 0)
 		{
 			$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneProfileIsNeeded');
 		}
@@ -202,7 +201,7 @@ abstract class User extends cmdbAbstractObject
 				{
 					if (UserRights::IsStimulusAllowed($sClass, $sStimulusCode, null, $this))
 					{
-						$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription()).'">'.htmlentities($oStimulus->GetLabel()).'</span>';
+						$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
 					}
 				}
 				$sStimuli = implode(', ', $aStimuli);
@@ -296,6 +295,35 @@ abstract class UserInternal extends User
 	}
 }
 
+/**
+ * Self register extension  
+ *
+ * @package     iTopORM
+ */
+interface iSelfRegister
+{
+	/**
+	 * Called when no user is found in iTop for the corresponding 'name'. This method
+	 * can create/synchronize the User in iTop with an external source (such as AD/LDAP) on the fly
+	 * @param string $sName The typed-in user name
+	 * @param string $sPassword The typed-in password
+	 * @param string $sLoginMode The login method used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used (any|internal|external)
+	 * @return bool true if the user is a valid one, false otherwise
+	 */
+	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
+	
+	/**
+	 * Called after the user has been authenticated and found in iTop. This method can
+	 * Update the user's definition on the fly (profiles...) to keep it in sync with an external source 
+	 * @param User $oUser The user to update/synchronize
+	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used
+	 * @return void
+	 */
+	public static function UpdateUser(User $oUser, $sLoginMode, $sAuthentication);
+}
+
 /**
  * User management core API  
  *
@@ -306,6 +334,7 @@ class UserRights
 	protected static $m_oAddOn;
 	protected static $m_oUser;
 	protected static $m_oRealUser;
+	protected static $m_sSelfRegisterAddOn = null;
 
 	public static function SelectModule($sModuleName)
 	{
@@ -325,6 +354,15 @@ class UserRights
 		self::$m_oRealUser = null;
 	}
 
+	public static function SelectSelfRegister($sModuleName)
+	{
+		if (!class_exists($sModuleName))
+		{
+			throw new CoreException("Could not select the class, '$sModuleName' for self register, is not a valid class name");
+		}
+		self::$m_sSelfRegisterAddOn = $sModuleName;
+	}
+
 	public static function GetModuleInstance()
 	{
 		return self::$m_oAddOn;
@@ -362,21 +400,38 @@ class UserRights
 		return true;
 	}
 
-	public static function CheckCredentials($sName, $sPassword, $sAuthentication = 'any')
+	public static function CheckCredentials($sName, $sPassword, $sLoginMode = 'form', $sAuthentication = 'any')
 	{
 		$oUser = self::FindUser($sName, $sAuthentication);
 		if (is_null($oUser))
 		{
-			return false;
+			return self::CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
 		}
 
 		if (!$oUser->CheckCredentials($sPassword))
 		{
 			return false;
 		}
+		self::UpdateUser($oUser, $sLoginMode, $sAuthentication);
 		return true;
 	}
+	
+	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication)
+	{
+		if (self::$m_sSelfRegisterAddOn != null)
+		{
+			return call_user_func(array(self::$m_sSelfRegisterAddOn, 'CheckCredentialsAndCreateUser'), $sName, $sPassword, $sLoginMode, $sAuthentication);
+		}
+	}
 
+	public static function UpdateUser($oUser, $sLoginMode, $sAuthentication)
+	{
+		if (self::$m_sSelfRegisterAddOn != null)
+		{
+			call_user_func(array(self::$m_sSelfRegisterAddOn, 'UpdateUser'), $oUser, $sLoginMode, $sAuthentication);
+		}
+	}
+	
 	public static function TrustWebServerContext()
 	{
 		if (!is_null(self::$m_oUser))
@@ -406,18 +461,6 @@ class UserRights
 		}
 	}
 
-	public static function CanLogOff()
-	{
-		if (!is_null(self::$m_oUser))
-		{
- 			return self::$m_oUser->CanLogOff();
-		}
-		else
-		{
-			return false;
-		}
-	}
-
 	public static function ChangePassword($sOldPassword, $sNewPassword, $sName = '')
 	{
 		if (empty($sName))
@@ -610,8 +653,6 @@ class UserRights
 		if (!self::CheckLogin()) return true;
 
 		if (self::IsAdministrator()) return true;
-		// Portal users actions are limited by the portal page...
-		if (self::IsPortalUser()) return true;
 
 		if (MetaModel::HasCategory($sClass, 'bizmodel'))
 		{
@@ -640,10 +681,6 @@ class UserRights
 
 		if (MetaModel::HasCategory($sClass, 'bizmodel'))
 		{
-			// #@# Temporary?????
-			// The read access is controlled in MetaModel::MakeSelectQuery()
-			if ($iActionCode == UR_ACTION_READ) return true;
-
 			if (is_null($oUser))
 			{
 				$oUser = self::$m_oUser;
@@ -668,10 +705,7 @@ class UserRights
 
 		if (MetaModel::DBIsReadOnly())
 		{
-			if ($iActionCode == UR_ACTION_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_DELETE) return false;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return false;
+			return false;
 		}
 
 		if (self::IsAdministrator($oUser)) return true;
@@ -820,4 +854,437 @@ class UserRights
 	}
 }
 
+/**
+ * Helper class to get the number/list of items for which a given action is allowed/possible
+ */
+class ActionChecker
+{
+	var $oFilter;
+	var $iActionCode;
+	var $iAllowedCount = null;
+	var $aAllowedIDs = null;
+	
+	public function __construct(DBObjectSearch $oFilter, $iActionCode)
+	{
+		$this->oFilter = $oFilter;
+		$this->iActionCode = $iActionCode;
+		$this->iAllowedCount = null;
+		$this->aAllowedIDs = null;
+	}
+	
+	/**
+	 * returns the number of objects for which the action is allowed
+	 * @return integer The number of "allowed" objects 0..N
+	 */
+	public function GetAllowedCount()
+	{
+		if ($this->iAllowedCount == null) $this->CheckObjects();
+		return $this->iAllowedCount;
+	}
+	
+	/**
+	 * If IsAllowed returned UR_ALLOWED_DEPENDS, this methods returns
+	 * an array of ObjKey => Status (true|false)
+	 * @return array
+	 */
+	public function GetAllowedIDs()
+	{
+		if ($this->aAllowedIDs == null) $this->IsAllowed();
+		return $this->aAllowedIDs;
+	}
+	
+	/**
+	 * Check if the speficied stimulus is allowed for the set of objects
+	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
+	 */
+	public function IsAllowed()
+	{
+		$sClass = $this->oFilter->GetClass();
+		$oSet = new DBObjectSet($this->oFilter);
+		$iActionAllowed = UserRights::IsActionAllowed($sClass, $this->iActionCode, $oSet);
+		if ($iActionAllowed == UR_ALLOWED_DEPENDS)
+		{
+			// Check for each object if the action is allowed or not
+			$this->aAllowedIDs = array();
+			$oSet->Rewind();
+			$this->iAllowedCount = 0;
+			while($oObj = $oSet->Fetch())
+			{
+				$oObjSet = DBObjectSet::FromArray($sClass, array($oObj));
+				if (UserRights::IsActionAllowed($sClass, $this->iActionCode, $oObjSet) == UR_ALLOWED_NO)
+				{
+					$this->aAllowedIDs[$oObj->GetKey()] = false;
+				}
+				else
+				{
+					// Assume UR_ALLOWED_YES, since there is just one object !
+					$this->aAllowedIDs[$oObj->GetKey()] = true;
+					$this->iAllowedCount++;
+				}
+			}
+		}
+		else if ($iActionAllowed == UR_ALLOWED_YES)
+		{
+			$this->iAllowedCount = $oSet->Count();
+			$this->aAllowedIDs = array(); // Optimization: not filled when Ok for all objects
+		}
+		else // UR_ALLOWED_NO
+		{
+			$this->iAllowedCount = 0;
+			$this->aAllowedIDs = array();
+		}
+		return $iActionAllowed;
+	}
+}
+
+/**
+ * Helper class to get the number/list of items for which a given stimulus can be applied (allowed & possible)
+ */
+class StimulusChecker extends ActionChecker
+{
+	var $sState = null;
+	
+	public function __construct(DBObjectSearch $oFilter, $sState, $iStimulusCode)
+	{
+		parent::__construct($oFilter, $iStimulusCode);
+		$this->sState = $sState;
+	}
+
+	/**
+	 * Check if the speficied stimulus is allowed for the set of objects
+	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
+	 */
+	public function IsAllowed()
+	{
+		$sClass = $this->oFilter->GetClass();
+		if (MetaModel::IsAbstract($sClass)) return UR_ALLOWED_NO; // Safeguard, not implemented if the base class of the set is abstract !
+		
+		$oSet = new DBObjectSet($this->oFilter);
+		$iActionAllowed = UserRights::IsStimulusAllowed($sClass,  $this->iActionCode, $oSet);
+		if ($iActionAllowed == UR_ALLOWED_NO)
+		{
+			$this->iAllowedCount = 0;
+			$this->aAllowedIDs = array();
+		}
+		else // Even if UR_ALLOWED_YES, we need to check if each object is in the appropriate state
+		{
+			// Hmmm, may not be needed right now because we limit the "multiple" action to object in
+			// the same state... may be useful later on if we want to extend this behavior...
+			
+			// Check for each object if the action is allowed or not
+			$this->aAllowedIDs = array();
+			$oSet->Rewind();
+			$iAllowedCount = 0;
+			$iActionAllowed = UR_ALLOWED_DEPENDS;
+			while($oObj = $oSet->Fetch())
+			{
+				$aTransitions = $oObj->EnumTransitions();
+				if (array_key_exists($this->iActionCode, $aTransitions))
+				{
+					// Temporary optimization possible: since the current implementation
+					// of IsActionAllowed does not perform a 'per instance' check, we could
+					// skip this second validation phase and assume it would return UR_ALLOWED_YES
+					$oObjSet = DBObjectSet::FromArray($sClass, array($oObj));
+					if (!UserRights::IsStimulusAllowed($sClass, $this->iActionCode, $oObjSet))
+					{
+						$this->aAllowedIDs[$oObj->GetKey()] = false;
+					}
+					else
+					{
+						// Assume UR_ALLOWED_YES, since there is just one object !
+						$this->aAllowedIDs[$oObj->GetKey()] = true;
+						$this->iState = $oObj->GetState();
+						$this->iAllowedCount++;
+					}					
+				}
+				else
+				{
+					$this->aAllowedIDs[$oObj->GetKey()] = false;					
+				}				
+			}
+		}
+		
+		if ($this->iAllowedCount == $oSet->Count())
+		{
+			$iActionAllowed = UR_ALLOWED_YES;
+		}
+		if ($this->iAllowedCount == 0)
+		{
+			$iActionAllowed = UR_ALLOWED_NO;
+		}
+
+		return $iActionAllowed;
+	}
+	
+	public function GetState()
+	{
+		return $this->iState;
+	}		
+}
+
+/**
+ * Self-register extension to allow the automatic creation & update of CAS users
+ * 
+ * @package iTopORM
+ *
+ */
+class CAS_SelfRegister implements iSelfRegister
+{
+	/**
+	 * Called when no user is found in iTop for the corresponding 'name'. This method
+	 * can create/synchronize the User in iTop with an external source (such as AD/LDAP) on the fly
+	 * @param string $sName The CAS authenticated user name
+	 * @param string $sPassword Ignored
+	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used
+	 * @return bool true if the user is a valid one, false otherwise
+	 */
+	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication)
+	{
+		if ($sLoginMode != 'cas') return false; // Must be authenticated via CAS
+
+		$sCASMemberships = MetaModel::GetConfig()->Get('cas_memberof');
+		$bFound =  false;
+		if (!empty($sCASMemberships))
+		{
+			if (phpCAS::hasAttribute('memberOf'))
+			{
+				// A list of groups is specified, the user must a be member of (at least) one of them to pass
+				$aCASMemberships = array();
+				$aTmp = explode(';', $sCASMemberships);
+				setlocale(LC_ALL, "en_US.utf8"); // !!! WARNING: this is needed to have  the iconv //TRANSLIT working fine below !!!
+				foreach($aTmp as $sGroupName)
+				{
+					$aCASMemberships[] = trim(iconv('UTF-8', 'ASCII//TRANSLIT', $sGroupName)); // Just in case remove accents and spaces...
+				}
+
+				$aMemberOf = phpCAS::getAttribute('memberOf');
+				if (!is_array($aMemberOf)) $aMemberOf = array($aMemberOf); // Just one entry, turn it into an array
+				$aFilteredGroupNames = array();
+				foreach($aMemberOf as $sGroupName)
+				{
+					phpCAS::log("Info: user if a member of the group: ".$sGroupName);
+					$sGroupName = trim(iconv('UTF-8', 'ASCII//TRANSLIT', $sGroupName)); // Remove accents and spaces as well
+					$aFilteredGroupNames[] = $sGroupName;
+					if (in_array($sGroupName, $aCASMemberships))
+					{
+						$bCASUserSynchro = MetaModel::GetConfig()->Get('cas_user_synchro');
+						if ($bCASUserSynchro)
+						{
+							// If needed create a new user for this email/profile
+							phpCAS::log('Info: cas_user_synchro is ON');
+							$bFound = self::CreateCASUser(phpCAS::getUser(), $aMemberOf);
+						}
+						else
+						{
+							phpCAS::log('Info: cas_user_synchro is OFF');
+						}
+						$bFound = true;
+						break;
+					}	
+				}
+				if(!$bFound)
+				{
+					phpCAS::log("User ".phpCAS::getUser().", none of his/her groups (".implode('; ', $aFilteredGroupNames).") match any of the required groups: ".implode('; ', $aCASMemberships));
+				}
+			}
+			else
+			{
+				// Too bad, the user is not part of any of the group => not allowed
+				phpCAS::log("No 'memberOf' attribute found for user ".phpCAS::getUser().". Are you using the SAML protocol (S1) ?");
+			}
+		}
+		else
+		{
+			// No membership required, anybody will pass
+			$bFound = true;
+		}
+		
+		if (!$bFound)
+		{
+			// The user is not part of the allowed groups, => log out
+			$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
+			$sCASLogoutUrl = MetaModel::GetConfig()->Get('cas_logout_redirect_service');
+			if (empty($sCASLogoutUrl))
+			{
+				$sCASLogoutUrl = $sUrl;
+			}
+			phpCAS::logoutWithRedirectService($sCASLogoutUrl); // Redirects to the CAS logout page
+			// Will never return !			
+		}
+		return $bFound;
+	}
+	
+	/**
+	 * Called after the user has been authenticated and found in iTop. This method can
+	 * Update the user's definition (profiles...) on the fly to keep it in sync with an external source 
+	 * @param User $oUser The user to update/synchronize
+	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used
+	 * @return void
+	 */
+	public static function UpdateUser(User $oUser, $sLoginMode, $sAuthentication)
+	{
+		if (($sLoginMode == 'cas') && (phpCAS::hasAttribute('memberOf')))
+		{
+			$aMemberOf = phpCAS::getAttribute('memberOf');
+			if (!is_array($aMemberOf)) $aMemberOf = array($aMemberOf); // Just one entry, turn it into an array
+			
+			return self::SetProfilesFromCAS($oUser, $aMemberOf);
+		}
+		// No groups defined in CAS or not CAS at all: do nothing...
+		return true;
+	}
+	
+	/**
+	 * Helper method to create a CAS based user
+	 * @param string $sEmail
+	 * @param array $aGroups
+	 * @return bool true on success, false otherwise
+	 */
+	protected static function CreateCASUser($sEmail, $aGroups)
+	{
+		if (!MetaModel::IsValidClass('URP_Profiles'))
+		{
+			phpCAS::log("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
+			return false;
+		}
+				
+		$oUser = MetaModel::GetObjectByName('UserExternal', $sEmail, false);
+		if ($oUser == null)
+		{
+			// Create the user, link it to a contact
+			phpCAS::log("Info: the user '$sEmail' does not exist. A new UserExternal will be created.");
+			$oSearch = new DBObjectSearch('Person');
+			$oSearch->AddCondition('email', $sEmail);
+			$oSet = new DBObjectSet($oSearch);
+			$iContactId = 0;
+			switch($oSet->Count())
+			{
+				case 0:
+				phpCAS::log("Error: found no contact with the email: '$sEmail'. Cannot create the user in iTop.");
+				return;
+
+				case 1:
+				$oContact = $oSet->Fetch();
+				$iContactId = $oContact->GetKey();
+				phpCAS::log("Info: Found 1 contact '".$oContact->GetName()."' (id=$iContactId) corresponding to the email '$sEmail'.");
+				break;
+
+				default:
+				phpCAS::log("Error: ".$oSet->Count()." contacts have the same email: '$sEmail'. Cannot create a user for this email.");
+				return;
+			}
+			
+			$oUser = new UserExternal();
+			$oUser->Set('login', $sEmail);
+			$oUser->Set('contactid', $iContactId);
+			$oUser->Set('language', MetaModel::GetConfig()->GetDefaultLanguage());
+		}
+		else
+		{
+			phpCAS::log("Info: the user '$sEmail' already exists (id=".$oUser->GetKey().").");
+		}
+
+		// Now synchronize the profiles
+		if (!self::SetProfilesFromCAS($oUser, $aGroups))
+		{
+			return false;
+		}
+		else 
+		{
+			if ($oUser->IsNew() || $oUser->IsModified())
+			{
+				$oMyChange = MetaModel::NewObject("CMDBChange");
+				$oMyChange->Set("date", time());
+				$oMyChange->Set("userinfo", 'CAS/LDAP Synchro');
+				$oMyChange->DBInsert();
+				if ($oUser->IsNew())
+				{
+					$oUser->DBInsertTracked($oMyChange);
+				}
+				else
+				{
+					$oUser->DBUpdateTracked($oMyChange);
+				}
+			}
+			
+			return true;
+		}
+	}
+	
+	protected static function SetProfilesFromCAS($oUser, $aGroups)
+	{
+		if (!MetaModel::IsValidClass('URP_Profiles'))
+		{
+			phpCAS::log("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
+			return false;
+		}
+		
+		// read all the existing profiles
+		$oProfilesSearch = new DBObjectSearch('URP_Profiles');
+		$oProfilesSet = new DBObjectSet($oProfilesSearch);
+		$aAllProfiles = array();
+		while($oProfile = $oProfilesSet->Fetch())
+		{
+			$aAllProfiles[strtolower($oProfile->GetName())] = $oProfile->GetKey();
+		}
+		
+		// Translate the CAS/LDAP group names into iTop profile names
+		$aProfiles = array();
+		$sPattern = MetaModel::GetConfig()->Get('cas_profile_pattern');
+		foreach($aGroups as $sGroupName)
+		{
+			if (preg_match($sPattern, $sGroupName, $aMatches))
+			{
+				if (array_key_exists(strtolower($aMatches[1]), $aAllProfiles))
+				{
+					$aProfiles[] = $aAllProfiles[strtolower($aMatches[1])];
+				}
+				else
+				{
+					phpCAS::log("Warning: {$aMatches[1]} is not a valid iTop profile (extracted from group name: '$sGroupName'). Ignored.");
+				}
+			}
+		}
+		if (count($aProfiles) == 0)
+		{
+			phpCAS::log("Error: no group name matches the pattern: '$sPattern'. The user '$sEmail' has no profiles in iTop, and therefore cannot be created.");
+			return false;
+		}
+		
+		// Now synchronize the profiles
+		$oProfilesSet = DBObjectSet::FromScratch('URP_UserProfile');
+		foreach($aProfiles as $iProfileId)
+		{
+			$oLink = new URP_UserProfile();
+			$oLink->Set('profileid', $iProfileId);
+			$oLink->Set('reason', 'CAS/LDAP Synchro');
+			$oProfilesSet->AddObject($oLink);
+		}
+		$oUser->Set('profile_list', $oProfilesSet);
+		phpCAS::log("Info: the user $sEmail (id=".$oUser->GetKey().") now has the following profiles: '".implode("', '", $aProfiles)."'.");
+		return true;
+	}
+	/**
+	 * Helper function to check if the supplied string is a litteral string or a regular expression pattern
+	 * @param string $sCASPattern
+	 * @return bool True if it's a regular expression pattern, false otherwise
+	 */
+	protected static function IsPattern($sCASPattern)
+	{
+		if ((substr($sCASPattern, 0, 1) == '/') && (substr($sCASPattern, -1) == '/'))
+		{
+			// the string is enclosed by slashes, let's assume it's a pattern
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+
+// By default enable the 'CAS_SelfRegister' defined above
+UserRights::SelectSelfRegister('CAS_SelfRegister');
 ?>

core/valuesetdef.class.inc.php

@@ -60,10 +60,12 @@ abstract class ValueSetDefinition
 		}
 		if (strlen($sContains) == 0)
 		{
+			// No filtering
 			$aRet = $this->m_aValues;
 		}
 		else
 		{
+			// Filter on results containing the needle <sContain>
 			$aRet = array();
 			foreach ($this->m_aValues as $sKey=>$sValue)
 			{
@@ -73,6 +75,7 @@ abstract class ValueSetDefinition
 				}
 			}
 		}
+		// Sort on the display value
 		asort($aRet);
 		return $aRet;
 	}
@@ -88,21 +91,62 @@ abstract class ValueSetDefinition
  */
 class ValueSetObjects extends ValueSetDefinition
 {
+	protected $m_sContains;
 	protected $m_sFilterExpr; // in OQL
 	protected $m_sValueAttCode;
 	protected $m_aOrderBy;
+	protected $m_aExtraConditions;
 	private $m_bAllowAllData;
 
 	public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false)
 	{
+		$this->m_sContains = '';
 		$this->m_sFilterExpr = $sFilterExp;
 		$this->m_sValueAttCode = $sValueAttCode;
 		$this->m_aOrderBy = $aOrderBy;
 		$this->m_bAllowAllData = $bAllowAllData;
+		$this->m_aExtraConditions = array();
 	}
 
-	protected function LoadValues($aArgs)
+	public function AddCondition(DBObjectSearch $oFilter)
 	{
+		$this->m_aExtraConditions[] = $oFilter;		
+	}
+
+	public function ToObjectSet($aArgs = array(), $sContains = '')
+	{
+		if ($this->m_bAllowAllData)
+		{
+			$oFilter = DBObjectSearch::FromOQL_AllData($this->m_sFilterExpr);
+		}
+		else
+		{
+			$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr);
+		}
+		foreach($this->m_aExtraConditions as $oExtraFilter)
+		{
+			$oFilter->MergeWith($oExtraFilter);
+		}
+
+		return new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
+	}
+
+	public function GetValues($aArgs, $sContains = '')
+	{
+		if (!$this->m_bIsLoaded || ($sContains != $this->m_sContains))
+		{
+			$this->LoadValues($aArgs, $sContains);
+			$this->m_bIsLoaded = true;
+		}
+		// The results are already filtered and sorted (on friendly name)
+		$aRet = $this->m_aValues;
+		return $aRet;
+	}
+
+	protected function LoadValues($aArgs, $sContains = '')
+	{
+		$this->m_sContains = $sContains;
+
 		$this->m_aValues = array();
 		
 		if ($this->m_bAllowAllData)
@@ -114,6 +158,15 @@ class ValueSetObjects extends ValueSetDefinition
 			$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr);
 		}
 		if (!$oFilter) return false;
+		foreach($this->m_aExtraConditions as $oExtraFilter)
+		{
+			$oFilter->MergeWith($oExtraFilter);
+		}
+
+		$oValueExpr = new ScalarExpression('%'.$sContains.'%');
+		$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
+		$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+		$oFilter->AddConditionExpression($oNewCondition);
 
 		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
 		while ($oObject = $oObjects->Fetch())
@@ -198,7 +251,7 @@ class ValueSetRelatedObjectsFromLinkSet extends ValueSetDefinition
 			}
 			// #@# or AddObjectArray($aObjects) ?
 			$oSetToCreate = DBObjectSet::FromArray($this->m_sTargetLinkClass, $aLinksToCreate);
-			$this->m_aValues[$oObject->GetKey()] = $oObject->GetAsHTML($oObject->GetName());
+			$this->m_aValues[$oObject->GetKey()] = $oObject->GetName();
 		}
 
 		return true;
@@ -250,6 +303,34 @@ class ValueSetEnum extends ValueSetDefinition
 	}
 }
 
+/**
+ * Fixed set values, defined as a range: 0..59 (with an optional increment)
+ *
+ * @package     iTopORM
+ */
+class ValueSetRange extends ValueSetDefinition
+{
+	protected $m_iStart;
+	protected $m_iEnd;
+
+	public function __construct($iStart, $iEnd, $iStep = 1)
+	{
+		$this->m_iStart = $iStart;
+		$this->m_iEnd = $iEnd;
+		$this->m_iStep = $iStep;
+	}
+
+	protected function LoadValues($aArgs)
+	{
+		$iValue = $this->m_iStart;
+		for($iValue = $this->m_iStart; $iValue <= $this->m_iEnd; $iValue += $this->m_iStep)
+		{
+			$this->m_aValues[$iValue] = $iValue;
+		}
+		return true;
+	}
+}
+
 
 /**
  * Data model classes 

css/light-grey.css

@@ -1,6 +1,6 @@
 /* CSS Document */
 body {
-    font-family: Tahoma, Verdana, Arial, Helevtica;
+    font-family: Tahoma, Verdana, Arial, Helvetica;
     font-size: 10pt;
     background-color: #fff;
     color:#000000;
@@ -10,7 +10,7 @@ body {
 }
 
 .raw_output {
-    font-family: Courier-New, Courier, Arial, Helevtica;
+    font-family: Courier-New, Courier, Arial, Helvetica;
     font-size: 8pt;
     background-color: #eeeeee;
     color: #000000;
@@ -126,9 +126,9 @@ th.headerSortDown {
 
 td {
     font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 8pt;
+    font-size: 12px;
     color:#696969;
-	background-color: #ffffff;
+	nobackground-color: #ffffff;
 	padding: 0px;
 }
 
@@ -139,12 +139,45 @@ tr.clicked td {
 }
 
 td.label {
+	vertical-align: top;
+}
+td.label span {
     font-family: Tahoma, Verdana, Arial, Helvetica;
     font-size: 12px;
     color: #000000;
-    background-color:#f6f6f6;
-    padding: 0.25em;
-    font-weight:bold;	
+    padding: 5px;
+    padding-right: 10px;	
+    font-weight:bold;
+    vertical-align: top;
+    text-align: right;
+    display: block;
+}
+fieldset td.label span {
+    padding: 3px;
+    padding-right: 10px;
+}
+fieldset {
+    margin-top: 3px;	
+    -moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border-style: solid;
+	border-color: #ddd;
+}
+
+legend {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 12px;
+	padding:8px;
+	color: #fff;
+	background-color: #1C94C4;
+	font-weight: bold;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+.ui-widget-content td legend a, .ui-widget-content td legend a:hover, .ui-widget-content td legend a:visited {
+	color: #fff;
 }
 
 .ui-widget-content td a, p a, p a:visited, td a, td a:visited {
@@ -160,7 +193,7 @@ p a:hover, td a:hover {
 	background: url(../images/mini-arrow-orange.gif) no-repeat left;
 }
 
-td a.no-arrow, td a.no-arrow:visited {
+td a.no-arrow, td a.no-arrow:visited, .SearchDrawer a.no-arrow, .SearchDrawer a.no-arrow:visited {
 	text-decoration:none;
 	color:#000000;
 	padding-left:0px;
@@ -373,8 +406,10 @@ div.itop_popup {
 
 div.itop_popup > ul {
 	height:19px;
+	line-height: 17px;
+	vertical-align: middle;
 	display:block;
-	width:70px; /* Nasty work-around for IE... en attendant mieux */
+	nowidth:70px; /* Nasty work-around for IE... en attendant mieux */
 	padding-left: 5px;
 	background: url(../images/actions_left.png) no-repeat top left;
 	cursor: pointer;
@@ -385,7 +420,7 @@ div.itop_popup > ul > li {
 	list-style: none;
 	font-size: 11px;
 	font-family: Tahoma,sans-serif;
-	height: 19px;
+	height: 17px;
 	padding-right: 16px;
 	padding-left: 4px;
 	background: url(../images/actions_right.png) no-repeat top right transparent;
@@ -917,3 +952,163 @@ span.form_validation {
 	width: 95%;
 	-moz-border-radius: 0.5em;
 }
+.wiki_broken_link {
+	text-decoration: line-through;
+}
+.synoptics, .synoptics tr td {
+	background: transparent;
+	padding:10px;
+	font-size:1em;
+	vertical-align:middle;
+	color:#fff;
+	text-align:center;
+}
+.synoptics tr td.arrow {
+	color:#333;
+	border-top: 1px dashed #333;
+	width:100px;
+}
+.synoptics tr.synoptics_header td {
+	color:#000; font-size:1em;
+	vertical-align:middle;
+	text-align:center;
+}
+.mono_value {
+	display: inline-block;
+	background-color: #3c3;
+	color: #fff;
+	font-weight:bold;
+	padding: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin-left:3px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+.multi_values {
+	display: inline-block;
+	background-color: #c33;
+	color: #fff;
+	font-weight:bold;
+	padding: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin-left:3px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+.caselog {
+	overflow-x: hidden;
+	display: block;
+	overflow-y: auto;
+	border: 1px #ddd solid;
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 12px;
+}
+.caselog_input_header {
+	padding-top:3px;
+	padding-bottom:3px;
+	border-top:1px solid #fff;
+	background: #ddd;
+	width:100%;
+}
+.caselog_header {
+	padding:3px;
+	border-top:1px solid #fff;
+	background: #ddd url(../images/plus.gif) left no-repeat;
+	padding-left: 16px;
+	cursor: pointer;
+	width:100%;
+}
+.caselog_header.open {
+	background: #ddd url(../images/minus.gif) left no-repeat;
+}
+.caselog_entry {
+	padding:3px;
+	padding-left: 16px;
+	border-bottom:1px #999 solid;
+	margin-left:0;
+	margin-right:0;
+ 	white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+, CSS3 */
+}
+table.details {
+  border-collapse: collapse;
+  noborder-bottom: 2px #fff solid;
+  width:100%;
+}
+table.details>tbody>tr>td {
+	border-bottom: 2px #ddd solid;
+	padding-bottom: 5px;
+	padding-top: 3px;
+}
+fieldset table.details>tbody>tr>td {
+	padding-top: 3px;
+	background: transparent;
+	border: 0;
+}
+.ac_dlg_loading {
+	background: white url('../images/indicator.gif') right center no-repeat;
+}
+table.pagination {
+	display:inline-block;
+}
+table.pagination tr td {
+	padding: 3px;
+}
+.pager {
+	float:left;
+}
+.pager p {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+.pager td span {
+	min-width: 20px;
+	display:inline-block;
+	text-align: center;
+	cursor: pointer;
+}
+
+.pager td span.curr_page {
+	color: #fff;
+	background: #999;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+img.prev, img.first, img.next, img.last {
+	cursor: pointer;
+}
+div.actions_button {
+	float:right;
+	background: url("../images/actions_left.png") no-repeat scroll left top transparent;
+	padding-left: 5px;
+	margin-top: 13px;
+	margin-right: 10px;
+	height:17px;
+	vertical-align: middle;
+}
+
+div.actions_button a, .actions_button a:hover, .actions_button a:visited {
+	background:url(../images/actions_bkg.png) no-repeat scroll right top transparent;
+	color:#fff;
+	padding-right: 8px;
+	cursor:pointer;
+	font-family: Tahoma,sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	padding-left: 4px;
+	text-decoration: none;
+	height:17px;
+	line-height: 17px;
+	display: block;
+}
+select#org_id {
+	max-width: 90%;
+}

dictionaries/dictionary.itop.core.php

@@ -84,14 +84,38 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Core:AttributeTemplateHTML' => 'Template HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders',
 
-	'Core:AttributeWikiText' => 'Wiki article',
-	'Core:AttributeWikiText+' => 'Wiki formatted text',
-
 	'Core:AttributeDateTime' => 'Date/time',
 	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>yyyy-mm-dd hh:mm:ss</b><br/>
+	Example: 2011-07-19 18:40:00
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>',
 
 	'Core:AttributeDate' => 'Date',
 	'Core:AttributeDate+' => 'Date (year-month-day)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>yyyy-mm-dd</b><br/>
+	Example: 2011-07-19
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>',
 
 	'Core:AttributeDeadline' => 'Deadline',
 	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time',
@@ -116,6 +140,12 @@ Dict::Add('EN US', 'English', 'English', array(
 
 	'Core:AttributePropertySet' => 'Properties',
 	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)',
+
+	'Core:AttributeFriendlyName' => 'Friendly name',
+	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes',
+
+	'Core:FriendlyName-Label' => 'Name',
+	'Core:FriendlyName-Description' => 'Friendly name',
 ));
 
 
@@ -205,9 +235,11 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Change:ObjectDeleted' => 'Object deleted',
 	'Change:ObjectModified' => 'Object modified',
 	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s set to %2$s (previous value: %3$s)',
+	'Change:AttName_SetTo' => '%1$s set to %2$s',
 	'Change:Text_AppendedTo_AttName' => '%1$s appended to %2$s',
 	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modified, previous value: %2$s',
 	'Change:AttName_Changed' => '%1$s modified',
+	'Change:AttName_EntryAdded' => '%1$s modified, new entry added.',
 ));
 
 //
@@ -239,13 +271,13 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:Event' => 'Log Event',
 	'Class:Event+' => 'An application internal event',
-	'Class:Event/Attribute:message' => 'message',
+	'Class:Event/Attribute:message' => 'Message',
 	'Class:Event/Attribute:message+' => 'short description of the event',
-	'Class:Event/Attribute:date' => 'date',
+	'Class:Event/Attribute:date' => 'Date',
 	'Class:Event/Attribute:date+' => 'date and time at which the changes have been recorded',
-	'Class:Event/Attribute:userinfo' => 'user info',
+	'Class:Event/Attribute:userinfo' => 'User info',
 	'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
-	'Class:Event/Attribute:finalclass' => 'type',
+	'Class:Event/Attribute:finalclass' => 'Type',
 	'Class:Event/Attribute:finalclass+' => '',
 ));
 
@@ -329,6 +361,21 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:EventWebService/Attribute:data+' => 'Result data',
 ));
 
+//
+// Class: EventLoginUsage
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventLoginUsage' => 'Login Usage',
+	'Class:EventLoginUsage+' => 'Connection to the application',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User',
+));
+
 //
 // Class: Action
 //
@@ -422,6 +469,15 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:TriggerOnObject/Attribute:target_class+' => '',
 ));
 
+//
+// Class: TriggerOnPortalUpdate
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal',
+));
+
 //
 // Class: TriggerOnStateChange
 //
@@ -479,5 +535,223 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:lnkTriggerAction/Attribute:order+' => 'Actions execution order',
 ));
 
+//
+// Synchro Data Source
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SynchroDataSource/Attribute:name' => 'Name',
+	'Class:SynchroDataSource/Attribute:name+' => 'Name',
+	'Class:SynchroDataSource/Attribute:description' => 'Description',
+	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class',
+	'Class:SynchroDataSource/Attribute:user_id' => 'User',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy', //TODO enum values
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted',
+	'SynchroDataSource:Description' => 'Description',
+	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
+	'SynchroDataSource:Deletion' => 'Deletion rules',
+	'SynchroDataSource:Status' => 'Status',
+	'SynchroDataSource:Information' => 'Information',
+	'SynchroDataSource:Definition' => 'Definition',
+	'Core:SynchroAttributes' => 'Attributes',
+	'Core:SynchroStatus' => 'Status',
+	'Core:Synchro:ErrorsLabel' => 'Errors',	
+	'Core:Synchro:CreatedLabel' => 'Created',
+	'Core:Synchro:ModifiedLabel' => 'Modified',
+	'Core:Synchro:UnchangedLabel' => 'Unchanged',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errors',
+	'Core:Synchro:ReconciledLabel' => 'Reconciled',
+	'Core:Synchro:ReconciledNewLabel' => 'Created',
+	'Core:SynchroReconcile:Yes' => 'Yes',
+	'Core:SynchroReconcile:No' => 'No',
+	'Core:SynchroUpdate:Yes' => 'Yes',
+	'Core:SynchroUpdate:No' => 'No',
+	'Core:Synchro:LastestStatus' => 'Latest Status',
+	'Core:Synchro:History' => 'Synchronization History',
+	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...',
+	'Menu:DataSources' => 'Synchronization Data Sources',
+	'Menu:DataSources+' => 'All Synchronization Data Sources',
+	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)',
+	'Core:Synchro:label_repl_new' => 'New (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)', 
+	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Created (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)',
+	'Core:Synchro:History' => 'Synchronization History',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.',			
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete',			
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.',
+	'Core:SynchroReplica:PublicData' => 'Public Data',
+	'Core:SynchroReplica:PrivateDetails' => 'Private Details',
+	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
+	'Core:SynchroAtt:attcode' => 'Attribute',
+	'Core:SynchroAtt:attcode+' => 'Field of the object',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?',
+	'Core:SynchroAtt:reconciliation+' => 'Used for searching',
+	'Core:SynchroAtt:update' => 'Update ?',
+	'Core:SynchroAtt:update+' => 'Used to update the object',
+	'Core:SynchroAtt:update_policy' => 'Update Policy',
+	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)',
+	'Core:Synchro:ListOfDataSources' => 'List of data sources:',
+	'Core:Synchro:LastSynchro' => 'Last synchronization:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s',
+	'TitleSynchroExecution' => 'Execution of the synchronization',
+	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s',
+	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.',
+	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
+	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
+	'Class:AsyncSendEmail' => 'Email (asynchronous)',
+	'Class:AsyncSendEmail/Attribute:to' => 'To',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Subject',
+	'Class:AsyncSendEmail/Attribute:body' => 'Body',
+	'Class:AsyncSendEmail/Attribute:header' => 'Header',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry',
+	'Class:SynchroDataSource' => 'Synchro Data Source',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody',
+	'Class:SynchroAttribute' => 'Synchro Attribute',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Sycnhro Data Source',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code',
+	'Class:SynchroAttribute/Attribute:update' => 'Update',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Class',
+	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute',
+	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator',
+	'Class:SynchroLog' => 'Synchr Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroLog/Attribute:start_date' => 'Start Date',
+	'Class:SynchroLog/Attribute:end_date' => 'End Date',
+	'Class:SynchroLog/Attribute:status' => 'Status',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Error',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged',
+	'Class:SynchroLog/Attribute:last_error' => 'Last error',
+	'Class:SynchroLog/Attribute:traces' => 'Traces',
+	'Class:SynchroReplica' => 'Synchro Replica',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen',
+	'Class:SynchroReplica/Attribute:status' => 'Status',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'New',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date',
+	'Class:appUserPreferences' => 'User Preferences',
+	'Class:appUserPreferences/Attribute:userid' => 'User',
+	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
+));
+
+//
+// Attribute Duration
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Core:Duration_Seconds'	=> '%1$ds',	
+	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
+));
 
 ?>

dictionaries/dictionary.itop.ui.php

@@ -76,6 +76,26 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Class:AuditRule/Attribute:category_name+' => 'Name of the category for this rule',
 ));
 
+//
+// Class: QueryOQL
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Query' => 'Query',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way',
+	'Class:Query/Attribute:name' => 'Name',
+	'Class:Query/Attribute:name+' => 'Identifies the query',
+	'Class:Query/Attribute:description' => 'Description',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)',
+	'Class:Query/Attribute:fields' => 'Fields',
+	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export',
+
+	'Class:QueryOQL' => 'OQL Query',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language',
+	'Class:QueryOQL/Attribute:oql' => 'Expression',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression',
+));
+
 //////////////////////////////////////////////////////////////////////
 // Classes in 'addon/userrights'
 //////////////////////////////////////////////////////////////////////
@@ -367,7 +387,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrect link definition: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
 	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d not found.',
 	'UI:Error:WizardCircularReferenceInDependencies' => 'Error: Circular reference in the dependencies between the fields, check the data model.',
-	'UI:Error:UploadedFileTooBig' => 'Uploaded file is too big. (Max allowed size is %1$s). Check you PHP configuration for upload_max_filesize and post_max_size.',
+	'UI:Error:UploadedFileTooBig' => 'The uploaded file is too big. (Max allowed size is %1$s). To modify this limit, contact your iTop administrator. (Check the PHP configuration for upload_max_filesize and post_max_size on the server).',
 	'UI:Error:UploadedFileTruncated.' => 'Uploaded file has been truncated !',
 	'UI:Error:NoTmpDir' => 'The temporary directory is not defined.',
 	'UI:Error:CannotWriteToTmp_Dir' => 'Unable to write the temporary file to the disk. upload_tmp_dir = "%1$s".',
@@ -400,7 +420,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:HistoryTab' => 'History',
 	'UI:NotificationsTab' => 'Notifications',
 	'UI:History:BulkImports' => 'History',
-	'UI:History:BulkImports+' => 'List of CSV imports (last first)',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)',
 	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)',
 	'UI:History:Date' => 'Date',
 	'UI:History:Date+' => 'Date of the change',
@@ -416,6 +436,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:History:StatsDeletes+' => 'Count of objects deleted',
 	'UI:Loading' => 'Loading...',
 	'UI:Menu:Actions' => 'Actions',
+	'UI:Menu:OtherActions' => 'Other Actions',
 	'UI:Menu:New' => 'New...',
 	'UI:Menu:Add' => 'Add...',
 	'UI:Menu:Manage' => 'Manage...',
@@ -428,6 +449,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:UndefinedObject' => 'undefined',
 	'UI:Document:OpenInNewWindow:Download' => 'Open in new window: %1$s, Download: %2$s',
 	'UI:SelectAllToggle+' => 'Select / Deselect All',
+	'UI:SplitDateTime-Date' => 'date',
+	'UI:SplitDateTime-Time' => 'time',
 	'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
 	'UI:DisplayAll' => 'Display All',
 	'UI:CollapseList' => 'Collapse',
@@ -447,6 +470,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Login:IdentifyYourself' => 'Identify yourself before continuing',
 	'UI:Login:UserNamePrompt' => 'User Name',
 	'UI:Login:PasswordPrompt' => 'Password',
+	'UI:Login:About' => '',
 	'UI:Login:ChangeYourPassword' => 'Change Your Password',
 	'UI:Login:OldPasswordPrompt' => 'Old password',
 	'UI:Login:NewPasswordPrompt' => 'New password',
@@ -456,6 +480,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:LogOff:ThankYou' => 'Thank you for using iTop',
 	'UI:LogOff:ClickHereToLoginAgain' => 'Click here to login again...',
 	'UI:ChangePwdMenu' => 'Change Password...',
+	'UI:Login:PasswordChanged' => 'Password successfully set !',
 	'UI:AccessRO-All' => 'iTop is read-only',
 	'UI:AccessRO-Users' => 'iTop is read-only for end-users',
 	'UI:Login:RetypePwdDoesNotMatch' => 'New password and retyped new password do not match !',
@@ -530,7 +555,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Audit:HeaderNbObjects' => '# Objects',
 	'UI:Audit:HeaderNbErrors' => '# Errors',
 	'UI:Audit:PercentageOk' => '% Ok',
-	
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.',
+
 	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluation',
 	'UI:RunQuery:QueryExamples' => 'Query Examples',
 	'UI:RunQuery:HeaderPurpose' => 'Purpose',
@@ -542,7 +569,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
 	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
 	'UI:RunQuery:Error' => 'An error occured while running the query: %1$s',
-	
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries',
 	'UI:Schema:Title' => 'iTop objects schema',
 	'UI:Schema:CategoryMenuItem' => 'Category <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relationships',
@@ -602,8 +629,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Schema:LifeCycleAttributeMustChange' => 'Must change',
 	'UI:Schema:LifeCycleAttributeMustPrompt' => 'User will be prompted to change the value',
 	'UI:Schema:LifeCycleEmptyList' => 'empty list',
-	
 	'UI:LinksWidget:Autocomplete+' => 'Type the first 3 characters...',
+	'UI:Edit:TestQuery' => 'Test query',
 	'UI:Combo:SelectValue' => '--- select a value ---',
 	'UI:Label:SelectedObjects' => 'Selected objects: ',
 	'UI:Label:AvailableObjects' => 'Available objects: ',
@@ -616,15 +643,17 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:RemoveLinkedObjectsOf_Class' => 'Remove selected objects',
 	'UI:Message:EmptyList:UseAdd' => 'The list is empty, use the "Add..." button to add elements.',
 	'UI:Message:EmptyList:UseSearchForm' => 'Use the search form above to search for objects to be added.',
-	
 	'UI:Wizard:FinalStepTitle' => 'Final step: confirmation',
 	'UI:Title:DeletionOf_Object' => 'Deletion of %1$s',
 	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Bulk deletion of %1$d objects of class %2$s',
 	'UI:Delete:NotAllowedToDelete' => 'You are not allowed to delete this object',
 	'UI:Delete:NotAllowedToUpdate_Fields' => 'You are not allowed to update the following field(s): %1$s',
 	'UI:Error:NotEnoughRightsToDelete' => 'This object could not be deleted because the current user do not have sufficient rights',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
 	'UI:Error:CannotDeleteBecauseOfDepencies' => 'This object could not be deleted because some manual operations must be performed prior to that',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that',
 	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
+	'UI:Delete:Deleted' => 'deleted',
 	'UI:Delete:AutomaticallyDeleted' => 'automatically deleted',
 	'UI:Delete:AutomaticResetOf_Fields' => 'automatic reset of field(s): %1$s',
 	'UI:Delete:CleaningUpRefencesTo_Object' => 'Cleaning up all references to %1$s...',
@@ -633,8 +662,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s deleted.',
 	'UI:Delete:ConfirmDeletionOf_Name' => 'Deletion of %1$s',
 	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Deletion of %1$d objects of class %2$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => 'Should be automaticaly deleted, but you are not allowed to do so',
-	'UI:Delete:MustBeDeletedManuallyButNotAllowed' => 'Must be deleted manually - but you are not allowed to delete this object, please contact your application admin',
+	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s',
 	'UI:Delete:WillBeDeletedAutomatically' => 'Will be automaticaly deleted',
 	'UI:Delete:MustBeDeletedManually' => 'Must be deleted manually',
 	'UI:Delete:CannotUpdateBecause_Issue' => 'Should be automatically updated, but: %1$s',
@@ -815,6 +845,9 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Menu:RunQueriesMenu' => 'Run Queries',
 	'Menu:RunQueriesMenu+' => 'Run any query',
 	
+	'Menu:QueryMenu' => 'Query phrasebook',
+	'Menu:QueryMenu+' => 'Query phrasebook',
+	
 	'Menu:DataAdministration' => 'Data administration',
 	'Menu:DataAdministration+' => 'Data administration',
 	
@@ -856,14 +889,19 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'UI:RelationshipGraph' => 'Graphical view',
 	'UI:RelationshipList' => 'List',
 	'UI:OperationCancelled' => 'Operation Cancelled',
+	'UI:ElementsDisplayed' => 'Filtering',
 
 	'Portal:Title' => 'iTop user portal',
 	'Portal:Refresh' => 'Refresh',
 	'Portal:Back' => 'Back',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Create a new request',
 	'Portal:ChangeMyPassword' => 'Change my password',
 	'Portal:Disconnect' => 'Disconnect',
 	'Portal:OpenRequests' => 'My open requests',
+	'Portal:ClosedRequests'  => 'My closed requests',
 	'Portal:ResolvedRequests'  => 'My resolved requests',
 	'Portal:SelectService' => 'Select a service from the catalog:',
 	'Portal:PleaseSelectOneService' => 'Please select one service',
@@ -871,17 +909,59 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Portal:PleaseSelectAServiceSubCategory' => 'Please select one sub-category',
 	'Portal:DescriptionOfTheRequest' => 'Enter the description of your request:',
 	'Portal:TitleRequestDetailsFor_Request' => 'Details for request %1$s:',
-	'Portal:NoOpenRequest' => 'No request in this category.',
+	'Portal:NoOpenRequest' => 'No request in this category',
+	'Portal:NoClosedRequest' => 'No request in this category',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
 	'Portal:Button:CloseTicket' => 'Close this ticket',
+	'Portal:Button:UpdateRequest' => 'Update the request',
 	'Portal:EnterYourCommentsOnTicket' => 'Enter your comments about the resolution of this ticket:',
 	'Portal:ErrorNoContactForThisUser' => 'Error: the current user is not associated with a Contact/Person. Please contact your administrator.',
 	'Portal:Attachments' => 'Attachments',
 	'Portal:AddAttachment' => ' Add Attachment ',
 	'Portal:RemoveAttachment' => ' Remove Attachment ',
 	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)',
-	'Enum:Undefined' => 'Undefined',
+	'Enum:Undefined' => 'Undefined',	
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds',
+	'UI:ModifyAllPageTitle' => 'Modify All',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d',
+	'UI:Menu:ModifyAll' => 'Modify...',
+	'UI:Button:ModifyAll' => 'Modify All',
+	'UI:Button:PreviewModifications' => 'Preview Modifications >>',
+	'UI:ModifiedObject' => 'Object Modified',
+	'UI:BulkModifyStatus' => 'Operation',
+	'UI:BulkModifyStatus+' => 'Status of the operation',
+	'UI:BulkModifyErrors' => 'Errors (if any)',
+	'UI:BulkModifyErrors+' => 'Errors preventing the modification',	
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Error',
+	'UI:BulkModifyStatusModified' => 'Modified',
+	'UI:BulkModifyStatusSkipped' => 'Skipped',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)',
+	'UI:BulkModify:N_MoreValues' => '%1$d more values...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s',
+	'UI:FailedToApplyStimuli' => 'The action has failed.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s',
+	'UI:CaseLogTypeYourTextHere' => 'Type your text here:',
+	'UI:CaseLog:DateFormat' => 'Y-m-d H:i:s',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Initial value:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.',
+	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.',
+	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.',
+	'UI:Pagination:PageSize' => '%1$s objects per page',
+	'UI:Pagination:PagesLabel' => 'Pages:',
+	'UI:Pagination:All' => 'All',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s',
+	'UI:Preferences' => 'Preferences...',
+	'UI:FavoriteOrganizations' => 'My Favorite Organizations',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. '.
+								   'Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting "All Organizations" in the drop-down list.',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ',
 ));
-
-
-
 ?>

dictionaries/es_cr.dictionary.itop.core.php

@@ -29,7 +29,7 @@
 //////////////////////////////////////////////////////////////////////
 //
 
-Dict::Add('ES CR', 'English', 'English', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:AttributeLinkedSet' => 'Array of objects',
 	'Core:AttributeLinkedSet+' => 'Any kind of objects [subclass] of the same class',
 
@@ -90,9 +90,6 @@ Dict::Add('ES CR', 'English', 'English', array(
 	'Core:AttributeTemplateHTML' => 'Template HTML',
 	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders',
 
-	'Core:AttributeWikiText' => 'Wiki article',
-	'Core:AttributeWikiText+' => 'Wiki formatted text',
-
 	'Core:AttributeDateTime' => 'Date/time',
 	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)',
 
@@ -203,6 +200,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 // Used by CMDBChangeOp... & derived classes
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s modificado en %2$s (valor anterior: %3$s)',
+	'Change:AttName_SetTo' => '%1$s modificado en %2$s',
 	'Change:Text_AppendedTo_AttName' => '%1$s añadido a %2$s',
 	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modificado, valor anterior: %2$s',
 	'Change:AttName_Changed' => '%1$s modificado',

dictionaries/es_cr.dictionary.itop.ui.php

@@ -414,6 +414,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:History:Changes+' => 'Chambios hechos al objeto',
 	'UI:Loading' => 'Cargando...',
 	'UI:Menu:Actions' => 'Acciones',
+	'UI:Menu:OtherActions' => 'Otras Acciones',
 	'UI:Menu:New' => 'Nuevo...',
 	'UI:History:StatsCreations' => 'Created',
 	'UI:History:StatsCreations+' => 'Count of objects created',
@@ -628,8 +629,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s borrado.',
 	'UI:Delete:ConfirmDeletionOf_Name' => 'Borrado de %1$s',
 	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Borrado de %1$d objetos de al clase %2$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => 'Beberia ser eliminado automaticamente, pero usted no esta autorizado para hacerlo',
-	'UI:Delete:MustBeDeletedManuallyButNotAllowed' => 'Debe ser borrado manualmente - pero usted no esta autorizado para borrar este objeto, por favor contacte al administrador de la aplicacion',
+//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Beberia ser eliminado automaticamente, pero usted no esta autorizado para hacerlo',
+//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Debe ser borrado manualmente - pero usted no esta autorizado para borrar este objeto, por favor contacte al administrador de la aplicacion',
 	'UI:Delete:WillBeDeletedAutomatically' => 'Sera borrado automaticamente',
 	'UI:Delete:MustBeDeletedManually' => 'Debe ser borrado manualmente',
 	'UI:Delete:CannotUpdateBecause_Issue' => 'Debe ser actualizado automaticamente, pero: %1$s',

dictionaries/fr.dictionary.itop.ui.php

@@ -15,46 +15,12 @@
 //   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * Localized data
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @author	Erwan Taloc <erwan.taloc@combodo.com>
+ * @author	Romain Quetiez <romain.quetiez@combodo.com>
+ * @author	Denis Flaven <denis.flaven@combodo.com>
+ * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:AuditCategory' => 'Catégorie d\'audit',
-	'Class:AuditCategory+' => 'A section inside the overall audit',
-	'Class:AuditCategory/Attribute:name' => 'Nom',
-	'Class:AuditCategory/Attribute:name+' => 'Nom raccourci',
-	'Class:AuditCategory/Attribute:description' => 'Description',
-	'Class:AuditCategory/Attribute:description+' => 'Description',
-	'Class:AuditCategory/Attribute:definition_set' => 'Ensemble de définition',
-	'Class:AuditCategory/Attribute:definition_set+' => 'Expression OQL qui défini le périmètre d\'application de l\'audit',
-	'Class:AuditCategory/Attribute:rules_list' => 'Règles d\'audit',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Règles d\'audit pour cette catégorie',
-));
-
-//
-// Class: AuditRule
-//
-
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:AuditRule' => 'Règle d\'audit',
 	'Class:AuditRule+' => '',
@@ -66,26 +32,106 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:AuditRule/Attribute:query+' => 'Expression OQL de calcul des éléments incorrects',
 	'Class:AuditRule/Attribute:valid_flag' => 'Interprétation',
 	'Class:AuditRule/Attribute:valid_flag+' => 'La requête définit-elle les éléments valides ?',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Objets valides',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '',
 	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'Objets incorrects',
 	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Objets valides',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '',
 	'Class:AuditRule/Attribute:category_id' => 'Catégorie',
 	'Class:AuditRule/Attribute:category_id+' => '',
-	'Class:AuditRule/Attribute:category_name' => 'Category',
+	'Class:AuditRule/Attribute:category_name' => 'Categorie',
 	'Class:AuditRule/Attribute:category_name+' => '',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:AuditCategory' => 'Catégorie d\'audit',
+	'Class:AuditCategory+' => 'Une section de l\'audit',
+	'Class:AuditCategory/Attribute:name' => 'Nom',
+	'Class:AuditCategory/Attribute:name+' => 'Nom raccourci',
+	'Class:AuditCategory/Attribute:description' => 'Description',
+	'Class:AuditCategory/Attribute:description+' => 'Description',
+	'Class:AuditCategory/Attribute:definition_set' => 'Ensemble de définition',
+	'Class:AuditCategory/Attribute:definition_set+' => 'Expression OQL qui défini le périmètre d\'application de l\'audit',
+	'Class:AuditCategory/Attribute:rules_list' => 'Règles d\'audit',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Règles d\'audit pour cette catégorie',
+	'Class:Query' => 'Requête',
+	'Class:Query+' => 'Une requête définit un ensemble d\'information de manière dynamique',
+	'Class:Query/Attribute:name' => 'Nom',
+	'Class:Query/Attribute:name+' => 'Identification de la requête',
+	'Class:Query/Attribute:description' => 'Description',
+	'Class:Query/Attribute:description+' => 'Description complète (finalité, utilisations, public)',
+	'Class:Query/Attribute:fields' => 'Champs',
+	'Class:Query/Attribute:fields+' => 'Liste CSV des attributs (ou alias.attribut) à exporter',
+	'Class:QueryOQL' => 'Requête OQL',
+	'Class:QueryOQL+' => 'Une requête écrite dans le langage "Object Query Language"',
+	'Class:QueryOQL/Attribute:oql' => 'Expression',
+	'Class:QueryOQL/Attribute:oql+' => 'Expression OQL',
+	'Class:URP_Profiles' => 'Profil',
+	'Class:URP_Profiles+' => 'Profil utilisateur',
+	'Class:URP_Profiles/Attribute:name' => 'Nom',
+	'Class:URP_Profiles/Attribute:name+' => '',
+	'Class:URP_Profiles/Attribute:description' => 'Description',
+	'Class:URP_Profiles/Attribute:description+' => '',
+	'Class:URP_Profiles/Attribute:user_list' => 'Utilisateurs',
+	'Class:URP_Profiles/Attribute:user_list+' => 'Comptes utilisateur (logins) ayant ce profil',
+	'Class:URP_UserProfile' => 'Utilisateur/Profil',
+	'Class:URP_UserProfile+' => '',
+	'Class:URP_UserProfile/Attribute:userid' => 'Utilisateur',
+	'Class:URP_UserProfile/Attribute:userid+' => '',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => '',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profileid+' => '',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profile+' => '',
+	'Class:URP_UserProfile/Attribute:reason' => 'Raison',
+	'Class:URP_UserProfile/Attribute:reason+' => 'Justifie le rôle affecté à cet utilisateur',
+	'Class:URP_UserOrg' => 'Utilisateur/Organisation',
+	'Class:URP_UserOrg+' => 'Organisations permises pour l\'utilisateur',
+	'Class:URP_UserOrg/Attribute:userid' => 'Utilisateur',
+	'Class:URP_UserOrg/Attribute:userid+' => '',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organisation',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organisation',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
+	'Class:URP_UserOrg/Attribute:reason' => 'Raison',
+	'Class:URP_UserOrg/Attribute:reason+' => 'Justifie la permission de voir les données de cette organisation',
+	'Class:URP_ActionGrant' => 'action_permission',
+	'Class:URP_ActionGrant+' => 'permissions on classes',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profile',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'usage profile',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profile',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'usage profile',
+	'Class:URP_ActionGrant/Attribute:class' => 'Class',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Target class',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Permission',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'allowed or not allowed?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'yes',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'yes',
+	'Class:URP_ActionGrant/Attribute:action' => 'Action',
+	'Class:URP_ActionGrant/Attribute:action+' => 'operations to perform on the given class',
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => 'permissions on stimilus in the life cycle of the object',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profile',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'usage profile',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Class',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'Target class',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Permission',
+	'Class:URP_StimulusGrant/Attribute:permission+' => 'allowed or not allowed?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'no',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'yes',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'yes',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
+	'Class:URP_AttributeGrant' => 'attribute_permission',
+	'Class:URP_AttributeGrant+' => 'permissions at the attributes level',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Action grant',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'action grant',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribute',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribute code',
 	'Class:User' => 'Utilisateur',
 	'Class:User+' => 'Compte utilisateur',
 	'Class:User/Attribute:finalclass' => 'Type de compte',
@@ -110,31 +156,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:User/Attribute:profile_list+' => 'Rôles, ouvrants les droits d\'accès',
 	'Class:User/Attribute:allowed_org_list' => 'Organisations permises',
 	'Class:User/Attribute:allowed_org_list+' => 'L\'utilisateur a le droit de voir les données des organisations listées ici. Si aucune organisation n\'est spécifiée, alors aucune restriction ne s\'applique.',
-
 	'Class:User/Error:LoginMustBeUnique' => 'Le login doit être unique - "%1s" est déjà utilisé.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'L\'utilisateur doit avoir au moins un profil.',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_Profiles' => 'Profil',
-	'Class:URP_Profiles+' => 'Profil utilisateur',
-	'Class:URP_Profiles/Attribute:name' => 'Nom',
-	'Class:URP_Profiles/Attribute:name+' => '',
-	'Class:URP_Profiles/Attribute:description' => 'Description',
-	'Class:URP_Profiles/Attribute:description+' => '',
-	'Class:URP_Profiles/Attribute:user_list' => 'Utilisateurs',
-	'Class:URP_Profiles/Attribute:user_list+' => 'Comptes utilisateur (logins) ayant ce profil',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_Dimensions' => 'Dimension',
 	'Class:URP_Dimensions+' => 'Dimension applicative (défini des silos)',
 	'Class:URP_Dimensions/Attribute:name' => 'Nom',
@@ -143,51 +166,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_Dimensions/Attribute:description+' => '',
 	'Class:URP_Dimensions/Attribute:type' => 'Type',
 	'Class:URP_Dimensions/Attribute:type+' => 'Nom de classe ou type de données (unité de projection)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_UserProfile' => 'Utilisateur/Profil',
-	'Class:URP_UserProfile+' => '',
-	'Class:URP_UserProfile/Attribute:userid' => 'Utilisateur',
-	'Class:URP_UserProfile/Attribute:userid+' => '',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => '',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
-	'Class:URP_UserProfile/Attribute:profileid+' => '',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
-	'Class:URP_UserProfile/Attribute:profile+' => '',
-	'Class:URP_UserProfile/Attribute:reason' => 'Raison',
-	'Class:URP_UserProfile/Attribute:reason+' => 'Justifie le rôle affecté à cet utilisateur',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_UserOrg' => 'Utilisateur/Organisation',
-	'Class:URP_UserOrg+' => 'Organizations permises pour l\'utilisateur',
-	'Class:URP_UserOrg/Attribute:userid' => 'Utilisateur',
-	'Class:URP_UserOrg/Attribute:userid+' => '',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => '',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organisation',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organisation',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
-	'Class:URP_UserOrg/Attribute:reason' => 'Raison',
-	'Class:URP_UserOrg/Attribute:reason+' => 'Justifie la permission de voir les données de cette organisation',
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_ProfileProjection' => 'profile_projection',
 	'Class:URP_ProfileProjection+' => 'profile projections',
 	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimension',
@@ -202,13 +180,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant |  | +attribute code',
 	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribute',
 	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Target attribute code (optional)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_ClassProjection' => 'class_projection',
 	'Class:URP_ClassProjection+' => 'class projections',
 	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimension',
@@ -221,78 +192,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant |  | +attribute code',
 	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribute',
 	'Class:URP_ClassProjection/Attribute:attribute+' => 'Target attribute code (optional)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_ActionGrant' => 'action_permission',
-	'Class:URP_ActionGrant+' => 'permissions on classes',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Profile',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'usage profile',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profile',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'usage profile',
-	'Class:URP_ActionGrant/Attribute:class' => 'Class',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Target class',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Permission',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'allowed or not allowed?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'yes',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'yes',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_ActionGrant/Attribute:action' => 'Action',
-	'Class:URP_ActionGrant/Attribute:action+' => 'operations to perform on the given class',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_StimulusGrant' => 'stimulus_permission',
-	'Class:URP_StimulusGrant+' => 'permissions on stimilus in the life cycle of the object',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profile',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => 'usage profile',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Class',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'Target class',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Permission',
-	'Class:URP_StimulusGrant/Attribute:permission+' => 'allowed or not allowed?',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'yes',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'yes',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:URP_AttributeGrant' => 'attribute_permission',
-	'Class:URP_AttributeGrant+' => 'permissions at the attributes level',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Action grant',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'action grant',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribute',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribute code',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:WelcomeMenu' => 'Bienvenue',
 	'Menu:WelcomeMenu+' => 'Bienvenue dans iTop',
 	'Menu:WelcomeMenuPage' => 'Bienvenue',
 	'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop',
 	'UI:WelcomeMenu:Title' => 'Bienvenue dans iTop',
-
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop est un portail opérationnel complet et libre pour gérer votre SI.</p>
 <ul>il contient:
 <li>Une base de gestion des configuration (CMDB - Configuration management database) pour documenter et gérer votre parc informatique.</li>
@@ -303,7 +207,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 <li>Des tableaux de bord pour avoir rapidement une vue synthétique de votre SI.</li>
 </ul>
 <p>Tous ces modules peuvent être installés séparément, à votre rythme.</p>',
-
 	'UI:WelcomeMenu:RightBlock' => '<p>iTop a été conçu pour les fournisseurs de service, il permet à vos équipes IT de gérer facilement de multiples clients et organisations.
 <ul>iTop fournit un riche ensemble de processus métier&nbsp;pour:
 <li>Augmenter l\'efficacité de la gestion de votre SI</li> 
@@ -319,20 +222,18 @@ Dict::Add('FR FR', 'French', 'Français', array(
 <li>Contrôllez l\'actif le plus important de votre SI&nbsp;: la documentation.</li>
 </ul>
 </p>',
-
 	'UI:WelcomeMenu:AllOpenRequests' => 'Requêtes en cours: %1$d',
 	'UI:WelcomeMenu:MyCalls' => 'Mes Appels Support',
 	'UI:WelcomeMenu:OpenIncidents' => 'Incidents en cours: %1$d',
 	'UI:WelcomeMenu:AllConfigItems' => 'Actifs: %1$d',
 	'UI:WelcomeMenu:MyIncidents' => 'Mes Incidents',
-	'UI:AllOrganizations' => ' Toutes les Organizations ',
+	'UI:AllOrganizations' => ' Toutes les Organisations ',
 	'UI:YourSearch' => 'Votre recherche',
 	'UI:LoggedAsMessage' => 'Connecté comme: %1$s',
 	'UI:LoggedAsMessage+Admin' => 'Connecté comme: %1$s (Administrateur)',
 	'UI:Button:Logoff' => 'Déconnexion',
 	'UI:Button:GlobalSearch' => 'Rechercher',
 	'UI:Button:Search' => 'Rechercher',
-
 	'UI:Button:Query' => ' Lancer la requête ',
 	'UI:Button:Ok' => 'Ok',
 	'UI:Button:Cancel' => 'Annuler',
@@ -356,26 +257,24 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Button:Delete' => ' Supprimer ! ',
 	'UI:Button:ChangePassword' => ' Changer ! ',
 	'UI:Button:ResetPassword' => ' Ràz du mot de passe ',
-	
 	'UI:SearchToggle' => 'Recherche',
-
 	'UI:ClickToCreateNew' => 'Créer un nouvel objet de type %1$s',
+	'UI:SearchFor_Class' => 'Rechercher des objets de type %1$s',
 	'UI:NoObjectToDisplay' => 'Aucun objet à afficher.',
 	'UI:Error:MandatoryTemplateParameter_object_id' => 'Le paramètre object_id est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
-	'UI:Error:MandatoryTemplateParameter_link_attr' => 'Le paramètre target_attr est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Le paramètre taarget_attr est obligatoire quand link_attr est spécifié. Vérifiez la définition du modèle.',
 	'UI:Error:MandatoryTemplateParameter_group_by' => 'Le paramètre group_by est obligatoire. Vérifiez la définition du modèle.',
 	'UI:Error:InvalidGroupByFields' => 'Liste des champs "group by" incorrecte: "%1$s".',
 	'UI:Error:UnsupportedStyleOfBlock' => 'Erreur: style de bloc("%1$s") inconnu.',
 	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'la définition du lien est incorrecte: la classe d\'objets à gérer: %1$s n\'est référencée par aucune clef externe de la classe %2$s',
 	'UI:Error:Object_Class_Id_NotFound' => 'L\'objet: %1$s:%2$d est introuvable.',
 	'UI:Error:WizardCircularReferenceInDependencies' => 'Erreur: Référence circulaire entre les dépendences entre champs, vérifiez le modèle de données.',
-	'UI:Error:UploadedFileTooBig' => 'Le fichier téléchargé est trop gros. (La taille maximale autorisée est %1$s). Vérifiez la valeur des variables upload_max_filesize et post_max_size dans la configuration PHP.',
+	'UI:Error:UploadedFileTooBig' => 'Le fichier téléchargé est trop gros. (La taille maximale autorisée est %1$s). Pour modifier cette limite contactez votre administrateur iTop. (Réglages upload_max_filesize et post_max_size dans la configuration PHP sur le serveur)',
 	'UI:Error:UploadedFileTruncated.' => 'Le fichier téléchargé a été tronqué !',
 	'UI:Error:NoTmpDir' => 'Il n\'y a aucun répertoire temporaire de défini.',
 	'UI:Error:CannotWriteToTmp_Dir' => 'Impossible d\'écrire le fichier temporaire sur disque. upload_tmp_dir = "%1$s".',
 	'UI:Error:UploadStoppedByExtension_FileName' => 'Téléchargement arrêté à cause de l\'extension. (Nom du fichier original = "%1$s").',
 	'UI:Error:UploadFailedUnknownCause_Code' => 'Le téléchargement a échoué pour une raison inconnue. (Code d\'erreur = "%1$s").',
-	
 	'UI:Error:1ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque le paramètre suivant: %1$s.',
 	'UI:Error:2ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s and %2$s.',
 	'UI:Error:3ParametersMissing' => 'Erreur: Pour effectuer cette opération il manque les paramètres suivants: %1$s, %2$s and %3$s.',
@@ -391,7 +290,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Error:ObjectAlreadyCloned' => 'Erreur: l\'objet a déjà été dupliqué !',
 	'UI:Error:ObjectAlreadyCreated' => 'Erreur: l\'objet a déjà été créé !',
 	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Erreur: le stimulus "%1$s" n\'est pas valide pour l\'objet %2$s dans l\'état "%3$s".',
-	
 	'UI:GroupBy:Count' => 'Nombre',
 	'UI:GroupBy:Count+' => 'Nombre d\'éléments',
 	'UI:CountOfObjects' => '%1$d objets correspondants aux critères.',
@@ -417,6 +315,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:History:StatsDeletes+' => 'Nombre d\'objets effacés',
 	'UI:Loading' => 'Chargement...',
 	'UI:Menu:Actions' => 'Actions',
+	'UI:Menu:OtherActions' => 'Autres Actions',
 	'UI:Menu:New' => 'Créer...',
 	'UI:Menu:Add' => 'Ajouter...',
 	'UI:Menu:Manage' => 'Gérer...',
@@ -424,12 +323,13 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Menu:CSVExport' => 'Exporter en CSV',
 	'UI:Menu:Modify' => 'Modifier...',
 	'UI:Menu:Delete' => 'Supprimer...',
-	'UI:Menu:Manage' => 'Gérer...',
 	'UI:Menu:BulkDelete' => 'Supprimer...',
 	'UI:UndefinedObject' => 'non défini',
 	'UI:Document:OpenInNewWindow:Download' => 'Ouvrir dans un nouvelle fenêtre: %1$s, Télécharger: %2$s',
-	'UI:SelectAllToggle+' => 'Tout Sélectionner / Tout Désélectionner',
+	'UI:SelectAllToggle+' => 'Tout sélectionner / Tout déselectionner',
 	'UI:TruncatedResults' => '%1$d objets affichés sur %2$d',
+	'UI:SplitDateTime-Date' => 'date',
+	'UI:SplitDateTime-Time' => 'heure',
 	'UI:DisplayAll' => 'Tout afficher',
 	'UI:CollapseList' => 'Refermer',
 	'UI:CountOfResults' => '%1$d objet(s)',
@@ -457,6 +357,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:LogOff:ThankYou' => 'Merci d\'avoir utilisé iTop',
 	'UI:LogOff:ClickHereToLoginAgain' => 'Cliquez ici pour vous reconnecter...',
 	'UI:ChangePwdMenu' => 'Changer de mot de passe...',
+	'UI:Login:PasswordChanged' => 'Mot de passe mis à jour !',
 	'UI:AccessRO-All' => 'iTop est en lecture seule',
 	'UI:AccessRO-Users' => 'iTop est en lecture seule pour les utilisateurs finaux',
 	'UI:Login:RetypePwdDoesNotMatch' => 'Les deux saisies du nouveau mot de passe ne sont pas identiques !',
@@ -507,35 +408,30 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:CSVImport:Tab:Templates' => 'Modèles',
 	'UI:CSVImport:PasteData' => 'Collez ici les données à importer:',
 	'UI:CSVImport:PickClassForTemplate' => 'Choisissez un modèle à télécharger: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Caractère séparateur:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Entourage des champs texte',
-	'UI:CSVImport:CommentsAndHeader' => 'En-tête et commentaires',
-	'UI:CSVImport:SeparatorCharacter' => 'Separator character:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Text qualifier character',
-	'UI:CSVImport:CommentsAndHeader' => 'Comments and header',
+	'UI:CSVImport:SeparatorCharacter' => 'Séparateur:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Délimiteur de texte',
+	'UI:CSVImport:CommentsAndHeader' => 'Commentaires et en-tête',
 	'UI:CSVImport:SelectClass' => 'Sélectionner le type d\'objets à importer:',
 	'UI:CSVImport:AdvancedMode' => 'Mode expert',
-	'UI:CSVImport:AdvancedMode+' => 'En mode expert, l\'"id" (clef primaire) des objets peut être utilisé pour renommer des objets.' .
-									'Cependant la colonne "id" (si elle est présente) ne peut être utilisée que comme clef de recherche et ne peut pas être combinée avec une autre clef de recherche.',
+	'UI:CSVImport:AdvancedMode+' => 'En mode expert, l\'"id" (clef primaire) des objets peut être utilisé pour renommer des objets.Cependant la colonne "id" (si elle est présente) ne peut être utilisée que comme clef de recherche et ne peut pas être combinée avec une autre clef de recherche.',
 	'UI:CSVImport:SelectAClassFirst' => 'Pour configurer la correspondance, choississez d\'abord un type ci-dessus.',
 	'UI:CSVImport:HeaderFields' => 'Champs',
 	'UI:CSVImport:HeaderMappings' => 'Correspondance',
 	'UI:CSVImport:HeaderSearch' => 'Recherche ?',
 	'UI:CSVImport:AlertIncompleteMapping' => 'Veuillez choisir le correspondance de chacun des champs.',
 	'UI:CSVImport:AlertNoSearchCriteria' => 'Veuillez choisir au moins une clef de recherche.',
-	'UI:CSVImport:Encoding' => 'Encodage des caractères',	
-
+	'UI:CSVImport:Encoding' => 'Encodage des caractères',
 	'UI:UniversalSearchTitle' => 'iTop - Recherche Universelle',
 	'UI:UniversalSearch:Error' => 'Erreur : %1$s',
 	'UI:UniversalSearch:LabelSelectTheClass' => 'Sélectionnez le type d\'objets à rechercher : ',
-
 	'UI:Audit:Title' => 'iTop - Audit de la CMDB',
 	'UI:Audit:InteractiveAudit' => 'Audit Interactif',
 	'UI:Audit:HeaderAuditRule' => 'Règle d\'audit',
 	'UI:Audit:HeaderNbObjects' => 'Nb d\'Objets',
 	'UI:Audit:HeaderNbErrors' => 'Nb d\'Erreurs',
 	'UI:Audit:PercentageOk' => '% Ok',
-
+	'UI:Audit:ErrorIn_Rule_Reason' => 'Erreur OQL dans la règle %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'Erreur OQL dans la catégorie %1$s: %2$s.',
 	'UI:RunQuery:Title' => 'iTop - Evaluation de requêtes OQL',
 	'UI:RunQuery:QueryExamples' => 'Exemples de requêtes',
 	'UI:RunQuery:HeaderPurpose' => 'Objectif',
@@ -547,7 +443,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:RunQuery:DevelopedQuery' => 'Requête OQL décompilée : ',
 	'UI:RunQuery:SerializedFilter' => 'Version sérialisée : ',
 	'UI:RunQuery:Error' => 'Une erreur s\'est produite durant l\'exécution de la requête : %1$s',
-
+	'UI:Query:UrlForExcel' => 'Lien à copier-coller dans Excel, pour déclarer une source de données à partir du web',
 	'UI:Schema:Title' => 'Modèle de données iTop',
 	'UI:Schema:CategoryMenuItem' => 'Catégorie <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relations',
@@ -606,13 +502,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Schema:LifeCycleAttributeMustChange' => 'Doit changer',
 	'UI:Schema:LifeCycleAttributeMustPrompt' => 'L\'utilisateur se verra proposer de changer la valeur',
 	'UI:Schema:LifeCycleEmptyList' => 'liste vide',
-
 	'UI:LinksWidget:Autocomplete+' => 'Tapez les 3 premiers caractères...',
+	'UI:Edit:TestQuery' => 'Tester le requête',
 	'UI:Combo:SelectValue' => '--- choisissez une valeur ---',
 	'UI:Label:SelectedObjects' => 'Objets sélectionnés: ',
 	'UI:Label:AvailableObjects' => 'Objets disponibles: ',
 	'UI:Link_Class_Attributes' => 'Attributs du type %1$s',
-	'UI:SelectAllToggle+' => 'Tout sélectionner / Tout déselectionner',
 	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Ajouter des objets de type %1$s liés à %3$s (%2$s)',
 	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Ajouter des objets de type %1$s à lier à cet objet de type %2$s',
 	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gérer les objets de type %1$s liés à %3$s (%2$s)',
@@ -620,15 +515,17 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:RemoveLinkedObjectsOf_Class' => 'Enlever les objets sélectionnés',
 	'UI:Message:EmptyList:UseAdd' => 'La liste est vide, utilisez le bouton "Ajouter..." pour ajouter des objets.',
 	'UI:Message:EmptyList:UseSearchForm' => 'Utilisez le formulaire de recherche ci-dessus pour trouver les objets à ajouter.',
-
 	'UI:Wizard:FinalStepTitle' => 'Dernière étape: confirmation',
 	'UI:Title:DeletionOf_Object' => 'Suppression de %1$s',
 	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Suppression massive de %1$d objets de type %2$s',
 	'UI:Delete:NotAllowedToDelete' => 'Vous n\'êtes pas autorisé à supprimer cet objet',
 	'UI:Delete:NotAllowedToUpdate_Fields' => 'Vous n\'êtes pas autorisé à mettre à jour les champs suivants : %1$s',
 	'UI:Error:NotEnoughRightsToDelete' => 'Cet objet ne peut pas être supprimé car l\'utilisateur courant n\'a pas les droits nécessaires.',
+	'UI:Error:CannotDeleteBecause' => 'Cet objet ne peut pas être effacé. Raison: %1$s',
 	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Cet objet ne peut pas être supprimé, des opérations manuelles sont nécessaire avant sa suppression.',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Des opération manuelles sont nécessaires avant de pouvoir effacer cet objet',
 	'UI:Archive_User_OnBehalfOf_User' => '%1$s pour %2$s',
+	'UI:Delete:Deleted' => 'supprimé',
 	'UI:Delete:AutomaticallyDeleted' => 'supprimé automatiquement',
 	'UI:Delete:AutomaticResetOf_Fields' => 'mise à jour automatique des champ(s): %1$s',
 	'UI:Delete:CleaningUpRefencesTo_Object' => 'Suppression de toutes les références vers %1$s...',
@@ -637,14 +534,15 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Delete:_Name_Class_Deleted' => ' %2$s %1$s supprimé.',
 	'UI:Delete:ConfirmDeletionOf_Name' => 'Suppression de %1$s',
 	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Suppression de %1$d objets de type %2$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => 'Devrait être supprimé automatiquement, mais vous n\'avez pas le droit d\'effectuer cette opération.',
-	'UI:Delete:MustBeDeletedManuallyButNotAllowed' => 'Doit être supprimé manuellement - mais vous n\'avez pas le droit de supprimer cet objet, contactez votre administrateur pour régler ce problème',
+	'UI:Delete:CannotDeleteBecause' => 'Ne peux pas être supprimé: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Devrait être supprimé automatiquement, mais cela n\'est pas possible: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Doit être supprimé manuellement, mais cela n\'est pas possible: %1$s',
 	'UI:Delete:WillBeDeletedAutomatically' => 'Sera supprimé automatiquement',
 	'UI:Delete:MustBeDeletedManually' => 'Doit être supprimé manuellement',
 	'UI:Delete:CannotUpdateBecause_Issue' => 'Devrait être mis à jour automatiquement, mais: %1$s',
 	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Va être mis à jour automatiquement (champs impactés : %1$s)',
 	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objets ou liens font référence à %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objets ou liens font référence à certain des objets à supprimer',	
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objets ou liens font référence à certain des objets à supprimer',
 	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'pour garantir l\'intégrité de la base de données, toutes les références doivent être supprimées.',
 	'UI:Delete:Consequence+' => 'Ce qui va être effectué',
 	'UI:Delete:SorryDeletionNotAllowed' => 'Désolé, vous n\'êtes pas autorisé à supprimer cette objet. Voir les explications détaillées ci-dessus.',
@@ -661,9 +559,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Search:Count_ObjectsOf_Class_Found' => 'Trouvé %1$d objet(s) de type %2$s.',
 	'UI:Search:NoObjectFound' => 'Aucun objet trouvé.',
 	'UI:ModificationPageTitle_Object_Class' => 'iTop - %2$s - Modification de %1$s',
-	'UI:ModificationTitle_Class_Object' => '%1$s - Modification de <span class=\"hilite\">%2$s</span>',
+	'UI:ModificationTitle_Class_Object' => '%1$s - Modification de <span class="hilite">%2$s</span>',
 	'UI:ClonePageTitle_Object_Class' => 'iTop - %2$s - Duplication de %1$s',
-	'UI:CloneTitle_Class_Object' => ' %1$s - Duplication de <span class=\"hilite\">%2$s</span>',
+	'UI:CloneTitle_Class_Object' => ' %1$s - Duplication de <span class="hilite">%2$s</span>',
 	'UI:CreationPageTitle_Class' => 'iTop - Création d\'un objet de type %1$s ',
 	'UI:CreationTitle_Class' => 'Création d\'un objet de type %1$s',
 	'UI:SelectTheTypeOf_Class_ToCreate' => 'Sélectionnez le type de %1$s à créer :',
@@ -676,11 +574,10 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '%1$s pour %2$s de l\'état %3$s vers l\'état %4$s.',
 	'UI:ObjectCouldNotBeWritten' => 'L\'objet ne peut pas être enregistré: %1$s',
 	'UI:PageTitle:FatalError' => 'iTop - Erreur Fatale',
-	'UI:FatalErrorMessage' => 'Erreur fatale, iTop ne peut pas continuer.',
 	'UI:SystemIntrusion' => 'Accès non autorisé. Vous êtes en train de d\'effectuer une opération qui ne vous est pas permise.',
+	'UI:FatalErrorMessage' => 'Erreur fatale, iTop ne peut pas continuer.',
 	'UI:Error_Details' => 'Erreur: %1$s.',
-
-	'UI:PageTitle:ClassProjections'	=> 'iTop gestion des utilisateurs - projections des classes',
+	'UI:PageTitle:ClassProjections' => 'iTop gestion des utilisateurs - projections des classes',
 	'UI:PageTitle:ProfileProjections' => 'iTop gestion des utilisateurs - projections des profils',
 	'UI:UserManagement:Class' => 'Type',
 	'UI:UserManagement:Class+' => 'Type des objets',
@@ -717,16 +614,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
 	'UI:UserManagement:NoLifeCycleApplicable+' => 'Aucun cycle de vie n\'est défini pour ce type d\'objets.',
 	'UI:UserManagement:GrantMatrix' => 'Matrice des droits',
-	'UI:USerManagement:LinkBetween_User_And_Profile' => 'Lien entre %1$s et %2$s',
-	'UI:USerManagement:LinkBetween_User_And_Org' => 'Lien entre %1$s et %2$s',
-
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Lien entre %1$s et %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Lien entre %1$s et %2$s',
 	'Menu:AdminTools' => 'Outils d\'admin',
 	'Menu:AdminTools+' => 'Outils d\'administration',
 	'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
-
-	'UI:AuditMenu' => 'Audit',
-	'UI:AuditMenu+' => 'Audit',
-
 	'UI:ChangeManagementMenu' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu+' => 'Gestion du Changement',
 	'UI:ChangeManagementMenu:Title' => 'Résumé des changements',
@@ -734,67 +626,48 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changements par état',
 	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changements par workgroup',
 	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changements en attente d\'assignation',
-	
-	'UI:ConfigurationItemsMenu'=> 'Actifs (CIs)',
-	'UI:ConfigurationItemsMenu+'=> 'Tous les actifs',
+	'UI:ConfigurationItemsMenu' => 'Actifs (CIs)',
+	'UI:ConfigurationItemsMenu+' => 'Tous les actifs',
 	'UI:ConfigurationItemsMenu:Title' => 'Résumé des actifs (CIs)',
 	'UI-ConfigurationItemsMenu-ServersByCriticity' => 'Serveurs par criticité',
 	'UI-ConfigurationItemsMenu-PCsByCriticity' => 'PCs par criticité',
 	'UI-ConfigurationItemsMenu-NWDevicesByCriticity' => 'Equipements réseau par criticité',
 	'UI-ConfigurationItemsMenu-ApplicationsByCriticity' => 'Applications par criticité',
-	
 	'UI:ConfigurationManagementMenu' => 'Gestion de Configuration',
 	'UI:ConfigurationManagementMenu+' => 'Gestion de Configuration',
 	'UI:ConfigurationManagementMenu:Title' => 'Résumé de l\'Infrastructure',
 	'UI-ConfigurationManagementMenu-InfraByType' => 'Nombre d\'éléments par type',
 	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Nombre d\'éléments par état',
-	
-'UI:ConfigMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion de Configuration',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Actifs par état',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Actifs par type',
-
-'UI:RequestMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Demandes Utilisateurs',
-'UI-RequestManagementOverview-RequestByService' => 'Demandes par service',
-'UI-RequestManagementOverview-RequestByPriority' => 'Demandes par priorité',
-'UI-RequestManagementOverview-RequestUnassigned' => 'Demandes non affectées à un agent',
-
-'UI:IncidentMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Incidents',
-'UI-IncidentManagementOverview-IncidentByService' => 'Incidents par service',
-'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents par priorité',
-'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents non affectés à un agent',
-
-'UI:ChangeMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Changements',
-'UI-ChangeManagementOverview-ChangeByType' => 'Changes par type',
-'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes non affectés à un agent',
-'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruptions de service liées à un changement',
-
-'UI:ServiceMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Services',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contrats clients à renouveler dans les 30 jours',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contrats fournisseurs à renouveler dans les 30 jours',
-
+	'UI:ConfigMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion de Configuration',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Actifs par état',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Actifs par type',
+	'UI:RequestMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Demandes Utilisateurs',
+	'UI-RequestManagementOverview-RequestByService' => 'Demandes par service',
+	'UI-RequestManagementOverview-RequestByPriority' => 'Demandes par priorité',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'Demandes non affectées à un agent',
+	'UI:IncidentMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Incidents',
+	'UI-IncidentManagementOverview-IncidentByService' => 'Incidents par service',
+	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents par priorité',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents non affectés à un agent',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Changements',
+	'UI-ChangeManagementOverview-ChangeByType' => 'Changes par type',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes non affectés à un agent',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruptions de service liées à un changement',
+	'UI:ServiceMgmtMenuOverview:Title' => 'Tableau de bord de la Gestion des Services',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contrats clients à renouveler dans les 30 jours',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contrats fournisseurs à renouveler dans les 30 jours',
 	'UI:ContactsMenu' => 'Contacts',
 	'UI:ContactsMenu+' => 'Contacts',
 	'UI:ContactsMenu:Title' => 'Résumé des contacts',
 	'UI-ContactsMenu-ContactsByLocation' => 'Contacts par emplacement',
 	'UI-ContactsMenu-ContactsByType' => 'Contacts par type',
 	'UI-ContactsMenu-ContactsByStatus' => 'Contacts par état',
-
-
 	'Menu:CSVImportMenu' => 'Import CSV',
 	'Menu:CSVImportMenu+' => 'Import ou mise à jour en masse',
-	
 	'Menu:DataModelMenu' => 'Modèle de Données',
 	'Menu:DataModelMenu+' => 'Résumé du Modèle de Données',
-	
 	'Menu:ExportMenu' => 'Exportation',
 	'Menu:ExportMenu+' => 'Exportation des résultats d\'une requête en HTML, CSV ou XML',
-	
-	'UI:IncidentManagementMenu:Title' => 'Résumé des incidents',
-	'UI-IncidentManagementMenu-IncidentsByType' => 'Incidents par type',
-	'UI-IncidentManagementMenu-IncidentsByStatus' => 'Incidents par état',
-	'UI-IncidentManagementMenu-IncidentsByWorkgroup' => 'Incidents par workgroup',
-	'UI-IncidentManagementMenu-IncidentsNotYetAssigned' => 'Incidents en attente d\'assignation',
-		
 	'Menu:NotificationsMenu' => 'Notifications',
 	'Menu:NotificationsMenu+' => 'Configuration des Notifications',
 	'UI:NotificationsMenu:Title' => 'Configuration des <span class="hilite">Notifications</span>',
@@ -820,43 +693,38 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:NotificationsMenu:OnStateLeave' => 'Quand un objet quitte un état donné',
 	'UI:NotificationsMenu:Actions' => 'Actions',
 	'UI:NotificationsMenu:AvailableActions' => 'Actions existantes',
-
 	'Menu:AuditCategories' => 'Catégories d\'audit',
 	'Menu:AuditCategories+' => 'Catégories d\'audit',
 	'Menu:Notifications:Title' => 'Catégories d\'audit',
-	
 	'Menu:RunQueriesMenu' => 'Requêtes OQL',
 	'Menu:RunQueriesMenu+' => 'Executer une requête OQL',
-	
+	'Menu:QueryMenu' => 'Livre des requêtes',
+	'Menu:QueryMenu+' => 'Livre des requêtes',
 	'Menu:DataAdministration' => 'Administration des données',
 	'Menu:DataAdministration+' => 'Administration des données',
-	
 	'Menu:UniversalSearchMenu' => 'Recherche Universelle',
 	'Menu:UniversalSearchMenu+' => 'Rechercher n\'importe quel objet...',
-	
 	'Menu:ApplicationLogMenu' => 'Application Log',
 	'Menu:ApplicationLogMenu+' => 'Application Log',
 	'Menu:ApplicationLogMenu:Title' => 'Application Log',
-
 	'Menu:UserManagementMenu' => 'Gestion des Utilisateurs',
 	'Menu:UserManagementMenu+' => 'Gestion des Utilisateurs',
-
 	'Menu:ProfilesMenu' => 'Profils',
 	'Menu:ProfilesMenu+' => 'Profils',
 	'Menu:ProfilesMenu:Title' => 'Profils',
-
-	'Menu:UserAccountsMenu' => 'Comptes Utilisateur',
-	'Menu:UserAccountsMenu+' => 'Comptes Utilisateur',
-	'MenuUI:UserAccountsMenu:Title' => 'Comptes Utilisateur',	
-
+	'Menu:UserAccountsMenu' => 'Comptes Utilisateurs',
+	'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs',
+	'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateusr',
 	'UI:iTopVersion:Short' => 'iTop version %1$s',
 	'UI:iTopVersion:Long' => 'iTop version %1$s-%2$s du %3$s',
 	'UI:PropertiesTab' => 'Propriétés',
-
+	'UI:OpenDocumentInNewWindow_' => 'Ouvrir ce document dans uns autre fenêtre: %1$s',
+	'UI:DownloadDocument_' => 'Télécharger ce document: %1$s',
+	'UI:Document:NoPreview' => 'L\'aperçu n\'est pas disponible pour ce type de documents',
 	'UI:DeadlineMissedBy_duration' => 'Passé de %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',		
-	'UI:Deadline_Minutes' => '%1$d min',			
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
+	'UI:Deadline_LessThan1Min' => '< 1 min',
+	'UI:Deadline_Minutes' => '%1$d min',
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',
 	'UI:Deadline_Days_Hours_Minutes' => '%1$dj %2$dh %3$dmin',
 	'UI:Help' => 'Aide',
 	'UI:PasswordConfirm' => '(Confirmer)',
@@ -864,32 +732,79 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'UI:DisplayThisMessageAtStartup' => 'Afficher ce message au démarrage',
 	'UI:RelationshipGraph' => 'Vue graphique',
 	'UI:RelationshipList' => 'Liste',
+	'UI:ElementsDisplayed' => 'Filtrage',
 	'UI:OperationCancelled' => 'Opération Annulée',
-
 	'Portal:Title' => 'Portail utilisateur iTop',
 	'Portal:Refresh' => 'Rafraîchir',
 	'Portal:Back' => 'Retour',
+	'Portal:WelcomeUserOrg' => 'Bienvenue %1$s (%2$s)',
+	'Portal:ShowOngoing' => 'Requêtes en cours',
+	'Portal:ShowClosed' => 'Requêtes fermées',
 	'Portal:CreateNewRequest' => 'Créer une nouvelle requête',
 	'Portal:ChangeMyPassword' => 'Changer mon mot de passe',
 	'Portal:Disconnect' => 'Déconnexion',
 	'Portal:OpenRequests' => 'Mes requêtes en cours',
-	'Portal:ResolvedRequests'  => 'Mes requêtes résolues',
+	'Portal:ClosedRequests'  => 'Mes requêtes fermées',
+	'Portal:ResolvedRequests' => 'Mes requêtes résolues',
 	'Portal:SelectService' => 'Choisissez un service dans le catalogue:',
 	'Portal:PleaseSelectOneService' => 'Veuillez choisir un service',
 	'Portal:SelectSubcategoryFrom_Service' => 'Choisissez une sous-catégorie du service %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Veuillez choisir une sous-catégorie', 
+	'Portal:PleaseSelectAServiceSubCategory' => 'Veuillez choisir une sous-catégorie',
 	'Portal:DescriptionOfTheRequest' => 'Entrez la description de votre requête:',
 	'Portal:TitleRequestDetailsFor_Request' => 'Détails de votre requête %1$s:',
 	'Portal:NoOpenRequest' => 'Aucune requête.',
+	'Portal:NoClosedRequest' => 'Aucune requête.',
+	'Portal:Button:ReopenTicket' => 'Réouvrir cette requête',
 	'Portal:Button:CloseTicket' => 'Clôre cette requête',
+	'Portal:Button:UpdateRequest' => 'Mettre à jour la requête',
 	'Portal:EnterYourCommentsOnTicket' => 'Vos commentaires à propos du traitement de cette requête:',
 	'Portal:ErrorNoContactForThisUser' => 'Erreur: l\'utilisateur courant n\'est pas associé à une Personne/Contact. Contactez votre administrateur.',
 	'Portal:Attachments' => 'Pièces jointes',
 	'Portal:AddAttachment' => ' Ajouter une pièce jointe ',
 	'Portal:RemoveAttachment' => ' Enlever la pièce jointe ',
 	'Portal:Attachment_No_To_Ticket_Name' => 'Pièce jointe #%1$d à %2$s (%3$s)',
-
 	'Enum:Undefined' => 'Non défini',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s J %2$s H %3$s min %4$s s',
+	'UI:ModifyAllPageTitle' => 'Modification par lots',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modification de %1$d objet(s) de type %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modification de %1$d (sur %3$d) objets de type %2$s',
+	'UI:Menu:ModifyAll' => 'Modifier...',
+	'UI:Button:ModifyAll' => 'Modifier',
+	'UI:Button:PreviewModifications' => 'Aperçu des modifications >>',
+	'UI:ModifiedObject' => 'Objet Modifié',
+	'UI:BulkModifyStatus' => 'Opération',
+	'UI:BulkModifyStatus+' => '',
+	'UI:BulkModifyErrors' => 'Erreur',
+	'UI:BulkModifyErrors+' => '',
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Erreur',
+	'UI:BulkModifyStatusModified' => 'Modifié',
+	'UI:BulkModifyStatusSkipped' => 'Ignoré',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d valeurs distinctes:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d fois',
+	'UI:BulkModify:N_MoreValues' => '%1$d valeurs supplémentaires...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentative de modification du champ en lecture seule: %1$s',
+	'UI:FailedToApplyStimuli' => 'L\'action a échoué',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modification de %2$d objet(s) de type %3$s',
+	'UI:CaseLogTypeYourTextHere' => 'Nouvelle entrée ci-dessous:',
+	'UI:CaseLog:DateFormat' => 'Y-m-d H:i:s',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Valeur initiale:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'Le champ %1$s ne peut pas être modifié car il est géré par une synchronisation avec une source de données. Valeur ignorée.',
+	'UI:ActionNotAllowed' => 'Vous n\'êtes pas autorisé à exécuter cette opération sur ces objets.',
+	'UI:BulkAction:NoObjectSelected' => 'Veuillez s\électionner au moins un objet pour cette opération.',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Le champ %1$s ne peut pas être modifié car il est géré par une synchronisation avec une source de données. Valeur inchangée.',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s éléments / %2$s éléments sélectionné(s).',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s éléments.',
+	'UI:Pagination:PageSize' => '%1$s éléments par page',
+	'UI:Pagination:PagesLabel' => 'Pages:',
+	'UI:Pagination:All' => 'Tous',
+	'UI:HierarchyOf_Class' => 'Hiérarchie de type %1$s',
+	'UI:Preferences' => 'Preferences...',
+	'UI:FavoriteOrganizations' => 'Mes Organisations Favorites',
+	'UI:FavoriteOrganizations+' => 'Cochez dans la liste ci-dessous les organisations que vous voulez voir listées dans le menu principal. '.
+								   'Ceci n\'est pas un réglage de sécurité. Les objets de toutes les organisations sont toujours visibles en choisissant "Toutes les Organisations" dans le menu.',
+	'UI:NavigateAwayConfirmationMessage' => 'Toute modification sera perdue.',
+	'UI:Create_Class_InState' => 'Créer l\'objet %1$s dans l\'état: ',
 ));
-
 ?>

dictionaries/hu.dictionary.itop.core.php

@@ -0,0 +1,481 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:ActionEmail' => 'E-mail értesítés',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Teszt címzett',
+	'Class:ActionEmail/Attribute:test_recipient+' => '',
+	'Class:ActionEmail/Attribute:from' => 'Feladó',
+	'Class:ActionEmail/Attribute:from+' => '',
+	'Class:ActionEmail/Attribute:reply_to' => 'Válasz',
+	'Class:ActionEmail/Attribute:reply_to+' => '',
+	'Class:ActionEmail/Attribute:to' => 'Címzett',
+	'Class:ActionEmail/Attribute:to+' => '',
+	'Class:ActionEmail/Attribute:cc' => 'Másolatot kap',
+	'Class:ActionEmail/Attribute:cc+' => '',
+	'Class:ActionEmail/Attribute:bcc' => 'Titkos másolatot kap',
+	'Class:ActionEmail/Attribute:bcc+' => '',
+	'Class:ActionEmail/Attribute:subject' => 'Tárgy',
+	'Class:ActionEmail/Attribute:subject+' => '',
+	'Class:ActionEmail/Attribute:body' => 'Szöveg',
+	'Class:ActionEmail/Attribute:body+' => '',
+	'Class:ActionEmail/Attribute:importance' => 'Fontosság',
+	'Class:ActionEmail/Attribute:importance+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'Fontos',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'Nem fontos',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normál',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
+	'Class:TriggerOnStateEnter' => 'Kiváltó ok (állapotba belépés)',
+	'Class:TriggerOnStateEnter+' => '',
+	'Class:TriggerOnStateLeave' => 'Kiváltó ok (állapot elhagyás)',
+	'Class:TriggerOnStateLeave+' => '',
+	'Class:TriggerOnObjectCreate' => 'Kiváltó ok (objektum létrehozás)',
+	'Class:TriggerOnObjectCreate+' => '',
+	'Class:lnkTriggerAction' => 'Akció / Kiváltó ok',
+	'Class:lnkTriggerAction+' => '',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Akció',
+	'Class:lnkTriggerAction/Attribute:action_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Kiváltó ok',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Sorrend',
+	'Class:lnkTriggerAction/Attribute:order+' => '',
+	'Class:AsyncSendEmail' => 'E-mail (aszinkron)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Címzett',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Tárgy',
+	'Class:AsyncSendEmail/Attribute:body' => 'Szöveg',
+	'Class:AsyncSendEmail/Attribute:header' => 'Fejléc',
+	'Class:CMDBChange' => 'Változás',
+	'Class:CMDBChange+' => '',
+	'Class:CMDBChange/Attribute:date' => 'Dátum',
+	'Class:CMDBChange/Attribute:date+' => '',
+	'Class:CMDBChange/Attribute:userinfo' => 'Egyéb információ',
+	'Class:CMDBChange/Attribute:userinfo+' => '',
+	'Class:CMDBChangeOp' => 'Változtatás művelet',
+	'Class:CMDBChangeOp+' => '',
+	'Class:CMDBChangeOp/Attribute:change' => 'Válktozás',
+	'Class:CMDBChangeOp/Attribute:change+' => '',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'Objektum osztály',
+	'Class:CMDBChangeOp/Attribute:objclass+' => '',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'Objektum azonosító',
+	'Class:CMDBChangeOp/Attribute:objkey+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'Típus',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+	'Class:CMDBChangeOpCreate' => 'Objektum létrehozás',
+	'Class:CMDBChangeOpCreate+' => '',
+	'Class:CMDBChangeOpDelete' => 'Objektum törlés',
+	'Class:CMDBChangeOpDelete+' => '',
+	'Class:CMDBChangeOpSetAttribute' => 'Objektum változtatás',
+	'Class:CMDBChangeOpSetAttribute+' => '',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribútum',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Tulajdonság változtatás',
+	'Class:CMDBChangeOpSetAttributeScalar+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Új érték',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'Módosítás dátuma',
+	'Class:CMDBChangeOpSetAttributeBlob+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Előző adat',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Titkosított jelszó',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Titkosított mező',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeText' => 'Szöveg változás',
+	'Class:CMDBChangeOpSetAttributeText+' => '',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Előző adat',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Esemény napló',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Utolsó bejegyzés',
+	'Class:Event' => 'Napló esemény',
+	'Class:Event+' => '',
+	'Class:Event/Attribute:message' => 'Üzenet',
+	'Class:Event/Attribute:message+' => '',
+	'Class:Event/Attribute:date' => 'Dátum',
+	'Class:Event/Attribute:date+' => '',
+	'Class:Event/Attribute:userinfo' => 'Felhasználói információ',
+	'Class:Event/Attribute:userinfo+' => '',
+	'Class:Event/Attribute:finalclass' => 'Típus',
+	'Class:Event/Attribute:finalclass+' => '',
+	'Class:EventNotification' => 'Értesítés esemény',
+	'Class:EventNotification+' => '',
+	'Class:EventNotification/Attribute:trigger_id' => 'Kiváltó ok',
+	'Class:EventNotification/Attribute:trigger_id+' => '',
+	'Class:EventNotification/Attribute:action_id' => 'Felhasználó',
+	'Class:EventNotification/Attribute:action_id+' => '',
+	'Class:EventNotification/Attribute:object_id' => 'Objektum azonosító',
+	'Class:EventNotification/Attribute:object_id+' => '',
+	'Class:EventNotificationEmail' => 'E-mail küldés esemény',
+	'Class:EventNotificationEmail+' => '',
+	'Class:EventNotificationEmail/Attribute:to' => 'Címzett',
+	'Class:EventNotificationEmail/Attribute:to+' => '',
+	'Class:EventNotificationEmail/Attribute:cc' => 'Másolatot kap',
+	'Class:EventNotificationEmail/Attribute:cc+' => '',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'Titkos másolatot kap',
+	'Class:EventNotificationEmail/Attribute:bcc+' => '',
+	'Class:EventNotificationEmail/Attribute:from' => 'Feladó',
+	'Class:EventNotificationEmail/Attribute:from+' => '',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Tárgy',
+	'Class:EventNotificationEmail/Attribute:subject+' => '',
+	'Class:EventNotificationEmail/Attribute:body' => 'Szöveg',
+	'Class:EventNotificationEmail/Attribute:body+' => '',
+	'Class:EventIssue' => 'Kérés esemény',
+	'Class:EventIssue+' => '',
+	'Class:EventIssue/Attribute:issue' => 'Kérés',
+	'Class:EventIssue/Attribute:issue+' => '',
+	'Class:EventIssue/Attribute:impact' => 'Hatás',
+	'Class:EventIssue/Attribute:impact+' => '',
+	'Class:EventIssue/Attribute:page' => 'Oldal',
+	'Class:EventIssue/Attribute:page+' => '',
+	'Class:EventIssue/Attribute:arguments_post' => 'Kérés részletei',
+	'Class:EventIssue/Attribute:arguments_post+' => '',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL ',
+	'Class:EventIssue/Attribute:arguments_get+' => '',
+	'Class:EventIssue/Attribute:callstack' => 'Híváslista',
+	'Class:EventIssue/Attribute:callstack+' => '',
+	'Class:EventIssue/Attribute:data' => 'Dátum',
+	'Class:EventIssue/Attribute:data+' => '',
+	'Class:EventWebService' => 'Web szolgáltatás esemény',
+	'Class:EventWebService+' => '',
+	'Class:EventWebService/Attribute:verb' => 'Kérés',
+	'Class:EventWebService/Attribute:verb+' => '',
+	'Class:EventWebService/Attribute:result' => 'Eredmény',
+	'Class:EventWebService/Attribute:result+' => '',
+	'Class:EventWebService/Attribute:log_info' => 'Info napló',
+	'Class:EventWebService/Attribute:log_info+' => '',
+	'Class:EventWebService/Attribute:log_warning' => 'Warning napló',
+	'Class:EventWebService/Attribute:log_warning+' => '',
+	'Class:EventWebService/Attribute:log_error' => 'Error napló',
+	'Class:EventWebService/Attribute:log_error+' => '',
+	'Class:EventWebService/Attribute:data' => 'Adat',
+	'Class:EventWebService/Attribute:data+' => '',
+	'Class:EventLoginUsage' => 'Belépés esemény',
+	'Class:EventLoginUsage+' => '',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Felhasználó név',
+	'Class:EventLoginUsage/Attribute:user_id+' => '',
+	'Class:SynchroDataSource' => 'Szinkron adatforrás',
+	'Class:SynchroDataSource/Attribute:name' => 'Neve',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Leírás',
+	'Class:SynchroDataSource/Attribute:status' => 'Státusz',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Megvalósított',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Éles üzemben',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Felhasználó',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Cél osztály',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Tartalom szűkítés',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Teljesen feltöltött intervallum',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Egyeztetési szabály',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'A következő attribútum használata',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Elsődleges kulcs használata',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Létrehozás',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Firssítés',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Létrehozás',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (véletlen?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Törlési szabály',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Törlés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Figyelmen kívül hagyás',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Frissítés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Frissítés után törlés',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Szabályok frissítése',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Késleltetés időtartama',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribútum lista',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Engedélyezett felhasználók',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Csak rendszergazdák',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Mindenkinek engedélyezett az objektumok törlése',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Senki',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Ikonok URL-je',
+	'Class:SynchroDataSource/Attribute:url_icon+' => '',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Alkalmazások URL-je',
+	'Class:SynchroDataSource/Attribute:url_application+' => '',
+	'Class:SynchroAttribute' => 'Szinkron attribútumok',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Szinkron adatforrás',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Kód',
+	'Class:SynchroAttribute/Attribute:update' => 'Frissítés',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Egyeztetés',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Frissítési irányelv',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inicializálás ha üres',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Osztály',
+	'Class:SynchroAttExtKey' => 'Szinkron attribútum (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Egyeztetés attribútuma',
+	'Class:SynchroAttLinkSet' => 'Szinkron attribútum (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Sor elválasztó',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attribútum elválasztó',
+	'Class:SynchroLog' => 'Szinkron napló',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Szinkron adatforrás',
+	'Class:SynchroLog/Attribute:start_date' => 'Kezdés dátuma',
+	'Class:SynchroLog/Attribute:end_date' => 'Befejezés dátuma',
+	'Class:SynchroLog/Attribute:status' => 'Státusz',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Hibátlanul lefutott',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Hibás',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Még fut',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replikáció létrejött',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replikáció összesen',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objektumok törölve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb hibái törlés közben',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objketumok elavultak',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb hibák elavulás közben',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objketumok létrehozva',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb hibák létrehozás közben',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objektum frissítve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb hibák firssítés közben',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb hibák rekonsziliálás közben',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replikáció eltűnt',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objketumok frissítve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objketumok változatlanok',
+	'Class:SynchroLog/Attribute:last_error' => 'Utolsó hiba',
+	'Class:SynchroLog/Attribute:traces' => 'Trace',
+	'Class:SynchroReplica' => 'Szinkron másolat',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Szinkron adatforrás',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Cél objektum azonosító',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Cél típusa',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Utolsó megtekintett',
+	'Class:SynchroReplica/Attribute:status' => 'Státusz',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Módosított',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Új',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Árva',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Szinkronizált',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objektum létrehozott?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Utolsó hiba',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Létrehozás dátuma',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Utolsó módosítás dátuma',
+	'Class:appUserPreferences' => 'Felhasználói beállítások',
+	'Class:appUserPreferences/Attribute:userid' => 'Felhasználó',
+	'Class:appUserPreferences/Attribute:preferences' => 'Beállítások',
+	'Core:AttributeLinkedSet' => 'Objektum tömbök',
+	'Core:AttributeLinkedSet+' => '',
+	'Core:AttributeLinkedSetIndirect' => 'Objektum tömbök (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => '',
+	'Core:AttributeInteger' => 'Integer',
+	'Core:AttributeInteger+' => '',
+	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal+' => '',
+	'Core:AttributeBoolean' => 'Boolean',
+	'Core:AttributeBoolean+' => '',
+	'Core:AttributeString' => 'String',
+	'Core:AttributeString+' => '',
+	'Core:AttributeClass' => 'Class',
+	'Core:AttributeClass+' => '',
+	'Core:AttributeApplicationLanguage' => 'Alkalmazás nyelve',
+	'Core:AttributeApplicationLanguage+' => '',
+	'Core:AttributeFinalClass' => 'Class (auto)',
+	'Core:AttributeFinalClass+' => '',
+	'Core:AttributePassword' => 'Jelszó',
+	'Core:AttributePassword+' => '',
+	'Core:AttributeEncryptedString' => 'Encrypted string',
+	'Core:AttributeEncryptedString+' => '',
+	'Core:AttributeText' => 'Text',
+	'Core:AttributeText+' => '',
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => '',
+	'Core:AttributeEmailAddress' => 'E-mail cím',
+	'Core:AttributeEmailAddress+' => '',
+	'Core:AttributeIPAddress' => 'IP cím',
+	'Core:AttributeIPAddress+' => '',
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => '',
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => '',
+	'Core:AttributeTemplateString' => 'Sablon szöveg',
+	'Core:AttributeTemplateString+' => '',
+	'Core:AttributeTemplateText' => 'Sablon szöveg',
+	'Core:AttributeTemplateText+' => '',
+	'Core:AttributeTemplateHTML' => 'Sablon HTML',
+	'Core:AttributeTemplateHTML+' => '',
+	'Core:AttributeDateTime' => 'Date/time',
+	'Core:AttributeDateTime+' => '',
+	'Core:AttributeDate' => 'Date',
+	'Core:AttributeDate+' => '',
+	'Core:AttributeDeadline' => 'Határidő',
+	'Core:AttributeDeadline+' => '',
+	'Core:AttributeExternalKey' => 'Külső kulcs',
+	'Core:AttributeExternalKey+' => '',
+	'Core:AttributeExternalField' => 'Külső mező',
+	'Core:AttributeExternalField+' => '',
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => '',
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => '',
+	'Core:AttributeOneWayPassword' => 'One way password',
+	'Core:AttributeOneWayPassword+' => '',
+	'Core:AttributeTable' => 'Table',
+	'Core:AttributeTable+' => '',
+	'Core:AttributePropertySet' => 'Tulajdonságok',
+	'Core:AttributePropertySet+' => '',
+	'Class:CMDBChangeOp/Attribute:date' => 'Dátum',
+	'Class:CMDBChangeOp/Attribute:date+' => '',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'Felhasználó',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
+	'Change:ObjectCreated' => 'Objektum létrehozva',
+	'Change:ObjectDeleted' => 'Objektum törölve',
+	'Change:ObjectModified' => 'Objektum módosítva',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s új értéke: %2$s (előző értéke: %3$s)',
+	'Change:AttName_SetTo' => '%1$s új értéke %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s hozzáfűzve %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s módosítva, előző érték: %2$s',
+	'Change:AttName_Changed' => '%1$s módosítva',
+	'Change:AttName_EntryAdded' => '%1$s módosítva, új bejegyzés hozzáadva.',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Felhasználó neve',
+	'Class:EventLoginUsage/Attribute:contact_name+' => '',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Felhasználó e-mail',
+	'Class:EventLoginUsage/Attribute:contact_email+' => '',
+	'Class:Action' => 'Egyedi akciók',
+	'Class:Action+' => '',
+	'Class:Action/Attribute:name' => 'Neve',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Leírás',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Státusz',
+	'Class:Action/Attribute:status+' => '',
+	'Class:Action/Attribute:status/Value:test' => 'Tesztelés alatt',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'Éles üzemeben',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inaktív',
+	'Class:Action/Attribute:status/Value:disabled+' => '',
+	'Class:Action/Attribute:trigger_list' => 'Kapcsolódó kiváltó okok',
+	'Class:Action/Attribute:trigger_list+' => '',
+	'Class:Action/Attribute:finalclass' => 'Típus',
+	'Class:Action/Attribute:finalclass+' => '',
+	'Class:ActionNotification' => 'Értesítés',
+	'Class:ActionNotification+' => '',
+	'Class:Trigger' => 'Kiváltó ok',
+	'Class:Trigger+' => '',
+	'Class:Trigger/Attribute:description' => 'Leírás',
+	'Class:Trigger/Attribute:description+' => '',
+	'Class:Trigger/Attribute:action_list' => 'Kiváltott akció',
+	'Class:Trigger/Attribute:action_list+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Típus',
+	'Class:Trigger/Attribute:finalclass+' => '',
+	'Class:TriggerOnObject' => 'Kiváltó ok (osztály függő)',
+	'Class:TriggerOnObject+' => '',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Cél osztály',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnStateChange' => 'Kiváltó ok (állapot változás)',
+	'Class:TriggerOnStateChange+' => '',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Állapot',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Akció',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Kiváltó ok',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Senki',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Csak adminisztrátorok',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tíltott felhasználók',
+	'SynchroDataSource:Description' => 'Leírás',
+	'SynchroDataSource:Reconciliation' => 'Keresés &amp; rekponsziliálás',
+	'SynchroDataSource:Deletion' => 'Törlés szabályai',
+	'SynchroDataSource:Status' => 'Státusz',
+	'SynchroDataSource:Information' => 'Információ',
+	'SynchroDataSource:Definition' => 'Meghatározás',
+	'Core:SynchroAttributes' => 'Attribútumok',
+	'Core:SynchroStatus' => 'Státusz',
+	'Core:Synchro:ErrorsLabel' => 'Hibák',
+	'Core:Synchro:CreatedLabel' => 'Létrehozva',
+	'Core:Synchro:ModifiedLabel' => 'Módosítva',
+	'Core:Synchro:UnchangedLabel' => 'Változatlan',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Hibák',
+	'Core:Synchro:ReconciledLabel' => 'Rekonsziliált',
+	'Core:Synchro:ReconciledNewLabel' => 'Létrehozva',
+	'Core:SynchroReconcile:Yes' => 'Igen',
+	'Core:SynchroReconcile:No' => 'Nem',
+	'Core:SynchroUpdate:Yes' => 'Igen',
+	'Core:SynchroUpdate:No' => 'Nem',
+	'Core:Synchro:LastestStatus' => 'Utolsó státusz',
+	'Core:Synchro:History' => 'Szinkronizáció történet',
+	'Core:Synchro:NeverRun' => 'Ez a szinkronizáció még soha nem futott. Nincs még napló bejegyzés.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'Az utolsó szinkronizáció lefutásának időpontja: %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Az szinkronizáció elindut %1$s, de még fut.',
+	'Menu:DataSources' => 'Szinkronizált adatforrások',
+	'Menu:DataSources+' => '',
+	'Core:Synchro:label_repl_ignored' => 'Figyelmen kívül hagyott (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Elveszett (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Létező (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Új (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Törölt (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Elavult (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Hibák (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Beavatkozás nem szükséges (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Változatan (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Frisített (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Hibák (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Változatlan (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Frissített (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Létrehozott (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Hibák (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Másolat elkészítve: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Egyeztetéshez legalább egy kulcsot meg kell adni, egyébként az egyeztetés az elsődleges kulcs alapján történik.',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A törlés késleltetésének időtartamát meg kell adni, egyébként az objektum törölve lesz annak elavulttá minősítése után.',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Lejárt objektumok frissítése nem tud megtörténni.',
+	'Core:SynchroReplica:PublicData' => 'Publikus adatok',
+	'Core:SynchroReplica:PrivateDetails' => 'Privát adatok',
+	'Core:SynchroReplica:BackToDataSource' => 'Vissza a következő szinkron adatforráshoz: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Másolatok listája',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'Azonosító (Elsődleges kulcs)',
+	'Core:SynchroAtt:attcode' => 'Attribútum',
+	'Core:SynchroAtt:attcode+' => '',
+	'Core:SynchroAtt:reconciliation' => 'Egyeztetés?',
+	'Core:SynchroAtt:reconciliation+' => '',
+	'Core:SynchroAtt:update' => 'Frissített?',
+	'Core:SynchroAtt:update+' => '',
+	'Core:SynchroAtt:update_policy' => 'Frissítési szabály',
+	'Core:SynchroAtt:update_policy+' => '',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Egyeztetés kulcsa',
+	'Core:SynchroAtt:reconciliation_attcode+' => '',
+	'Core:SyncDataExchangeComment' => '(DataExchange)',
+	'Core:Synchro:ListOfDataSources' => 'Adatforrások listája',
+	'Core:Synchro:LastSynchro' => 'Utolsó szimkronizáció',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Az objektum szinkronizálva a külső adatforrással.',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Objektum <b>létrehozva</b> a következő adatforrásban: %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Objektum <b>törölhető</b> a következő külső adatforrásból: %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => '<b>Objektum nem törölhető</b> mert egy másik adatforrás (%1$s) tulajdona',
+	'TitleSynchroExecution' => 'Szinkronizáció végrehajtás',
+	'Class:SynchroDataSource:DataTable' => 'Adatbázis tábla: %1$s',
+	'Core:SyncDataSourceObsolete' => 'Az adatforrás elvalultnak van jelölve. Művelet visszavonva.',
+	'Core:SyncDataSourceAccessRestriction' => 'Csak az adminisztrátor vagy speciális jogokkal rendelkező felhasználó futtathatja a műveletet. Művelet visszavonva.',
+	'Core:SyncTooManyMissingReplicas' => 'Import során az összes másolat elveszett. Az import valóban lefutott? Művelet visszavonva.',
+	'Core:Duration_Seconds' => '%1$sds',
+	'Core:Duration_Minutes_Seconds' => '%1$sdmin %2$sds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$sdh %2$sdmin %3$sds',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$sdh %3$sdmin %4$ds',
+));
+?>

dictionaries/hu.dictionary.itop.ui.php

@@ -0,0 +1,776 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:AuditRule' => 'Auditálási szabály',
+	'Class:AuditRule+' => '',
+	'Class:AuditRule/Attribute:name' => 'Szabály neve',
+	'Class:AuditRule/Attribute:name+' => '',
+	'Class:AuditRule/Attribute:description' => 'Auditálási szabály leírása',
+	'Class:AuditRule/Attribute:description+' => '',
+	'Class:AuditRule/Attribute:query' => 'Futtatandó lekérdezés',
+	'Class:AuditRule/Attribute:query+' => '',
+	'Class:AuditRule/Attribute:valid_flag' => 'Érvényes objektum?',
+	'Class:AuditRule/Attribute:valid_flag+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'hamis',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'igaz',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '',
+	'Class:AuditRule/Attribute:category_id' => 'Kategória',
+	'Class:AuditRule/Attribute:category_id+' => '',
+	'Class:AuditCategory' => 'Audit kategória',
+	'Class:AuditCategory+' => '',
+	'Class:AuditCategory/Attribute:name' => 'Kategória neve',
+	'Class:AuditCategory/Attribute:name+' => '',
+	'Class:AuditCategory/Attribute:description' => 'Audit kategória leírása',
+	'Class:AuditCategory/Attribute:description+' => '',
+	'Class:AuditCategory/Attribute:definition_set' => 'Meghatározás halmaz',
+	'Class:AuditCategory/Attribute:definition_set+' => '',
+	'Class:AuditCategory/Attribute:rules_list' => 'Audit szabályok',
+	'Class:AuditCategory/Attribute:rules_list+' => '',
+	'Class:URP_Profiles' => 'Profil',
+	'Class:URP_Profiles+' => '',
+	'Class:URP_Profiles/Attribute:name' => 'Neve',
+	'Class:URP_Profiles/Attribute:name+' => '',
+	'Class:URP_Profiles/Attribute:description' => 'Leírás',
+	'Class:URP_Profiles/Attribute:description+' => '',
+	'Class:URP_Profiles/Attribute:user_list' => 'Felhasználók',
+	'Class:URP_Profiles/Attribute:user_list+' => '',
+	'Class:URP_UserProfile' => 'Profilhoz rendelt felhasználók',
+	'Class:URP_UserProfile+' => '',
+	'Class:URP_UserProfile/Attribute:userid' => 'Felhasználó',
+	'Class:URP_UserProfile/Attribute:userid+' => '',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profileid+' => '',
+	'Class:URP_UserProfile/Attribute:reason' => 'Ok',
+	'Class:URP_UserProfile/Attribute:reason+' => '',
+	'Class:URP_UserOrg' => 'Felhasználó szervezeti egysége',
+	'Class:URP_UserOrg+' => '',
+	'Class:URP_UserOrg/Attribute:userid' => 'Felhasználó',
+	'Class:URP_UserOrg/Attribute:userid+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Szervezeti egység',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
+	'Class:URP_UserOrg/Attribute:reason' => 'Ok',
+	'Class:URP_UserOrg/Attribute:reason+' => '',
+	'Class:URP_ActionGrant' => 'action_permission',
+	'Class:URP_ActionGrant+' => '',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profileid+' => '',
+	'Class:URP_ActionGrant/Attribute:class' => 'Osztály',
+	'Class:URP_ActionGrant/Attribute:class+' => '',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Hozzáférés',
+	'Class:URP_ActionGrant/Attribute:permission+' => '',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nem',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => '',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Igen',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => '',
+	'Class:URP_ActionGrant/Attribute:action' => 'Akció',
+	'Class:URP_ActionGrant/Attribute:action+' => '',
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => '',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => '',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Osztály',
+	'Class:URP_StimulusGrant/Attribute:class+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Hozzáférés',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nem',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Igen',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => '',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => '',
+	'Class:URP_AttributeGrant' => 'attribute_permission',
+	'Class:URP_AttributeGrant+' => '',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Akció engedély',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribútum',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => '',
+	'Class:AuditRule/Attribute:category_name' => 'Kategória',
+	'Class:AuditRule/Attribute:category_name+' => '',
+	'Class:User' => 'Felhasználó',
+	'Class:User+' => '',
+	'Class:User/Attribute:finalclass' => 'Felhasználó típusa',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'Kapcsolattartó (személy)',
+	'Class:User/Attribute:contactid+' => '',
+	'Class:User/Attribute:last_name' => 'Családnév',
+	'Class:User/Attribute:last_name+' => '',
+	'Class:User/Attribute:first_name' => 'Keresztnév',
+	'Class:User/Attribute:first_name+' => '',
+	'Class:User/Attribute:email' => 'E-mail',
+	'Class:User/Attribute:email+' => '',
+	'Class:User/Attribute:login' => 'Bejelentkezési név',
+	'Class:User/Attribute:login+' => '',
+	'Class:User/Attribute:language' => 'Nyelv',
+	'Class:User/Attribute:language+' => '',
+	'Class:User/Attribute:language/Value:EN US' => 'Angol',
+	'Class:User/Attribute:language/Value:EN US+' => '',
+    'Class:User/Attribute:language/Value:HU HU' => 'Magyar',
+    'Class:User/Attribute:language/Value:HU HU+' => '',
+	'Class:User/Attribute:language/Value:FR FR' => 'Francia',
+	'Class:User/Attribute:language/Value:FR FR+' => '',
+	'Class:User/Attribute:profile_list' => 'Profil',
+	'Class:User/Attribute:profile_list+' => '',
+	'Class:User/Attribute:allowed_org_list' => 'Engedélyezett szervezeti egységek',
+	'Class:User/Attribute:allowed_org_list+' => '',
+	'Class:User/Error:LoginMustBeUnique' => 'Bejelentkezési névnek egyedinek kell lennie - "%1s" már létezik.',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Legalább egy profilt a felhasználóhoz kell rendelni.',
+	'Class:URP_Dimensions' => 'Dimenzió',
+	'Class:URP_Dimensions+' => '',
+	'Class:URP_Dimensions/Attribute:name' => 'Neve',
+	'Class:URP_Dimensions/Attribute:name+' => '',
+	'Class:URP_Dimensions/Attribute:description' => 'Leírás',
+	'Class:URP_Dimensions/Attribute:description+' => '',
+	'Class:URP_Dimensions/Attribute:type' => 'Típus',
+	'Class:URP_Dimensions/Attribute:type+' => '',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Bejelentkezési név',
+	'Class:URP_UserProfile/Attribute:userlogin+' => '',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profile+' => '',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Bejelentkezési név',
+	'Class:URP_UserOrg/Attribute:userlogin+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Szervezeti egység',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => '',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimenzió',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => '',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimenzió',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => '',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profil',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => '',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profil',
+	'Class:URP_ProfileProjection/Attribute:profile+' => '',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Érték',
+	'Class:URP_ProfileProjection/Attribute:value+' => '',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribútum',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => '',
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => '',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimenzió',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => '',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimenzió',
+	'Class:URP_ClassProjection/Attribute:dimension+' => '',
+	'Class:URP_ClassProjection/Attribute:class' => 'Osztály',
+	'Class:URP_ClassProjection/Attribute:class+' => '',
+	'Class:URP_ClassProjection/Attribute:value' => 'Érték',
+	'Class:URP_ClassProjection/Attribute:value+' => '',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribútum',
+	'Class:URP_ClassProjection/Attribute:attribute+' => '',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profile+' => '',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profile+' => '',
+	'Menu:WelcomeMenu' => 'Üdvözlöm',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Üdvözlöm',
+	'Menu:WelcomeMenuPage+' => '',
+	'UI:WelcomeMenu:Title' => 'Üdvözli az iTop',
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop egy teljeskörű, OpenSource, IT üzemeltetés támogató portál.</p>
+<ul>A következőket tartalmazza:
+<li>Teljeskörű CMDB (Konfiguráció menedzsment adatbázis) az IT eszközök dokumentálására és verzió kezelésére.</li>
+<li>Incidens menedzsment modul az összes IT-hez kapcsolódó kérés életciklusának követésére.</li>
+<li>Változás menedzsment modul az IT infrastruktúra változásainak nyomonkövetésére és tervezésére.</li>
+<li>Ismert hibák adatbázisa az incidens kezelés sebességének növelésére.</li>
+<li>Üzmeszünet modul az összes tervezett leállás tervezésére és azzal kapcsolatos kommunikáció támogatására.</li>
+<li>Dashboard-ok az IT infrastruktúra pillanatnyi állapotának gyors áttekintésére.</li>
+</ul>
+<p>Mindegyik modul önállóan telepíthető és használható.</p>',
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop egy szolgáltatás orientált megoldás, amely segít az IT szakembereknek több ügyfél és szervezet egyidejű menedzselését.
+<ul>az iTop az üzleti folyamatok javításához egy hatékony eszköz, mert:
+<li>javítja az IT menedzsment hatékonyságát</li> 
+<li>növeli IT üzemeltetés teljesítményét</li> 
+<li>növeli az ügyfél elégedettséget és a vezetők számára lehetőséget ad az üzleti teljesítmény növelésére</li>
+</ul>
+</p>
+<p>Az iTop teljesn nyílt ezért, egyszerűen integrálható a jelenlegi IT infrastruktúrába</p>
+<p>
+<ul>Az üzemeltetési portál bevezetésével:
+<li>jobban menedzselhető az egyre komplexebb IT infrstruktúra</li>
+<li>az ITIL folyamatok bevezetésre kerülnek</li>
+<li>hatékonyan tudja kezelni az egyik legfontosabb IT eszközt, a dokumentációt.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Összes nyitott kérés: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Saját kérések',
+	'UI:WelcomeMenu:OpenIncidents' => 'Nyitott incidensek: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Konfigurációs elemek: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Hozzám rendelt incidensek',
+	'UI:AllOrganizations' => 'Összes szervezeti egység',
+	'UI:YourSearch' => 'Saját keresések',
+	'UI:LoggedAsMessage' => 'Bejelentkezve %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Bejelentkezve %1$s (Administrator)',
+	'UI:Button:Logoff' => 'Kijelentkezés',
+	'UI:Button:GlobalSearch' => 'Keresés',
+	'UI:Button:Search' => ' Keresés',
+	'UI:Button:Query' => ' Lekérdezés',
+	'UI:Button:Ok' => 'OK',
+	'UI:Button:Cancel' => 'Mégse',
+	'UI:Button:Apply' => 'Alkalmazás',
+	'UI:Button:Back' => ' << Vissza',
+	'UI:Button:Restart' => ' |<< Újraindítás',
+	'UI:Button:Next' => ' Következő >>',
+	'UI:Button:Finish' => ' Befejezés',
+	'UI:Button:DoImport' => ' Importálás indítása',
+	'UI:Button:Done' => ' Kész',
+	'UI:Button:SimulateImport' => ' Import szimulálása',
+	'UI:Button:Test' => 'Teszt!',
+	'UI:Button:Evaluate' => ' Értékelés',
+	'UI:Button:AddObject' => ' Hozzáad...',
+	'UI:Button:BrowseObjects' => ' Böngészés...',
+	'UI:Button:Add' => ' Hozzáad ',
+	'UI:Button:AddToList' => ' << Hozzáad ',
+	'UI:Button:RemoveFromList' => ' Eltávolít >> ',
+	'UI:Button:FilterList' => ' Szűrés... ',
+	'UI:Button:Create' => ' Létrehoz',
+	'UI:Button:Delete' => ' Töröl !',
+	'UI:Button:ChangePassword' => ' Jelszó változtatás',
+	'UI:Button:ResetPassword' => ' Jelszó változtatás',
+	'UI:SearchToggle' => 'Keresés',
+	'UI:ClickToCreateNew' => 'Új %1$s létrehozása',
+	'UI:SearchFor_Class' => '%1$s objektumok keresése',
+	'UI:NoObjectToDisplay' => 'Nincs megjeleníthető objektum',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'object_id pareméter kötelező a link_attr megadásánál. Ellenőrizze a sablon definíciót.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'target_attr pareméter kötelező a link_attr megadásánál. Ellenőrizze a sablon definíciót.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'group_by paraméter kötelező. Ellenőrizze a sablon definíciót.',
+	'UI:Error:InvalidGroupByFields' => 'Csoportosításnál használt érvénytelen mezők: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Hiba: nem támogatott stílus tömb: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Nem megfelelő kapcsolat meghatározás: kapcsolódó osztály: %1$s nem külső kulcs a %2$s osztályban',
+	'UI:Error:Object_Class_Id_NotFound' => 'Objektum: %1$s:%2$d nem található.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Hiba: Körkörös hivatkozás az egymásra mutató mezők között. Ellenőrizze az adatmodelt.',
+	'UI:Error:UploadedFileTooBig' => 'Feltöltendő fájl túl nagy. (Maximális méret: %1$s). Ellenőroizze a PHP konfigurációs fájlban az upload_max_filesize és post_max_size beállításokat.',
+	'UI:Error:UploadedFileTruncated.' => 'Feltöltött fájl átméretezett!',
+	'UI:Error:NoTmpDir' => 'Az átmeneti könyvtár nem meghatározott.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Az átmeneti fájl nem írható. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Feltöltés megállt a fájl kiterjesztés miatt. (Eredeti fájl név = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Fájl feltöltés sikertelen ismeretlen hiba miatt. (Hibakód = "%1$s").',
+	'UI:Error:1ParametersMissing' => 'Hiba: a következő paramétert meg kell adni ennél a műveletnél: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s és %2$s.',
+	'UI:Error:3ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s, %2$s és %3$s.',
+	'UI:Error:4ParametersMissing' => 'Hiba: a következő paramétereket meg kell adni ennél a műveletnél: %1$s, %2$s, %3$s és %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Hiba: nem megfelelő OQL lekérdezés: %1$',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Hiba történt a lekérdezs futtatása közben: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Hiba: az objketum már korábban módosításra került.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Hiba: az objektum nem frissíthető.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Hiba: az objektum már korában törlésre került!',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Az osztály objektumainak tömeges törlése nem engedélyezett %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'Az osztály objektumainak törlése nem engedélyezett %1$s',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Az osztály objektumainak tömeges frissítése nem engedélyezett %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Hiba: az objektum már klónozott!',
+	'UI:Error:ObjectAlreadyCreated' => 'Hiba: az objekltum már létrehozva!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Hiba: érvénytelen stimulus "%1$s" a következő objektum %2$s következő állapotában "%3$s".',
+	'UI:GroupBy:Count' => 'Számossága',
+	'UI:GroupBy:Count+' => '',
+	'UI:CountOfObjects' => '%1$d darab objektum felel meg a kritériumoknak.',
+	'UI_CountOfObjectsShort' => '%1$d objketum.',
+	'UI:NoObject_Class_ToDisplay' => 'Nincs megjeleníthető %1$s',
+	'UI:History:LastModified_On_By' => 'Utolsó módosítást a következő objektumon %1$s %2$s végezte.',
+	'UI:HistoryTab' => 'Törénet',
+	'UI:NotificationsTab' => 'Értesítés',
+	'UI:History:BulkImports' => 'Történet',
+	'UI:History:BulkImports+' => '',
+	'UI:History:BulkImportDetails' => 'CSV import végrehajtva: %1$s (%2$s által)',
+	'UI:History:Date' => 'Dátum',
+	'UI:History:Date+' => '',
+	'UI:History:User' => 'Felhasználó',
+	'UI:History:User+' => '',
+	'UI:History:Changes' => 'Változások',
+	'UI:History:Changes+' => '',
+	'UI:History:StatsCreations' => 'Létrehozva',
+	'UI:History:StatsCreations+' => '',
+	'UI:History:StatsModifs' => 'Módosítva',
+	'UI:History:StatsModifs+' => '',
+	'UI:History:StatsDeletes' => 'Törölve',
+	'UI:History:StatsDeletes+' => '',
+	'UI:Loading' => 'Betöltés...',
+	'UI:Menu:Actions' => 'Akciók',
+	'UI:Menu:OtherActions' => 'Egyéb Akciók',
+	'UI:Menu:New' => 'Új...',
+	'UI:Menu:Add' => 'Hozzáad...',
+	'UI:Menu:Manage' => 'Kezel...',
+	'UI:Menu:EMail' => 'e-mail',
+	'UI:Menu:CSVExport' => 'CSV export',
+	'UI:Menu:Modify' => 'Módosít...',
+	'UI:Menu:Delete' => 'Töröl...',
+	'UI:Menu:BulkDelete' => 'Töröl...',
+	'UI:UndefinedObject' => 'nem meghatározott',
+	'UI:Document:OpenInNewWindow:Download' => 'Megnyitás új ablakban: %1$s, Letöltés: %2$s',
+	'UI:SelectAllToggle+' => '',
+	'UI:TruncatedResults' => '%1$d objektum megjelenítve %2$d példányból',
+	'UI:DisplayAll' => 'Összes megjelenítése',
+	'UI:CollapseList' => 'Elemek',
+	'UI:CountOfResults' => '%1$d objektum',
+	'UI:ChangesLogTitle' => 'Változás napló (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Változás napló üres',
+	'UI:SearchFor_Class_Objects' => 'Keresés %1$s objektumra',
+	'UI:OQLQueryBuilderTitle' => 'OQL lekérdezés szerkesztő',
+	'UI:OQLQueryTab' => 'OQL lekérdezés',
+	'UI:SimpleSearchTab' => 'Egyszerű keresés',
+	'UI:Details+' => '',
+	'UI:SearchValue:Any' => '* Any *',
+	'UI:SearchValue:Mixed' => '* mixed *',
+	'UI:SelectOne' => '-- válasszon ki egyet --',
+	'UI:Login:Welcome' => 'Üdvözli az iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Nem megfelelő bejelentkezési név/jelszó, kérjük próbálja újra.',
+	'UI:Login:IdentifyYourself' => 'Folytatás előtt azonosítsa magát',
+	'UI:Login:UserNamePrompt' => 'Felhasználó név',
+	'UI:Login:PasswordPrompt' => 'Jelszó',
+	'UI:Login:ChangeYourPassword' => 'Jelszó változtatás',
+	'UI:Login:OldPasswordPrompt' => 'Jelenlegi jelszó',
+	'UI:Login:NewPasswordPrompt' => 'Új jelszó',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Új jelszó ismét',
+	'UI:Login:IncorrectOldPassword' => 'Hiba: a jelenlegi jelszó hibás',
+	'UI:LogOffMenu' => 'Kilépés',
+	'UI:LogOff:ThankYou' => 'Köszönjük, hogy az iTop-ot használja!',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Ismételt bejelentkezéshez kattintson ide',
+	'UI:ChangePwdMenu' => 'Jelszó módosítás...',
+	'UI:Login:PasswordChanged' => 'Jelszó sikeresen beállítva!',
+	'UI:AccessRO-All' => 'iTop csak olvasás módban',
+	'UI:AccessRO-Users' => 'iTop csak olvasás módban a végfelhasználók számára',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Az új jelszó és ismételten beírt érték nem egyezik!',
+	'UI:Button:Login' => 'Belépés az iTop alkalmazásba',
+	'UI:Login:Error:AccessRestricted' => 'iTop hozzáférés korlátozva. Kérem forduljon az iTop adminisztrátorhoz!',
+	'UI:Login:Error:AccessAdmin' => 'Adminisztrátori hozzáférés korlátozott. Kérem forduljon az iTop adminisztrátorhoz!',
+	'UI:CSVImport:MappingSelectOne' => '-- válasszon ki egyet --',
+	'UI:CSVImport:MappingNotApplicable' => '-- mező figyelmen kívül hagyása --',
+	'UI:CSVImport:NoData' => 'Üres mező..., kérem agyjon meg adatot!',
+	'UI:Title:DataPreview' => 'Adatok előnézete',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Hiba: Az import fájl egyetlen oszlopot tartalmaz. A megfelelő elválasztó karaktert adta meg?',
+	'UI:CSVImport:FieldName' => 'Mező %1$d',
+	'UI:CSVImport:DataLine1' => 'Adatsor 1',
+	'UI:CSVImport:DataLine2' => 'Adatsor 2',
+	'UI:CSVImport:idField' => 'id (elsődeges kulcs)',
+	'UI:Title:BulkImport' => 'iTop - tömeges betöltés',
+	'UI:Title:BulkImport+' => '',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%2$s osztály %1$d objektumának szinkronizációja',
+	'UI:CSVImport:ClassesSelectOne' => '-- válasszon ki egyet --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Belső hiba: "%1$s" nem megfelelő kód, mert "%2$s" nem külső kulcsa a "%3$s" osztálynak',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objektumok változatlanok maradnak.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objektumok fognak megváltozni.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objektumok hozzáadásra kerülnek.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objektumok hibásak lesznek.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objektumok változatlanak maradtak',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objektumok módosításra kerültek.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objektumok hozzáadásra kerültek.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d objkektumok hibásak.',
+	'UI:Title:CSVImportStep2' => '2. lépés az 5-ből: CSV adat opciók',
+	'UI:Title:CSVImportStep3' => '3. lépés az 5-ből: Adatok összerendelés',
+	'UI:Title:CSVImportStep4' => '4. lépés az 5-ből: Import szimuláció',
+	'UI:Title:CSVImportStep5' => '5. lépés az 5-ből: Import befejezve',
+	'UI:CSVImport:LinesNotImported' => 'Sorok, melyek nem lettek betöltve:',
+	'UI:CSVImport:LinesNotImported+' => '',
+	'UI:CSVImport:SeparatorComma+' => '',
+	'UI:CSVImport:SeparatorSemicolon+' => '',
+	'UI:CSVImport:SeparatorTab+' => '',
+	'UI:CSVImport:SeparatorOther' => 'egyéb:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '',
+	'UI:CSVImport:QualifierSimpleQuote+' => '',
+	'UI:CSVImport:QualifierOther' => 'egyéb:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Első sor fejléc információkat tartalmaz (oszlopok nevei)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '%1$s sorok kihagyása a fájl elejéről',
+	'UI:CSVImport:CSVDataPreview' => 'CSV adat előnézet',
+	'UI:CSVImport:SelectFile' => 'Import fájl kiválasztása:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Betöltés fájlból',
+	'UI:CSVImport:Tab:CopyPaste' => 'Adat másolás és beillesztés',
+	'UI:CSVImport:Tab:Templates' => 'Sablonok',
+	'UI:CSVImport:PasteData' => 'Import adatok beillesztése:',
+	'UI:CSVImport:PickClassForTemplate' => 'Letöltendő sablon kiválasztása:',
+	'UI:CSVImport:SeparatorCharacter' => 'Elválasztó karakter:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Szöveg qualifier karakter',
+	'UI:CSVImport:CommentsAndHeader' => 'Megjegyzések és fejléc',
+	'UI:CSVImport:SelectClass' => 'Importálandó osztály kiválasztása:',
+	'UI:CSVImport:AdvancedMode' => 'Haladó mód',
+	'UI:CSVImport:AdvancedMode+' => '',
+	'UI:CSVImport:SelectAClassFirst' => 'Adat összerendeléshez elöször válassza ki az osztályt.',
+	'UI:CSVImport:HeaderFields' => 'Mező',
+	'UI:CSVImport:HeaderMappings' => 'Összerendelés',
+	'UI:CSVImport:HeaderSearch' => 'Keresés?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Kérem adja meg az összes mezőre az összerendelési szabályokat.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Kérem adjon eg legalább egy keresési kritériumot',
+	'UI:CSVImport:Encoding' => 'Karakter kódolása',
+	'UI:UniversalSearchTitle' => 'iTop - Univerzális kereső',
+	'UI:UniversalSearch:Error' => 'Hiba: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Keresendő osztály kiválasztása:',
+	'UI:Audit:Title' => 'iTop - CMDB Audit',
+	'UI:Audit:InteractiveAudit' => 'Interaktív Audit',
+	'UI:Audit:HeaderAuditRule' => 'Audit szabály',
+	'UI:Audit:HeaderNbObjects' => '# Objektumok',
+	'UI:Audit:HeaderNbErrors' => '# Hibák',
+	'UI:Audit:PercentageOk' => '% OK',
+	'UI:RunQuery:Title' => 'iTop - OQL lekérdezés értékelés',
+	'UI:RunQuery:QueryExamples' => 'Lekérdezés példák',
+	'UI:RunQuery:HeaderPurpose' => 'Cél',
+	'UI:RunQuery:HeaderPurpose+' => '',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL kifejezés',
+	'UI:RunQuery:HeaderOQLExpression+' => '',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Értékelendő kifejezés: ',
+	'UI:RunQuery:MoreInfo' => 'Több információ a lekérdezésről: ',
+	'UI:RunQuery:DevelopedQuery' => 'Újraírt lekérdező értékelés: ',
+	'UI:RunQuery:SerializedFilter' => 'Szerializált szűrő: ',
+	'UI:RunQuery:Error' => 'A lekérdezés futtatása közben a következő hiba jelentkezett: %1$s',
+	'UI:Schema:Title' => 'iTop objektum séma',
+	'UI:Schema:CategoryMenuItem' => '<b>%1$s</b> kategória',
+	'UI:Schema:Relationships' => 'Kapcsolatok',
+	'UI:Schema:AbstractClass' => 'Absztrakt osztály: nem példányosítható belőle objektum.',
+	'UI:Schema:NonAbstractClass' => 'Nem absztrakt osztály: objektum példányosítható belőle.',
+	'UI:Schema:ClassHierarchyTitle' => 'Osztály hierarchia',
+	'UI:Schema:AllClasses' => 'Összes osztály',
+	'UI:Schema:ExternalKey_To' => 'Külső kulcs %1$s-hoz',
+	'UI:Schema:Columns_Description' => 'Oszlopok: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Alapértelmezett: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null érték engedélyezett',
+	'UI:Schema:NullNotAllowed' => 'Null érték nem engedélyezett',
+	'UI:Schema:Attributes' => 'Attribútumok',
+	'UI:Schema:AttributeCode' => 'Attribútum kód',
+	'UI:Schema:AttributeCode+' => '',
+	'UI:Schema:Label' => 'Cimke',
+	'UI:Schema:Label+' => '',
+	'UI:Schema:Type' => 'Típus',
+	'UI:Schema:Type+' => '',
+	'UI:Schema:Origin' => 'Származás',
+	'UI:Schema:Origin+' => '',
+	'UI:Schema:Description' => 'Leírás',
+	'UI:Schema:Description+' => '',
+	'UI:Schema:AllowedValues' => 'Engedélyezett értékek',
+	'UI:Schema:AllowedValues+' => '',
+	'UI:Schema:MoreInfo' => 'Több információ',
+	'UI:Schema:MoreInfo+' => '',
+	'UI:Schema:SearchCriteria' => 'Keresési kritériumok',
+	'UI:Schema:FilterCode' => 'Szűrő kód',
+	'UI:Schema:FilterCode+' => '',
+	'UI:Schema:FilterDescription' => 'Leírás',
+	'UI:Schema:FilterDescription+' => '',
+	'UI:Schema:AvailOperators' => 'Elérhető műveletek',
+	'UI:Schema:AvailOperators+' => '',
+	'UI:Schema:ChildClasses' => 'Leszármazott osztályok',
+	'UI:Schema:ReferencingClasses' => 'Referált osztályok',
+	'UI:Schema:RelatedClasses' => 'Kapcsolódó osztályok',
+	'UI:Schema:LifeCycle' => 'Életciklus',
+	'UI:Schema:Triggers' => 'Kiváltó okok',
+	'UI:Schema:Relation_Code_Description' => 'Kapcsolat <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Lenn: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Fenn: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: kiterjesztése %2$d szintre, lekérdezés: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: nincs kiterjesztve (%2$d szintekre), lekérdezés: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s hivatkozva %2$s az osztályban %3$s mezőn keresztül',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s hozzácsatolva %2$s-hoz %3$s-n keresztül::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'A következő osztályok mutatnak %1$s-ra (1:n kapcsolat):',
+	'UI:Schema:Links:n-n' => 'A következő osztályok mutatnak %1$s-ra (n:n kapcsolat):',
+	'UI:Schema:Links:All' => 'Össze kapcsolódó osztály grafikonja',
+	'UI:Schema:NoLifeCyle' => 'Nincs életciklus rendelve ehhez az osztályhoz.',
+	'UI:Schema:LifeCycleTransitions' => 'Átmenetek',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Attribútum opciók',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Rejtett',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Csak olvasható',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Kötelező',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Változtatni kell',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Felhasználó kéri a változtatását',
+	'UI:Schema:LifeCycleEmptyList' => 'üres lista',
+	'UI:LinksWidget:Autocomplete+' => '',
+	'UI:Combo:SelectValue' => '--- válasszon értéket ---',
+	'UI:Label:SelectedObjects' => 'Kiválasztott objektumok: ',
+	'UI:Label:AvailableObjects' => 'Lehetséges objektumok: ',
+	'UI:Link_Class_Attributes' => '%1$s attribútumai',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%1$s objektumok hozzáadása %2$s osztályhoz kapcsolással: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => '%1$s objektumok hozzáadása %2$s osztályhoz csatolással',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s osztályhoz kapcsolt %1$s objektumok kezelése: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Hozzáadás %1$s osztályhoz',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Kiválasztott objektum eltávolítása',
+	'UI:Message:EmptyList:UseAdd' => 'A lista üres, használja a "Hozzáadás..." gombot az elemekre.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Használja a kereső formot a hozzáadandó objektumok kiválasztásához.',
+	'UI:Wizard:FinalStepTitle' => 'Utolsó lépés: megerősítés',
+	'UI:Title:DeletionOf_Object' => '%1$s törlése',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s osztály %1$d objektumának tömeges törlése',
+	'UI:Delete:NotAllowedToDelete' => 'Nem enegedélyezett az objektum törlése',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'A következő mező módosítása nem engedélyezett: %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Az objektum nem törölhető, mert a felhasználónak nincs elegendő joga',
+	'UI:Error:CannotDeleteBecause' => 'Az objektum nem törölhető, mert: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Az objektum nem törölhető, mert néhány hozzá kapcsolódó magasabb prioritású manuális művelet végrehajtásra vár',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Az objektum nem törölhető, mert néhány hozzá kapcsolódó magasabb prioritású manuális művelet végrehajtásra vár',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s felhasználó %2$s nevében',
+	'UI:Delete:Deleted' => 'törölt',
+	'UI:Delete:AutomaticallyDeleted' => 'automatikusan törölt',
+	'UI:Delete:AutomaticResetOf_Fields' => ' következő mezők automatikus újratöltése: %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Összes referencia tisztítása %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s osztály %1$d objektumára mutató referenciák tisztítása',
+	'UI:Delete:Done+' => '',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s törölve.',
+	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s törlése',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$s osztály %1$d objektumának törlése',
+	'UI:Delete:CannotDeleteBecause' => 'Sikertelenül töröltek: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Automatikusan kellett volna törlődniük, de a művelet nem volt végrehajtható: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Manuállis törlés nem végrehajtható: %1$s',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Automatikusan lesznek törölve',
+	'UI:Delete:MustBeDeletedManually' => 'Manuálisan törlendők',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Automatikus frissítés sikeretelen: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Automatikusan lesznek frissítve (reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objektumok / kapcsolatok hivatkoznak erre: %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objektumok / kapcsolatok hivatkoznak törlendő objektumokra',
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Adatbázis integritás ellenőrzés szükséges. Néhány hivatkozás megszüntetésre kerül.',
+	'UI:Delete:Consequence+' => '',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Az objektum törlése nem engedélyezett. Részletes magyarázat a következő sorokban.',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Kérem hajtsa végre a következő listában található műveleteket manuálisan az objektum törlésének kéréséhez',
+	'UI:Delect:Confirm_Object' => 'Kérjük hagyja jóvá a %1$s törlését!',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Kérjük hagyja jóvá a %2$s ostály %1$d objektumának törlését!',
+	'UI:WelcomeToITop' => 'Üdvözli az iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s részletek',
+	'UI:ErrorPageTitle' => 'iTop - Hiba',
+	'UI:ObjectDoesNotExist' => 'Sajnálom ez az objektum nem létezik (vagy a megtekintése nem engedélyezett a felhasználó számára).',
+	'UI:SearchResultsPageTitle' => 'iTop - Keresés eredményei',
+	'UI:Search:NoSearch' => 'Nincs keresés',
+	'UI:FullTextSearchTitle_Text' => '"%1$s" keresés eredményei:',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s osztály %1$d objektuma',
+	'UI:Search:NoObjectFound' => 'Objektum nem található',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s módosítása',
+	'UI:ModificationTitle_Class_Object' => '%1$s: <span class=\"hilite\">%2$s</span> módosítása',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - %1$s - %2$s klón módosítása',
+	'UI:CloneTitle_Class_Object' => '%1$s: <span class=\"hilite\">%2$s</span> klón',
+	'UI:CreationPageTitle_Class' => 'iTop - %1$s létrehozása',
+	'UI:CreationTitle_Class' => '%1$s létrehozása',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Válassza ki a létrehozni kívánt %1$s osztály típusát:',
+	'UI:Class_Object_NotUpdated' => 'Változás nem történt, %1$s (%2$s) <strong>NEM</strong> lett módosítva.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) frissítve.',
+	'UI:BulkDeletePageTitle' => 'iTop - Tömeges törlés',
+	'UI:BulkDeleteTitle' => 'Válassza ki a törölni kívánt objektumokat:',
+	'UI:PageTitle:ObjectCreated' => 'iTop objektum létrehozva.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s létrehozva.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Alkalmazva %1$s objektumon: %2$s.Kinduló állapot: %3$s cél állapot: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'Au objektum írása sikertlen: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - Fatális hiba',
+	'UI:SystemIntrusion' => 'Hozzáférés megtagadva. A művelet végrehajtása nem engedélyezett.',
+	'UI:FatalErrorMessage' => 'Fatális hiba, iTop nem tudja a működését folytatni',
+	'UI:Error_Details' => 'Hiba: %1$s.',
+	'UI:PageTitle:ClassProjections' => 'iTop felhasználó menedzsmet - osztály nézet',
+	'UI:PageTitle:ProfileProjections' => 'iTop felhasználó menedzsmet - profil nézet',
+	'UI:UserManagement:Class' => 'Osztály',
+	'UI:UserManagement:Class+' => '',
+	'UI:UserManagement:ProjectedObject' => 'Objektum',
+	'UI:UserManagement:ProjectedObject+' => '',
+	'UI:UserManagement:AnyObject' => '* any *',
+	'UI:UserManagement:User' => 'Felhasználó',
+	'UI:UserManagement:User+' => '',
+	'UI:UserManagement:Profile' => 'Profil',
+	'UI:UserManagement:Profile+' => '',
+	'UI:UserManagement:Action:Read' => 'Olvas',
+	'UI:UserManagement:Action:Read+' => '',
+	'UI:UserManagement:Action:Modify' => 'Módosít',
+	'UI:UserManagement:Action:Modify+' => '',
+	'UI:UserManagement:Action:Delete' => 'Töröl',
+	'UI:UserManagement:Action:Delete+' => '',
+	'UI:UserManagement:Action:BulkRead' => 'Tömeges beolvasás (Export)',
+	'UI:UserManagement:Action:BulkRead+' => '',
+	'UI:UserManagement:Action:BulkModify' => 'Tömeges módosítás',
+	'UI:UserManagement:Action:BulkModify+' => '',
+	'UI:UserManagement:Action:BulkDelete' => 'Tömeges törlés',
+	'UI:UserManagement:Action:BulkDelete+' => '',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => '',
+	'UI:UserManagement:Action' => 'Akció',
+	'UI:UserManagement:Action+' => '',
+	'UI:UserManagement:TitleActions' => 'Akciók',
+	'UI:UserManagement:Permission' => 'Engedély',
+	'UI:UserManagement:Permission+' => '',
+	'UI:UserManagement:Attributes' => 'Attribútumok',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Igen',
+	'UI:UserManagement:ActionAllowed:No' => 'Nem',
+	'UI:UserManagement:AdminProfile+' => '',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => '',
+	'UI:UserManagement:GrantMatrix' => 'Jogosutlsági mátrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Kapcsolat %1$s és %2$s között',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Kapcsolat %1$s és %2$s között',
+	'Menu:AdminTools' => 'Adminisztrációs eszközök',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Eszközök csak az adminisztrátori profilhoz rendlet felhasználók számára elérhetők.',
+	'UI:ChangeManagementMenu' => 'Változás menedzsment',
+	'UI:ChangeManagementMenu+' => '',
+	'UI:ChangeManagementMenu:Title' => 'Változás áttekintése',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Változások típusok szerint',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Változások státusz szerint',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Változások csoportok szerint',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Még nem kiosztott változások',
+	'UI:ConfigurationItemsMenu' => 'Konfigurációs elemek',
+	'UI:ConfigurationItemsMenu+' => '',
+	'UI:ConfigurationItemsMenu:Title' => 'Konfigurációs elemek áttekintése',
+	'UI-ConfigurationItemsMenu-ServersByCriticity' => 'Szerverek kritikusság szerint',
+	'UI-ConfigurationItemsMenu-PCsByCriticity' => 'PC-k kritikusság szerint',
+	'UI-ConfigurationItemsMenu-NWDevicesByCriticity' => 'Hálózati eszközök kritikusság szerint',
+	'UI-ConfigurationItemsMenu-ApplicationsByCriticity' => 'Alkalmazások kritikusság szerint',
+	'UI:ConfigurationManagementMenu' => 'Konfiguráció menedzsment',
+	'UI:ConfigurationManagementMenu+' => '',
+	'UI:ConfigurationManagementMenu:Title' => 'Infrastruktúra áttekintő',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastruktúra objetumok típusok szerint',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastruktúra objetumok státuszok szerint',
+	'UI:ConfigMgmtMenuOverview:Title' => 'Konfiguráció menedzsment dashboard',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Konfigurációs elemek státusz szerint',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Konfigurációs elemek típus szerint',
+	'UI:RequestMgmtMenuOverview:Title' => 'Igény menedzsment dashboard',
+	'UI-RequestManagementOverview-RequestByService' => 'Felhasználói kérések szolgáltatásonként',
+	'UI-RequestManagementOverview-RequestByPriority' => 'Felhasználói kérések prioritás szerint',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'Felhasználói kérések, amelyek még nem lettek felelőshöz rendelve',
+	'UI:IncidentMgmtMenuOverview:Title' => 'Incidens menedzsment dashboard',
+	'UI-IncidentManagementOverview-IncidentByService' => 'Incidensek szolgáltatásonként',
+	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidensek prioritás szerint',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidensek, amelyek még nem lettek felelőshöz rendelve',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Változás menedzsment dashboard',
+	'UI-ChangeManagementOverview-ChangeByType' => 'Változások típusonként',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Változások, amelyek még nem lettek felelőshöz rendelve',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Változások által okozott leállási idő',
+	'UI:ServiceMgmtMenuOverview:Title' => 'Szolgáltatás menedszment dashboard',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'A következő 30 napban lejáró ügyfél szerződések',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'A következő 30 napban lejáró szállítói szerződések',
+	'UI:ContactsMenu' => 'Kapcsolattartók',
+	'UI:ContactsMenu+' => '',
+	'UI:ContactsMenu:Title' => 'Kapcsolattartó áttekintő',
+	'UI-ContactsMenu-ContactsByLocation' => 'Kapcsolattartók földrajzi hely szerint',
+	'UI-ContactsMenu-ContactsByType' => 'Kapcsolattartók típus szerint',
+	'UI-ContactsMenu-ContactsByStatus' => 'Kapcsolattartók státusz szerint',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Adatmodell',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' => 'Értesítések',
+	'Menu:NotificationsMenu+' => '',
+	'UI:NotificationsMenu:Title' => '<span class="hilite">Értesítések</span> beállítása',
+	'UI:NotificationsMenu:Help' => 'Segítség',
+	'UI:NotificationsMenu:HelpContent' => '<p>Az iTop alkalmazásban az értesítések teljesen testreszabhatók. Értesítések az objektumok két csoportjára épülnek: <i>kiváltó okok és akciók</i>.</p>
+<p><i><b>Kiváltó ok</b></i> határozza meg mikor kell az értesítést végrehajtani. Kiváltó okoknak 2 típusa van az objektum életciklius három fázisának lefedésére:
+<ol>
+	<li>"OnCreate" kiváltó ok egy objektum létrehozása</li>
+	<li>"OnStateEnter" kiváltó ok egy adott objektum állapot változása - az új objektum állapot elérése előtt váltódik ki</li>
+	<li>"OnStateLeave" kiváltó ok egy adott objektum állapot változása - az új objektum állapot elhagyása után váltódik ki</li>
+</ol>
+</p>
+<p>
+<i><b>Akciók</b></i> határozzák meg mit kell végrehjatani a kiváltó ok bekövetkezésekor. Jelenleg egyetlen akció fajta van: e-mail küldés.Természetesen az egyedi akciókbna meg lehet határozni a levél alapját képző sablont és az abba beépülő speciális paramétereket, pl.: címzett, fontossás, stb.
+</p>
+<p>Speciális oldal: <a href="../setup/email.test.php" target="_blank">email.test.php</a> oldalon keresztül a PHP mail konfiguráció tesztelhető.</p>
+<p>Akció végrehjatásához azt kiváltó okhoz kell rendelni.
+Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az akciók végrehatási sorrendjét.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Kiváltó okok',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Lehetséges kiváltó okok',
+	'UI:NotificationsMenu:OnCreate' => 'Objektum létrehozás',
+	'UI:NotificationsMenu:OnStateEnter' => 'Objketum állapotba való belépése',
+	'UI:NotificationsMenu:OnStateLeave' => 'Objektum állotból való kilépése',
+	'UI:NotificationsMenu:Actions' => 'Akciók',
+	'UI:NotificationsMenu:AvailableActions' => 'Lehetséges akciók',
+	'Menu:AuditCategories' => 'Audit kategóriák',
+	'Menu:AuditCategories+' => '',
+	'Menu:Notifications:Title' => 'Audit kategóriák',
+	'Menu:RunQueriesMenu' => 'Lekérdezés futtatás',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:DataAdministration' => 'Adat adminisztráció',
+	'Menu:DataAdministration+' => '',
+	'Menu:UniversalSearchMenu' => 'Univerzális keresés',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:ApplicationLogMenu' => 'Alkalmazás napló',
+	'Menu:ApplicationLogMenu+' => '',
+	'Menu:ApplicationLogMenu:Title' => 'Alkalmazás napló',
+	'Menu:UserManagementMenu' => 'Felhasználó menedzsment',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profilok',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profilok',
+	'Menu:UserAccountsMenu' => 'Felhasználói fiókok',
+	'Menu:UserAccountsMenu+' => '',
+	'Menu:UserAccountsMenu:Title' => 'Felhasználói fiókok',
+	'UI:iTopVersion:Short' => 'iTop verzió: %1$s',
+	'UI:iTopVersion:Long' => 'iTop verzió: %1$s-%2$s %3$s',
+	'UI:PropertiesTab' => 'Tulajdonságok',
+	'UI:OpenDocumentInNewWindow_' => 'A követekező dokumentum megnyitása új ablakban: %1$s',
+	'UI:DownloadDocument_' => 'A következő dokuemntum letöltése: %1$s',
+	'UI:Document:NoPreview' => 'Nem elérhető előnézet ehhez a dokuemntumhoz',
+	'UI:DeadlineMissedBy_duration' => 'Elmulsztva %1$s által',
+	'UI:Deadline_LessThan1Min' => '< 1 perc',
+	'UI:Deadline_Minutes' => '%1$d perc',
+	'UI:Deadline_Hours_Minutes' => '%1$dóra %2$dperc',
+	'UI:Deadline_Days_Hours_Minutes' => '%1$nap %2$dóra %3$dperc',
+	'UI:Help' => 'Segítség',
+	'UI:PasswordConfirm' => '(Jóváhagyás)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '%1$s objektumok hozzáadása előtt mentse ezt az  objektumot',
+	'UI:DisplayThisMessageAtStartup' => 'Az üzenet megjelenítése indításkor',
+	'UI:RelationshipGraph' => 'Grafikus nézet',
+	'UI:RelationshipList' => 'Lista',
+	'UI:OperationCancelled' => 'Művelet visszavonva',
+	'Portal:Title' => 'iTop felhasználói portál',
+	'Portal:Refresh' => 'Frissítés',
+	'Portal:Back' => 'Vissza',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => 'Új kérés létrehozása',
+	'Portal:ChangeMyPassword' => 'Jelszó változtatás',
+	'Portal:Disconnect' => 'Kilépés',
+	'Portal:OpenRequests' => 'Nyitott kéréseim',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests' => 'Megoldott kéréseim',
+	'Portal:SelectService' => 'Válasszon szolgáltatást a katalógusból:',
+	'Portal:PleaseSelectOneService' => 'Kérem válasszon egy szolgáltatást',
+	'Portal:SelectSubcategoryFrom_Service' => 'Válassza ki a %1$s szolgáltatás alkategóriáját:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Kérem válasszon egy alkategóriát',
+	'Portal:DescriptionOfTheRequest' => 'Adja meg a kérés leírásást:',
+	'Portal:TitleRequestDetailsFor_Request' => '%1$s kérés részletei:',
+	'Portal:NoOpenRequest' => 'A kategóriához nem tartozik nyitott kérés.',
+	'Portal:NoClosedRequest' => 'No request in this category',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
+	'Portal:Button:CloseTicket' => 'Hibajegy lezárása',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => 'Adjon megjegyzést a megoldáshoz:',
+	'Portal:ErrorNoContactForThisUser' => 'Hiba: az aktuális felhasználó nem tartozik egyetlen Kapcsolattartóhoz / Szemályhez sem. Kérem vegye felk a kapcsolatot az adminisztrátorral.',
+	'Portal:Attachments' => 'Csatolmányok',
+	'Portal:AddAttachment' => 'Csatolmány hozzáadása',
+	'Portal:RemoveAttachment' => 'Csatolmány eltávolítása',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Csatolmányok: #%1$d a %2$s (%3$s) hibajegyhez',
+	'Enum:Undefined' => 'Nem meghatározott',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s nap %2$s óra %3$s perc %4$s másodperc',
+	'UI:ModifyAllPageTitle' => 'Összes módosítása',
+	'UI:Modify_N_ObjectsOf_Class' => '%2$s osztály %1$d objketumainak módosítása',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => '%2$s osztály %1$d objektumának módosítása, kivéve: %3$d',
+	'UI:Menu:ModifyAll' => 'Módosítás...',
+	'UI:Button:ModifyAll' => 'Összes módosítása',
+	'UI:Button:PreviewModifications' => 'Módosítások előnézete >>',
+	'UI:ModifiedObject' => 'Objektum módosítva',
+	'UI:BulkModifyStatus' => 'Művelet',
+	'UI:BulkModifyStatus+' => '',
+	'UI:BulkModifyErrors' => 'Hibák (ha vannak)',
+	'UI:BulkModifyErrors+' => '',
+	'UI:BulkModifyStatusOk' => 'OK',
+	'UI:BulkModifyStatusError' => 'Hiba',
+	'UI:BulkModifyStatusModified' => 'Módosítva',
+	'UI:BulkModifyStatusSkipped' => 'Átugorva',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d eltérő értékek:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s *, %2$d *',
+	'UI:BulkModify:N_MoreValues' => '%1$d további értékei ...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Kísérlet a következő csak olvaható mező beállítására: %1$s',
+	'UI:FailedToApplyStimuli' => 'A művelet sikertelen',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: %3$s osztály %2$d objketumainak módosítása',
+	'UI:CaseLogTypeYourTextHere' => 'Írjon ide:',
+	'UI:CaseLog:DateFormat' => 'Y-m-d H:i:s',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Kezdeti érték:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => '%1$s mező nem írható, mert a szinkronizációnál használt kulcs. Érték nem lett beállítva.',
+	'UI:ActionNotAllowed' => 'Ennek a műveletnek a végrehajtása nem engedélyezett ezen az objektumon.',
+	'UI:BulkAction:NoObjectSelected' => 'Válasszon ki legalább egy objketumot a művelet végrehajtásához',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => '%1$s mező nem írható, mert a szinkronizációnál használt kulcs. Érték változatlan maradt.',
+));
+?>

dictionaries/it.dictionary.itop.core.php

@@ -0,0 +1,485 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * @author	Erwan Taloc <erwan.taloc@combodo.com>
+ * @author	Romain Quetiez <romain.quetiez@combodo.com>
+ * @author	Denis Flaven <denis.flaven@combodo.com>
+
+ * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:ActionEmail' => 'E-mail di notifica',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Test destinatario',
+	'Class:ActionEmail/Attribute:test_recipient+' => '',
+	'Class:ActionEmail/Attribute:from' => 'Da',
+	'Class:ActionEmail/Attribute:from+' => '',
+	'Class:ActionEmail/Attribute:reply_to' => 'Rispondi A',
+	'Class:ActionEmail/Attribute:reply_to+' => '',
+	'Class:ActionEmail/Attribute:to' => 'A',
+	'Class:ActionEmail/Attribute:to+' => '',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => '',
+	'Class:ActionEmail/Attribute:bcc' => 'BCC',
+	'Class:ActionEmail/Attribute:bcc+' => '',
+	'Class:ActionEmail/Attribute:subject' => 'Oggetto',
+	'Class:ActionEmail/Attribute:subject+' => '',
+	'Class:ActionEmail/Attribute:body' => 'corpo',
+	'Class:ActionEmail/Attribute:body+' => '',
+	'Class:ActionEmail/Attribute:importance' => 'priorità',
+	'Class:ActionEmail/Attribute:importance+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'alta',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'bassa',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normake',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
+	'Class:TriggerOnStateEnter' => 'Trigger (sull\'entrare in uno stato)',
+	'Class:TriggerOnStateEnter+' => '',
+	'Class:TriggerOnStateLeave' => 'Trigger (sul lasciare uno stato)~~',
+	'Class:TriggerOnStateLeave+' => '',
+	'Class:TriggerOnObjectCreate' => 'Trigger (sulla creazione di un oggetto)~~',
+	'Class:TriggerOnObjectCreate+' => '',
+	'Class:lnkTriggerAction' => 'Azione/Trigger~~',
+	'Class:lnkTriggerAction+' => '',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Azione',
+	'Class:lnkTriggerAction/Attribute:action_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Ordine',
+	'Class:lnkTriggerAction/Attribute:order+' => '',
+	'Class:AsyncSendEmail' => 'Email (asincrona)',
+	'Class:AsyncSendEmail/Attribute:to' => 'A',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Oggetto',
+	'Class:AsyncSendEmail/Attribute:body' => 'Corpo',
+	'Class:AsyncSendEmail/Attribute:header' => 'Intestazione',
+	'Class:CMDBChange' => 'Cambio',
+	'Class:CMDBChange+' => '',
+	'Class:CMDBChange/Attribute:date' => 'data',
+	'Class:CMDBChange/Attribute:date+' => '',
+	'Class:CMDBChange/Attribute:userinfo' => 'info varie',
+	'Class:CMDBChange/Attribute:userinfo+' => '',
+	'Class:CMDBChangeOp' => 'Operazione di Cambio',
+	'Class:CMDBChangeOp+' => '',
+	'Class:CMDBChangeOp/Attribute:change' => 'cambio',
+	'Class:CMDBChangeOp/Attribute:change+' => '',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'oggetto della classe',
+	'Class:CMDBChangeOp/Attribute:objclass+' => '',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'oggetto id',
+	'Class:CMDBChangeOp/Attribute:objkey+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'tipo',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+	'Class:CMDBChangeOpCreate' => 'creazione dell\'oggetto',
+	'Class:CMDBChangeOpCreate+' => '',
+	'Class:CMDBChangeOpDelete' => 'cancellazione dell\'oggetto',
+	'Class:CMDBChangeOpDelete+' => '',
+	'Class:CMDBChangeOpSetAttribute' => 'cambio dell\'oggetto',
+	'Class:CMDBChangeOpSetAttribute+' => '',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attributo',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'cambio della proprietà',
+	'Class:CMDBChangeOpSetAttributeScalar+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valore precedente',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Valore Nuovo',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'modifica i dati',
+	'Class:CMDBChangeOpSetAttributeBlob+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Dati precedenti',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Password criptata',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Valore Precedente',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valore Precedente',
+	'Class:CMDBChangeOpSetAttributeText' => 'modifica testo',
+	'Class:CMDBChangeOpSetAttributeText+' => '',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Dati precendenti',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Log dei casi',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Ultima entrata',
+	'Class:Event' => 'Log dell\'evento',
+	'Class:Event+' => '',
+	'Class:Event/Attribute:message' => 'Messaggio',
+	'Class:Event/Attribute:message+' => '',
+	'Class:Event/Attribute:date' => 'Data',
+	'Class:Event/Attribute:date+' => '',
+	'Class:Event/Attribute:userinfo' => 'Info Utente',
+	'Class:Event/Attribute:userinfo+' => '',
+	'Class:Event/Attribute:finalclass' => 'Tipo',
+	'Class:Event/Attribute:finalclass+' => '',
+	'Class:EventNotification' => 'Notifica dell\'evento',
+	'Class:EventNotification+' => '',
+	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
+	'Class:EventNotification/Attribute:trigger_id+' => '',
+	'Class:EventNotification/Attribute:action_id' => 'utente',
+	'Class:EventNotification/Attribute:action_id+' => '',
+	'Class:EventNotification/Attribute:object_id' => 'Oggetto id',
+	'Class:EventNotification/Attribute:object_id+' => '',
+	'Class:EventNotificationEmail' => 'Email caso di emissione',
+	'Class:EventNotificationEmail+' => '',
+	'Class:EventNotificationEmail/Attribute:to' => 'A',
+	'Class:EventNotificationEmail/Attribute:to+' => '',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => '',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => '',
+	'Class:EventNotificationEmail/Attribute:from' => 'Da',
+	'Class:EventNotificationEmail/Attribute:from+' => '',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Oggeto',
+	'Class:EventNotificationEmail/Attribute:subject+' => '',
+	'Class:EventNotificationEmail/Attribute:body' => 'Corpo',
+	'Class:EventNotificationEmail/Attribute:body+' => '',
+	'Class:EventIssue' => 'Evento Problema',
+	'Class:EventIssue+' => '',
+	'Class:EventIssue/Attribute:issue' => 'Problema',
+	'Class:EventIssue/Attribute:issue+' => '',
+	'Class:EventIssue/Attribute:impact' => 'Impatto',
+	'Class:EventIssue/Attribute:impact+' => '',
+	'Class:EventIssue/Attribute:page' => 'Pagina',
+	'Class:EventIssue/Attribute:page+' => '',
+	'Class:EventIssue/Attribute:arguments_post' => 'Argomenti inviati',
+	'Class:EventIssue/Attribute:arguments_post+' => '',
+	'Class:EventIssue/Attribute:arguments_get' => 'Argomenti URL',
+	'Class:EventIssue/Attribute:arguments_get+' => '',
+	'Class:EventIssue/Attribute:callstack' => 'Callstack',
+	'Class:EventIssue/Attribute:callstack+' => '',
+	'Class:EventIssue/Attribute:data' => 'Dati',
+	'Class:EventIssue/Attribute:data+' => '',
+	'Class:EventWebService' => 'Evento Servizio Web',
+	'Class:EventWebService+' => '',
+	'Class:EventWebService/Attribute:verb' => 'Verbo',
+	'Class:EventWebService/Attribute:verb+' => '',
+	'Class:EventWebService/Attribute:result' => 'Resulto',
+	'Class:EventWebService/Attribute:result+' => '',
+	'Class:EventWebService/Attribute:log_info' => 'Log delle info',
+	'Class:EventWebService/Attribute:log_info+' => '',
+	'Class:EventWebService/Attribute:log_warning' => 'Log dei warning',
+	'Class:EventWebService/Attribute:log_warning+' => '',
+	'Class:EventWebService/Attribute:log_error' => 'Log degli errori',
+	'Class:EventWebService/Attribute:log_error+' => '',
+	'Class:EventWebService/Attribute:data' => 'Dati',
+	'Class:EventWebService/Attribute:data+' => '',
+	'Class:EventLoginUsage' => 'Login di utilizzo',
+	'Class:EventLoginUsage+' => '',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => '',
+	'Class:SynchroDataSource' => 'Sorgente di sincronizzazione dei dati',
+	'Class:SynchroDataSource/Attribute:name' => 'Nome',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Descrizione',
+	'Class:SynchroDataSource/Attribute:status' => 'Stato',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementazione',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produzione',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Utente',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe Target',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Campo di applicazione restrizione',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervallo a pieno carico',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Policy di riconciliazione',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Usa gli attributi',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Usa il campo chiave primaria',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Azione su zero~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crea',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Azione su uno',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aggiorna',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Azione su molti',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crea',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Considera il primo (random?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Policy di cancellazioen',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Cancella',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignora',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aggiorna',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi Cancella',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Regole per l\'aggiornamento',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Durata di conservazione',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista degli attributi',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'utenti autorizzati',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Solo Amministratore',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tutti sono autorizzati a cancellare questi oggetti',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nessuno',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icona di collegamento ipertestuale',
+	'Class:SynchroDataSource/Attribute:url_icon+' => '',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Collegamento ipertestuale all\'applicazione',
+	'Class:SynchroDataSource/Attribute:url_application+' => '',
+	'Class:SynchroAttribute' => 'Attributo di sincronizzazione',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Sorgente sincronizzazione dati',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Codice attributo',
+	'Class:SynchroAttribute/Attribute:update' => 'Aggiorna',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Rincocilia',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Policy di aggiornamento',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Bloccato',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Sbloccato',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inizializza se vuoto',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Classe',
+	'Class:SynchroAttExtKey' => 'Attributo di sincronizzazione (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Attributo di riconciliazione',
+	'Class:SynchroAttLinkSet' => 'Attributo di sincronizzazione (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Separatore di righe',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Separatore di attributi',
+	'Class:SynchroLog' => 'Log di sincronizzazione',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Sorgente di sincronizzazione dati',
+	'Class:SynchroLog/Attribute:start_date' => 'Data di inizio',
+	'Class:SynchroLog/Attribute:end_date' => 'Data di fine',
+	'Class:SynchroLog/Attribute:status' => 'Stato',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completo',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Errore',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Ancora in esecuzione',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica viste',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica totale',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb oggetti cancellati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb di errore durante la cancellazione',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb oggetti obsoleti',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb di errori mentre obsoleta',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb oggetti creati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb di errori durante la creazione',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb oggetti aggiornati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb di errori durante l\'aggiornamento',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb di errori durante la riconcilazione',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb repliche scomparse',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb oggetti aggiornati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb oggetti non modificati',
+	'Class:SynchroLog/Attribute:last_error' => 'Untimo errore',
+	'Class:SynchroLog/Attribute:traces' => 'Tracce',
+	'Class:SynchroReplica' => 'Replica sincronizzazione',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Sorgente di sincronizzazione dati',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Oggetto di destinazione (ID)~~',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Tipo di destinazione',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Ultimo visto',
+	'Class:SynchroReplica/Attribute:status' => 'Stato',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificato',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nuovo',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orfano',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Sincronizzato',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Oggetto Creato ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Ultimo Errore',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data di creazione',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Data ultima modifica',
+	'Class:appUserPreferences' => 'Preferenze utente',
+	'Class:appUserPreferences/Attribute:userid' => 'Utente',
+	'Class:appUserPreferences/Attribute:preferences' => 'Preferenze',
+	'Core:AttributeLinkedSet' => 'Array di oggetti',
+	'Core:AttributeLinkedSet+' => '',
+	'Core:AttributeLinkedSetIndirect' => 'Array di oggetti (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => '',
+	'Core:AttributeInteger' => 'Integero',
+	'Core:AttributeInteger+' => '',
+	'Core:AttributeDecimal' => 'Decimale',
+	'Core:AttributeDecimal+' => '',
+	'Core:AttributeBoolean' => 'Booleano',
+	'Core:AttributeBoolean+' => '',
+	'Core:AttributeString' => 'Stringa',
+	'Core:AttributeString+' => '',
+	'Core:AttributeClass' => 'Classe',
+	'Core:AttributeClass+' => '',
+	'Core:AttributeApplicationLanguage' => 'Linguaggio Utente',
+	'Core:AttributeApplicationLanguage+' => '',
+	'Core:AttributeFinalClass' => 'Classe (auto)',
+	'Core:AttributeFinalClass+' => '',
+	'Core:AttributePassword' => 'Password',
+	'Core:AttributePassword+' => '',
+	'Core:AttributeEncryptedString' => 'Stringa criptata',
+	'Core:AttributeEncryptedString+' => '',
+	'Core:AttributeText' => 'Testo',
+	'Core:AttributeText+' => '',
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => '',
+	'Core:AttributeEmailAddress' => 'Indirizzo Email',
+	'Core:AttributeEmailAddress+' => '',
+	'Core:AttributeIPAddress' => 'Indirizzo IP',
+	'Core:AttributeIPAddress+' => '',
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => '',
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => '',
+	'Core:AttributeTemplateString' => 'Stringa Template',
+	'Core:AttributeTemplateString+' => '',
+	'Core:AttributeTemplateText' => 'Testo Template',
+	'Core:AttributeTemplateText+' => '',
+	'Core:AttributeTemplateHTML' => 'HTML Template',
+	'Core:AttributeTemplateHTML+' => '',
+	'Core:AttributeDateTime' => 'Data/ora',
+	'Core:AttributeDateTime+' => '',
+	'Core:AttributeDate' => 'Data',
+	'Core:AttributeDate+' => '',
+	'Core:AttributeDeadline' => 'Scadenza',
+	'Core:AttributeDeadline+' => '',
+	'Core:AttributeExternalKey' => 'Chiave esterna',
+	'Core:AttributeExternalKey+' => '',
+	'Core:AttributeExternalField' => 'Campo esterno',
+	'Core:AttributeExternalField+' => '',
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => '',
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => '',
+	'Core:AttributeOneWayPassword' => 'Password unidierzionale',
+	'Core:AttributeOneWayPassword+' => '',
+	'Core:AttributeTable' => 'Tabella',
+	'Core:AttributeTable+' => '',
+	'Core:AttributePropertySet' => 'Proprietà',
+	'Core:AttributePropertySet+' => '',
+	'Class:CMDBChangeOp/Attribute:date' => 'data',
+	'Class:CMDBChangeOp/Attribute:date+' => '',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'utente',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
+	'Change:ObjectCreated' => 'Oggetto creato',
+	'Change:ObjectDeleted' => 'Oggetto cancellato',
+	'Change:ObjectModified' => 'Object modificato',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s imposatato a  %2$s (valore precendente: %3$s)',
+	'Change:AttName_SetTo' => '%1$s impostato a  %2$s~~',
+	'Change:Text_AppendedTo_AttName' => '%1$s allegato a  %2$s~~',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s moficato, valore precendente: %2$s',
+	'Change:AttName_Changed' => '%1$s modificato',
+	'Change:AttName_EntryAdded' => '%1$s modificato, nuova entrata aggiunta.',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Nome Utente',
+	'Class:EventLoginUsage/Attribute:contact_name+' => '',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Email Utente',
+	'Class:EventLoginUsage/Attribute:contact_email+' => '',
+	'Class:Action' => 'Azione personalizzata',
+	'Class:Action+' => '',
+	'Class:Action/Attribute:name' => 'Nome',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Descrizione',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Stato',
+	'Class:Action/Attribute:status+' => '',
+	'Class:Action/Attribute:status/Value:test' => 'In fase di test',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'In produzione',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inattivo',
+	'Class:Action/Attribute:status/Value:disabled+' => '',
+	'Class:Action/Attribute:trigger_list' => 'Trigger Correlati',
+	'Class:Action/Attribute:trigger_list+' => '',
+	'Class:Action/Attribute:finalclass' => 'Tipo',
+	'Class:Action/Attribute:finalclass+' => '',
+	'Class:ActionNotification' => 'Notifica',
+	'Class:ActionNotification+' => '',
+	'Class:Trigger' => 'Trigger',
+	'Class:Trigger+' => '',
+	'Class:Trigger/Attribute:description' => 'Descrizione',
+	'Class:Trigger/Attribute:description+' => '',
+	'Class:Trigger/Attribute:action_list' => 'Azioni Triggerate',
+	'Class:Trigger/Attribute:action_list+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Tipo',
+	'Class:Trigger/Attribute:finalclass+' => '',
+	'Class:TriggerOnObject' => 'Trigger (classe dipendente)',
+	'Class:TriggerOnObject+' => '',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Classe Target',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnStateChange' => 'Trigger (sul cambio di stato)',
+	'Class:TriggerOnStateChange+' => '',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Stato',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Azione',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nessuno',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Solo Amministratore',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tutti gli utenti autorizzati',
+	'SynchroDataSource:Description' => 'Descrizione',
+	'SynchroDataSource:Reconciliation' => 'Ricerca &amp; riconciliazione',
+	'SynchroDataSource:Deletion' => 'Regole di cancellazione',
+	'SynchroDataSource:Status' => 'Stato',
+	'SynchroDataSource:Information' => 'Informazione',
+	'SynchroDataSource:Definition' => 'Definizione',
+	'Core:SynchroAttributes' => 'Attributi',
+	'Core:SynchroStatus' => 'Stato',
+	'Core:Synchro:ErrorsLabel' => 'Errori',
+	'Core:Synchro:CreatedLabel' => 'Creato',
+	'Core:Synchro:ModifiedLabel' => 'Modificato',
+	'Core:Synchro:UnchangedLabel' => 'Non modificato',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errori',
+	'Core:Synchro:ReconciledLabel' => 'Reconciliato',
+	'Core:Synchro:ReconciledNewLabel' => 'Creato',
+	'Core:SynchroReconcile:Yes' => 'Si',
+	'Core:SynchroReconcile:No' => 'No',
+	'Core:SynchroUpdate:Yes' => 'Si',
+	'Core:SynchroUpdate:No' => 'No',
+	'Core:Synchro:LastestStatus' => 'Ultimo stato',
+	'Core:Synchro:History' => 'Storia della sincronizzazione',
+	'Core:Synchro:NeverRun' => 'Questa sincronizzazione non è mai stata eseguita. Nessun Log ancora...',
+	'Core:Synchro:SynchroEndedOn_Date' => 'L\'ultima sincronizzazione si è conclusa il %1$s.~~',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La sincronizzazione è iniziata il %1$s è ancora in esecuzione...~~',
+	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati',
+	'Menu:DataSources+' => '',
+	'Core:Synchro:label_repl_ignored' => 'Ignorato(%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Scomparso (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Esistente (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Nuovo (%1$s)~~',
+	'Core:Synchro:label_obj_deleted' => 'Cancellato (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleto (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errori (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Nessuna Azione (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Non modificato(%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Aggiornato (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Errori (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Non modificato (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Aggiornato (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Creato (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Errori (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s~~',
+	'Core:Synchro:Nb_Replica' => 'Replica processata: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Almeno una chiave riconciliazione deve essere specificata, o la policy di conciliazione deve essere quella di utilizzare la chiave primaria',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Deve essere specificato un periodo di conservazione di cancellazione , dato che gli oggetti devono essere eliminati dopo essere contrassegnati come obsoleti ',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Oggetti obsoleti devono essere aggiornati, ma nessun aggiornamento è specificato',
+	'Core:SynchroReplica:PublicData' => 'Dati Pubblici',
+	'Core:SynchroReplica:PrivateDetails' => 'Dettagli Privati',
+	'Core:SynchroReplica:BackToDataSource' => 'Torna indietro alla sorgente di sincronizzazione dei dati: %1$s~~',
+	'Core:SynchroReplica:ListOfReplicas' => 'Lista della Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Chiave Primaria)',
+	'Core:SynchroAtt:attcode' => 'Attributo',
+	'Core:SynchroAtt:attcode+' => '',
+	'Core:SynchroAtt:reconciliation' => 'Riconciliazione ?~~',
+	'Core:SynchroAtt:reconciliation+' => '',
+	'Core:SynchroAtt:update' => 'Aggiornamento ?~~',
+	'Core:SynchroAtt:update+' => '',
+	'Core:SynchroAtt:update_policy' => 'Policy di aggiornamento',
+	'Core:SynchroAtt:update_policy+' => '',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Chiave di riconciliazione',
+	'Core:SynchroAtt:reconciliation_attcode+' => '',
+	'Core:SyncDataExchangeComment' => '(Scambio dati)',
+	'Core:Synchro:ListOfDataSources' => 'Lista delle sorgenti di dati:',
+	'Core:Synchro:LastSynchro' => 'Ultima sincronizzazione:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Questo oggetto è sincronizzato con una sorgente esterna di dati',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'L\'oggetti è stato <b>creato</b> da una sorgente esterna di dati %1$s~~',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'L\'oggetti <b>può essere cancellato</b> da una sorgente esterna di dati %1$s~~',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Tu <b>non puoi cancellare l\'oggetto</b> perché è di proprietà della sorgente dati esterna %1$s~~',
+	'TitleSynchroExecution' => 'Esecuzione della sincronizzazione',
+	'Class:SynchroDataSource:DataTable' => 'Tabella del database: %1$s',
+	'Core:SyncDataSourceObsolete' => 'La fonte dei dati è contrassegnata come obsoleta. Operazione annullata',
+	'Core:SyncDataSourceAccessRestriction' => 'Solo amministratori o l\'utente specificato nella fonte dei dati può eseguire questa operazione. Operazione annullata',
+	'Core:SyncTooManyMissingReplicas' => 'Tutte le repliche sono mancanti dall\'importazione. Hai eseguito realmente l\'importazione? Operazione annullata',
+	'Core:Duration_Seconds' => '%1$ds',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$sec~~',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sg %2$dh %3$dmin %4$ds~~',
+));
+?>

dictionaries/it.dictionary.itop.ui.php

@@ -0,0 +1,781 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * @author	Erwan Taloc <erwan.taloc@combodo.com>
+ * @author	Romain Quetiez <romain.quetiez@combodo.com>
+ * @author	Denis Flaven <denis.flaven@combodo.com>
+
+ * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:AuditRule' => 'Regola di Audit',
+	'Class:AuditRule+' => '',
+	'Class:AuditRule/Attribute:name' => 'Nome della regola',
+	'Class:AuditRule/Attribute:name+' => '',
+	'Class:AuditRule/Attribute:description' => 'Descrizione della regola di Audit',
+	'Class:AuditRule/Attribute:description+' => '',
+	'Class:AuditRule/Attribute:query' => 'Query da eseguire',
+	'Class:AuditRule/Attribute:query+' => '',
+	'Class:AuditRule/Attribute:valid_flag' => 'Oggetti validi?',
+	'Class:AuditRule/Attribute:valid_flag+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'falso',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'vero',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '',
+	'Class:AuditRule/Attribute:category_id' => 'Categoria',
+	'Class:AuditRule/Attribute:category_id+' => '',
+	'Class:AuditCategory' => 'Categoria di Audit',
+	'Class:AuditCategory+' => '',
+	'Class:AuditCategory/Attribute:name' => 'Nome della Categoria',
+	'Class:AuditCategory/Attribute:name+' => '',
+	'Class:AuditCategory/Attribute:description' => 'Descrizione della Categoria di Audit',
+	'Class:AuditCategory/Attribute:description+' => '',
+	'Class:AuditCategory/Attribute:definition_set' => 'Insieme di definizione',
+	'Class:AuditCategory/Attribute:definition_set+' => '',
+	'Class:AuditCategory/Attribute:rules_list' => 'Regole di Audit',
+	'Class:AuditCategory/Attribute:rules_list+' => '',
+	'Class:URP_Profiles' => 'Profilo',
+	'Class:URP_Profiles+' => '',
+	'Class:URP_Profiles/Attribute:name' => 'Nome',
+	'Class:URP_Profiles/Attribute:name+' => '',
+	'Class:URP_Profiles/Attribute:description' => 'Descrizione',
+	'Class:URP_Profiles/Attribute:description+' => '',
+	'Class:URP_Profiles/Attribute:user_list' => 'Utenti',
+	'Class:URP_Profiles/Attribute:user_list+' => '',
+	'Class:URP_UserProfile' => 'Utente da Profilare',
+	'Class:URP_UserProfile+' => '',
+	'Class:URP_UserProfile/Attribute:userid' => 'Utente',
+	'Class:URP_UserProfile/Attribute:userid+' => '',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profilo',
+	'Class:URP_UserProfile/Attribute:profileid+' => '',
+	'Class:URP_UserProfile/Attribute:reason' => 'Motivo',
+	'Class:URP_UserProfile/Attribute:reason+' => '',
+	'Class:URP_UserOrg' => 'Organizzazione dell\'utente',
+	'Class:URP_UserOrg+' => '',
+	'Class:URP_UserOrg/Attribute:userid' => 'Utente',
+	'Class:URP_UserOrg/Attribute:userid+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organizazione',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
+	'Class:URP_UserOrg/Attribute:reason' => 'Motivo',
+	'Class:URP_UserOrg/Attribute:reason+' => '',
+	'Class:URP_ActionGrant' => 'azione_autorizzazione',
+	'Class:URP_ActionGrant+' => '',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profilo',
+	'Class:URP_ActionGrant/Attribute:profileid+' => '',
+	'Class:URP_ActionGrant/Attribute:class' => 'Classe',
+	'Class:URP_ActionGrant/Attribute:class+' => '',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Autorizzazione',
+	'Class:URP_ActionGrant/Attribute:permission+' => '',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => '',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'yes',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => '',
+	'Class:URP_ActionGrant/Attribute:action' => 'Azione',
+	'Class:URP_ActionGrant/Attribute:action+' => '',
+	'Class:URP_StimulusGrant' => 'stimulus_autorizzazione',
+	'Class:URP_StimulusGrant+' => '',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profilo',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => '',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Classe',
+	'Class:URP_StimulusGrant/Attribute:class+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Autorizzazione',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'yes',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => '',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => '',
+	'Class:URP_AttributeGrant' => 'attributo_autorizzazione',
+	'Class:URP_AttributeGrant+' => '',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Azione di sovvenzione',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attributo',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => '',
+	'Class:AuditRule/Attribute:category_name' => 'Categoria',
+	'Class:AuditRule/Attribute:category_name+' => '',
+	'Class:User' => 'User~~',
+	'Class:User+' => '',
+	'Class:User/Attribute:finalclass' => 'Tipo di account',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'Contatto (persona)',
+	'Class:User/Attribute:contactid+' => '',
+	'Class:User/Attribute:last_name' => 'Cognome',
+	'Class:User/Attribute:last_name+' => '',
+	'Class:User/Attribute:first_name' => 'Nome',
+	'Class:User/Attribute:first_name+' => '',
+	'Class:User/Attribute:email' => 'Email',
+	'Class:User/Attribute:email+' => '',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => '',
+	'Class:User/Attribute:language' => 'Lingua',
+	'Class:User/Attribute:language+' => '',
+	'Class:User/Attribute:language/Value:EN US' => 'Inglese',
+	'Class:User/Attribute:language/Value:EN US+' => '',
+	'Class:User/Attribute:language/Value:FR FR' => 'Francese',
+	'Class:User/Attribute:language/Value:FR FR+' => '',
+	'Class:User/Attribute:profile_list' => 'Profili',
+	'Class:User/Attribute:profile_list+' => '',
+	'Class:User/Attribute:allowed_org_list' => 'Organizzazioni autorizzate',
+	'Class:User/Attribute:allowed_org_list+' => '',
+	'Class:User/Error:LoginMustBeUnique' => 'Login deve essere unico - "%1s" è già utilizzato.~~',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Almeno un profilo deve essere assegnato a questo utente',
+	'Class:URP_Dimensions' => 'dimensione',
+	'Class:URP_Dimensions+' => '',
+	'Class:URP_Dimensions/Attribute:name' => 'Nome',
+	'Class:URP_Dimensions/Attribute:name+' => '',
+	'Class:URP_Dimensions/Attribute:description' => 'Descrizione',
+	'Class:URP_Dimensions/Attribute:description+' => '',
+	'Class:URP_Dimensions/Attribute:type' => 'Tipo',
+	'Class:URP_Dimensions/Attribute:type+' => '',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => '',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profilo',
+	'Class:URP_UserProfile/Attribute:profile+' => '',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organizazione',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
+	'Class:URP_ProfileProjection' => 'profilo_proiezione',
+	'Class:URP_ProfileProjection+' => '',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensione',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => '',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensione',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => '',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profilo',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => '',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profilo',
+	'Class:URP_ProfileProjection/Attribute:profile+' => '',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Valore dell\'espressione',
+	'Class:URP_ProfileProjection/Attribute:value+' => '',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attributo',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => '',
+	'Class:URP_ClassProjection' => 'classe_proiezione',
+	'Class:URP_ClassProjection+' => '',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensione',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => '',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensione',
+	'Class:URP_ClassProjection/Attribute:dimension+' => '',
+	'Class:URP_ClassProjection/Attribute:class' => 'Classe',
+	'Class:URP_ClassProjection/Attribute:class+' => '',
+	'Class:URP_ClassProjection/Attribute:value' => 'Valore dell\'espressione',
+	'Class:URP_ClassProjection/Attribute:value+' => '',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attributo',
+	'Class:URP_ClassProjection/Attribute:attribute+' => '',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profilo',
+	'Class:URP_ActionGrant/Attribute:profile+' => '',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profilo',
+	'Class:URP_StimulusGrant/Attribute:profile+' => '',
+	'Menu:WelcomeMenu' => 'Benveuto',
+	'Menu:WelcomeMenu+' => '',
+	'Menu:WelcomeMenuPage' => 'Benvenuto',
+	'Menu:WelcomeMenuPage+' => '',
+	'UI:WelcomeMenu:Title' => 'Benveuto su iTop',
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop è un completo Portale Funzionale IT, Open Source.</p>
+<ul>Esso include:
+<li>Un completo CMDB (Configuration management database) per documentare e gestire l\'IT di inventario.</li>
+<li>Un modulo di gestione degli incidenti per monitorare e comunicare su tutte le problematiche che si verificano nel settore IT.</li>
+<li>Un modulo di gestione delle modifiche per pianificare e monitorare i cambiamenti all\'ambiente IT.</li>
+<li>Una banca dati errori noti per accelerare la risoluzione di incidenti.</li>
+<li>Un modulo di interruzione per documentare tutte le interruzioni pianificate e notificare gli opportuni contatti.</li>
+<li>Un cruscotto per ottenere rapidamente una panoramica del sistema IT.</li>
+</ul>
+<p>Tutti i moduli possono essere installati, passo dopo passo, indipendentemente l\'uno dall\'altro.</p>',
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop è fornitore di servizi di orientamento, che consente ai progettisti di gestire più o organizzazioni o clienti con facilità.
+<ul>>iTop, offre un set ricco di funzionalità dei processi di business che:
+<li>Migliora l\'efficacia di gestione IT</li> 
+<li>Guida le prestazione delle operazioni IT</li> 
+<li>Migliora la soddisfazione del cliente e fornisce ai dirigenti un idea della performance del business.</li>
+</ul>
+</p>
+<p>iTop è completamente aperto per essere integrato all\'interno della vostra infrastruttura di gestione dell\'IT.</p>
+<p>
+<ul>L\'adozione di questa nuova generazione di portale funzionale IT vi aiuterà a:
+<li>Meglio gestire un ambiente IT sempre più complesso.</li>
+<li>Implementare i processi ITIL al proprio ritmo.</li>
+<li>Gestire la risorsa più importante della tua IT: Documentazione.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Apri le richieste: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Le mie richieste',
+	'UI:WelcomeMenu:OpenIncidents' => 'Apri gli incidenti: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Elementi di Configurazione (CI): %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Incidenti assegnati a me',
+	'UI:AllOrganizations' => ' Tutte le Organizzazioni ',
+	'UI:YourSearch' => 'La tua Cerca',
+	'UI:LoggedAsMessage' => 'Logged come %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (Amministratore)',
+	'UI:Button:Logoff' => 'Log off',
+	'UI:Button:GlobalSearch' => 'Cerca',
+	'UI:Button:Search' => ' Cerca',
+	'UI:Button:Query' => ' Domanda',
+	'UI:Button:Ok' => 'Ok',
+	'UI:Button:Cancel' => 'Cancella',
+	'UI:Button:Apply' => 'Applica',
+	'UI:Button:Back' => ' << Indietro',
+	'UI:Button:Restart' => ' |<< Riavvia',
+	'UI:Button:Next' => ' Prossimo >> ',
+	'UI:Button:Finish' => ' Fine',
+	'UI:Button:DoImport' => ' Esegui le Imporazioni ! ~~',
+	'UI:Button:Done' => ' Fatto',
+	'UI:Button:SimulateImport' => ' Simula l\'Importazione ~~',
+	'UI:Button:Test' => 'Testa!',
+	'UI:Button:Evaluate' => ' Valuta',
+	'UI:Button:AddObject' => ' Aggiungi... ~~',
+	'UI:Button:BrowseObjects' => ' Sfoglia... ~~',
+	'UI:Button:Add' => ' Aggiungi ~~',
+	'UI:Button:AddToList' => ' << Aggiungi ~~',
+	'UI:Button:RemoveFromList' => ' Rimuovi >> ~~',
+	'UI:Button:FilterList' => ' Filtra... ~~',
+	'UI:Button:Create' => ' Crea ~~',
+	'UI:Button:Delete' => ' Cancella ! ~~',
+	'UI:Button:ChangePassword' => ' Cambia Password ~~',
+	'UI:Button:ResetPassword' => ' Resetta Password ~~',
+	'UI:SearchToggle' => 'Cerca',
+	'UI:ClickToCreateNew' => 'Crea un nuovo %1$s~~',
+	'UI:SearchFor_Class' => 'Cerca l\'oggetto %1$s',
+	'UI:NoObjectToDisplay' => 'Nessun oggetto da mostrare.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Object_id parametro è obbligatorio quando link_attr è specificato. Verificare la definizione del modello di display.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Target_attr parametro è obbligatorio quando link_attr è specificato. Verificare la definizione del modello di display.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Il parametro è group_by obbligatoria. Verificare la definizione del modello di display.',
+	'UI:Error:InvalidGroupByFields' => 'Elenco di campi non valido per il raggruppamento: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Errore: Stile non supportato di blocco: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Errata definizione di link: la classe di oggetti da gestire: %1$s non è stato trovato come chiave esterna nella classe %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Oggetto: %1$s:%2$d non trovato.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Errore: Riferimento circolare nelle dipendenze tra i campi, controllare il modello di dati.',
+	'UI:Error:UploadedFileTooBig' => 'Il file caricato è troppo grande. (dimensione massima consentita è di %1$s). Verificare di configurazione di PHP per upload_max_filesize e post_max_size.',
+	'UI:Error:UploadedFileTruncated.' => 'Il file caricato è stata troncato !',
+	'UI:Error:NoTmpDir' => 'La directory temporanea non è definita.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Impossibile scrivere il file temporaneo sul disco. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Caricamento fermato per estensione. (Nome del file originale = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Il caricamento del file non riuscito, causa sconosciuta. (Codice errore = "%1$s").',
+	'UI:Error:1ParametersMissing' => 'Errore: il seguente parametro deve essere specificato per questa operazione: %1$s.',
+	 'UI:Error:2ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s e %2$s.',
+        'UI:Error:3ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s e %3$s.',
+        'UI:Error:4ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s, %3$s e %4$s.',
+        'UI:Error:IncorrectOQLQuery_Message' => 'Errore: errata OQL query: %1$s',
+	 'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Si è verificato un errore durante l\'esecuzione della query: %1$s',
+        'UI:Error:ObjectAlreadyUpdated' => 'Errore: l\'oggetto è già stato aggiornato.',
+        'UI:Error:ObjectCannotBeUpdated' => 'Errore: oggetto non può essere aggiornato.',
+        'UI:Error:ObjectsAlreadyDeleted' => 'Errore: gli oggetti sono già stati eliminati!',
+        'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Non hai i permessi per eseguire una eliminazione collettiva degli oggetti della classe %1$s',
+        'UI:Error:DeleteNotAllowedOn_Class' => 'Non ti è permesso di eliminare gli oggetti della classe %1$s',
+        'UI:Error:BulkModifyNotAllowedOn_Class' => 'Non hai i permessi per eseguire un aggiornamento collettivo degli oggetti della classe %1$s',
+        'UI:Error:ObjectAlreadyCloned' => 'Errore: l\'oggetto è già stato clonato!',
+        'UI:Error:ObjectAlreadyCreated' => 'Errore: l\'oggetto è già stato creato!',
+        'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Errore: stimolo non valido "%1$s" su un oggetto %2$s nello stato "%3$s".',
+
+	'UI:GroupBy:Count' => 'Conteggio',
+	'UI:GroupBy:Count+' => '',
+	'UI:CountOfObjects' => '%1$d oggetti corrispondenti ai criteri.',
+	'UI_CountOfObjectsShort' => '%1$d oggetti.',
+        'UI:NoObject_Class_ToDisplay' => 'No %1$s da visualizzare',
+        'UI:History:LastModified_On_By' => 'Ultima modifica %1$s da %2$s.',
+        'UI:HistoryTab' => 'Storia',
+        'UI:NotificationsTab' => 'Notifiche',
+        'UI:History:BulkImports' => 'Storia',
+        'UI:History:BulkImports+' => 'Elenco delle importazioni CSV (primo ultimo)',
+        'UI:History:BulkImportDetails' => 'Modifiche derivanti dai importazione CSV eseguita su %1$s (da %2$s)',
+	'UI:History:Date' => 'Data',
+	'UI:History:Date+' => '',
+	'UI:History:User' => 'Utente',
+	'UI:History:User+' => '',
+	'UI:History:Changes' => 'Modifiche',
+	'UI:History:Changes+' => '',
+	'UI:History:StatsCreations' => 'Creato',
+	'UI:History:StatsCreations+' => '',
+	'UI:History:StatsModifs' => 'Modificato',
+	'UI:History:StatsModifs+' => '',
+	'UI:History:StatsDeletes' => 'Cancellato',
+	'UI:History:StatsDeletes+' => '',
+	'UI:Loading' => 'Caricamento...',
+	'UI:Menu:Actions' => 'Azioni',
+	'UI:Menu:OtherActions' => 'Altre Azioni',
+	'UI:Menu:New' => 'Nuovo...',
+	'UI:Menu:Add' => 'Aggiungi...',
+	'UI:Menu:Manage' => 'Gestischi...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'CSV Export',
+	'UI:Menu:Modify' => 'Modifica...',
+	'UI:Menu:Delete' => 'Cancella...',
+	'UI:Menu:BulkDelete' => 'Cancella...',
+	'UI:UndefinedObject' => 'non definito',
+	'UI:Document:OpenInNewWindow:Download' => 'Apri in una nuova finestra: %1$s, Scarica: %2$s',
+	'UI:SelectAllToggle+' => '',
+	'UI:TruncatedResults' => '%1$d oggetti visualizzati su %2$d',
+	'UI:DisplayAll' => 'Mostra tutto',
+	'UI:CollapseList' => 'Collassa',
+	'UI:CountOfResults' => '%1$d oggetto(i)',
+	'UI:ChangesLogTitle' => 'Log delle modifiche (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Log delle modifiche è vuoto',
+	'UI:SearchFor_Class_Objects' => 'Cerca per  %1$s Oggetti',
+	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryTab' => 'OQL Query',
+	'UI:SimpleSearchTab' => 'Ricerca semplice',
+	'UI:Details+' => '',
+	'UI:SearchValue:Any' => '* Qualsiasi *',
+	'UI:SearchValue:Mixed' => '* misti *',
+	'UI:SelectOne' => '-- selezionare uno --',
+	'UI:Login:Welcome' => 'Benvenuti su iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Errato login/password, si prega di riprovare.',
+	'UI:Login:IdentifyYourself' => 'Identifica te stesso prima di continuare',
+	'UI:Login:UserNamePrompt' => 'Nome Utente',
+        'UI:Login:PasswordPrompt' => 'Password',
+        'UI:Login:ChangeYourPassword' => 'Cambia la tua password',
+        'UI:Login:OldPasswordPrompt' => 'Vecchia password',
+        'UI:Login:NewPasswordPrompt' => 'Nuova password',
+        'UI:Login:RetypeNewPasswordPrompt' => 'Riscrivi la nuova password',
+        'UI:Login:IncorrectOldPassword' => 'Errore: la vecchia password non è corretta',
+        'UI:LogOffMenu' => 'Log off',
+	'UI:LogOff:ThankYou' => 'Grazie per aver scelto iTop',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Clicca qui per effettuare il login di nuovo...',
+        'UI:ChangePwdMenu' => 'Cambia Password...',
+        'UI:AccessRO-All' => 'iTop è di sola lettura',
+        'UI:AccessRO-Users' => 'iTop è di sola lettura per gli utenti finali',
+        'UI:Login:RetypePwdDoesNotMatch' => 'Nuova password e la nuova password digitata nuovamente non corrispondono !',
+        'UI:Button:Login' => 'Entra in iTop',
+
+	'UI:Login:Error:AccessRestricted' => 'L\'accesso a iTop è limitato. Si prega di contattare un amministratore iTop.',
+	'UI:Login:Error:AccessAdmin' => 'Accesso limitato alle persone che hanno privilegi di amministratore. Si prega di contattare un amministratore iTop.',
+	'UI:CSVImport:MappingSelectOne' => '-- seleziona uno --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignora questo campo --',
+	'UI:CSVImport:NoData' => 'Insieme di dati vuoto ..., si prega di fornire alcuni dati!',
+	'UI:Title:DataPreview' => 'Anteprima dati',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Errore: I dati contengono solo una colonna. Avete selezionato il carattere separatore appropriato?',
+	'UI:CSVImport:FieldName' => 'Campo %1$d',
+	'UI:CSVImport:DataLine1' => 'Dati Linea 1',
+	'UI:CSVImport:DataLine2' => 'Dati Linea 2',
+	'UI:CSVImport:idField' => 'id (Chiave Primaria)',
+	'UI:Title:BulkImport' => 'iTop - importazione collettiva',
+	'UI:Title:BulkImport+' => '',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronizzazione di %1$d oggetti della classe %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- seleziona uno --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Errore interno: "%1$s" è un codice errato, perché "%2$s" NON è una chiave esterna della classe "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d oggetto(i) rimarrà invariato.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d oggetto(i) sarà modificato.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d oggetto(i) sarà aggiunto.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d oggetto(i) avranno i errori.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d oggetto(i) è rimasto invariato.',
+	'UI:CSVImport:ObjectsWereModified' =>  '%1$d oggetto(i) sono stati modificati.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d oggetto(i) sono stati aggiunti.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d oggetto(i) hanno avuto errori.',
+	'UI:Title:CSVImportStep2' => 'Step 2 of 5: opzioni dati CVS',
+	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Mappatura dei dati',
+	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Importa simulazione',
+	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Importazione completata',
+	'UI:CSVImport:LinesNotImported' => 'Linee che non possono essere caricate:',
+	'UI:CSVImport:LinesNotImported+' => '',
+	'UI:CSVImport:SeparatorComma+' => '',
+	'UI:CSVImport:SeparatorSemicolon+' => '',
+	'UI:CSVImport:SeparatorTab+' => '',
+	'UI:CSVImport:SeparatorOther' => 'altri:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '',
+	'UI:CSVImport:QualifierSimpleQuote+' => '',
+	'UI:CSVImport:QualifierOther' => 'other:~~',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Tratta la prima riga come intestazione (nomi di colonna)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Salta le linee %1$s all\'inzio del file',
+	'UI:CSVImport:CSVDataPreview' => 'CSV Anteprima dei dati',
+	'UI:CSVImport:SelectFile' => 'Selezionare il file da importare:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Carica da un file',
+	'UI:CSVImport:Tab:CopyPaste' => 'Copia e incolla i dati',
+	'UI:CSVImport:Tab:Templates' => 'Modelli',
+	'UI:CSVImport:PasteData' => 'Incolla i dati da importare:',
+	'UI:CSVImport:PickClassForTemplate' =>  'Scegli il modello da scaricare: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Separatore di carattere:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Testo di qualificazione carattere',
+	'UI:CSVImport:CommentsAndHeader' => 'Commenti e intestazione',
+	'UI:CSVImport:SelectClass' => 'Selezionare la classe da importare:',
+	'UI:CSVImport:AdvancedMode' => 'Modalità avanzata',
+	'UI:CSVImport:AdvancedMode+' => '',
+	'UI:CSVImport:SelectAClassFirst' => 'Per configurare il mapping, selezionare prima una classe.',
+	'UI:CSVImport:HeaderFields' => 'Campi',
+	'UI:CSVImport:HeaderMappings' => 'Mappings',
+	'UI:CSVImport:HeaderSearch' => 'Cerca?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Per favore seleziona una mappatura per ogni campo.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Per favore seleziona almeno un criterio di ricerca',
+	'UI:CSVImport:Encoding' => 'Codifica dei caratteri',
+	'UI:UniversalSearchTitle' => 'iTop - Ricerca Universale',
+	'UI:UniversalSearch:Error' => 'Errore: %1$s~~',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Seleziona la classe per la ricerca: ',
+	'UI:Audit:Title' => 'iTop - CMDB Audit~~',
+	'UI:Audit:InteractiveAudit' => 'Audit Interattivo',
+	'UI:Audit:HeaderAuditRule' => 'Regole di Audit',
+	'UI:Audit:HeaderNbObjects' => '# Oggetti',
+	'UI:Audit:HeaderNbErrors' => '# Errori',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:RunQuery:Title' => 'iTop - Valutazione Query OQL',
+	'UI:RunQuery:QueryExamples' => 'Esempi di Query',
+	'UI:RunQuery:HeaderPurpose' => 'Scopo',
+	'UI:RunQuery:HeaderPurpose+' => '',
+	'UI:RunQuery:HeaderOQLExpression' => 'Espressioni OQL',
+	'UI:RunQuery:HeaderOQLExpression+' => '',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Espressione da valutare: ',
+	'UI:RunQuery:MoreInfo' => 'Maggiori informazioni sulla query: ',
+	'UI:RunQuery:DevelopedQuery' => 'Espressione della query riqualificata:',
+	'UI:RunQuery:SerializedFilter' => 'Filtro pubblicato: ',
+	'UI:RunQuery:Error' => 'Si è verificato un errore durante l\'esecuzione della query: %1$s',
+	'UI:Schema:Title' => 'iTop schema degli oggetti',
+	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relazioni',
+	'UI:Schema:AbstractClass' => 'Classe astratta: nessun oggetto da questa classe può essere istanziato.',
+	'UI:Schema:NonAbstractClass' => 'Classe non-astratta: oggetti da questa classe possono essere istanziati.',
+	'UI:Schema:ClassHierarchyTitle' => 'Gerarchia delle classi',
+	'UI:Schema:AllClasses' => 'Tutte le classi',
+	'UI:Schema:ExternalKey_To' => 'Chiave esterna  %1$s',
+	'UI:Schema:Columns_Description' => 'Colonne: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Default: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null consentito',
+	'UI:Schema:NullNotAllowed' => 'Null NON consentito',
+	'UI:Schema:Attributes' => 'Attributi',
+	'UI:Schema:AttributeCode' => 'Codice attributo',
+	'UI:Schema:AttributeCode+' => '',
+	'UI:Schema:Label' =>  'Etichetta',
+	'UI:Schema:Label+' => '',
+	'UI:Schema:Type' => 'Tipo',
+	'UI:Schema:Type+' => '',
+	'UI:Schema:Origin' => 'Origine',
+	'UI:Schema:Origin+' => '',
+	'UI:Schema:Description' => 'Descrizione',
+	'UI:Schema:Description+' => '',
+	'UI:Schema:AllowedValues' => 'Valori consentiti',
+	'UI:Schema:AllowedValues+' => '',
+	'UI:Schema:MoreInfo' => 'Maggiori informazioni',
+	'UI:Schema:MoreInfo+' => '',
+	'UI:Schema:SearchCriteria' => 'Criteri di ricerca',
+	'UI:Schema:FilterCode' => 'Codice di filtro',
+	'UI:Schema:FilterCode+' => '',
+	'UI:Schema:FilterDescription' => 'Descrizione',
+	'UI:Schema:FilterDescription+' => '',
+	'UI:Schema:AvailOperators' => 'Operatori disponibili',
+	'UI:Schema:AvailOperators+' => '',
+	'UI:Schema:ChildClasses' => 'Classi figlio',
+	'UI:Schema:ReferencingClasses' => 'Classi di rifermento',
+	'UI:Schema:RelatedClasses' => 'Classi correlate',
+	'UI:Schema:LifeCycle' => 'Ciclo di vita',
+	'UI:Schema:Triggers' => 'Triggers',
+	'UI:Schema:Relation_Code_Description' => 'Relazione <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' =>  'Giù: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Su: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: propagato al livello %2$d, query: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: non si propaga a (%2$d livelli), query: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s fa riferimento la classe %2$s tramite il campo %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s è legata alla %2$s via %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'Classi che puntano a %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Classi legati alla %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'Grafico di tutte le classi correlate',
+	'UI:Schema:NoLifeCyle' => 'Non vi è alcun ciclo di vita definito per questa classe.',
+	'UI:Schema:LifeCycleTransitions' => 'Transizioni',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Opzioni per l\'attributo',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Nascosto',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Di sola lettura',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obbigatorio',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Deve cambiare',
+	'UI:Schema:LifeCycleAttributeMustPrompt' =>  'All\'utente verrà richiesto di modificare il valore',
+	'UI:Schema:LifeCycleEmptyList' => 'lista vuota',
+	'UI:LinksWidget:Autocomplete+' => '',
+	'UI:Combo:SelectValue' => '--- seleziona un valore ---',
+	'UI:Label:SelectedObjects' => 'oggetti selezionati: ',
+	'UI:Label:AvailableObjects' => 'Oggetti disponibili: ',
+	'UI:Link_Class_Attributes' => '%1$s attributi',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Aggiungi l\'oggeto %1$s collegato con %2$s: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Aggiungi l\'oggeto %1$s al collegamento con %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gestisci l\'oggetto %1$s collegato con %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Aggiungi %1$s...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Rimuovi gli oggetti selezionati',
+	'UI:Message:EmptyList:UseAdd' => 'La lista è vuota, utilizzare il pulsante "Aggiungi ..." per aggiungere elementi.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Utilizza il modulo di ricerca qui sopra per cercare oggetti da aggiungere.',
+	'UI:Wizard:FinalStepTitle' => 'Passo finale: la conferma',
+	'UI:Title:DeletionOf_Object' => 'Soppressione di %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Cancellazione collettiva di %1$d oggetti della classe %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'Non ti è permesso di eliminare l\'oggetto',
+	'UI:Delete:NotAllowedToUpdate_Fields' =>  'Non hai i permessi per aggiornare il seguente campo(i): %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Questo oggetto non può essere cancellato perché l\'utente corrente non dispone dei diritti necessari',
+	'UI:Error:CannotDeleteBecause' => 'Questo oggetto non può essere cancellato perchè: %1$s~~',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s a nome di %2$s',
+	'UI:Delete:Deleted' => 'deleted~~',
+	'UI:Delete:AutomaticallyDeleted' => 'automaticamente eliminato',
+	'UI:Delete:AutomaticResetOf_Fields' => 'ripristino automatico del campo(i): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Pulizia di tutti i riferimenti a %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Pulizia di tutti i riferimenti a %1$d oggetti di classe %2$s...',
+	'UI:Delete:Done+' => '',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s cancellato.',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Soppressione di %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Soppressione di %1$d oggetti di classe %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Non può essere cancellato: %1$s~~',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Dovrebbe essere eliminato automaticamente, ma questo non è fattibile: %1$s~~',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Deve essere cancellato manualmente, ma questo non è fattibile: %1$s~~',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Sarà cancellato automaticamente',
+	'UI:Delete:MustBeDeletedManually' => 'Deve essere cancellato manualmente',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Dovrebbero essere automaticamente aggiornati, ma: %1$s~~',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Sarà automaticamente aggiornato (reset: %1$s)~~',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d oggetti/link fanno riferimento %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d oggetti / link fanno riferimento alcuni degli oggetti da eliminare', 
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Per garantire l\'integrità del database, ogni riferimento dovrebbe essere ulteriormente eliminato',
+	'UI:Delete:Consequence+' => '',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Spiacenti, non sei autorizzato a cancellare questo oggetto, vedere le spiegazioni di cui sopra',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Si prega di eseguire le operazioni manuali di cui sopra prima di richiedere la cancellazione di questo oggetto',
+	'UI:Delect:Confirm_Object' =>  'Si prega di confermare che si desidera eliminare %1$s.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Si prega di confermare che si desidera eliminare i seguenti oggetti %1$d della classe %2$s.',
+	'UI:WelcomeToITop' =>  'Benvenuto su iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s dettagli',
+	'UI:ErrorPageTitle' => 'iTop - Errore',
+	'UI:ObjectDoesNotExist' => 'Spiacenti, questo oggetto non esiste (o non si è autorizzati per vederlo).',
+	'UI:SearchResultsPageTitle' => 'iTop - Risultati della ricerca',
+	'UI:Search:NoSearch' => 'Niente da ricercare',
+	'UI:FullTextSearchTitle_Text' => 'Risultati per "%1$s":',
+	'UI:Search:Count_ObjectsOf_Class_Found' => 'Trovato l\'oggetto(i) %1$d della classe %2$s.',
+	'UI:Search:NoObjectFound' => 'Nessun oggetto trovato.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modifica',
+	'UI:ModificationTitle_Class_Object' => 'Modifica di %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s modifica',
+	'UI:CloneTitle_Class_Object' => 'Clone di %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - Creazione di un nuovo %1$s ',
+	'UI:CreationTitle_Class' => 'Creazione di un nuovo %1$s',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Seleziona il tipo di %1$s da creare:',
+	'UI:Class_Object_NotUpdated' => 'Nessun cambiamento rilevato, %1$s (%2$s)  <strong>non</strong> è stato modificato.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) aggiornato.',
+	'UI:BulkDeletePageTitle' => 'iTop - Eliminazione collettiva',
+	'UI:BulkDeleteTitle' => 'Seleziona gli oggetti che si desidera eliminare:',
+	'UI:PageTitle:ObjectCreated' => 'iTop Oggetto Creato.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s creato.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Applicazione %1$s all\'oggetto: %2$s nello stato %3$s allo stato target: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'L\'oggetto non può essere scritto: %1$s~~',
+	'UI:PageTitle:FatalError' => 'iTop - Fatal Error',
+	'UI:SystemIntrusion' => 'Accesso negato. Hai cercato di eseguire un\'operazione che non ti è consentita.',
+	'UI:FatalErrorMessage' => 'Fatal error, iTop non può continuare.',
+	'UI:Error_Details' => 'Errore: %1$s.',
+	'UI:PageTitle:ClassProjections' => 'iTop gestione degli utenti - proiezioni classe',
+	'UI:PageTitle:ProfileProjections' => 'iTop gestione degli utenti - proiezioni profilo',
+	'UI:UserManagement:Class' => 'Classe',
+	'UI:UserManagement:Class+' => '',
+	'UI:UserManagement:ProjectedObject' => 'Oggetto',
+	'UI:UserManagement:ProjectedObject+' => '',
+	'UI:UserManagement:AnyObject' => '* qualsiasi *',
+	'UI:UserManagement:User' => 'Utente',
+	'UI:UserManagement:User+' => '',
+	'UI:UserManagement:Profile' => 'Profilo',
+	'UI:UserManagement:Profile+' => '',
+	'UI:UserManagement:Action:Read' => 'Leggi',
+	'UI:UserManagement:Action:Read+' => '',
+	'UI:UserManagement:Action:Modify' => 'Modifica',
+	'UI:UserManagement:Action:Modify+' => '',
+	'UI:UserManagement:Action:Delete' => 'Cancella',
+	'UI:UserManagement:Action:Delete+' => '',
+	'UI:UserManagement:Action:BulkRead' => 'Leggi Bulk (Export)',
+	'UI:UserManagement:Action:BulkRead+' => '',
+	'UI:UserManagement:Action:BulkModify' => 'Modifica Bulk',
+	'UI:UserManagement:Action:BulkModify+' => '',
+	'UI:UserManagement:Action:BulkDelete' => 'Cancella Bulk ',
+	'UI:UserManagement:Action:BulkDelete+' => '',
+	'UI:UserManagement:Action:Stimuli' => 'Stimoli',
+	'UI:UserManagement:Action:Stimuli+' => '',
+	'UI:UserManagement:Action' => 'Azione',
+	'UI:UserManagement:Action+' => '',
+	'UI:UserManagement:TitleActions' => 'Azioni',
+	'UI:UserManagement:Permission' => 'Autorizzazione',
+	'UI:UserManagement:Permission+' => '',
+	'UI:UserManagement:Attributes' => 'Attributi',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Si',
+	'UI:UserManagement:ActionAllowed:No' => 'No',
+	'UI:UserManagement:AdminProfile+' => '',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => '',
+	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Collegamento tra %1$s e %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Collegamento tra %1$s e %2$s',
+	'Menu:AdminTools' => 'Strumenti di amministrazione',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore',
+	'UI:ChangeManagementMenu' => 'Gestione Cambi',
+	'UI:ChangeManagementMenu+' => '',
+	'UI:ChangeManagementMenu:Title' => 'Panoramica dei cambi',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Cambi per tipo',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Cambi per stato',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Cambi per gruppi di lavoro',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Cambi non ancora assegnati',
+	'UI:ConfigurationItemsMenu' => 'Configuration Items',
+	'UI:ConfigurationItemsMenu+' => '',
+	'UI:ConfigurationItemsMenu:Title' => 'Configuration Items Panoramica',
+	'UI-ConfigurationItemsMenu-ServersByCriticity' => 'Server per criticità',
+	'UI-ConfigurationItemsMenu-PCsByCriticity' => 'PCs per criticità',
+	'UI-ConfigurationItemsMenu-NWDevicesByCriticity' => 'Dispositivi di rete per criticità',
+	'UI-ConfigurationItemsMenu-ApplicationsByCriticity' => 'Applicazioni per criticità',
+	'UI:ConfigurationManagementMenu' => 'Gestione Configurazione',
+	'UI:ConfigurationManagementMenu+' => '',
+	'UI:ConfigurationManagementMenu:Title' => 'Panoramica delle infrastrutture',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Oggetti infrastruttutura per tipo',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Oggetti infrastruttutura per stato',
+	'UI:ConfigMgmtMenuOverview:Title' =>  'Cruscotto per Gestione configurazione',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items per stato',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items per tipo',
+	'UI:RequestMgmtMenuOverview:Title' => 'Cruscotto per Gestione Richieste',
+	'UI-RequestManagementOverview-RequestByService' => 'Richieste degli utenti per servizio',
+	'UI-RequestManagementOverview-RequestByPriority' => 'Richieste degli utenti per priorità',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'Richieste degli utenti non ancora assegnate ad un agente',
+	'UI:IncidentMgmtMenuOverview:Title' => 'Cruscotto Gestione degli Incidenti',
+	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenti per servizio',
+	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenti per  priorità',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidenti non ancora assegnati ad un agente',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
+	'UI-ChangeManagementOverview-ChangeByType' => 'Cambi per tipo',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Cambi non ancora assegnati ad un agente',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruzioni dovute ai cambi',
+	'UI:ServiceMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratti con i clienti da rinnovarsi in 30 giorni',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratti con i fornitori da rinnovarsi in 30 giorni',
+	'UI:ContactsMenu' => 'Contatti',
+	'UI:ContactsMenu+' => '',
+	'UI:ContactsMenu:Title' => 'Contatti Panoramica',
+	'UI-ContactsMenu-ContactsByLocation' => 'Contatti per localizzazione',
+	'UI-ContactsMenu-ContactsByType' => 'Contatti per tipo',
+	'UI-ContactsMenu-ContactsByStatus' => 'Contatti per stato',
+	'Menu:CSVImportMenu' =>  'Importazione CSV',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Modello Dati',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Esporta',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' =>  'Notifiche',
+	'Menu:NotificationsMenu+' => '',
+	'UI:NotificationsMenu:Title' =>  'Configurazione delle <span class="hilite">Notifiche</span>',
+	'UI:NotificationsMenu:Help' => 'Aiuto',
+	'UI:NotificationsMenu:HelpContent' => '<p>In iTop le notifiche sono completamente personalizzabili. Essi si basano su due serie di oggetti: <i>trigger e azioni</i>.</p>
+<p><i><b>Triggers</b></i> per definire quando una notifica verrà eseguita. Ci sono 3 tipi di trigger per la copertura di 3 fasi differenti del ciclo di vita di un oggetto:
+<ol>
+	 <li>the "OnCreate" trigger vengono eseguiti quando un oggetto della classe specificata viene creata</li>
+	 <li>the "OnStateEnter" trigger vengono eseguiti prima che un oggetto della classe data entra in uno stato specifico (provenienti da un altro Stato)</li>
+	 <li>the "OnStateLeave" trigger vengono eseguiti quando un oggetto della classe lascia uno stato specificato</li>
+</ol>
+
+</p>
+<p>
+<i><b>Azioni</b></i> definire le azioni da eseguire quando il trigger vengono eseguiti. Per ora c\'è solo un tipo di azione consiste nel mandare un messaggio email.
+Inoltre, tali azioni definiscono il modello da utilizzare per l\'invio della e-mail così come gli altri parametri del messaggio come, l\'importanza dei destinatari, etc
+</p>
+<p>Una Pagina speciale: <a href="../setup/email.test.php" target="_blank">email.test.php</a> è disponibile per il testing e la risoluzione dei problemi di configurazione PHP mail.</p>
+<p>Per essere eseguite, le azioni devono essere associate ai trigger.
+Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine", che specifica in quale ordine le azioni devono essere eseguite.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Triggers',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Triggers Disponibili',
+	'UI:NotificationsMenu:OnCreate' => 'When an object is created~~',
+	'UI:NotificationsMenu:OnStateEnter' => 'Quando un oggetto viene creato',
+	'UI:NotificationsMenu:OnStateLeave' => 'Quando un oggetto lascia un determinato stato',
+	'UI:NotificationsMenu:Actions' => 'Azioni',
+	'UI:NotificationsMenu:AvailableActions' => 'Azioni disponibili',
+	'Menu:AuditCategories' => 'Categorie di Audit',
+	'Menu:AuditCategories+' => '',
+	'Menu:Notifications:Title' => 'Categorie di Audit',
+	'Menu:RunQueriesMenu' => 'Esegui query',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:DataAdministration' => 'Dati di amministrazione',
+	'Menu:DataAdministration+' => '',
+	'Menu:UniversalSearchMenu' => 'Ricerca universale',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:ApplicationLogMenu' => 'Log dell\'applicazione',
+	'Menu:ApplicationLogMenu+' => '',
+	'Menu:ApplicationLogMenu:Title' => 'Log dell\'applicazione',
+	'Menu:UserManagementMenu' => 'Gestione degli utenti',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profili',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profili',
+	'Menu:UserAccountsMenu' => 'Account utente',
+	'Menu:UserAccountsMenu+' => '',
+	'Menu:UserAccountsMenu:Title' => 'Account utente',
+	'UI:iTopVersion:Short' => 'Versione iTop %1$s',
+	'UI:iTopVersion:Long' => 'Versione iTop %1$s-%2$s costruita il %3$s',
+	'UI:PropertiesTab' => 'Proprietà',
+	'UI:OpenDocumentInNewWindow_' => 'Apri questo documento in una nuova finestra: %1$s',
+	'UI:DownloadDocument_' => 'Scarica questo documento: %1$s',
+	'UI:Document:NoPreview' => 'Non è disponibile un\'anteprima per questo tipo di documento',
+	'UI:DeadlineMissedBy_duration' => 'Mancati %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',
+	'UI:Deadline_Minutes' => '%1$d min', 
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',  
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dg %2$dh %3$dmin',
+	'UI:Help' => 'Aiuto',
+	'UI:PasswordConfirm' => '(Conferma)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Prima di aggiungere più %1$s oggetti, salva questo oggetto.',
+	'UI:DisplayThisMessageAtStartup' => 'Visualizza questo messaggio in fase di avvio',
+	'UI:RelationshipGraph' => 'Visualizzazione grafica',
+	'UI:RelationshipList' => 'Lista',
+	'UI:OperationCancelled' => 'Operazione Annullata',
+	'Portal:Title' => 'Portale Utente iTop',
+	'Portal:Refresh' => 'Ricarica',
+	'Portal:Back' => 'Indietro',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => 'Crea una nuova richiesta',
+	'Portal:ChangeMyPassword' => 'Cambia la mia password',
+	'Portal:Disconnect' => 'Disconnetti',
+	'Portal:OpenRequests' => 'Le mie richieste aperte',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests' => 'Le mie richieste risolte',
+	'Portal:SelectService' => 'Seleziona un servizio dal catalogo:',
+	'Portal:PleaseSelectOneService' => 'Si prega di selezionare un servizio',
+	'Portal:SelectSubcategoryFrom_Service' => 'Seleziona una sotto-categoria per il servizio %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Si prega di selezionare una delle sottocategorie',
+	'Portal:DescriptionOfTheRequest' => 'Inserisci la descrizione della tua richiesta:',
+	'Portal:TitleRequestDetailsFor_Request' => 'Dettagli per la richiesta %1$s:',
+	'Portal:NoOpenRequest' => 'Nessuna richiesta in questa categoria.',
+	'Portal:NoClosedRequest' => 'Nessuna richiesta in questa categoria.',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
+	'Portal:Button:CloseTicket' => 'Chiudi questo ticket',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => 'Inserisci il tuo commento sulla risoluzione di questo ticket:',
+	'Portal:ErrorNoContactForThisUser' =>  'Errore: l\'utente corrente non è associato ad un Contatto/Persona. Si prega di contattare l\'amministratore.',
+	'Portal:Attachments' => 'Allegati',
+	'Portal:AddAttachment' => ' Aggiungi allegati ',
+	'Portal:RemoveAttachment' =>  ' Rimuovi allegati ',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Allegato #%1$d a %2$s (%3$s)',
+	'Enum:Undefined' => 'Non definito',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Giorni %2$s Ore %3$s Minuti %4$s Secondi',
+	'UI:ModifyAllPageTitle' => 'Modifica Tutto',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifica %1$d oggetto della classe %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifica %1$d oggetto della classe %2$s fuori da %3$d~~',
+	'UI:Menu:ModifyAll' => 'Modifica...',
+	'UI:Button:ModifyAll' => 'Modifica tutto',
+	'UI:Button:PreviewModifications' => 'Anteprima Modifiche >>~~',
+	'UI:ModifiedObject' => 'Oggetto Modificato',
+	'UI:BulkModifyStatus' => 'Operazioni',
+	'UI:BulkModifyStatus+' => '',
+	'UI:BulkModifyErrors' => 'Errori (eventuali)',
+	'UI:BulkModifyErrors+' => '',
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Errore',
+	'UI:BulkModifyStatusModified' => 'Modificato',
+	'UI:BulkModifyStatusSkipped' => 'Saltato',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d valori distinti:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d volta(e)',
+	'UI:BulkModify:N_MoreValues' => '%1$d più valori...~~',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentativo di impostare il campo di sola lettura: %1$s',
+	'UI:FailedToApplyStimuli' => 'L\'azione non è riuscita.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifica %2$d oggetti della classe %3$s~~',
+	'UI:CaseLogTypeYourTextHere' => 'Digitare il tuo testo qui:',
+	'UI:CaseLog:DateFormat' => 'A-m-g H:m:s',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
+	'UI:CaseLog:InitialValue' => 'Valore iniziale:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore non impostato.',
+	'UI:ActionNotAllowed' => 'Non hai i permessi per eseguire questa azione su questi oggetti.',
+	'UI:BulkAction:NoObjectSelected' => 'Si prega di selezionare almeno un oggetto per eseguire questa operazione',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore rimane invariato.',
+));
+?>

dictionaries/ja.dictionary.itop.core.php

@@ -0,0 +1,483 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Localized data
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @author      Tadashi Kaneda <kaneda@smartec.co.jp>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Core:AttributeLinkedSet' => 'オブジェクト配列',
+	'Core:AttributeLinkedSet+' => '同一あるいはサブクラスに属するオブジェクト',
+
+	'Core:AttributeLinkedSetIndirect' => 'オブジェクト配列 (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => '同一クラスの任意のオブジェクト(サブクラス)',
+
+	'Core:AttributeInteger' => 'Int型',
+	'Core:AttributeInteger+' => '数値 (負数あり)',
+
+	'Core:AttributeDecimal' => 'Decimal型',
+	'Core:AttributeDecimal+' => 'Decimal値 (負数あり)',
+
+	'Core:AttributeBoolean' => 'ブール型',
+	'Core:AttributeBoolean+' => 'Bool値',
+
+	'Core:AttributeString' => '文字列',
+	'Core:AttributeString+' => '文字列',
+
+	'Core:AttributeClass' => 'クラス',
+	'Core:AttributeClass+' => 'クラス',
+
+	'Core:AttributeApplicationLanguage' => '使用言語',
+	'Core:AttributeApplicationLanguage+' => '言語・国別 (EN US)',
+
+	'Core:AttributeFinalClass' => 'クラス (自動)',
+	'Core:AttributeFinalClass+' => 'オブジェクトの実クラス (コアで自動的に生成される)',
+
+	'Core:AttributePassword' => 'パスワード',
+	'Core:AttributePassword+' => '外部デバイス用パスワード',
+
+ 	'Core:AttributeEncryptedString' => '暗号化文字列',
+	'Core:AttributeEncryptedString+' => 'ローカルキーで暗号化された文字列',
+
+	'Core:AttributeText' => 'テキスト',
+	'Core:AttributeText+' => '複数行文字列',
+
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'HTML文字列',
+
+	'Core:AttributeEmailAddress' => 'メールアドレス',
+	'Core:AttributeEmailAddress+' => 'メールアドレス',
+
+	'Core:AttributeIPAddress' => 'IPアドレス',
+	'Core:AttributeIPAddress+' => 'IPアドレス',
+
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => 'OQL式',
+
+	'Core:AttributeEnum' => '列挙型',
+	'Core:AttributeEnum+' => 'ナンバリング済み文字列のリスト',
+
+	'Core:AttributeTemplateString' => 'テンプレート文字列',
+	'Core:AttributeTemplateString+' => 'プレースホルダを含む文字列',
+
+	'Core:AttributeTemplateText' => 'テンプレートテキスト',
+	'Core:AttributeTemplateText+' => 'プレースホルダを含むテキスト',
+
+	'Core:AttributeTemplateHTML' => 'テンプレートHTML',
+	'Core:AttributeTemplateHTML+' => 'プレースホルダを含むHTML',
+
+	'Core:AttributeWikiText' => 'Wikiアーティクル',
+	'Core:AttributeWikiText+' => 'Wikiフォーマット済みテキスト',
+
+	'Core:AttributeDateTime' => '日付/時刻',
+	'Core:AttributeDateTime+' => '日付と時刻(年-月-日 hh:mm:ss)',
+
+	'Core:AttributeDate' => '日付',
+	'Core:AttributeDate+' => '日付 (年-月-日)',
+
+	'Core:AttributeDeadline' => '締切',
+	'Core:AttributeDeadline+' => '日付, 現在時刻からの相対表示',
+
+	'Core:AttributeExternalKey' => '外部キー',
+	'Core:AttributeExternalKey+' => '外部(あるいはフォーリン)キー',
+
+	'Core:AttributeExternalField' => '外部フィールド',
+	'Core:AttributeExternalField+' => '外部キーにマッピングされたフィールド',
+
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => '絶対URLもしくは相対URLのテキスト文字列',
+
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => '任意のバイナリコンテンツ(ドキュメント)',
+
+	'Core:AttributeOneWayPassword' => '一方向パスワード',
+	'Core:AttributeOneWayPassword+' => '一方向暗号化(ハッシュ)パスワード',
+
+	'Core:AttributeTable' => 'テーブル',
+	'Core:AttributeTable+' => 'インデックス化された二次元配列',
+
+	'Core:AttributePropertySet' => 'プロパティ',
+	'Core:AttributePropertySet+' => '型づけされていないプロパティのリスト(名前とバリュー)',
+));
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChange' => '変更',
+	'Class:CMDBChange+' => '変更履歴',
+	'Class:CMDBChange/Attribute:date' => '日付',
+	'Class:CMDBChange/Attribute:date+' => '変更が記録された日時',
+	'Class:CMDBChange/Attribute:userinfo' => 'その他情報',
+	'Class:CMDBChange/Attribute:userinfo+' => '呼出側の定義済み情報',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOp' => '変更操作',
+	'Class:CMDBChangeOp+' => '変更操作履歴',
+	'Class:CMDBChangeOp/Attribute:change' => '変更',
+	'Class:CMDBChangeOp/Attribute:change+' => '変更',
+	'Class:CMDBChangeOp/Attribute:date' => '日付',
+	'Class:CMDBChangeOp/Attribute:date+' => '変更日時',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'ユーザ',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '変更者',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'オブジェクトクラス',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'オブジェクトクラス',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'オブジェクトID',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'オブジェクトID',
+	'Class:CMDBChangeOp/Attribute:finalclass' => '型',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOpCreate' => 'オブジェクト生成',
+	'Class:CMDBChangeOpCreate+' => 'オブジェクト生成履歴',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOpDelete' => 'オブジェクト削除',
+	'Class:CMDBChangeOpDelete+' => 'オブジェクト削除履歴',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOpSetAttribute' => 'オブジェクト更新',
+	'Class:CMDBChangeOpSetAttribute+' => 'オブジェクトプロパティの更新履歴',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => '属性',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '更新プロパティのコード',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => 'プロパティ更新',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'オブジェクトのスカラープロパティの更新履歴',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => '変更前の値',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '属性の変更前の値',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => '新規の値',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '属性の新規の値',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Change:ObjectCreated' => 'オブジェクトを生成しました',
+	'Change:ObjectDeleted' => 'オブジェクトを削除しました',
+	'Change:ObjectModified' => 'オブジェクトを更新しました',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$sを%2$sに設定しました (変更前の値: %3$s)',
+	'Change:Text_AppendedTo_AttName' => '%1$sを%2$sに追加しました',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$sを更新しました。更新前の値: %2$s',
+	'Change:AttName_Changed' => '%1$sを更新しました',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => 'データ変更',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'データ変更履歴',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => '変更前のデータ', //'Previous data',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'この属性の以前の内容', //'previous contents of the attribute',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CMDBChangeOpSetAttributeText' => 'テキストの変更', //'text change',
+	'Class:CMDBChangeOpSetAttributeText+' => 'テキストの変更履歴', //'text change tracking',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => '以前の内容', //'Previous data',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'この属性の以前の内容', //'previous contents of the attribute',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Event' => 'ログイベント',// 'Log Event',
+	'Class:Event+' => 'アプリケーション内部イベント', //'An application internal event',
+	'Class:Event/Attribute:message' => 'メッセージ', //'message',
+	'Class:Event/Attribute:message+' => 'イベント概略', //'short description of the event',
+	'Class:Event/Attribute:date' => '日付', //'date',
+	'Class:Event/Attribute:date+' => '変更が記録された日時', //'date and time at which the changes have been recorded',
+	'Class:Event/Attribute:userinfo' => 'ユーザ情報', //'user info',
+	'Class:Event/Attribute:userinfo+' => 'このイベントをトリガーにアクションを起こすユーザの識別', //'identification of the user that was doing the action that triggered this event',
+	'Class:Event/Attribute:finalclass' => '型', //'type',
+	'Class:Event/Attribute:finalclass+' => '',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:EventNotification' => '通知イベント', // 'Notification event',
+	'Class:EventNotification+' => '創出された通知のトレース', //'Trace of a notification that has been sent',
+	'Class:EventNotification/Attribute:trigger_id' => 'トリガー', //'Trigger',
+	'Class:EventNotification/Attribute:trigger_id+' => 'ユーザアカウント', //'user account',
+	'Class:EventNotification/Attribute:action_id' => 'ユーザ', //'user',
+	'Class:EventNotification/Attribute:action_id+' => 'ユーザアカウント', //'user account',
+	'Class:EventNotification/Attribute:object_id' => 'オブジェクトID', //'Object id',
+	'Class:EventNotification/Attribute:object_id+' => 'オブジェクトID(トリガーでクラスが定義済み?)', //'object id (class defined by the trigger ?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array('Class:EventNotificationEmail' => 'メール送出イベント', //'Email emission event',
+					       'Class:EventNotificationEmail+' => '送出されたメールのトレース',//Trace of an email that has been sent',
+	'Class:EventNotificationEmail/Attribute:to' => 'TO',
+	'Class:EventNotificationEmail/Attribute:to+' => 'TO',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:from' => 'From',
+					       'Class:EventNotificationEmail/Attribute:from+' => 'メール送信者', //'Sender of the message',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Subject',
+	'Class:EventNotificationEmail/Attribute:subject+' => 'Subject',
+	'Class:EventNotificationEmail/Attribute:body' => 'Body',
+	'Class:EventNotificationEmail/Attribute:body+' => 'Body',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+					       'Class:EventIssue' => 'イシューイベント', //'Issue event',
+					       'Class:EventIssue+' => 'イシュー(警告、エラーetc)のトレース', //'Trace of an issue (warning, error, etc.)',
+					       'Class:EventIssue/Attribute:issue' => 'イシュー', //'Issue',
+					       'Class:EventIssue/Attribute:issue+' => '何が起こったか', //'What happened',
+					       'Class:EventIssue/Attribute:impact' => 'インパクト', //'Impact',
+					       'Class:EventIssue/Attribute:impact+' => 'その結果', //'What are the consequences',
+					       'Class:EventIssue/Attribute:page' => 'ページ', //'Page',
+					       'Class:EventIssue/Attribute:page+' => 'HTTPエントリポイント', //'HTTP entry point',
+					       'Class:EventIssue/Attribute:arguments_post' => 'POSTされた引数', //'Posted arguments',
+					       'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST引数', //'HTTP POST arguments',
+					       'Class:EventIssue/Attribute:arguments_get' => 'URLパラメータ', //'URL arguments',
+					       'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GETパラメータ', //'HTTP GET arguments',
+					       'Class:EventIssue/Attribute:callstack' => 'コールスタック', //'Callstack',
+					       'Class:EventIssue/Attribute:callstack+' => 'スタックをコールする', //'Call stack',
+					       'Class:EventIssue/Attribute:data' => 'データ', //'Data',
+					       'Class:EventIssue/Attribute:data+' => '詳細情報', //'More information',
+));
+
+//
+// Class: EventWebService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:EventWebService' => 'ウェブサービスイベント', //'Web service event',
+					       'Class:EventWebService+' => 'ウェブサービス呼出のYトレース', //'Trace of an web service call',
+					       'Class:EventWebService/Attribute:verb' => '動詞', //'Verb',
+					       'Class:EventWebService/Attribute:verb+' => '操作名', //'Name of the operation',
+					       'Class:EventWebService/Attribute:result' => '結果', //'Result',
+					       'Class:EventWebService/Attribute:result+' => '総体的な成功/失敗', //'Overall success/failure',
+					       'Class:EventWebService/Attribute:log_info' => 'インフォログ', //'Info log',
+					       'Class:EventWebService/Attribute:log_info+' => 'インフォログの結果', //'Result info log',
+					       'Class:EventWebService/Attribute:log_warning' => 'ウォーニングログ', //'Warning log',
+					       'Class:EventWebService/Attribute:log_warning+' => 'ウォーニングログ結果', //'Result warning log',
+					       'Class:EventWebService/Attribute:log_error' => 'エラーログ', //'Error log',
+					       'Class:EventWebService/Attribute:log_error+' => 'エラーログ結果', //'Result error log',
+					       'Class:EventWebService/Attribute:data' => 'データ', //'Data',
+					       'Class:EventWebService/Attribute:data+' => 'データ結果', //'Result data',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:Action' => 'カスタムアクション', //'Custom Action',
+					       'Class:Action+' => 'ユーザ定義アクション', //'User defined action',
+					       'Class:Action/Attribute:name' => '名前', //'Name',
+	'Class:Action/Attribute:name+' => '',
+					       'Class:Action/Attribute:description' => '概要', //'Description',
+	'Class:Action/Attribute:description+' => '',
+					       'Class:Action/Attribute:status' => 'ステータス', //'Status',
+					       'Class:Action/Attribute:status+' => '製品化済み、あるいは?', //'In production or ?',
+					       'Class:Action/Attribute:status/Value:test' => 'テスト済み', //'Being tested',
+					       'Class:Action/Attribute:status/Value:test+' => 'テスト済み', //'Being tested',
+					       'Class:Action/Attribute:status/Value:enabled' => '製品化済み', //'In production',
+					       'Class:Action/Attribute:status/Value:enabled+' => '製品化済み', //'In production',
+					       'Class:Action/Attribute:status/Value:disabled' => '非アクティブ', //'Inactive',
+					       'Class:Action/Attribute:status/Value:disabled+' => '非アクティブ', //'Inactive',
+					       'Class:Action/Attribute:trigger_list' => '関連トリガ', //'Related Triggers',
+					       'Class:Action/Attribute:trigger_list+' => 'このアクションにリンクされたトリガ', //'Triggers linked to this action',
+					       'Class:Action/Attribute:finalclass' => '型', //'Type',
+	'Class:Action/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:ActionNotification' => 'ノーティフィケーション', //'Notification',
+					       'Class:ActionNotification+' => 'ノーティフィケーション(抽象)', //'Notification (abstract)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:ActionEmail' => 'メール通知', //'Email notification',
+	'Class:ActionEmail+' => '',
+					       'Class:ActionEmail/Attribute:test_recipient' => 'テストレシピ', //'Test recipient',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Detination in case status is set to "Test"',
+	'Class:ActionEmail/Attribute:from' => 'From',
+	'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header',
+	'Class:ActionEmail/Attribute:reply_to' => 'Reply to',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header',
+	'Class:ActionEmail/Attribute:to' => 'To',
+					       'Class:ActionEmail/Attribute:to+' => 'メールの宛先', //'Destination of the email',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
+	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
+	'Class:ActionEmail/Attribute:subject' => 'subject',
+					       'Class:ActionEmail/Attribute:subject+' => 'メールのタイトル', //'Title of the email',
+	'Class:ActionEmail/Attribute:body' => 'body',
+					       'Class:ActionEmail/Attribute:body+' => 'メールの本文', //'Contents of the email',
+	'Class:ActionEmail/Attribute:importance' => 'importance',
+					       'Class:ActionEmail/Attribute:importance+' => '重要度フラグ', //'Importance flag',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'low',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => 'low',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'high',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => 'high',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:Trigger' => 'トリガー', //'Trigger',
+					       'Class:Trigger+' => 'カスタムイベントヘッダ', //'Custom event handler',
+					       'Class:Trigger/Attribute:description' => '概要', //'Description',
+					       'Class:Trigger/Attribute:description+' => '1行概要', //'one line description',
+					       'Class:Trigger/Attribute:action_list' => 'トリガされたアクション', //'Triggered actions',
+					       'Class:Trigger/Attribute:action_list+' => 'トリガが発火した場合に動作するアクション', //'Actions performed when the trigger is activated',
+					       'Class:Trigger/Attribute:finalclass' => '型', //'Type',
+	'Class:Trigger/Attribute:finalclass+' => '',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:TriggerOnObject' => 'トリガ(クラス依存)', //'Trigger (class dependent)',
+					       'Class:TriggerOnObject+' => '指定オブジェクトのクラスへのトリガ', //'Trigger on a given class of objects',
+					       'Class:TriggerOnObject/Attribute:target_class' => 'ターゲットクラス', //'Target class',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:TriggerOnStateChange' => '(状態変更の)トリガ', // Trigger (on state change)',
+					       'Class:TriggerOnStateChange+' => 'オブジェクト状態変更のトリガ', //'Trigger on object state change',
+					       'Class:TriggerOnStateChange/Attribute:state' => '状態', //'State',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:TriggerOnStateEnter' => 'トリガ(ある状態に入る)', // 'Trigger (on entering a state)',
+					       'Class:TriggerOnStateEnter+' => 'オブジェクト状態変更のトリガ: 入場', //'Trigger on object state change - entering',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:TriggerOnStateLeave' => '(ある状態から退場する)トリガ', // 'Trigger (on leaving a state)',
+					       'Class:TriggerOnStateLeave+' => 'オブジェクト状態変更のトリガ: 退場', //Trigger on object state change - leaving',
+));
+
+//
+// Class: TriggerOnObjectCreate
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:TriggerOnObjectCreate' => '(オブジェクト生成の)トリガ', //Trigger (on object creation)',
+					       'Class:TriggerOnObjectCreate+' => '指定されたクラスの(子クラスの)オブジェクト生成のトリガ', //Trigger on object creation of [a child class of] the given class',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:lnkTriggerAction' => 'アクション/トリガ', //'Action/Trigger',
+					       'Class:lnkTriggerAction+' => 'トリガとアクション間のリンク', //'Link between a trigger and an action',
+					       'Class:lnkTriggerAction/Attribute:action_id' => 'アクション', //'Action',
+					       'Class:lnkTriggerAction/Attribute:action_id+' => '実行されるべきアクション', //'The action to be executed',
+					       'Class:lnkTriggerAction/Attribute:action_name' => 'アクション', //'Action',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+					       'Class:lnkTriggerAction/Attribute:trigger_id' => 'トリガ', //'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+					       'Class:lnkTriggerAction/Attribute:trigger_name' => 'トリガ', //'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+					       'Class:lnkTriggerAction/Attribute:order' => '処理順序', //'Order',
+					       'Class:lnkTriggerAction/Attribute:order+' => 'アクション実行順序', //'Actions execution order',
+));
+
+
+?>

dictionaries/ja.dictionary.itop.ui.php

@@ -0,0 +1,914 @@
+<?php
+// Copyright (C) 2010 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
+
+/**
+ * Localized data
+ *
+ * @author      Erwan Taloc <erwan.taloc@combodo.com>
+ * @author      Romain Quetiez <romain.quetiez@combodo.com>
+ * @author      Denis Flaven <denis.flaven@combodo.com>
+ * @author      Tadashi Kaneda <kaneda@rworks.jp>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:AuditCategory' => '監査カテゴリ', //Audit Category',
+					       'Class:AuditCategory+' => '監査全体の内部セクション', //'A section inside the overall audit',
+					       'Class:AuditCategory/Attribute:name' => 'カテゴリ名', //'Category Name',
+					       'Class:AuditCategory/Attribute:name+' => '本カテゴリの短縮名', //'Short name for this category',
+					       'Class:AuditCategory/Attribute:description' => '監査カテゴリ概要', //'Audit Category Description',
+					       'Class:AuditCategory/Attribute:description+' => '本監査カテゴリの詳細記述', //'Long description for this audit category',
+					       'Class:AuditCategory/Attribute:definition_set' => '定義セット', //'Definition Set',
+					       'Class:AuditCategory/Attribute:definition_set+' => '監査するべきオブジェクトの集合を定義するOQL式', //'OQL expression defining the set of objects to audit',
+					       'Class:AuditCategory/Attribute:rules_list' => '監査ルール', //'Audit Rules',
+					       'Class:AuditCategory/Attribute:rules_list+' => '本カテゴリの監査ルール', //'Audit rules for this category',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:AuditRule' => '監査ルール', //'Audit Rule',
+					       'Class:AuditRule+' => '指定された監査カテゴリをチェックするためのルール', //'A rule to check for a given Audit category',
+					       'Class:AuditRule/Attribute:name' => 'ルール名', //'Rule Name',
+					       'Class:AuditRule/Attribute:name+' => '本ルールの短縮名', //'Short name for this rule',
+					       'Class:AuditRule/Attribute:description' => '監査ルール概要', //'Audit Rule Description',
+					       'Class:AuditRule/Attribute:description+' => '本監査ルールの詳細記述', //'Long description for this audit rule',
+					       'Class:AuditRule/Attribute:query' => '実行するクエリ', //'Query to Run',
+					       'Class:AuditRule/Attribute:query+' => '実行するOQL式', //'The OQL expression to run',
+					       'Class:AuditRule/Attribute:valid_flag' => '正しいオブジェクト?', // 'Valid Objects?', 
+					       'Class:AuditRule/Attribute:valid_flag+' => 'このルールが正しいオブジェクトを返す場合は真、そうでなければ偽', //'True if the rule returns the valid objects, false otherwise',
+					       'Class:AuditRule/Attribute:valid_flag/Value:true' => '真', //'true',
+					       'Class:AuditRule/Attribute:valid_flag/Value:true+' => '真', //'true',
+					       'Class:AuditRule/Attribute:valid_flag/Value:false' => '偽', //'false',
+					       'Class:AuditRule/Attribute:valid_flag/Value:false+' => '偽', //'false',
+					       'Class:AuditRule/Attribute:category_id' => 'カテゴリ', //'Category',
+					       'Class:AuditRule/Attribute:category_id+' => '本ルールのカテゴリ', //'The category for this rule',
+					       'Class:AuditRule/Attribute:category_name' => 'カテゴリ', //'Category',
+					       'Class:AuditRule/Attribute:category_name+' => '本ルールのカテゴリ名', //'Name of the category for this rule',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:User' => 'ユーザ', //'User',
+					       'Class:User+' => 'ユーザログイン', //'User login',
+					       'Class:User/Attribute:finalclass' => 'アカウント種別', //'Type of account',
+	'Class:User/Attribute:finalclass+' => '',
+					       'Class:User/Attribute:contactid' => 'コンタクト(人)', //'Contact (person)',
+					       'Class:User/Attribute:contactid+' => 'ビジネスデータから抽出した個人情報の詳細', //'Personal details from the business data',
+					       'Class:User/Attribute:last_name' => '名字', //'Last name',
+					       'Class:User/Attribute:last_name+' => '適切なコンタクト名', //'Name of the corresponding contact',
+					       'Class:User/Attribute:first_name' => '名前', //'First name',
+					       'Class:User/Attribute:first_name+' => '適切なコンタクトの名前', //'First name of the corresponding contact',
+					       'Class:User/Attribute:email' => 'メールアドレス', //'Email',
+					       'Class:User/Attribute:email+' => '適切なコンタクトのメールアドレス', //'Email of the corresponding contact',
+					       'Class:User/Attribute:login' => 'ログイン', //'Login',
+					       'Class:User/Attribute:login+' => 'ユーザ識別文字列', //'user identification string',
+					       'Class:User/Attribute:language' => '言語', //'Language',
+					       'Class:User/Attribute:language+' => 'ユーザ使用言語', //'user language',
+					       'Class:User/Attribute:language/Value:EN US' => '英語', //'English',
+					       'Class:User/Attribute:language/Value:EN US+' => '英語(米国)', //'English (U.S.)',
+					       'Class:User/Attribute:language/Value:FR FR' => 'フランス語', //'French',
+					       'Class:User/Attribute:language/Value:FR FR+' => 'フランス語(フランス)', //'French (France)',
+					       'Class:User/Attribute:profile_list' => 'プロフィール', //'Profiles',
+					       'Class:User/Attribute:profile_list+' => '役割、この人に委譲された権限', //'Roles, granting rights for that person',
+					       'Class:User/Attribute:allowed_org_list' => '許可された組織', //'Allowed Organizations',
+					       'Class:User/Attribute:allowed_org_list+' => 'このエンドユーザは以下の組織に属するデータの参照を許可されている。組織が指定されていなければ、制限はありません。', //'The end user is allowed to see data belonging to the following organizations. If no organization is specified, there is no restriction.',
+
+					       'Class:User/Error:LoginMustBeUnique' => 'ログイン名は一意でないといけません。- "%1s" はすでに使われています。', //'Login must be unique - "%1s" is already being used.',
+					       'Class:User/Error:AtLeastOneProfileIsNeeded' => '少なくとも1件のプロフィールがこのユーザに指定されていないといけません。', //'At least one profile must be assigned to this user.',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:URP_Profiles' => 'プロフィール', //'Profile',
+					       'Class:URP_Profiles+' => 'ユーザプロフィール', //'User profile',
+					       'Class:URP_Profiles/Attribute:name' => '名前', //'Name',
+					       'Class:URP_Profiles/Attribute:name+' => 'ラベル', //'label',
+					       'Class:URP_Profiles/Attribute:description' => '概要', //'Description',
+					       'Class:URP_Profiles/Attribute:description+' => '1行で書くと', //'one line description',
+					       'Class:URP_Profiles/Attribute:user_list' => 'ユーザ', //'Users',
+					       'Class:URP_Profiles/Attribute:user_list+' => 'この役割をもつ人', //'persons having this role',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:URP_Dimensions' => '次元', //'dimension',
+	'Class:URP_Dimensions+' => 'application dimension (defining silos)',
+					       'Class:URP_Dimensions/Attribute:name' => '名前', //'Name',
+					       'Class:URP_Dimensions/Attribute:name+' => 'ラベル', //'label',
+					       'Class:URP_Dimensions/Attribute:description' => '概要', //'Description',
+					       'Class:URP_Dimensions/Attribute:description+' => '1行で書くと', //'one line description',
+					       'Class:URP_Dimensions/Attribute:type' => '種別', //'Type',
+					       'Class:URP_Dimensions/Attribute:type+' => 'クラス名、もしくはデータ型(projection unit)', //'class name or data type (projection unit)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:URP_UserProfile' => 'User to profile',
+	'Class:URP_UserProfile+' => 'ユーザプロフィール', //'user profiles',
+	'Class:URP_UserProfile/Attribute:userid' => 'ユーザ', //'User',
+	'Class:URP_UserProfile/Attribute:userid+' => 'ユーザアカウント', //'user account',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'ログイン', //'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'ユーザのログイン', //'User\'s login',
+	'Class:URP_UserProfile/Attribute:profileid' => 'プロフィール', //'Profile',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'プロフィールの用法???', //'usage profile',
+	'Class:URP_UserProfile/Attribute:profile' => 'プロフィール', //'Profile',
+	'Class:URP_UserProfile/Attribute:profile+' => 'プロフィール名', //'Profile name',
+	'Class:URP_UserProfile/Attribute:reason' => '理由', //'Reason',
+	'Class:URP_UserProfile/Attribute:reason+' => 'なぜ、この人物がこの役割を持つかを説明する', //'explain why this person may have this role',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:URP_UserOrg' => 'ユーザ組織', //'User organizations',
+					       'Class:URP_UserOrg+' => '許可された組織', //'Allowed organizations',
+					       'Class:URP_UserOrg/Attribute:userid' => 'ユーザ', //'User',
+					       'Class:URP_UserOrg/Attribute:userid+' => 'ユーザアカウント', //'user account',
+					       'Class:URP_UserOrg/Attribute:userlogin' => 'ログイン', //'Login',
+					       'Class:URP_UserOrg/Attribute:userlogin+' => 'ユーザのログイン', //'User\'s login',
+					       'Class:URP_UserOrg/Attribute:allowed_org_id' => '組織', //'Organization',
+					       'Class:URP_UserOrg/Attribute:allowed_org_id+' => '許可された組織', //'Allowed organization',
+					       'Class:URP_UserOrg/Attribute:allowed_org_name' => '組織', //'Organization',
+					       'Class:URP_UserOrg/Attribute:allowed_org_name+' => '許可された組織', //'Allowed organization',
+					       'Class:URP_UserOrg/Attribute:reason' => '理由', //'Reason',
+					       'Class:URP_UserOrg/Attribute:reason+' => 'なぜこの人物がこの組織に属するデータを参照できるのかを説明する', // 'explain why this person is allowed to see the data belonging to this organization',
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:URP_ProfileProjection' => 'プロファイルプロジェクション???', // 'profile_projection',
+					       'Class:URP_ProfileProjection+' => 'プロファイルプロジェクション???', //'profile projections',
+					       'Class:URP_ProfileProjection/Attribute:dimensionid' => '次元', //'Dimension',
+					       'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'アプリケーション次元', // 'application dimension',
+					       'Class:URP_ProfileProjection/Attribute:dimension' => '次元', //'Dimension',
+					       'Class:URP_ProfileProjection/Attribute:dimension+' => 'アプリケーション次元', //'application dimension',
+					       'Class:URP_ProfileProjection/Attribute:profileid' => 'プロフィール', //'Profile',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'usage profile???',
+					       'Class:URP_ProfileProjection/Attribute:profile' => 'プロフィール', //'Profile',
+					       'Class:URP_ProfileProjection/Attribute:profile+' => 'プロフィール名', //'Profile name',
+					       'Class:URP_ProfileProjection/Attribute:value' => 'Value式', //'Value expression',
+					       'Class:URP_ProfileProjection/Attribute:value+' => '($userを使う)OQL式 | アクセス先 | +attribute code', //'OQL expression (using $user) | constant |  | +attribute code',
+					       'Class:URP_ProfileProjection/Attribute:attribute' => '属性', //'Attribute',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Target attribute code (optional)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => 'クラスの射影???', // 'clas projection', 
+	'Class:URP_ClassProjection/Attribute:dimensionid' => '次元', //'Dimension',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'アプリケーション次元', //'application dimension',
+	'Class:URP_ClassProjection/Attribute:dimension' => '次元', //'Dimension',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'アプリケーション次元', //'application dimension',
+	'Class:URP_ClassProjection/Attribute:class' => 'クラス', //'Class',
+	'Class:URP_ClassProjection/Attribute:class+' => 'ターゲットクラス', //'Target class',
+	'Class:URP_ClassProjection/Attribute:value' => 'Value式???', //'Value expression',
+	'Class:URP_ClassProjection/Attribute:value+' => '($this を使った)OQL式 | 定数 | +attribute code', //'OQL expression (using $this) | constant |  | +attribute code',
+	'Class:URP_ClassProjection/Attribute:attribute' => '属性', //'Attribute',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'ターゲット属性コード(オプション)', //'Target attribute code (optional)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:URP_ActionGrant' => 'アクション権限', //'action_permission',
+ 					       'Class:URP_ActionGrant+' => 'クラスに対する権限', //'permissions on classes',
+					       'Class:URP_ActionGrant/Attribute:profileid' => 'プロファイル', //'Profile',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'usage profile',
+					       'Class:URP_ActionGrant/Attribute:profile' => 'プロファイル', //'Profile',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'usage profile',
+					       'Class:URP_ActionGrant/Attribute:class' => 'クラス', //'Class',
+					       'Class:URP_ActionGrant/Attribute:class+' => 'ターゲットクラス', //'Target class',
+					       'Class:URP_ActionGrant/Attribute:permission' => '権限', //'Permission',
+					       'Class:URP_ActionGrant/Attribute:permission+' => '権限の有無は?', //'allowed or not allowed?',
+					       'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'はい', //'yes',
+					       'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'はい', //'yes',
+					       'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'いいえ', //'no',
+					       'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'いいえ', //'no',
+					       'Class:URP_ActionGrant/Attribute:action' => 'アクション', //'Action',
+					       'Class:URP_ActionGrant/Attribute:action+' => '指定されたクラスにすべき操作', //'operations to perform on the given class',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => 'permissions on stimilus in the life cycle of the object',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'プロファイル', //'Profile',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'usage profile',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'プロファイル', //'Profile',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile',
+	'Class:URP_StimulusGrant/Attribute:class' => 'クラス', //'Class',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'ターゲットクラス', //'Target class',
+	'Class:URP_StimulusGrant/Attribute:permission' => '権限', // 'Permission',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '権限の有無?', //'allowed or not allowed?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'はい', //'yes',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'はい', //'yes',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'いいえ', //'no',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'いいえ', //'no',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Class:URP_AttributeGrant' => '権限属性', //'attribute_permission',
+					       'Class:URP_AttributeGrant+' => '属性レベルでの権限', //'permissions at the attributes level',
+					       'Class:URP_AttributeGrant/Attribute:actiongrantid' => '実行権限', //'Action grant',
+					       'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '実行権限', //'action grant',
+					       'Class:URP_AttributeGrant/Attribute:attcode' => '属性', //'Attribute',
+					       'Class:URP_AttributeGrant/Attribute:attcode+' => '属性コード', //'attribute code',
+));
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+					       'Menu:WelcomeMenu' => 'ようこそ', //'Welcome',
+					       'Menu:WelcomeMenu+' => 'ようこそ、iTopへ', //'Welcome to iTop',
+					       'Menu:WelcomeMenuPage' => 'ようこそ', //'Welcome',
+					       'Menu:WelcomeMenuPage+' => 'ようこそ、iTopへ', //'Welcome to iTop',
+					       'UI:WelcomeMenu:Title' => 'ようこそ、iTopへ', //'Welcome to iTop',
+					       // '<p>iTop is a complete, OpenSource, IT Operational Portal.</p>
+					       'UI:WelcomeMenu:LeftBlock' => '<p>iTopは、オープンソースの、これだけで完結したIT業務用ポータルです。</p>
+<ul>下記に挙げるものが同梱されています。
+<li>IT資産インベントリをドキュメント化、管理を行うための完全なCMDB(コンフィグレーション管理データベース)</li>
+<li>IT資産関連で発生した問題のトラッキングとそれに関する議論のためのインシデント管理モジュール</li>
+<li>IT資産環境への変更を加える場合のプランニングと変更をトラッキングするための変更管理モジュール</li>
+<li>インシデント解決のスピードアップするための既知エラーデータベース</li>
+<li>計画停電をすべてドキュメント化し、適切な連絡先に通知するための停電モジュール</li>
+<li>IT資産の概観を素早く得るためのダッシュボード</li>
+</ul>
+<p>すべてのモジュールはそれぞれ独立して別個にセットアップが可能である。</p>',
+
+					       //'<p>iTop is service provider oriented, it allows IT engineers to manage easily multiple customers or organizations.
+	'UI:WelcomeMenu:RightBlock' => '<p>iTopはサービスプロバイダ指向であり、ITエンジニアが複数の顧客や組織を簡単に管理できるようになる。
+<ul>iTopでは　下記のように、機能豊富なビジネスプロセスを取り揃えた。
+<li>効果的なIT資産管理</li>
+<li>IT業務の効率化推進</li>
+<li>顧客満足度の改善と、経営幹部へ、ビジネスパフォーマンス見える化を提供</li>
+</ul>
+</p>
+<p>iTopは完全にオープンなので、あなたが今使っているIT資産管理インフラとの統合が可能である。</p>
+<p>
+<ul>この次世代IT資産管理業務ポータルを採用すれば、こんなことが可能になる。
+<li>より複雑になりつつある、IT資産環境の管理を確実にする。</li>
+<li>自分のペースでITILプロセス実装することができる。</li>
+<li>IT資産の中でもっとも重要なアセットである、「ドキュメンテーション」を管理することができる。</li>
+</ul>
+</p>',
+					       'UI:WelcomeMenu:AllOpenRequests' => 'リクエストを開く: %1$d', //'Open requests: %1$d',
+					       'UI:WelcomeMenu:MyCalls' => 'マイリクエスト', //'My requests',
+					       'UI:WelcomeMenu:OpenIncidents' => 'インシデントを開く: %1$d', //'Open incidents: %1$d',
+					       'UI:WelcomeMenu:AllConfigItems' => '設定項目', //'Configuration Items: %1$d',
+					       'UI:WelcomeMenu:MyIncidents' => '自分にアサインされたインシデント', //'Incidents assigned to me',
+					       'UI:AllOrganizations' => '全組織', //' All Organizations ',
+					       'UI:YourSearch' => 'あなたのサーチ', //'Your Search',
+					       'UI:LoggedAsMessage' => '%1$s としてログインする', //'Logged in as %1$s',
+					       'UI:LoggedAsMessage+Admin' => '%1$s　(管理者)としてログインする', //'Logged in as %1$s (Administrator)',
+					       'UI:Button:Logoff' => 'ログオフ', //'Log off',
+					       'UI:Button:GlobalSearch' => 'サーチ', //'Search',
+					       'UI:Button:Search' => ' サーチ', //' Search ',
+					       'UI:Button:Query' => ' クエリ', //' Query ',
+					       'UI:Button:Ok' => 'OK', //'Ok',
+					       'UI:Button:Cancel' => 'キャンセル', //'Cancel',
+					       'UI:Button:Apply' => '適用する', //'Apply',
+					       'UI:Button:Back' => ' << 戻る', //' << Back ',
+					       'UI:Button:Restart' => ' |<< リスタート', //' |<< Restart ',
+					       'UI:Button:Next' => ' 次へ >> ', //' Next >> ',
+					       'UI:Button:Finish' => ' 終了 ', //' Finish ',
+					       'UI:Button:DoImport' => ' インポート実行! ', //' Run the Import ! ',
+					       'UI:Button:Done' => ' 完了 ', //' Done ',
+					       'UI:Button:SimulateImport' => ' インポートをシュミレート ', //' Simulate the Import ',
+					       'UI:Button:Test' => 'テスト実行!', //'Test!',
+					       'UI:Button:Evaluate' => ' 評価 ', //' Evaluate ',
+					       'UI:Button:AddObject' => ' 追加...', //' Add... ',
+					       'UI:Button:BrowseObjects' => 'ブラウズ...', //' Browse... ',
+					       'UI:Button:Add' => ' 追加 ', //' Add ',
+					       'UI:Button:AddToList' => ' << 追加 ', //' << Add ',
+					       'UI:Button:RemoveFromList' => '削除 >> ', //' Remove >> ',
+					       'UI:Button:FilterList' => ' フィルタ... ', //' Filter... ',
+					       'UI:Button:Create' => ' 生成 ', //' Create ',
+					       'UI:Button:Delete' => ' 削除! ', //' Delete ! ',
+					       'UI:Button:ChangePassword' => ' パスワード変更 ', //' Change Password ',
+					       'UI:Button:ResetPassword' => 'パスワードリセット ', //' Reset Password ',
+	
+					       'UI:SearchToggle' => 'サーチ', //'Search',
+					       'UI:ClickToCreateNew' => '新規 %1$s を生成', //'Create a new %1$s',
+					       'UI:SearchFor_Class' => '%1$s オブジェクトをサーチ', //'Search for %1$s objects',
+					       'UI:NoObjectToDisplay' => '表示すべきオブジェクトがありません。', //'No object to display.',
+					       'UI:Error:MandatoryTemplateParameter_object_id' => 'link_attrが指定されている時は、object_idパラメータは必須です。表示テンプレートの定義を確認してください。', //'Parameter object_id is mandatory when link_attr is specified. Check the definition of the display template.',
+					       'UI:Error:MandatoryTemplateParameter_target_attr' => 'link_attrを指定する場合は、target_attrパラメータは必須です。表示テンプレートの定義を確認してください。', //'Parameter target_attr is mandatory when link_attr is specified. Check the definition of the display template.',
+					       'UI:Error:MandatoryTemplateParameter_group_by' => 'group_byパラメータは必須です。表示テンプレートの定義を確認してください。', //'Parameter group_by is mandatory. Check the definition of the display template.',
+	'UI:Error:InvalidGroupByFields' => 'Invalid list of fields to group by: "%1$s".',
+					       'UI:Error:UnsupportedStyleOfBlock' => 'エラー："%1$s"はサポートされていないブロックスタイルです。', //'Error: unsupported style of block: "%1$s".',
+					       'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'リンク定義が正しくありません。管理オブジェクトのクラス：%1Ss は、クラス %2$s クラスの外部キーとして見つかりません。', //'Incorrect link definition: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
+					       'UI:Error:Object_Class_Id_NotFound' => 'オブジェクト：%1$s:%2$d が見つかりません。', //'Object: %1$s:%2$d not found.',
+					       'UI:Error:WizardCircularReferenceInDependencies' => 'エラー: フィールド間の依存関係に循環参照があります。データモデルを確認してください。', //'Error: Circular reference in the dependencies between the fields, check the data model.',
+					       'UI:Error:UploadedFileTooBig' => 'アップロードファイルが大きすぎます(上限は %1$s )。PHPの設定にある、upload_max_filesizeと、post_max_sizeを確認してください。', //'Uploaded file is too big. (Max allowed size is %1$s). Check you PHP configuration for upload_max_filesize and post_max_size.',
+	'UI:Error:UploadedFileTruncated.' => 'アップロードファイルが切り捨てられました!', //'Uploaded file has been truncated !',
+					       'UI:Error:NoTmpDir' => 'この一時ディレクトリは定義されていません。', //'The temporary directory is not defined.',
+					       'UI:Error:CannotWriteToTmp_Dir' => '一時ファイルをディスクに書き込めません。upload_tmp_dir = "%1$s" です。', //'Unable to write the temporary file to the disk. upload_tmp_dir = "%1$s".',
+					       'UI:Error:UploadStoppedByExtension_FileName' => 'extensionにより、アップロードを停止しました。(オリジナルのファイル名は"%1$s"です)。', //'Upload stopped  by extension. (Original file name = "%1$s").',
+					       'UI:Error:UploadFailedUnknownCause_Code' => 'ファイルのアップロードに失敗しました。原因は不明(エラーコード: "%1$s")です。', //'File upload failed, unknown cause. (Error code = "%1$s").',
+	
+					       'UI:Error:1ParametersMissing' => 'エラー: この操作には下記のパラメータを指定する必要があります：%1$s', //'Error: the following parameter must be specified for this operation: %1$s.',
+					       'UI:Error:2ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s , %2$s', //'Error: the following parameters must be specified for this operation: %1$s and %2$s.',
+					       'UI:Error:3ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s', //Error: the following parameters must be specified for this operation: %1$s, %2$s and %3$s.',
+					       'UI:Error:4ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s,%4$s', //'Error: the following parameters must be specified for this operation: %1$s, %2$s, %3$s and %4$s.',
+					       'UI:Error:IncorrectOQLQuery_Message' => 'エラー：OQLクエリが正しくありません：%1$s', //'Error: incorrect OQL query: %1$s',
+					       'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'クエリ；%1$s 実行中にエラーが発生しました。', //'An error occured while running the query: %1$s',
+					       'UI:Error:ObjectAlreadyUpdated' => 'エラー：このオブジェクトはすでに更新済みです。', //'Error: the object has already been updated.',
+					       'UI:Error:ObjectCannotBeUpdated' => 'エラー：オブジェクトを更新できません。', //'Error: object cannot be updated.',
+					       'UI:Error:ObjectsAlreadyDeleted' => 'エラー：オブジェクトは既に削除されています。', //'Error: objects have already been deleted!',
+					       'UI:Error:BulkDeleteNotAllowedOn_Class' => '%1$s クラスのオブジェクトに対するバルク削除は許可されていません。', //'You are not allowed to perform a bulk delete of objects of class %1$s',
+					       'UI:Error:DeleteNotAllowedOn_Class' => '%1$s クラスのオブジェクトの削除は許可されていません。', //'You are not allowed to delete objects of class %1$s',
+					       'UI:Error:BulkModifyNotAllowedOn_Class' => '%1$s クラスのオブジェクトに対するバルクアップデート処理の実行は許可されていません。', //'You are not allowed to perform a bulk update of objects of class %1$s',
+					       'UI:Error:ObjectAlreadyCloned' => 'エラー：このオブジェクトはすでに、クローニングされています。', // 'Error: the object has already been cloned!',
+					       'UI:Error:ObjectAlreadyCreated' => 'エラー：このオブジェクトは既に生成済みです。', //'Error: the object has already been created!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'エラー：Error: invalid stimulus "%1$s" on object %2$s in state "%3$s".',
+	
+	
+					       'UI:GroupBy:Count' => 'カウント', //'Count',
+					       'UI:GroupBy:Count+' => '要素数', //'Number of elements',
+					       'UI:CountOfObjects' => '%1$d 個のオブジェクトが条件にマッチしました。', //'%1$d objects matching the criteria.',
+					       'UI_CountOfObjectsShort' => '%1$d オブジェクトです。', //'%1$d objects.',
+					       'UI:NoObject_Class_ToDisplay' => '表示できる %1$s はありません。', //'No %1$s to display',
+					       'UI:History:LastModified_On_By' => '最終更新日: %1$s ( %2$s )', //'Last modified on %1$s by %2$s.',
+					       'UI:HistoryTab' => '履歴', //'History',
+					       'UI:NotificationsTab' => '通知', //'Notifications',
+					       'UI:History:BulkImports' => '履歴', //'History',
+					       'UI:History:BulkImports+' => 'CSVインポートのリスト(last first)', //'List of CSV imports (last first)',
+					       'UI:History:BulkImportDetails' => '%2$s により実行された %1$s へのCSVインポート結果の変更???', // 'Changes resulting from the CSV import performed on %1$s (by %2$s)',
+					       'UI:History:Date' => '日付',//'Date',
+					       'UI:History:Date+' => '更新日時', //'Date of the change',
+					       'UI:History:User' => 'ユーザ', //'User',
+					       'UI:History:User+' => 'この変更を行ったユーザ', //'User who made the change',
+					       'UI:History:Changes' => '変更', //'Changes',
+					       'UI:History:Changes+' => 'このオブジェクトを変更する', //'Changes made to the object',
+					       'UI:History:StatsCreations' => '生成された', //'Created',
+					       'UI:History:StatsCreations+' => '生成されたオブジェクト数', //'Count of objects created',
+					       'UI:History:StatsModifs' => '修正された', //'Modified',
+					       'UI:History:StatsModifs+' => '修正されたオブジェクト数', //'Count of objects modified',
+					       'UI:History:StatsDeletes' => '削除された', //'Deleted',
+					       'UI:History:StatsDeletes+' => '削除されたオブジェクト数', //'Count of objects deleted',
+					       'UI:Loading' => '読み込み...', //'Loading...',
+					       'UI:Menu:Actions' => '実行...', //'Actions',
+       'UI:Menu:OtherActions' => '実行...', //'Actions',
+					       'UI:Menu:New' => '新規...', //'New...',
+					       'UI:Menu:Add' => '追加...', //'Add...',
+					       'UI:Menu:Manage' => '管理する...', //'Manage...',
+					       'UI:Menu:EMail' => 'Eメール', //'eMail',
+					       'UI:Menu:CSVExport' => 'CSVエクスポート', //'CSV Export',
+					       'UI:Menu:Modify' => '修正する...', //'Modify...',
+					       'UI:Menu:Delete' => '削除する...', //'Delete...',
+					       'UI:Menu:Manage' => '管理する...', //'Manage...',
+					       'UI:Menu:BulkDelete' => '削除する', //'Delete...',
+					       'UI:UndefinedObject' => '未定義', //'undefined',
+					       'UI:Document:OpenInNewWindow:Download' => '新規ウィンドウで開く: %1$s, ダウンロード: %2$s', //'Open in new window: %1$s, Download: %2$s',
+					       'UI:SelectAllToggle+' => 'すべて選択 / すべて非選択', //'Select / Deselect All',
+	'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
+					       'UI:DisplayAll' => 'すべて表示', //'Display All',
+					       'UI:CollapseList' => '折り畳む', //'Collapse',
+					       'UI:CountOfResults' => '%1$d オブジェクト', //'%1$d object(s)',
+					       'UI:ChangesLogTitle' => '変更履歴(%1$d)', //'Changes log (%1$d):',
+					       'UI:EmptyChangesLogTitle' => '変更履歴は空です。', //'Changes log is empty',
+					       'UI:SearchFor_Class_Objects' => '%1$s オブジェクトを検索', //'Search for %1$s Objects',
+					       'UI:OQLQueryBuilderTitle' => 'OQLクエリビルダ', //'OQL Query Builder',
+					       'UI:OQLQueryTab' => 'OQLクエリ', //'OQL Query',
+					       'UI:SimpleSearchTab' => '単純検索', //'Simple Search',
+					       'UI:Details+' => '詳細情報', //'Details',
+					       'UI:SearchValue:Any' => '* 任意 *', //'* Any *',
+					       'UI:SearchValue:Mixed' => '* 混成 *', //'* mixed *',
+					       'UI:SelectOne' => '-- 選んでください --', //'-- select one --',
+					       'UI:Login:Welcome' => 'iTopへようこそ', //'Welcome to iTop!',
+					       'UI:Login:IncorrectLoginPassword' => 'ログイン/パスワードが正しくありません。再度ログインしてください。', //'Incorrect login/password, please try again.',
+					       'UI:Login:IdentifyYourself' => '続けて作業を行う前に認証を受けてください。', //'Identify yourself before continuing',
+					       'UI:Login:UserNamePrompt' => 'ユーザ名', //'User Name',
+					       'UI:Login:PasswordPrompt' => 'パスワード', //'Password',
+					       'UI:Login:ChangeYourPassword' => 'パスワードを変更してください', //'Change Your Password',
+					       'UI:Login:OldPasswordPrompt' => '既存パスワード',//'Old password',
+					       'UI:Login:NewPasswordPrompt' => '新規パスワード', //'New password',
+					       'UI:Login:RetypeNewPasswordPrompt' => '新規パスワードを再度入力してください。', //'Retype new password',
+					       'UI:Login:IncorrectOldPassword' => 'エラー：既存パスワードが正しくありません。', //'Error: the old password is incorrect',
+					       'UI:LogOffMenu' => 'ログオフ', //'Log off',
+					       'UI:LogOff:ThankYou' => 'iTopをご利用いただき、ありがとうございます。', //'Thank you for using iTop',
+					       'UI:LogOff:ClickHereToLoginAgain' => '再度ログインするにはここをクリックしてください...', //'Click here to login again...',
+					       'UI:ChangePwdMenu' => 'パスワードを変更する...', //'Change Password...',
+					       'UI:AccessRO-All' => 'iTopは参照のみ有効です。', //'iTop is read-only',
+					       'UI:AccessRO-Users' => 'エンドユーザの方はiTopは参照のみ有効です。', //'iTop is read-only for end-users',
+					       'UI:Login:RetypePwdDoesNotMatch' => '2度入力された新規パスワードが一致しません!', //'New password and retyped new password do not match !',
+					       'UI:Button:Login' => 'iTopへ入る', //'Enter iTop',
+					       'UI:Login:Error:AccessRestricted' => 'iTopへのアクセスは制限されています。iTop管理者に問い合わせしてください。', //'iTop access is restricted. Please, contact an iTop administrator.',
+					       'UI:Login:Error:AccessAdmin' => '管理者権限をもつユーザにアクセスが制限されています。iTop管理者に問い合わせしてください。', //'Access restricted to people having administrator privileges. Please, contact an iTop administrator.',
+					       'UI:CSVImport:MappingSelectOne' => '-- 選択してください --', //'-- select one --',
+					       'UI:CSVImport:MappingNotApplicable' => '--このフィールドを無視する --', //'-- ignore this field --',
+					       'UI:CSVImport:NoData' => 'データが空です..., データを指定してください。', // 'Empty data set..., please provide some data!',
+					       'UI:Title:DataPreview' => 'データプレビュー', //'Data Preview',
+					       'UI:CSVImport:ErrorOnlyOneColumn' => 'エラー：このデータにはカラムが1つしか含まれていません。適切なセパレータ文字を選択しましたか?', //'Error: The data contains only one column. Did you select the appropriate separator character?',
+					       'UI:CSVImport:FieldName' => 'フィールド： %1$d', //'Field %1$d',
+					       'UI:CSVImport:DataLine1' => 'データ行 1', //'Data Line 1',
+					       'UI:CSVImport:DataLine2' => 'データ行 2', //'Data Line 2',
+					       'UI:CSVImport:idField' => 'ID (プライマリキー)', //'id (Primary Key)',
+					       'UI:Title:BulkImport' => 'iTop - バルクインポート', //'iTop - Bulk import',
+					       'UI:Title:BulkImport+' => 'CSV インポートウィザード', //'CSV Import Wizard',
+					       'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%2$s クラスの %1$d オブジェクトを同期', //'Synchronization of %1$d objects of class %2$s',
+					       'UI:CSVImport:ClassesSelectOne' => '--選択してください --',  //'-- select one --',
+					       'UI:CSVImport:ErrorExtendedAttCode' => '内部エラー： "%2$s" は"%3$s"クラスの外部キーではないので、"%1$s" は正しくないコードです。', // 'Internal error: "%1$s" is an incorrect code because "%2$s" is NOT an external key of the class "%3$s"',
+					       'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d オブジェクトが変更されないままです。', //'%1$d objects(s) will stay unchanged.',
+					       'UI:CSVImport:ObjectsWillBeModified' => '%1$d オブジェクトが修正されます。', //'%1$d objects(s) will be modified.',
+					       'UI:CSVImport:ObjectsWillBeAdded' => '%1$d オブジェクトが追加されます。', //'%1$d objects(s) will be added.',
+					       'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d オブジェクトにエラーがあります。', //'%1$d objects(s) will have errors.',
+					       'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d オブジェクトは変更されていません。', //'%1$d objects(s) remained unchanged.',
+					       'UI:CSVImport:ObjectsWereModified' => '%1$d オブジェクトが変更されました。', //'%1$d objects(s) were modified.',
+					       'UI:CSVImport:ObjectsWereAdded' => '%1$d オブジェクトが追加されました。', //'%1$d objects(s) were added.',
+					       'UI:CSVImport:ObjectsHadErrors' => '%1$s オブジェクトにエラーがあります。', //'%1$d objects(s) had errors.',
+					       'UI:Title:CSVImportStep2' => 'ステップ2/5: CSVデータオプション', //'Step 2 of 5: CSV data options',
+					       'UI:Title:CSVImportStep3' => 'ステップ3/5: データマッピング', //'Step 3 of 5: Data mapping',
+					       'UI:Title:CSVImportStep4' => 'ステップ4/5: インポートシミュレーション', //'Step 4 of 5: Import simulation',
+					       'UI:Title:CSVImportStep5' => 'ステップ5/5: インポート完了', //'Step 5 of 5: Import completed',
+					       'UI:CSVImport:LinesNotImported' => 'ロードできなかった行：', //'Lines that could not be loaded:',
+					       'UI:CSVImport:LinesNotImported+' => '下記の行はエラーが含まれていたのでインポートされませんでした。', //'The following lines have not been imported because they contain errors',
+					       'UI:CSVImport:SeparatorComma+' => ', (コンマ)', //', (comma)',
+					       'UI:CSVImport:SeparatorSemicolon+' => '; (セミコロン)', //'; (semicolon)',
+					       'UI:CSVImport:SeparatorTab+' => 'タブ', //'tab',
+					       'UI:CSVImport:SeparatorOther' => 'その他:', //'other:',
+					       'UI:CSVImport:QualifierDoubleQuote+' => '" (ダブルクォート)', //'" (double quote)',
+					       'UI:CSVImport:QualifierSimpleQuote+' => '\' (シングルクォート)', //'\' (simple quote)',
+					       'UI:CSVImport:QualifierOther' => 'その他：', //'other:',
+					       'UI:CSVImport:TreatFirstLineAsHeader' => '1行めをヘッダ(カラム名)として扱う', // 'Treat the first line as a header (column names)',
+					       'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'ファイル冒頭の%1$s 行をスキップする', //'Skip %1$s line(s) at the beginning of the file',
+					       'UI:CSVImport:CSVDataPreview' => 'CSVデータプレビュー', //'CSV Data Preview',
+					       'UI:CSVImport:SelectFile' => 'インポートするファイルを選択してください:', //'Select the file to import:',
+					       'UI:CSVImport:Tab:LoadFromFile' => 'ファイルからロードしてください', //'Load from a file',
+					       'UI:CSVImport:Tab:CopyPaste' => 'データをコピーペーストしてください', //'Copy and paste data',
+					       'UI:CSVImport:Tab:Templates' => 'テンプレート', //'Templates',
+					       'UI:CSVImport:PasteData' => 'インポートするデータをペーストしてください', //'Paste the data to import:',
+					       'UI:CSVImport:PickClassForTemplate' => 'ダウンロードするテンプレートを選んでください', //'Pick the template to download: ',
+					       'UI:CSVImport:SeparatorCharacter' => 'セパレータ文字', //'Separator character:',
+					       'UI:CSVImport:TextQualifierCharacter' => 'テキスト識別文字', //'Text qualifier character',
+					       'UI:CSVImport:CommentsAndHeader' => 'コメントとヘッダ', //'Comments and header',
+					       'UI:CSVImport:SelectClass' => 'インポートするクラスを選択してください', //'Select the class to import:',
+					       'UI:CSVImport:AdvancedMode' => '拡張モード', //'Advanced mode',
+					       'UI:CSVImport:AdvancedMode+' => '拡張モードでは、オブジェクトに付与されている"id"(プライマリキー)がオブジェクトの更新、リネームに指定可能です。' . //In advanced mode the "id" (primary key) of the objects can be used to update and rename objects.' .
+					       'しかしながら、"id"カラムは(たとえ存在しても)検索条件として指定できるのみであり、他の検索条件と組み合わせて利用することはできません。', //'However the column "id" (if present) can only be used as a search criteria and can not be combined with any other search criteria.',
+					       'UI:CSVImport:SelectAClassFirst' => 'マッピングを設定するには、まず最初にクラスを選択してください。', //'To configure the mapping, select a class first.',
+					       'UI:CSVImport:HeaderFields' => 'フィールド', //'Fields',
+					       'UI:CSVImport:HeaderMappings' => 'マッピング', //'Mappings',
+					       'UI:CSVImport:HeaderSearch' => '検索しますか?', //'Search?',
+					       'UI:CSVImport:AlertIncompleteMapping' => 'すべてのフィールドのマッピングを選択してください。', //'Please select a mapping for every field.',
+					       'UI:CSVImport:AlertNoSearchCriteria' => '少なくとも1つ以上の検索条件を選択してください。', //'Please select at least one search criteria',
+					       'UI:CSVImport:Encoding' => '文字エンコーディング', //'Character encoding',	
+					       'UI:UniversalSearchTitle' => 'iTop - ユニバーサルサーチ', //'iTop - Universal Search',
+					       'UI:UniversalSearch:Error' => 'エラー：%1$s', //'Error: %1$s',
+					       'UI:UniversalSearch:LabelSelectTheClass' => '検索するクラスを選択してください。', //'Select the class to search: ',
+	
+					       'UI:Audit:Title' => 'iTop - CMDB 監査', //'iTop - CMDB Audit',
+					       'UI:Audit:InteractiveAudit' => '対話型監査', //'Interactive Audit',
+					       'UI:Audit:HeaderAuditRule' => '監査ルール', //'Audit Rule',
+					       'UI:Audit:HeaderNbObjects' => 'オブジェクト数', //'# Objects',
+					       'UI:Audit:HeaderNbErrors' => 'エラー数', //'# Errors',
+					       'UI:Audit:PercentageOk' => '% OK', //'% Ok',
+	
+					       'UI:RunQuery:Title' => 'iTop - OQLクエリ評価', //'iTop - OQL Query Evaluation',
+					       'UI:RunQuery:QueryExamples' => 'クエリの例', //'Query Examples',
+					       'UI:RunQuery:HeaderPurpose' => '目的', //'Purpose',
+					       'UI:RunQuery:HeaderPurpose+' => 'クエリについての説明', //'Explanation about the query',
+					       'UI:RunQuery:HeaderOQLExpression' => 'OQL式', //'OQL Expression',
+					       'UI:RunQuery:HeaderOQLExpression+' => 'OQL文法によるクエリ', //'The query in OQL syntax',
+					       'UI:RunQuery:ExpressionToEvaluate' => '評価式', //'Expression to evaluate: ',
+					       'UI:RunQuery:MoreInfo' => '本クエリに関する詳細情報', //'More information about the query: ',
+					       'UI:RunQuery:DevelopedQuery' => 'クエリ式の再開発', //'Redevelopped query expression: ',
+					       'UI:RunQuery:SerializedFilter' => '序列化フィルタ：', //'Serialized filter: ',
+					       'UI:RunQuery:Error' => '本クエリ実行時にエラーが発生しました：%1$s', //'An error occured while running the query: %1$s',
+	
+					       'UI:Schema:Title' => 'iTop オブジェクトスキーマ', //'iTop objects schema',
+					       'UI:Schema:CategoryMenuItem' => 'カテゴリ <b>%1$s</b>', //'Category <b>%1$s</b>',
+					       'UI:Schema:Relationships' => '関連', //'Relationships',
+					       'UI:Schema:AbstractClass' => '抽象クラス：このクラスのインスタンスを生成することはできません。', //'Abstract class: no object from this class can be instantiated.',
+					       'UI:Schema:NonAbstractClass' => '非抽象クラス：このクラスのインスタンスを生成できます。', //'Non abstract class: objects from this class can be instantiated.',
+					       'UI:Schema:ClassHierarchyTitle' => 'クラス階層', //'Class hierarchy',
+					       'UI:Schema:AllClasses' => '全クラス', //'All classes',
+					       'UI:Schema:ExternalKey_To' => '%1$s の外部キー', //'External key to %1$s',
+					       'UI:Schema:Columns_Description' => 'カラム： <em>%1$s</em>', //'Columns: <em>%1$s</em>',
+					       'UI:Schema:Default_Description' => 'デフォルト： "%1$s"', //'Default: "%1$s"',
+					       'UI:Schema:NullAllowed' => 'Null許容', //'Null Allowed',
+					       'UI:Schema:NullNotAllowed' => 'Null 非許容', //'Null NOT Allowed',
+					       'UI:Schema:Attributes' => '属性', //'Attributes',
+					       'UI:Schema:AttributeCode' => '属性コード', //'Attribute Code',
+					       'UI:Schema:AttributeCode+' => '属性の内部コード', //'Internal code of the attribute',
+					       'UI:Schema:Label' => 'ラベル', //'Label',
+					       'UI:Schema:Label+' => '属性のラベル', //'Label of the attribute',
+					       'UI:Schema:Type' => '型', //'Type',
+	
+					       'UI:Schema:Type+' => '属性のデータ型', //'Data type of the attribute',
+					       'UI:Schema:Origin' => 'オリジン', //'Origin',
+					       'UI:Schema:Origin+' => 'この属性が定義されているベースクラス', //'The base class in which this attribute is defined',
+					       'UI:Schema:Description' => '概要', //'Description',
+					       'UI:Schema:Description+' => '本属性の概要', //'Description of the attribute',
+					       'UI:Schema:AllowedValues' => '取りうる値', //'Allowed values',
+					       'UI:Schema:AllowedValues+' => '本属性で取りうる値の制限', //'Restrictions on the possible values for this attribute',
+					       'UI:Schema:MoreInfo' => '詳細情報', //'More info',
+					       'UI:Schema:MoreInfo+' => 'データベースに定義された本フィールドの詳細情報', //'More information about the field defined in the database',
+					       'UI:Schema:SearchCriteria' => '検索条件', //'Search criteria',
+					       'UI:Schema:FilterCode' => 'フィルタコード', //'Filter code',
+					       'UI:Schema:FilterCode+' => '本検索条件のコード', //'Code of this search criteria',
+					       'UI:Schema:FilterDescription' => '概要', //'Description',
+					       'UI:Schema:FilterDescription+' => '本検索条件の概要', //'Description of this search criteria',
+					       'UI:Schema:AvailOperators' => '利用可能な演算子', //'Available operators',
+					       'UI:Schema:AvailOperators+' => '本検索条件で利用可能な演算子', //'Possible operators for this search criteria',
+					       'UI:Schema:ChildClasses' => '子クラス', //'Child classes',
+					       'UI:Schema:ReferencingClasses' => '参照クラス', //'Referencing classes',
+					       'UI:Schema:RelatedClasses' => '関係するクラス', //'Related classes',
+					       'UI:Schema:LifeCycle' => 'ライフサイクル', //'Life cycle',
+					       'UI:Schema:Triggers' => 'トリガ', //'Triggers',
+					       'UI:Schema:Relation_Code_Description' => 'リレーション <em>%1$s</em> (%2$s)', //'Relation <em>%1$s</em> (%2$s)',
+					       'UI:Schema:RelationDown_Description' => '下へ: %1$s', //'Down: %1$s',
+					       'UI:Schema:RelationUp_Description' => '上へ: %1$s', //'Up: %1$s',
+					       'UI:Schema:RelationPropagates' => '%1$s: %2$d レベルへ伝播、クエリ：%3$s', //'%1$s: propagate to %2$d levels, query: %3$s',
+					       'UI:Schema:RelationDoesNotPropagate' => '%1$s: 伝播しない (%2$d レベル), クエリ: %3$s', //'%1$s: does not propagates (%2$d levels), query: %3$s',
+					       'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s は%2$s クラスから %3$s フィールドにより参照されている', //'%1$s is referenced by the class %2$s via the field %3$s',
+					       'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s は %3$s::<em>%4$s</em>により%2$s へリンクされています。', //'%1$s is linked to %2$s via %3$s::<em>%4$s</em>',
+					       'UI:Schema:Links:1-n' => 'クラスは%1$sへポイントしています。(1:n リンク)', //'Classes pointing to %1$s (1:n links):',
+					       'UI:Schema:Links:n-n' => 'クラスは%1$sへリンクしています。(n:n リンク)', //'Classes linked to %1$s (n:n links):',
+					       'UI:Schema:Links:All' => '関連する全クラスのグラフ表示', //'Graph of all related classes',
+					       'UI:Schema:NoLifeCyle' => 'このクラスにはライフサイクルが定義されていません。', //'There is no life cycle defined for this class.',
+					       'UI:Schema:LifeCycleTransitions' => 'トランジション', //'Transitions',
+					       'UI:Schema:LifeCyleAttributeOptions' => '属性オプション', //'Attribute options',
+					       'UI:Schema:LifeCycleHiddenAttribute' => '隠し', //'Hidden',
+					       'UI:Schema:LifeCycleReadOnlyAttribute' => '参照限定',// 'Read-only',
+					       'UI:Schema:LifeCycleMandatoryAttribute' => '必須', //'Mandatory',
+					       'UI:Schema:LifeCycleAttributeMustChange' => '変更必須', //'Must change',
+					       'UI:Schema:LifeCycleAttributeMustPrompt' => 'ユーザはこの値を変更するよう、促されます。', //'User will be prompted to change the value',
+					       'UI:Schema:LifeCycleEmptyList' => '空リスト', //'empty list',
+	
+					       'UI:LinksWidget:Autocomplete+' => '最初の3文字をタイプしてください...', //'Type the first 3 characters...',
+					       'UI:Combo:SelectValue' => '--- 値を選んでください ---', //'--- select a value ---',
+					       'UI:Label:SelectedObjects' => '選択されたオブジェクト: ', //'Selected objects: ',
+					       'UI:Label:AvailableObjects' => '選択可能なオブジェクト: ', //'Available objects: ',
+					       'UI:Link_Class_Attributes' => '%1$s 属性', //'%1$s attributes',
+					       'UI:SelectAllToggle+' => '全部を選択 / 全部を非選択', //'Select All / Deselect All',
+					       'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s にリンクされた%1$sオブジェクトを追加：%3$s', //'Add %1$s objects linked with %2$s: %3$s',
+					       'UI:AddObjectsOf_Class_LinkedWith_Class' => '%1$s オブジェクトを%2$sとのリンクに追加', //'Add %1$s objects to link with the %2$s',
+					       'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s とりんくされた%1$sオブジェクトを管理する: %3$s', //'Manage %1$s objects linked with %2$s: %3$s',
+					       'UI:AddLinkedObjectsOf_Class' => '%1$s を追加...', //'Add %1$ss...',
+					       'UI:RemoveLinkedObjectsOf_Class' => '選択したオブジェクトを除外', //'Remove selected objects',
+					       'UI:Message:EmptyList:UseAdd' => 'リストは空です。"追加..."ボタンを利用して要素を追加してください。', //'The list is empty, use the "Add..." button to add elements.',
+					       'UI:Message:EmptyList:UseSearchForm' => '上の検索フォームを使って追加するオブジェクトを検索してください。', //'Use the search form above to search for objects to be added.',
+	
+					       'UI:Wizard:FinalStepTitle' => '最終ステップ：コンファーム', //'Final step: confirmation',
+					       'UI:Title:DeletionOf_Object' => '%1$sの削除', //'Deletion of %1$s',
+					       'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s クラスの%1$d個のオブジェクトをバルク削除', //'Bulk deletion of %1$d objects of class %2$s',
+					       'UI:Delete:NotAllowedToDelete' => 'このオブジェクトを削除する権限がありません。', //'You are not allowed to delete this object',
+					       'UI:Delete:NotAllowedToUpdate_Fields' => '以下のフィールドを更新する権限が与えられていません: %1$s', //'You are not allowed to update the following field(s): %1$s',
+					       'UI:Error:NotEnoughRightsToDelete' => 'カレントユーザは十分な権限を持っていないので、このオブジェクトは削除することができません。', //'This object could not be deleted because the current user do not have sufficient rights',
+					       'UI:Error:CannotDeleteBecauseOfDepencies' => 'いくつかのマニュアル操作を先に実装する必要があるので、このオブジェクトは削除できません。', //'This object could not be deleted because some manual operations must be performed prior to that',
+					       'UI:Archive_User_OnBehalfOf_User' => '%2$s を代表して %1$s', // '%1$s on behalf of %2$s',
+					       'UI:Delete:AutomaticallyDeleted' => '自動的に削除されました。', //'automatically deleted',
+					       'UI:Delete:AutomaticResetOf_Fields' => 'フィールドの自動リセット: %1$s', //'automatic reset of field(s): %1$s',
+					       'UI:Delete:CleaningUpRefencesTo_Object' => '%1$s への参照すべてをクリア', //'Cleaning up all references to %1$s...',
+					       'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s クラスの　%1$d個のオブジェクトへの参照をすべてクリア', //'Cleaning up all references to %1$d objects of class %2$s...',
+					       'UI:Delete:Done+' => '実行しました...???', //'What was done...',
+					       'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s 削除しました。', //'%1$s - %2$s deleted.',
+					       'UI:Delete:ConfirmDeletionOf_Name' => '%1$s の削除', //'Deletion of %1$s',
+					       'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$sクラスの%1$dオブジェクトの削除', //'Deletion of %1$d objects of class %2$s',
+					       'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => '自動的に削除されるべきだが、そのための権限がありません。', //'Should be automaticaly deleted, but you are not allowed to do so',
+					       'UI:Delete:MustBeDeletedManuallyButNotAllowed' => '手動で削除されるべきだが、このオブジェクトを削除するための権限がありません。アプリケーション管理者に問い合わせてください。', //'Must be deleted manually - but you are not allowed to delete this object, please contact your application admin',
+					       'UI:Delete:WillBeDeletedAutomatically' => '自動的に削除されます。', //'Will be automaticaly deleted',
+					       'UI:Delete:MustBeDeletedManually' => '手動で削除されるべきです。', //'Must be deleted manually',
+					       'UI:Delete:CannotUpdateBecause_Issue' => '自動的に更新されるべきだが: %1$s', //'Should be automatically updated, but: %1$s',
+					       'UI:Delete:WillAutomaticallyUpdate_Fields' => 'は自動的に更新されます。(reset: %1$s)', //'will be automaticaly updated (reset: %1$s)',
+					       'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$dオブジェクト/リンクは%2$sを参照しています。', //'%1$d objects/links are referencing %2$s',
+					       'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$dオブジェクト/リンクは削除されるべきオブジェクトを参照しています。', //'%1$d objects/links are referencing some of the objects to be deleted',	
+					       'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'データベース一貫性を確実にするために、いくつかの参照を除去する必要があります。', //'To ensure Database integrity, any reference should be further eliminated',
+	'UI:Delete:Consequence+' => 'What will be done',
+					       'UI:Delete:SorryDeletionNotAllowed' => '申し訳ございません。このオブジェクトを削除する権限がありません。上述の詳細説明を参照してください。', //'Sorry, you are not allowed to delete this object, see the detailed explanations above',
+					       'UI:Delete:PleaseDoTheManualOperations' => '本オブジェクトの削除を要求する前に、上記にリストされている操作を手動で行ってください。', //'Please perform the manual operations listed above prior to requesting the deletion of this object',
+					       'UI:Delect:Confirm_Object' => '%1$sを削除しようとしています。確認してください。', //'Please confirm that you want to delete %1$s.',
+					       'UI:Delect:Confirm_Count_ObjectsOf_Class' => '以下の%2$sクラスの%1$dオブジェクトを削除しようとしています。確認してください。', //'Please confirm that you want to delete the following %1$d objects of class %2$s.',
+					       'UI:WelcomeToITop' => 'iTopへようこそ', //'Welcome to iTop',
+					       'UI:DetailsPageTitle' => 'iTop - %1$s - %2$sの詳細', //'iTop - %1$s - %2$s details',
+					       'UI:ErrorPageTitle' => 'iTop - エラー', //'iTop - Error',
+					       'UI:ObjectDoesNotExist' => '申し訳ございません。このオブジェクトは既に存在しません。(あるいは参照する権限がありません。)', //'Sorry, this object does not exist (or you are not allowed to view it).',
+					       'UI:SearchResultsPageTitle' => 'iTop - 検索結果', //'iTop - Search Results',
+					       'UI:Search:NoSearch' => '検索するものがありません。', //'Nothing to search for',
+					       'UI:FullTextSearchTitle_Text' => '"%1$s"の結果：', //'Results for "%1$s":',
+					       'UI:Search:Count_ObjectsOf_Class_Found' => '%2$sクラスの%1$dオブジェクトが見つかりました。', //'%1$d object(s) of class %2$s found.',
+					       'UI:Search:NoObjectFound' => 'オブジェクトが見つかりませんでした。', //'No object found.',
+					       'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s 修正？？？', //'iTop - %1$s - %2$s modification',
+					       'UI:ModificationTitle_Class_Object' => '%1$sの修正： <span class=\"hilite\">%2$s</span>', //'Modification of %1$s: <span class=\"hilite\">%2$s</span>',
+					       'UI:ClonePageTitle_Object_Class' => 'iTop - クローン%1$s - %2$s 修正？？？', //'iTop - Clone %1$s - %2$s modification',
+					       'UI:CloneTitle_Class_Object' => '%1$sのクローン：<span class=\"hilite">%2$s</span>', //'Clone of %1$s: <span class=\"hilite\">%2$s</span>',
+					       'UI:CreationPageTitle_Class' => 'iTop - 新規%1$sを生成', //'iTop - Creation of a new %1$s ',
+					       'UI:CreationTitle_Class' => '新規%1$sの生成', //'Creation of a new %1$s',
+					       'UI:SelectTheTypeOf_Class_ToCreate' => '生成する%1$sの型を選択', //'Select the type of %1$s to create:',
+					       'UI:Class_Object_NotUpdated' => '変更は検出されませんでした。%1$sは修正されて<strong>いません</strong>', //'No change detected, %1$s (%2$s) has <strong>not</strong> been modified.',
+					       'UI:Class_Object_Updated' => '%1$s (%2$s) は更新されました。', //'%1$s (%2$s) updated.',
+					       'UI:BulkDeletePageTitle' => 'iTop - バルク削除', //'iTop - Bulk Delete',
+					       'UI:BulkDeleteTitle' => '削除するオブジェクトを選択してください。', //'Select the objects you want to delete:',
+					       'UI:PageTitle:ObjectCreated' => 'iTopオブジェクトが生成されました。', //'iTop Object Created.',
+					       'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s が生成されました。', //'%1$s - %2$s created.',
+					       'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '状態%3$sにある%1$sを状態%4$s状態をターゲットに、オブジェクト：%2$sに適用します。', //'Applying %1$s on object: %2$s in state %3$s to target state: %4$s.',
+					       'UI:ObjectCouldNotBeWritten' => 'そのオブジェクトは書き込みできません: %1$s', //'The object could not be written: %1$s',
+					       'UI:PageTitle:FatalError' => 'iTop - 致命的エラー', // 'iTop - Fatal Error',
+					       'UI:SystemIntrusion' => 'アクセスできません。権限のない操作を行おうとしています。', //'Access denied. You have trying to perform an operation that is not allowed for you.',
+					       'UI:FatalErrorMessage' => '致命的エラー、iTopは処理を継続できません。', //'Fatal error, iTop cannot continue.',
+					       'UI:Error_Details' => 'エラー：%1$s', //'Error: %1$s.',
+
+					       'UI:PageTitle:ClassProjections'	=> 'iTop ユーザ管理', //'iTop user management - class projections',
+					       'UI:PageTitle:ProfileProjections' => 'iTop ユーザ管理 - プロファイル立案', //'iTop user management - profile projections',
+					       'UI:UserManagement:Class' => 'クラス', //'Class',
+					       'UI:UserManagement:Class+' => 'オブジェクトのクラス', //'Class of objects',
+					       'UI:UserManagement:ProjectedObject' => 'オブジェクト', //'Object',
+	'UI:UserManagement:ProjectedObject+' => 'Projected object',
+					       'UI:UserManagement:AnyObject' => '* 任意 *', //'* any *',
+					       'UI:UserManagement:User' => 'ユーザ', //'User',
+	'UI:UserManagement:User+' => 'User involved in the projection',
+					       'UI:UserManagement:Profile' => 'プロファイル', //'Profile',
+	'UI:UserManagement:Profile+' => 'Profile in which the projection is specified',
+					       'UI:UserManagement:Action:Read' => '読み込み', //'Read',
+					       'UI:UserManagement:Action:Read+' => 'オブジェクトの読み込み/表示', //'Read/display objects',
+					       'UI:UserManagement:Action:Modify' => '修正', //'Modify',
+					       'UI:UserManagement:Action:Modify+' => 'オブジェクトの生成、編集(修正)', //'Create and edit (modify) objects',
+					       'UI:UserManagement:Action:Delete' => '削除', //'Delete',
+					       'UI:UserManagement:Action:Delete+' => 'オブジェクトの削除', //'Delete objects',
+					       'UI:UserManagement:Action:BulkRead' => '一括読み出し(エクスポート)', //'Bulk Read (Export)',
+	'UI:UserManagement:Action:BulkRead+' =>  'オブジェクトのリスト表示、もしくは一括エクスポート', // 'List objects or export massively',
+	'UI:UserManagement:Action:BulkModify' => '一括修正', // 'Bulk Modify',
+	'UI:UserManagement:Action:BulkModify+' => '一括生成/編集(CVSインポート)', //'Massively create/edit (CSV import)',
+	'UI:UserManagement:Action:BulkDelete' => '一括削除', //'Bulk Delete',
+	'UI:UserManagement:Action:BulkDelete+' => '複数オブジェクトをまとめて削除', //'Massively delete objects',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => '許可されている(複合)アクション', //'Allowed (compound) actions',
+	'UI:UserManagement:Action' => 'アクション', // 'Action',
+	'UI:UserManagement:Action+' => 'ユーザが実行したアクション', // 'Action performed by the user',
+	'UI:UserManagement:TitleActions' => 'アクション', //'Actions',
+	'UI:UserManagement:Permission' => 'パーミッション', //'Permission',
+	'UI:UserManagement:Permission+' => 'ユーザのパーミッション', // 'User\'s permissions',
+	'UI:UserManagement:Attributes' => '属性', // 'Attributes',
+	'UI:UserManagement:ActionAllowed:Yes' => 'はい', //'Yes',
+	'UI:UserManagement:ActionAllowed:No' => 'いいえ', //'No',
+	'UI:UserManagement:AdminProfile+' => '管理者にはデータベース中の全てのオブジェクトに対する読み/書きの全権限が与えられます。', //'Administrators have full read/write access to all objects in the database.',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => 'この暮らすにはライフサイクルは定義されていません。', //'No lifecycle has been defined for this class',
+	'UI:UserManagement:GrantMatrix' => '権限マトリクス', //'Grant Matrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s と %2$s間のリンク', //'Link between %1$s and %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s と %2$s 間のリンク', // 'Link between %1$s and %2$s',
+	
+	'Menu:AdminTools' => '管理ツール', //'Admin tools',
+	'Menu:AdminTools+' => '管理ツール', //'Administration tools',
+	'Menu:AdminTools?' => 'このツールは管理者プロファイルが設定されているユーザにのみアクセスが可能です。', //'Tools accessible only to users having the administrator profile',
+
+	'UI:ChangeManagementMenu' => '変更管理', //'Change Management',
+	'UI:ChangeManagementMenu+' => '変更管理', //'Change Management',
+	'UI:ChangeManagementMenu:Title' => '変更状況概観', //'Changes Overview',
+	'UI-ChangeManagementMenu-ChangesByType' => '型別変更内容', //'Changes by type',
+	'UI-ChangeManagementMenu-ChangesByStatus' => '状態別変更内容', //'Changes by status',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'ワークグループ別変更内容', //'Changes by workgroup',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'まだアサインされていない変更', //'Changes not yet assigned',
+
+	'UI:ConfigurationItemsMenu'=> '設定項目', //'Configuration Items',
+	'UI:ConfigurationItemsMenu+'=> 'すべてのデバイス', //'All Devices',
+	'UI:ConfigurationItemsMenu:Title' => '設定項目概観', //'Configuration Items Overview',
+	'UI-ConfigurationItemsMenu-ServersByCriticity' => 'サーバ(by criticity)', // 'Servers by criticity',
+	'UI-ConfigurationItemsMenu-PCsByCriticity' => 'PC (by criticity)', // 'PCs by criticity',
+	'UI-ConfigurationItemsMenu-NWDevicesByCriticity' => 'ネットワークデバイス (by criticity)', // 'Network devices by criticity',
+	'UI-ConfigurationItemsMenu-ApplicationsByCriticity' => 'アプリケーション (by criticity)', // 'Applications by criticity',
+	
+	'UI:ConfigurationManagementMenu' => 'コンフィグレーション管理', //'Configuration Management',
+	'UI:ConfigurationManagementMenu+' => 'コンフィグレーション管理', // 'Configuration Management',
+	'UI:ConfigurationManagementMenu:Title' => 'インフラストラクチャ概観', // 'Infrastructure Overview',
+	'UI-ConfigurationManagementMenu-InfraByType' => '型別インフラオブジェクト', // 'Infrastructure objects by type',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => '状態別インフラオブジェクト', // 'Infrastructure objects by status',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'コンフィグレーション管理用ダッシュボード', // 'Dashboard for Configuration Management',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '状態別コンフィグレーション項目', //'Configuration Items by status',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => '型別コンフィグレーション項目', // 'Configuration Items by type',
+
+'UI:RequestMgmtMenuOverview:Title' => 'リクエスト管理用ダッシュボード', // 'Dashboard for Request Management',
+'UI-RequestManagementOverview-RequestByService' => 'サービス別ユーザリクエスト', //'User Requests by service',
+'UI-RequestManagementOverview-RequestByPriority' => '優先度別ユーザリクエスト', // 'User Requests by priority',
+'UI-RequestManagementOverview-RequestUnassigned' => 'エージェントへ未アサインのユーザリクエスト', // 'User Requests not yet assigned to an agent',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'インシデント管理用ダッシュボード', // 'Dashboard for Incident Management',
+'UI-IncidentManagementOverview-IncidentByService' => 'サービス別インシデント', // 'Incidents by service',
+'UI-IncidentManagementOverview-IncidentByPriority' => '優先度別インシデント', // 'Incidents by priority',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'エージェントへ未アサインのインシデント', // 'Incidents not yet assigned to an agent',
+
+'UI:ChangeMgmtMenuOverview:Title' => '変更管理用ダッシュボード', // 'Dashboard for Change Management',
+'UI-ChangeManagementOverview-ChangeByType' => '型別変更内容', // 'Changes by type',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'エージェントへ未アサインの変更内容', // 'Changes not yet assigned to an agent',
+'UI-ChangeManagementOverview-ChangeWithOutage' => '変更すべき一時停止???', // 'Outages due to changes',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'サービス管理用ダッシュボード', // 'Dashboard for Service Management',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => '30日以内に契約更新が必要な顧客', // 'Customer contracts to be renewed in 30 days',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => '30日以内に契約更新が必要なプロバイダ', // 'Provider contracts to be renewed in 30 days',
+
+	'UI:ContactsMenu' => 'コンタクト', // 'Contacts',
+	'UI:ContactsMenu+' => 'コンタクト', // 'Contacts',
+	'UI:ContactsMenu:Title' => 'コンタクト概観', // 'Contacts Overview',
+	'UI-ContactsMenu-ContactsByLocation' => 'ロケーション別コンタクト', // 'Contacts by location',
+	'UI-ContactsMenu-ContactsByType' => 'タイプ別コンタクト', // 'Contacts by type',
+	'UI-ContactsMenu-ContactsByStatus' => '状態別コンタクト', //'Contacts by status',
+
+	'Menu:CSVImportMenu' => 'CSV インポート', // 'CSV import',
+	'Menu:CSVImportMenu+' => '一括生成/一括更新', //'Bulk creation or update',
+	
+	'Menu:DataModelMenu' => 'データモデル', // 'Data Model',
+	'Menu:DataModelMenu+' => 'データモデル概観', // 'Overview of the Data Model',
+	
+	'Menu:ExportMenu' => 'エクスポート', // 'Export',
+	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする', // 'Export the results of any query in HTML, CSV or XML',
+	
+	'Menu:NotificationsMenu' => 'ノーティフィケーション', // 'Notifications',
+	'Menu:NotificationsMenu+' => 'ノーティフィケーションの設定', // 'Configuration of the Notifications',
+	'UI:NotificationsMenu:Title' => '<span class="hilite">ノーティフィケーション</span>の設定', // 'Configuration of the <span class="hilite">Notifications</span>',
+	'UI:NotificationsMenu:Help' => 'ヘルプ', // 'Help'
+//	'UI:NotificationsMenu:HelpContent' => 	'<p>In iTop the notifications are fully customizable. They are based on two sets of objects: <i>triggers and actions</i>.</p>
+//<p><i><b>Triggers</b></i> define when a notification will be executed. There are 3 types of triggers for covering 3 differents phases of an object life cycle:
+//<ol>
+//	<li>the "OnCreate" triggers get executed when an object of the specified class is created</li>
+//	<li>the "OnStateEnter" triggers get executed before an object of the given class enters a specified state (coming from another state)</li>
+//	<li>the "OnStateLeave" triggers get executed when an object of the given class is leaving a specified state</li>
+//</ol>
+//</p>
+//<p>
+//<i><b>Actions</b></i> define the actions to be performed when the triggers execute. For now there is only one kind of action consisting in sending an email message.
+//Such actions also define the template to be used for sending the email as well as the other parameters of the message like the recipients, importance, etc.
+//</p>
+//<p>A special page: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is available for testing and troubleshooting your PHP mail configuration.</p>
+//<p>To be executed, actions must be associated to triggers.
+//When associated with a trigger, each action is given an "order" number, specifying in which order the actions are to be executed.</p>',
+
+	'UI:NotificationsMenu:HelpContent' => '<p>iTopでは、ノーティフィケーションはすべてカスタマイズが可能です。ノーティフィケーションは<i>トリガーとアクション</i>という二つのオブジェクトがベースになっています。
+<p><i><b>トリガー</b></i>は、あるノーティフィケーションがいつ実行されるのか、を定義する。トリガーは3つのタイプに分類され、オブジェクトライフサイクルにおける3つの異なるフェーズに対応する：
+<ol>
+	<li>"onCreate"トリガーは、指定されたクラスのオブジェクトが生成されたときに実行される。</li>
+	<li>"onStateEnter"トリガーは、指定されたクラスのオブジェクトが(他の状態から)指定された状態に入る前に実行される。</li>
+	<li>"onStateLeave"トリガーは、指定されたクラスのオブジェクトが指定された状態から出る際に実行される。</li>
+</ol>
+</p>
+<p>
+<i><b>アクション</b></i>はトリガーが実行される際の動作を定義する。例えば今、「メールを送信する」という動作で構成されるたった1種類だけのアクションがあるとしよう。
+このようなアクションは、受信者、重要度といったメッセージに付随する他のパラメータと同様、メール送信に利用されるテンプレートも定義する。
+</p>
+<p>特別なページ: <a href="../setup/email.test.php" target="_blank">email.test.php</p>は、PHPのメール設定をテストしたりトラブルシュートするのに利用可能である。</p>
+<p>実行するには、アクションがトリガーに関連づけられている必要がある。
+トリガーに関連づけられると、各々のアクションは順番が与えられ、どの順序でそのアクションが実行されるかが指定される。</p>',
+
+	'UI:NotificationsMenu:Triggers' => 'トリガー', // 'Triggers',
+	'UI:NotificationsMenu:AvailableTriggers' => '実行可能トリガー', // 'Available triggers',
+	'UI:NotificationsMenu:OnCreate' => 'オブジェクトが生成された時', // 'When an object is created',
+	'UI:NotificationsMenu:OnStateEnter' => 'オブジェクトが指定状態に入った時', // 'When an object enters a given state',
+	'UI:NotificationsMenu:OnStateLeave' => 'オブジェクトが指定状態から出た時', // 'When an object leaves a given state',
+	'UI:NotificationsMenu:Actions' => 'アクション', // 'Actions',
+	'UI:NotificationsMenu:AvailableActions' => '実行可能アクション', // 'Available actions',
+	
+	'Menu:AuditCategories' => '監査カテゴリ', // 'Audit Categories',
+	'Menu:AuditCategories+' => '監査カテゴリ', // 'Audit Categories',
+	'Menu:Notifications:Title' => '監査カテゴリ', // 'Audit Categories',
+	
+	'Menu:RunQueriesMenu' => 'クエリ実行', // 'Run Queries',
+	'Menu:RunQueriesMenu+' => '任意のクエリを実行', // 'Run any query',
+	
+	'Menu:DataAdministration' => 'データ管理', // 'Data administration',
+	'Menu:DataAdministration+' => 'データ管理', // 'Data administration',
+	
+	'Menu:UniversalSearchMenu' => '全検索', // 'Universal Search',
+	'Menu:UniversalSearchMenu+' => '何か...を検索', // 'Search for anything...',
+	
+	'Menu:ApplicationLogMenu' => 'Log de l\'application',
+	'Menu:ApplicationLogMenu+' => 'Log de l\'application',
+	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
+
+	'Menu:UserManagementMenu' => 'ユーザ管理', // 'User Management',
+	'Menu:UserManagementMenu+' => 'ユーザ管理', // 'User management',
+
+	'Menu:ProfilesMenu' => 'プロファイル', // 'Profiles',
+	'Menu:ProfilesMenu+' => 'プロファイル', // 'Profiles',
+	'Menu:ProfilesMenu:Title' => 'プロファイル', // 'Profiles',
+
+	'Menu:UserAccountsMenu' => 'ユーザアカウント', // 'User Accounts',
+	'Menu:UserAccountsMenu+' => 'ユーザアカウント', // 'User Accounts',
+	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント', // 'User Accounts',	
+
+	'UI:iTopVersion:Short' => 'iTopバージョン%1$s', // 'iTop version %1$s',
+	'UI:iTopVersion:Long' => 'iTopバージョン%1$s-%2$s, %3$sビルド', // 'iTop version %1$s-%2$s built on %3$s',
+	'UI:PropertiesTab' => 'プロパティ', // 'Properties',
+
+	'UI:OpenDocumentInNewWindow_' => '新規ウィンドウで本ドキュメント: %1$sを開く', // 'Open this document in a new window: %1$s',
+	'UI:DownloadDocument_' => '本ドキュメント: %1$sをダウンロードする', // 'Download this document: %1$s',
+	'UI:Document:NoPreview' => 'このタイプのドキュメントはプレビューできません。', // 'No preview is available for this type of document',
+
+	'UI:DeadlineMissedBy_duration' => '%1$s によって消去されました。', // 'Missed  by %1$s',
+	'UI:Deadline_LessThan1Min' => '1分以内', // '< 1 min',		
+	'UI:Deadline_Minutes' => '%1$d 分', // '%1$d min',			
+	'UI:Deadline_Hours_Minutes' => '%1$d時間%2$d分', // '%1$dh %2$dmin',			
+	'UI:Deadline_Days_Hours_Minutes' => '%1$d日%2$d時間%3$d分', // '%1$dd %2$dh %3$dmin',
+	'UI:Help' => 'ヘルプ', // 'Help',
+	'UI:PasswordConfirm' => '(確認)', // '(Confirm)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '%1$sオブジェクトをさらに追加する前に、このオブジェクトを保存してください。', // 'Before adding more %1$s objects, save this object.',
+	'UI:DisplayThisMessageAtStartup' => '起動時にこのメッセージを表示する', // 'Display this message at startup',
+	'UI:RelationshipGraph' => 'グラフィカル表示', // 'Graphical view',
+	'UI:RelationshipList' => 'リスト', // 'List',
+	'UI:OperationCancelled' => '操作はキャンセルされました', // 'Operation Cancelled',
+
+	'Portal:Title' => 'iTopユーザポータル', // 'iTop user portal',
+	'Portal:Refresh' => '更新', // 'Refresh',
+	'Portal:Back' => '戻る', // 'Back',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => '新規リクエストを生成する', // 'Create a new request',
+	'Portal:ChangeMyPassword' => 'パスワードを変更する', // 'Change my password',
+	'Portal:Disconnect' => '切断する', // 'Disconnect',
+	'Portal:OpenRequests' => '発行済みリクエスト', // 'My open requests',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests'  => '解決済みリクエスト', // 'My resolved requests',
+	'Portal:SelectService' => 'カタログからサービスを選択してください：', // 'Select a service from the catalog:',
+	'Portal:PleaseSelectOneService' => 'サービスを1つ選んでください', // 'Please select one service',
+	'Portal:SelectSubcategoryFrom_Service' => '本サービス：%1$sのサブカテゴリを選んでください', // 'Select a sub-category for the service %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'サブカテゴリを1つ選んでください', // 'Please select one sub-category',
+	'Portal:DescriptionOfTheRequest' => 'あなたのリクエストの詳細を記入してください：', // 'Enter the description of your request:',
+	'Portal:TitleRequestDetailsFor_Request' => 'リクエスト%1$sの詳細：', // Details for request %1$s:',
+	'Portal:NoOpenRequest' => '本カテゴリにリクエストはありません', // 'No request in this category.',
+	'Portal:NoClosedRequest' => 'No request in this category',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
+	'Portal:Button:CloseTicket' => '本チケットを閉じます。', // 'Close this ticket',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => '本チケットの解決について、コメントを入力してください。', // 'Enter your comments about the resolution of this ticket:',
+	'Portal:ErrorNoContactForThisUser' => 'エラー：現在のユーザはコンタクト/人物に関連づけられていません。管理者に問い合わせてください。', // 'Error: the current user is not associated with a Contact/Person. Please contact your administrator.',
+	'Portal:Attachments' => '添付', // 'Attachments',
+	'Portal:AddAttachment' => ' 添付を付加する ', // ' Add Attachment ',
+	'Portal:RemoveAttachment' => ' 添付を除去する ', // ' Remove Attachment ',
+	'Portal:Attachment_No_To_Ticket_Name' => '#%1$d を$2$s ($3$s)に添付する', // 'Attachment #%1$d to %2$s (%3$s)',
+	'Enum:Undefined' => '定義されていません', // 'Undefined',
+));
+
+
+
+?>

dictionaries/pt_br.dictionary.itop.core.php

@@ -23,100 +23,123 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Core:AttributeLinkedSet' => 'Array de objetos',
+	'Core:AttributeLinkedSet+' => 'Qualquer tipo de objetos da mesma classe ou subclasse',
 
-Dict::Add('PT BR', 'English', 'English', array(
-	'Core:AttributeLinkedSet' => 'Array of objects',
-	'Core:AttributeLinkedSet+' => 'Any kind of objects [subclass] of the same class',
+	'Core:AttributeLinkedSetIndirect' => 'Array de objetos (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => 'Qualquer tipo de objetos [sub-classe] da mesma classe',
 
-	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class',
-
-	'Core:AttributeInteger' => 'Integer',
-	'Core:AttributeInteger+' => 'Numeric value (could be negative)',
+	'Core:AttributeInteger' => 'Inteiro',
+	'Core:AttributeInteger+' => 'Valor numérico (não pode ser negativo)',
 
 	'Core:AttributeDecimal' => 'Decimal',
-	'Core:AttributeDecimal+' => 'Decimal value (could be negative)',
+	'Core:AttributeDecimal+' => 'Valor decimal (não pode ser negativo)',
 
 	'Core:AttributeBoolean' => 'Boolean',
 	'Core:AttributeBoolean+' => 'Boolean',
 
 	'Core:AttributeString' => 'String',
-	'Core:AttributeString+' => 'Alphanumeric string',
+	'Core:AttributeString+' => 'Seqüência alfanumérica',
 
-	'Core:AttributeClass' => 'Class',
-	'Core:AttributeClass+' => 'Class',
+	'Core:AttributeClass' => 'Classe',
+	'Core:AttributeClass+' => 'Classe',
 
-	'Core:AttributeApplicationLanguage' => 'User language',
-	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)',
+	'Core:AttributeApplicationLanguage' => 'Linguagem Usuário',
+	'Core:AttributeApplicationLanguage+' => 'Linguagem e país (EN US)',
 
-	'Core:AttributeFinalClass' => 'Class (auto)',
-	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)',
+	'Core:AttributeFinalClass' => 'Classe (auto)',
+	'Core:AttributeFinalClass+' => 'Classe real do objeto (criada automaticamente pelo core)',
 
-	'Core:AttributePassword' => 'Password',
-	'Core:AttributePassword+' => 'Password of an external device',
+	'Core:AttributePassword' => 'Senha',
+	'Core:AttributePassword+' => 'Senha para o dispositivo externo',
 
- 	'Core:AttributeEncryptedString' => 'Encrypted string',
-	'Core:AttributeEncryptedString+' => 'String encrypted with a local key',
+ 	'Core:AttributeEncryptedString' => 'String encriptada',
+	'Core:AttributeEncryptedString+' => 'String encriptada com uma chave local',
 
-	'Core:AttributeText' => 'Text',
-	'Core:AttributeText+' => 'Multiline character string',
+	'Core:AttributeText' => 'Texto',
+	'Core:AttributeText+' => 'Cadeia de caracteres Multi-linha',
 
 	'Core:AttributeHTML' => 'HTML',
 	'Core:AttributeHTML+' => 'HTML string',
 
-	'Core:AttributeEmailAddress' => 'Email address',
-	'Core:AttributeEmailAddress+' => 'Email address',
+	'Core:AttributeEmailAddress' => 'Endereço Email',
+	'Core:AttributeEmailAddress+' => 'Endereço Email',
 
-	'Core:AttributeIPAddress' => 'IP address',
-	'Core:AttributeIPAddress+' => 'IP address',
+	'Core:AttributeIPAddress' => 'Endereço IP',
+	'Core:AttributeIPAddress+' => 'Endereço IP',
 
 	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => 'Object Query Langage expression',
+	'Core:AttributeOQL+' => 'Expressão Object Query Langage',
 
 	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings',
+	'Core:AttributeEnum+' => 'Lista de pré-definida seqüências alfanuméricas',
 
-	'Core:AttributeTemplateString' => 'Template string',
-	'Core:AttributeTemplateString+' => 'String containing placeholders',
+	'Core:AttributeTemplateString' => 'Modelo string',
+	'Core:AttributeTemplateString+' => 'Espaço reservado contendo string',
 
-	'Core:AttributeTemplateText' => 'Template text',
-	'Core:AttributeTemplateText+' => 'Text containing placeholders',
+	'Core:AttributeTemplateText' => 'Modelo texto',
+	'Core:AttributeTemplateText+' => 'Texto contendo espaços reservados',
 
-	'Core:AttributeTemplateHTML' => 'Template HTML',
-	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders',
+	'Core:AttributeTemplateHTML' => 'Modelo HTML',
+	'Core:AttributeTemplateHTML+' => 'HTML contendo espaços reservados',
 
-	'Core:AttributeWikiText' => 'Wiki article',
-	'Core:AttributeWikiText+' => 'Wiki formatted text',
+	'Core:AttributeDateTime' => 'Data/hora',
+	'Core:AttributeDateTime+' => 'Data e hora (ano-mês-dia hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Formato Data:<br/>
+	<b>yyyy-mm-dd hh:mm:ss</b><br/>
+	Exemplo: 2011-07-19 18:40:00
+</p>
+<p>
+Operadores:<br/>
+	<b>&gt;</b><em>data</em><br/>
+	<b>&lt;</b><em>data</em><br/>
+	<b>[</b><em>data</em>,<em>data</em><b>]</b>
+</p>
+<p>
+Se o tempo for omitido, o padrão é 00:00:00
+</p>',
 
-	'Core:AttributeDateTime' => 'Date/time',
-	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)',
+	'Core:AttributeDate' => 'Data',
+	'Core:AttributeDate+' => 'Data (ano-mês-dia)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Formato Data:<br/>
+	<b>yyyy-mm-dd</b><br/>
+	Exemplo: 2011-07-19
+</p>
+<p>
+Operadores:<br/>
+	<b>&gt;</b><em>data</em><br/>
+	<b>&lt;</b><em>data</em><br/>
+	<b>[</b><em>data</em>,<em>data</em><b>]</b>
+</p>',
 
-	'Core:AttributeDate' => 'Date',
-	'Core:AttributeDate+' => 'Date (year-month-day)',
+	'Core:AttributeDeadline' => 'Prazo determinado',
+	'Core:AttributeDeadline+' => 'Data, apresentado relativamente ao tempo atual',
 
-	'Core:AttributeDeadline' => 'Deadline',
-	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time',
+	'Core:AttributeExternalKey' => 'Chave externa',
+	'Core:AttributeExternalKey+' => 'Chave externa (ou estrangeira)',
 
-	'Core:AttributeExternalKey' => 'External key',
-	'Core:AttributeExternalKey+' => 'External (or foreign) key',
-
-	'Core:AttributeExternalField' => 'External field',
-	'Core:AttributeExternalField+' => 'Field mapped from an external key',
+	'Core:AttributeExternalField' => 'Campo externo',
+	'Core:AttributeExternalField+' => 'Campo mapeado para uma chave externa',
 
 	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => 'Absolute or relative URL as a text string',
+	'Core:AttributeURL+' => 'URL absoluto ou relativo como um texto',
 
 	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => 'Any binary content (document)',
+	'Core:AttributeBlob+' => 'Qualquer conteúdo binário (documento)',
 
-	'Core:AttributeOneWayPassword' => 'One way password',
-	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password',
+	'Core:AttributeOneWayPassword' => 'Uma forma de senha',
+	'Core:AttributeOneWayPassword+' => 'Uma forma de senha encriptado',
 
-	'Core:AttributeTable' => 'Table',
-	'Core:AttributeTable+' => 'Indexed array having two dimensions',
+	'Core:AttributeTable' => 'Tabela',
+	'Core:AttributeTable+' => 'Matriz indexada tem duas dimensões',
 
-	'Core:AttributePropertySet' => 'Properties',
-	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)',
+	'Core:AttributePropertySet' => 'Propriedade',
+	'Core:AttributePropertySet+' => 'Lista de propriedades sem categoria (nome e valor)',
 ));
 
 
@@ -130,12 +153,12 @@ Dict::Add('PT BR', 'English', 'English', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChange' => 'Mudan&ccedil;as',
-	'Class:CMDBChange+' => 'Monitoramento Mudan&ccedil;as',
+	'Class:CMDBChange' => 'Alteração',
+	'Class:CMDBChange+' => 'Rastreamento de alterações',
 	'Class:CMDBChange/Attribute:date' => 'data',
-	'Class:CMDBChange/Attribute:date+' => 'data e hora que as mudan&ccedil;as tenham sido registradas.',
+	'Class:CMDBChange/Attribute:date+' => 'data e hora no qual a alteração foi registrada',
 	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
-	'Class:CMDBChange/Attribute:userinfo+' => 'Solicitante definido informa&ccedil;&atilde;o',
+	'Class:CMDBChange/Attribute:userinfo+' => 'informações definidas pelo solicitante',
 ));
 
 //
@@ -143,18 +166,18 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOp' => 'Opera&ccedil;&atilde;o Mudan&ccedil;a',
-	'Class:CMDBChangeOp+' => 'Controle Opera&ccedil;&atilde;o Mudan&ccedil;a',
-	'Class:CMDBChangeOp/Attribute:change' => 'mudan&ccedil;as',
-	'Class:CMDBChangeOp/Attribute:change+' => 'mudan&ccedil;as',
+	'Class:CMDBChangeOp' => 'Operação de mudança',
+	'Class:CMDBChangeOp+' => 'Operações de controle de alterações',
+	'Class:CMDBChangeOp/Attribute:change' => 'alterar',
+	'Class:CMDBChangeOp/Attribute:change+' => 'alterar',
 	'Class:CMDBChangeOp/Attribute:date' => 'data',
-	'Class:CMDBChangeOp/Attribute:date+' => 'data e hora das mudan&ccedil;as',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'usu&aacute;rio',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => 'quem fez esta mudan&ccedil;as',
+	'Class:CMDBChangeOp/Attribute:date+' => 'data e hora da alteração',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'usuário',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'que fez esta mudança',
 	'Class:CMDBChangeOp/Attribute:objclass' => 'classe objeto',
 	'Class:CMDBChangeOp/Attribute:objclass+' => 'classe objeto',
 	'Class:CMDBChangeOp/Attribute:objkey' => 'id objeto',
-	'Class:CMDBChangeOp/Attribute:objkey+' => 'objeto',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'id objeto',
 	'Class:CMDBChangeOp/Attribute:finalclass' => 'tipo',
 	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
 ));
@@ -164,8 +187,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpCreate' => 'objeto criado',
-	'Class:CMDBChangeOpCreate+' => 'Controle cria&ccedil;&atilde;o objeto',
+	'Class:CMDBChangeOpCreate' => 'criação do objeto',
+	'Class:CMDBChangeOpCreate+' => 'Rastreamento de criação do objeto',
 ));
 
 //
@@ -173,8 +196,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpDelete' => 'objeto apagado',
-	'Class:CMDBChangeOpDelete+' => 'Controle objeto eliminado',
+	'Class:CMDBChangeOpDelete' => 'objeto excluído',
+	'Class:CMDBChangeOpDelete+' => 'Rastreamento de exclusão do objeto',
 ));
 
 //
@@ -183,9 +206,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:CMDBChangeOpSetAttribute' => 'objeto alterado',
-	'Class:CMDBChangeOpSetAttribute+' => 'Controle do objeto alterado',
+	'Class:CMDBChangeOpSetAttribute+' => 'Rastreamento alteração propriedade Objeto',
 	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Atributo',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'c&oacute;digo da modifica&ccedil;&atilde;o',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'Código da propriedade modificado',
 ));
 
 //
@@ -193,23 +216,35 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => 'mudan&ccedil;a propriedade',
-	'Class:CMDBChangeOpSetAttributeScalar+' => 'controle da mudan&ccedil;a propriedade do objeto',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'propriedade alterado',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Propriedades escalares objeto de controle de alterações',
 	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valor anterior',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'valores anteriores do atributo',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'valor anterior do atributo',
 	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Novo valor',
 	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'novo valor do atributo',
 ));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Change:ObjectCreated' => 'Objeto criado',
+	'Change:ObjectDeleted' => 'Objeto excluído',
+	'Change:ObjectModified' => 'Objeto modificado',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s configurado para %2$s (valor anterior: %3$s)',
+	'Change:AttName_SetTo' => '%1$s configurado para %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s anexado ao %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modificado, valor anterior: %2$s',
+	'Change:AttName_Changed' => '%1$s modificado',
+	'Change:AttName_EntryAdded' => '%1$s modificado, nova entrada adicionada.',
+));
 
 //
 // Class: CMDBChangeOpSetAttributeBlob
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => 'mudan&ccedil;a dado',
-	'Class:CMDBChangeOpSetAttributeBlob+' => 'controle mudan&ccedil;a dado',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Dado anterior',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'conte&uacute;do anterior do atributo',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'alteração dados',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'Rastreamento alteração dados',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Dados anterior',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'conteúdo anterior do atributo',
 ));
 
 //
@@ -217,10 +252,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttributeText' => 'mudan&ccedil;a texto',
-	'Class:CMDBChangeOpSetAttributeText+' => 'controle mudan&ccedil;a texto',
+	'Class:CMDBChangeOpSetAttributeText' => 'alteração texto',
+	'Class:CMDBChangeOpSetAttributeText+' => 'Rastreamento alteração texto',
 	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Dado anterior',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'conte&uacute;do anterior do atributo',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'conteúdo anterior do atributo',
 ));
 
 //
@@ -228,15 +263,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Event' => 'Log Eventos',
-	'Class:Event+' => 'An application internal event',
-	'Class:Event/Attribute:message' => 'mensagem',
-	'Class:Event/Attribute:message+' => 'descri&ccedil;&atilde;o curta do evento',
-	'Class:Event/Attribute:date' => 'data',
-	'Class:Event/Attribute:date+' => 'data e hora em que as mudan&ccedil;as tenham sido registadas',
-	'Class:Event/Attribute:userinfo' => 'info usu&acute;rio',
-	'Class:Event/Attribute:userinfo+' => 'identifica&ccedil;&atilde;o do usu&aacute;rio queestava fazendo a a&ccedil;&atilde;o e desencadeou este evento',
-	'Class:Event/Attribute:finalclass' => 'tipo',
+	'Class:Event' => 'Evento registros',
+	'Class:Event+' => 'Um evento interno do aplicativo',
+	'Class:Event/Attribute:message' => 'Mensagens',
+	'Class:Event/Attribute:message+' => 'pequena descrição deste evento',
+	'Class:Event/Attribute:date' => 'Data',
+	'Class:Event/Attribute:date+' => 'data e hora em que as mudanças foram registradas',
+	'Class:Event/Attribute:userinfo' => 'Usuário info',
+	'Class:Event/Attribute:userinfo+' => 'identificação do usuário que estava fazendo a ação que desencadeou este evento',
+	'Class:Event/Attribute:finalclass' => 'Tipo',
 	'Class:Event/Attribute:finalclass+' => '',
 ));
 
@@ -245,14 +280,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventNotification' => 'Notifica&ccedil;&atilde;o evento',
+	'Class:EventNotification' => 'Evento Notificação',
 	'Class:EventNotification+' => 'Trace of a notification that has been sent',
-	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
-	'Class:EventNotification/Attribute:trigger_id+' => 'conta usu&aacute;rio',
-	'Class:EventNotification/Attribute:action_id' => 'usu&aacute;rio',
-	'Class:EventNotification/Attribute:action_id+' => 'conta usu&aacute;rio',
-	'Class:EventNotification/Attribute:object_id' => 'Objeto id',
-	'Class:EventNotification/Attribute:object_id+' => 'objeto id (classe definida pela trigger ?)',
+	'Class:EventNotification/Attribute:trigger_id' => 'Gatilho',
+	'Class:EventNotification/Attribute:trigger_id+' => 'conta usuário',
+	'Class:EventNotification/Attribute:action_id' => 'usuário',
+	'Class:EventNotification/Attribute:action_id+' => 'conta usuário',
+	'Class:EventNotification/Attribute:object_id' => 'Id objeto',
+	'Class:EventNotification/Attribute:object_id+' => 'Id objeto (classe definida pelo gatilho?)',
 ));
 
 //
@@ -260,8 +295,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventNotificationEmail' => 'Enviando evento Email',
-	'Class:EventNotificationEmail+' => 'Controle de um email que foi enviado',
+	'Class:EventNotificationEmail' => 'Evento envio Email',
+	'Class:EventNotificationEmail+' => 'Rastreamento de um e-mail que foi enviado',
 	'Class:EventNotificationEmail/Attribute:to' => 'Para',
 	'Class:EventNotificationEmail/Attribute:to+' => 'Para',
 	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
@@ -269,7 +304,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
 	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
 	'Class:EventNotificationEmail/Attribute:from' => 'De',
-	'Class:EventNotificationEmail/Attribute:from+' => 'Rementente da mensagem',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Remetente da mensagem',
 	'Class:EventNotificationEmail/Attribute:subject' => 'Assunto',
 	'Class:EventNotificationEmail/Attribute:subject+' => 'Assunto',
 	'Class:EventNotificationEmail/Attribute:body' => 'Corpo',
@@ -281,22 +316,22 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventIssue' => 'Emiss&atilde;o de evento',
-	'Class:EventIssue+' => 'Controle da emiss&atilde;o (aten&ccedil;&atilde;o, erros, etc.)',
-	'Class:EventIssue/Attribute:issue' => 'Emiss&atilde;o',
-	'Class:EventIssue/Attribute:issue+' => 'O que aconteceu?',
+	'Class:EventIssue' => 'Issue event',
+	'Class:EventIssue+' => 'Trace of an issue (warning, error, etc.)',
+	'Class:EventIssue/Attribute:issue' => 'Issue',
+	'Class:EventIssue/Attribute:issue+' => 'O que aconteceu',
 	'Class:EventIssue/Attribute:impact' => 'Impacto',
-	'Class:EventIssue/Attribute:impact+' => 'Quais s&atilde;o as consequ&ecirc;ncias?',
-	'Class:EventIssue/Attribute:page' => 'P&aacute;gina',
-	'Class:EventIssue/Attribute:page+' => 'HTTP ponto de entrada',
-	'Class:EventIssue/Attribute:arguments_post' => 'Postados argumentos',
-	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST argumentos',
+	'Class:EventIssue/Attribute:impact+' => 'Quais são as conseqüências',
+	'Class:EventIssue/Attribute:page' => 'Página',
+	'Class:EventIssue/Attribute:page+' => 'Ponto de entrada HTTP',
+	'Class:EventIssue/Attribute:arguments_post' => 'Postado argumentos',
+	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
 	'Class:EventIssue/Attribute:arguments_get' => 'URL argumentos',
 	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET argumentos',
 	'Class:EventIssue/Attribute:callstack' => 'Callstack',
 	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
 	'Class:EventIssue/Attribute:data' => 'Dado',
-	'Class:EventIssue/Attribute:data+' => 'Mais informa&ccedil;&otilde;es',
+	'Class:EventIssue/Attribute:data+' => 'Mais informação',
 ));
 
 //
@@ -304,43 +339,58 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventWebService' => 'Evento Web service',
-	'Class:EventWebService+' => 'Controle chamado do web service',
-	'Class:EventWebService/Attribute:verb' => 'Verb',
-	'Class:EventWebService/Attribute:verb+' => 'Nome da opera&ccedil;&atilde;o',
+	'Class:EventWebService' => 'Event serviço Web',
+	'Class:EventWebService+' => 'Rastreamento de uma chamada de serviço web',
+	'Class:EventWebService/Attribute:verb' => 'Verbo',
+	'Class:EventWebService/Attribute:verb+' => 'Nome da operação',
 	'Class:EventWebService/Attribute:result' => 'Resultado',
-	'Class:EventWebService/Attribute:result+' => 'Vis&atilde;o geral successos/falhas',
+	'Class:EventWebService/Attribute:result+' => 'Sucesso global / insucesso',
 	'Class:EventWebService/Attribute:log_info' => 'Info log',
 	'Class:EventWebService/Attribute:log_info+' => 'Resultado info log',
-	'Class:EventWebService/Attribute:log_warning' => 'Log aten&ccedil;&atilde;o',
-	'Class:EventWebService/Attribute:log_warning+' => 'Resultado Log aten&ccedil;&atilde;o',
-	'Class:EventWebService/Attribute:log_error' => 'Log erro',
-	'Class:EventWebService/Attribute:log_error+' => 'Resultado log erro',
+	'Class:EventWebService/Attribute:log_warning' => 'Warning log',
+	'Class:EventWebService/Attribute:log_warning+' => 'Resultado warning log',
+	'Class:EventWebService/Attribute:log_error' => 'Erro log',
+	'Class:EventWebService/Attribute:log_error+' => 'Resultado erro log',
 	'Class:EventWebService/Attribute:data' => 'Dado',
 	'Class:EventWebService/Attribute:data+' => 'Resultado dado',
 ));
 
+//
+// Class: EventLoginUsage
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EventLoginUsage' => 'Login utilizado',
+	'Class:EventLoginUsage+' => 'Conexão com a aplicação',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Nome usuário',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'Nome usuário',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Email usuário',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Endereço Email deste usuário',
+));
+
 //
 // Class: Action
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Action' => 'Personalizar A&ccedil;&atilde;o',
-	'Class:Action+' => 'A&ccedil;&atilde;o definida usu&aacute;rio',
+	'Class:Action' => 'Ação personalizada',
+	'Class:Action+' => 'Ação definida pelo usuário',
 	'Class:Action/Attribute:name' => 'Nome',
 	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Descri&ccedil;&atilde;o',
+	'Class:Action/Attribute:description' => 'Descrição',
 	'Class:Action/Attribute:description+' => '',
 	'Class:Action/Attribute:status' => 'Status',
-	'Class:Action/Attribute:status+' => 'Em produ&ccedil;&atilde;o ou ?',
-	'Class:Action/Attribute:status/Value:test' => 'Que est&aacute; sendo testado',
-	'Class:Action/Attribute:status/Value:test+' => 'Que est&aacute; sendo testado',
-	'Class:Action/Attribute:status/Value:enabled' => 'Em produ&ccedil;&atilde;o',
-	'Class:Action/Attribute:status/Value:enabled+' => 'Em produ&ccedil;&atilde;o',
+	'Class:Action/Attribute:status+' => 'Em produção ou ?',
+	'Class:Action/Attribute:status/Value:test' => 'que está sendo testado',
+	'Class:Action/Attribute:status/Value:test+' => 'que está sendo testado',
+	'Class:Action/Attribute:status/Value:enabled' => 'em produção',
+	'Class:Action/Attribute:status/Value:enabled+' => 'em produção',
 	'Class:Action/Attribute:status/Value:disabled' => 'Inativo',
 	'Class:Action/Attribute:status/Value:disabled+' => 'Inativo',
-	'Class:Action/Attribute:trigger_list' => 'Triggers relacionados',
-	'Class:Action/Attribute:trigger_list+' => 'Triggers ligado a esta a&ccedil;&atilde;o',
+	'Class:Action/Attribute:trigger_list' => 'Gatilhos relacionados',
+	'Class:Action/Attribute:trigger_list+' => 'Gatilho ligado para esta ação',
 	'Class:Action/Attribute:finalclass' => 'Tipo',
 	'Class:Action/Attribute:finalclass+' => '',
 ));
@@ -350,8 +400,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ActionNotification' => 'Notifica&ccedil;&atilde;o',
-	'Class:ActionNotification+' => 'Notifica&ccedil;&atilde;o (abstrato)',
+	'Class:ActionNotification' => 'Notificação',
+	'Class:ActionNotification+' => 'Notificação (resumo)',
 ));
 
 //
@@ -359,26 +409,26 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ActionEmail' => 'Email notifica&ccedil;&atilde;o',
+	'Class:ActionEmail' => 'Notificação Email',
 	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Teste destino',
-	'Class:ActionEmail/Attribute:test_recipient+' => 'Destinat&aacute;rio o status est&aacute; como "Teste"',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Testar destinatário',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Destinatário em caso estado está definido como "Teste"',
 	'Class:ActionEmail/Attribute:from' => 'De',
-	'Class:ActionEmail/Attribute:from+' => 'Ser&aacute; enviado dentro do cabe&ccedil;alho do email',
+	'Class:ActionEmail/Attribute:from+' => 'Será enviado para o cabeçalho de e-mail',
 	'Class:ActionEmail/Attribute:reply_to' => 'Responder para',
-	'Class:ActionEmail/Attribute:reply_to+' => 'Ser&aacute; enviado dentro do cabe&ccedil;alho do email',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Será enviado para o cabeçalho de e-mail',
 	'Class:ActionEmail/Attribute:to' => 'Para',
-	'Class:ActionEmail/Attribute:to+' => 'Destinat&aacute;rio para o email',
+	'Class:ActionEmail/Attribute:to+' => 'Destinatário para o email',
 	'Class:ActionEmail/Attribute:cc' => 'Cc',
-	'Class:ActionEmail/Attribute:cc+' => 'Com c&oacute;pia',
+	'Class:ActionEmail/Attribute:cc+' => 'Cc',
 	'Class:ActionEmail/Attribute:bcc' => 'bcc',
-	'Class:ActionEmail/Attribute:bcc+' => 'Com c&oacute;pia oculta',
+	'Class:ActionEmail/Attribute:bcc+' => 'Bcc',
 	'Class:ActionEmail/Attribute:subject' => 'assunto',
-	'Class:ActionEmail/Attribute:subject+' => 'T&iacute;tulo do email',
-	'Class:ActionEmail/Attribute:body' => 'corpo',
-	'Class:ActionEmail/Attribute:body+' => 'Conte&uacute;do do email',
-	'Class:ActionEmail/Attribute:importance' => 'import&acirc;ncia',
-	'Class:ActionEmail/Attribute:importance+' => 'Flag import&acirc;ncia',
+	'Class:ActionEmail/Attribute:subject+' => 'Título do email',
+	'Class:ActionEmail/Attribute:body' => 'Corpo',
+	'Class:ActionEmail/Attribute:body+' => 'Conteúdo do email',
+	'Class:ActionEmail/Attribute:importance' => 'importância',
+	'Class:ActionEmail/Attribute:importance+' => 'Emblema importância',
 	'Class:ActionEmail/Attribute:importance/Value:low' => 'baixo',
 	'Class:ActionEmail/Attribute:importance/Value:low+' => 'baixo',
 	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
@@ -392,12 +442,12 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Trigger' => 'Trigger',
-	'Class:Trigger+' => 'Personalizar manipulador de eventos',
-	'Class:Trigger/Attribute:description' => 'Descri&ccedil;&atilde;o',
-	'Class:Trigger/Attribute:description+' => 'uma linha descri&ccedil;&atilde;o',
-	'Class:Trigger/Attribute:action_list' => 'A&ccedil;&otilde;es desencadeadas',
-	'Class:Trigger/Attribute:action_list+' => 'A&ccedil;&otilde;es executadas quando a Trigger é ativado',
+	'Class:Trigger' => 'Gatilho',
+	'Class:Trigger+' => 'Manipulador de eventos personalizado',
+	'Class:Trigger/Attribute:description' => 'Descrição',
+	'Class:Trigger/Attribute:description+' => 'uma linha descrição',
+	'Class:Trigger/Attribute:action_list' => 'Ações desencadeadas',
+	'Class:Trigger/Attribute:action_list+' => 'Ações executadas quando o gatilho é ativado',
 	'Class:Trigger/Attribute:finalclass' => 'Tipo',
 	'Class:Trigger/Attribute:finalclass+' => '',
 ));
@@ -407,19 +457,28 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnObject' => 'Trigger (classe dependente)',
-	'Class:TriggerOnObject+' => 'Trigger em uma determinada classe de objetos',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Alvo classe',
+	'Class:TriggerOnObject' => 'Gatilho (classe dependente)',
+	'Class:TriggerOnObject+' => 'Gatilho em uma determinada classe de objetos',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Classe alvo',
 	'Class:TriggerOnObject/Attribute:target_class+' => '',
 ));
 
+//
+// Class: TriggerOnPortalUpdate
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnPortalUpdate' => 'Gatilho (quando atualizado a partir do portal)',
+	'Class:TriggerOnPortalUpdate+' => 'Gatilho em uma atualização de usuários finais a partir do portal',
+));
+
 //
 // Class: TriggerOnStateChange
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnStateChange' => 'Trigger (em estato mudan&ccedil;a)',
-	'Class:TriggerOnStateChange+' => 'Trigger sobre a mudan&ccedil;a de estado do objeto',
+	'Class:TriggerOnStateChange' => 'Gatilho (na mudança de estado)',
+	'Class:TriggerOnStateChange+' => 'Gatilho sobre a mudança de estado do objeto',
 	'Class:TriggerOnStateChange/Attribute:state' => 'Estado',
 	'Class:TriggerOnStateChange/Attribute:state+' => '',
 ));
@@ -429,8 +488,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnStateEnter' => 'Trigger (ao entrar em um estado)',
-	'Class:TriggerOnStateEnter+' => 'Trigger sobre a mudan&ccedil;a de estado do objeto - entrar',
+	'Class:TriggerOnStateEnter' => 'Gatilho (ao entrar em um estado)',
+	'Class:TriggerOnStateEnter+' => 'Gatilho sobre a mudança de estado de objeto - de entrar',
 ));
 
 //
@@ -438,8 +497,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnStateLeave' => 'Trigger (na saída de um estado)',
-	'Class:TriggerOnStateLeave+' => 'Trigger sobre a mudan&ccedil;a de estado do objeto - deixando',
+	'Class:TriggerOnStateLeave' => 'Gatilho (para sair de um estado)',
+	'Class:TriggerOnStateLeave+' => 'Gatilho sobre a mudança de estado do objeto - deixando',
 ));
 
 //
@@ -447,8 +506,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnObjectCreate' => 'Trigger (sobre a cria&ccedil;&atilde;o do objeto)',
-	'Class:TriggerOnObjectCreate+' => 'Trigger sobre a cria&ccedil;&atilde;o do objeto de [uma classe filha de] uma determinada classe',
+	'Class:TriggerOnObjectCreate' => 'Gatilho (na criação do objeto)',
+	'Class:TriggerOnObjectCreate+' => 'Gatilho na criação do objeto de [classe filha] determinada classe',
 ));
 
 //
@@ -456,19 +515,237 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkTriggerAction' => 'A&ccedil;&atilde;o/Trigger',
-	'Class:lnkTriggerAction+' => 'Liga&ccedil;&atilde;o entre uma trigger e uma a&ccedil;&atilde;o',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'A&ccedil;&atilde;o',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'A&ccedil;&atilde;o a ser executada',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'A&ccedil;&atilde;o',
+	'Class:lnkTriggerAction' => 'Ações/Gatilho',
+	'Class:lnkTriggerAction+' => 'Ligação entre um Gatilho e uma Ação',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Ação',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'A ação a ser executada',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Ação',
 	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Gatilho',
 	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Gatilho',
 	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
 	'Class:lnkTriggerAction/Attribute:order' => 'Ordem',
-	'Class:lnkTriggerAction/Attribute:order+' => 'AA&ccedil;&otilde;es executadas ordem',
+	'Class:lnkTriggerAction/Attribute:order+' => 'Ordem de execução das ações ',
 ));
 
+//
+// Synchro Data Source
+//
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SynchroDataSource/Attribute:name' => 'Nome',
+	'Class:SynchroDataSource/Attribute:name+' => 'Nome',
+	'Class:SynchroDataSource/Attribute:description' => 'Descrição',
+	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe alvo',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Usuário',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contato para notificação',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contato para notificar em caso de erro',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icones hiperlink',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hiperlink de uma pequena imagem representando o aplicativo com o qual o iTop é sincronizado',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Hiperlink aplicativo',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperlink para o objeto iTop na aplicação externa com a qual iTop é sincronizado (se aplicável). As substituições possíveis: $this->attribute$ e $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Política Reconciliação', //TODO enum values
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervalo da carga plena',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A recarga completa de todos os dados devem ocorrer pelo menos tão frequentemente como especificado aqui',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Ação do zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Medidas tomadas quando a busca retorna nenhum objeto',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Ação em um',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Medidas tomadas quando a busca retorna exatamente um objeto',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Ação em muitos',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Medidas tomadas quando a busca retorna mais de um objeto',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Usuários permitidos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Quem tem permissão para excluir objetos sincronizados',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Usuários permitidos',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Ninguém',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Somente Administradores',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Todos os usuários permitidos',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Regras de atualização',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Sintaxe: nome_do_campo:valor; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Duração de retenção',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo um objeto obsoleto é mantida antes de ser excluído',
+	'SynchroDataSource:Description' => 'Descrição',
+	'SynchroDataSource:Reconciliation' => 'Pesquisa &amp; reconciliação',
+	'SynchroDataSource:Deletion' => 'Regras de exclusão',
+	'SynchroDataSource:Status' => 'Status',
+	'SynchroDataSource:Information' => 'Informação',
+	'SynchroDataSource:Definition' => 'Definição',
+	'Core:SynchroAttributes' => 'Atributos',
+	'Core:SynchroStatus' => 'Status',
+	'Core:Synchro:ErrorsLabel' => 'Erros',	
+	'Core:Synchro:CreatedLabel' => 'Criado',
+	'Core:Synchro:ModifiedLabel' => 'Modificado',
+	'Core:Synchro:UnchangedLabel' => 'Inalterado',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Erros',
+	'Core:Synchro:ReconciledLabel' => 'reconciliados',
+	'Core:Synchro:ReconciledNewLabel' => 'Criado',
+	'Core:SynchroReconcile:Yes' => 'Sim',
+	'Core:SynchroReconcile:No' => 'Não',
+	'Core:SynchroUpdate:Yes' => 'Sim',
+	'Core:SynchroUpdate:No' => 'Não',
+	'Core:Synchro:LastestStatus' => 'Último Status',
+	'Core:Synchro:History' => 'Histórico sincronização',
+	'Core:Synchro:NeverRun' => 'Este sincronismo nunca foi executado. Sem registo ainda.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'A última sincronização terminou em %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'A sincronização começou em %1$s ainda está em execução...',
+	'Menu:DataSources' => 'Fontes de dados de sincronização',
+	'Menu:DataSources+' => 'Todas Fontes de dados de sincronização',
+	'Core:Synchro:label_repl_ignored' => 'Ignoradas (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Desaparecido (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Existente (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Novo (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Excluído (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoletos (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Erros (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Nenhuma ação (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Inalterado (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Atualizado (%1$s)', 
+	'Core:Synchro:label_obj_updated_errors' => 'Erros (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Inalterado (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Atualizado (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Criado (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Erros (%1$s)',
+	'Core:Synchro:History' => 'Histórico sincronização',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica processados: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Pelo menos uma chave de reconciliação deve ser especificado, ou a política de reconciliação deve ser a de usar a chave primária.',			
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Um período de retenção excluir deve ser especificado, já que objetos devem ser excluídos depois de ser marcado como obsoleto.',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Objetos obsoletos devem ser atualizados, mas nenhuma atualização é especificado.',
+	'Core:SynchroReplica:PublicData' => 'Dado público',
+	'Core:SynchroReplica:PrivateDetails' => 'Detalhe privado',
+	'Core:SynchroReplica:BackToDataSource' => 'Voltar para a Fonte de dados Sincro: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Lista de Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Chave Primária)',
+	'Core:SynchroAtt:attcode' => 'Atributo',
+	'Core:SynchroAtt:attcode+' => 'Campo do objeto',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliação ?',
+	'Core:SynchroAtt:reconciliation+' => 'Usado para pesquisa',
+	'Core:SynchroAtt:update' => 'Atualizar ?',
+	'Core:SynchroAtt:update+' => 'Usado para atualizar o objeto',
+	'Core:SynchroAtt:update_policy' => 'Política de atualização',
+	'Core:SynchroAtt:update_policy+' => 'Comportamento do campo atualizado',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Chave reconciliação',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Código atributo para a Reconciliação chave externa',
+	'Core:SyncDataExchangeComment' => '(Sincro dado)',
+	'Core:Synchro:ListOfDataSources' => 'Lista de fontes de dados:',
+	'Core:Synchro:LastSynchro' => 'Última sincronização:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Este objeto é sincronizado com uma fonte de dados externa',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'O objeto foi <b>criado</b> pela fonte de dados externa %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'O objeto <b>não pode ser excluído</b> pela fonte de dados externa %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Você <b>não pode excluir o objeto</b> porque é propriedade de uma fonte de dados externa %1$s',
+	'TitleSynchroExecution' => 'Execução da sincronização',
+	'Class:SynchroDataSource:DataTable' => 'Tabela Database: %1$s',
+	'Core:SyncDataSourceObsolete' => 'A fonte de dados é marcado como obsoleto. Operação cancelada.',
+	'Core:SyncDataSourceAccessRestriction' => 'Adminstradores ou apenas o usuário especificado na fonte de dados pode executar esta operação. Operação cancelada.',
+	'Core:SyncTooManyMissingReplicas' => 'Todos os registros foram intocado por algum tempo (todos os objetos podem ser apagados). Verifique se o processo que grava na tabela de sincronização ainda está em execução. Operação cancelada.',
+	'Core:SyncSplitModeCLIOnly' => 'A sincronização pode ser executado em pedaços só se for executado em modo CLI',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erro(s), %3$s atenção(s).',
+	'Core:SynchroReplica:TargetObject' => 'Objeto(s) sincronizado(s): %1$s',
+	'Class:AsyncSendEmail' => 'Email (assíncrono)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Para',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Assunto',
+	'Class:AsyncSendEmail/Attribute:body' => 'Corpo',
+	'Class:AsyncSendEmail/Attribute:header' => 'Cabeçalho',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Senha Criptograda',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Campo Criptograda',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Caso Log',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Última entrada',
+	'Class:SynchroDataSource' => 'Fonte de dados',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produção',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restrição de escopo',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use os atributos',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use o campo primary_key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Criar',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Atualizar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Criar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Pegue o primeiro (acaso?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política exclusão',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Excuir',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Atualizar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Atualize quando excluído',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista atributos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Somente Administradores',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Permissão total para excluir esses objetos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguém',
+	'Class:SynchroAttribute' => 'Atributo sincro',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Fonte de dados',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Código atributo',
+	'Class:SynchroAttribute/Attribute:update' => 'Atualizar',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconciliar',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Política atualizar',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Trancado',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Destrancado',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Iniciando se vazio',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Classe',
+	'Class:SynchroAttExtKey' => 'Atributo sincro (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Atributo Reconciliação',
+	'Class:SynchroAttLinkSet' => 'Atributo sincro (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Separador de linhas',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Separador atributos',
+	'Class:SynchroLog' => 'Sincro Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Fonte de dados',
+	'Class:SynchroLog/Attribute:start_date' => 'Data início',
+	'Class:SynchroLog/Attribute:end_date' => 'Data final',
+	'Class:SynchroLog/Attribute:status' => 'Status',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completado',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Erro',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Ainda está em execução',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Número réplica vista',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Número réplica total',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Número objeto(s) excluído(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Número de erros enquanto excluindo',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Número objeto(s) obsoleto(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Número de erros enquanto obsoletos',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Número objeto(s) criado(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Número de erros enquanto criava',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Número objeto(s) atualizado(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Número de erros enquanto atualizava',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Número de erros durante reconciliação',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Número réplica desaparecida',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Número objetos atualizados',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Número objetos inalterados',
+	'Class:SynchroLog/Attribute:last_error' => 'Últimos erros',
+	'Class:SynchroLog/Attribute:traces' => 'Traços',
+	'Class:SynchroReplica' => 'Sincro Réplica',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Fonte de dados',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Objeto destino (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Tipo destino',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Visto pela última vez',
+	'Class:SynchroReplica/Attribute:status' => 'Status',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificado',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Novo',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orfão',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Sincronizado',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objeto criado ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Último Erro',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Atenção',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data criação',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Última data modificação',
+	'Class:appUserPreferences' => 'Preferência de usuário',
+	'Class:appUserPreferences/Attribute:userid' => 'Usuário',
+	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
+	'Core:ExecProcess:Code1' => 'Comando errado ou comando terminou com erros (por exemplo, nome do script errado)',
+	'Core:ExecProcess:Code255' => 'PHP Erro (parsing, or runtime)',
+));
+
+//
+// Attribute Duration
+//
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Core:Duration_Seconds'	=> '%1$ds',	
+	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
+));
 
 ?>

dictionaries/ru.dictionary.itop.core.php

@@ -107,6 +107,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Change:ObjectCreated' => 'Объект создан',
 	'Change:ObjectDeleted' => 'Объект удалён',
 	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s установлено в %2$s (предыдущее значение: %3$s)',
+	'Change:AttName_SetTo' => '%1$s установлено в %2$s',
 	'Change:Text_AppendedTo_AttName' => '%1$s добавлено к %2$s',
 	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s изменено, предыдущее значение: %2$s',
 	'Change:AttName_Changed' => '%1$s изменено',

dictionaries/ru.dictionary.itop.ui.php

@@ -406,6 +406,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:History:Changes+' => 'Изменения, внесенные в объект',
 	'UI:Loading' => 'Загрузка...',
 	'UI:Menu:Actions' => 'Действия',
+	'UI:Menu:OtherActions' => 'Другие Действия',
 	'UI:Menu:New' => 'Новый...',
 	'UI:Menu:Add' => 'Добавить...',
 	'UI:Menu:Manage' => 'Управление...',
@@ -609,6 +610,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Пакетное удаление %1$d объектов класса %2$s',
 	'UI:Delete:NotAllowedToDelete' => 'Вы не можете удалить этот объект',
 	'UI:Delete:NotAllowedToUpdate_Fields' => 'Вы не можете обновить следующее(ие) поле(я): %1$s',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
 	'UI:Error:NotEnoughRightsToDelete' => 'Этот объект не может быть удален, потому что текущий пользователь не имеет достаточных прав',
 	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Этот объект не может быть удален, потому что некоторые ручные операции должны быть выполнены до этого',
 	'UI:Archive_User_OnBehalfOf_User' => '%1$s от имени %2$s',
@@ -620,8 +622,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s удалено.',
 	'UI:Delete:ConfirmDeletionOf_Name' => 'Удаление %1$s',
 	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Удаление %1$d объектов класса %2$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => 'Должно быть автоматичски удалено, но вы не можете это сделать',
-	'UI:Delete:MustBeDeletedManuallyButNotAllowed' => 'Необходимо удалить вручную - но вы не можете удалить этот объект, свяжитесь с администратором вашего приложения',
+//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Должно быть автоматичски удалено, но вы не можете это сделать',
+//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Необходимо удалить вручную - но вы не можете удалить этот объект, свяжитесь с администратором вашего приложения',
 	'UI:Delete:WillBeDeletedAutomatically' => 'Будет удалено автоматически',
 	'UI:Delete:MustBeDeletedManually' => 'Необходимо удалить вручную',
 	'UI:Delete:CannotUpdateBecause_Issue' => 'Должно быть автоматически обновлено, но: %1$s',
@@ -846,10 +848,14 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Portal:Title' => 'Пользовательский iTop портал',
 	'Portal:Refresh' => 'Обновить',
 	'Portal:Back' => 'Назад',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Создать новый запрос',
 	'Portal:ChangeMyPassword' => 'Изменить мой пароль',
 	'Portal:Disconnect' => 'Отключить',
 	'Portal:OpenRequests' => 'Мои открытые запросы',
+	'Portal:ClosedRequests'  => 'My closed requests',
 	'Portal:ResolvedRequests'  => 'Мои решённые запросы',
 	'Portal:SelectService' => 'Выбери сервис из каталога:',
 	'Portal:PleaseSelectOneService' => 'Необходимо выбрать хотя-бы один сервис',
@@ -858,7 +864,10 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Portal:DescriptionOfTheRequest' => 'Введи описание запроса:',
 	'Portal:TitleRequestDetailsFor_Request' => 'Подробности запроса %1$s:',
 	'Portal:NoOpenRequest' => 'Нет запросов в этой категории.',
+	'Portal:NoClosedRequest' => 'No request in this category',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
 	'Portal:Button:CloseTicket' => 'Закрыть этот "тикет"',
+	'Portal:Button:UpdateRequest' => 'Update the request',
 	'Portal:EnterYourCommentsOnTicket' => 'Введите ваши каментарии по решению этого "тикета":',
 	'Portal:ErrorNoContactForThisUser' => 'Ошибка: текющий пользователь не ассоциирован с Контактом/Человеком. Пожалуйста свяжитесь с вашим администратором.',
 	

dictionaries/tr.dictionary.itop.core.php

@@ -108,6 +108,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Change:ObjectCreated' => 'Nesne yaratıldı',
 	'Change:ObjectDeleted' => 'Nesne silindi',
 	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s\'nin değeri %2$s olarak atandı (önceki değer: %3$s)',
+	'Change:AttName_SetTo' => '%1$s\'nin değeri %2$s olarak atandı',
 	'Change:Text_AppendedTo_AttName' => '%2$s\'ye %1$s eklendi',
 	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$\'nin değeri deiştirildi, önceki değer: %2$s',
 	'Change:AttName_Changed' => '%1$s değiştirildi',

dictionaries/tr.dictionary.itop.ui.php

@@ -405,6 +405,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:History:Changes+' => 'Nesneye yapılan değişiklikler',
 	'UI:Loading' => 'Yükleniyor...',
 	'UI:Menu:Actions' => 'İşlemler',
+	'UI:Menu:OtherActions' => 'Diğer İşlemler',
 	'UI:Menu:New' => 'Yeni...',
 	'UI:Menu:Add' => 'Ekle...',
 	'UI:Menu:Manage' => 'Yönet...',
@@ -608,6 +609,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s sınıfına ait çoklu %1$d nesne silimi',
 	'UI:Delete:NotAllowedToDelete' => 'Bu nesneyi silmek için yetkiniz yok',
 	'UI:Delete:NotAllowedToUpdate_Fields' => '%1$s alanlarını güncellemek için yetkiniz yok',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
 	'UI:Error:NotEnoughRightsToDelete' => 'Nesne yetersiz yetki nedeniyle silinemedi',
 	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Bu nesneyi silmek için öncelikli dışarıdan yapılması gereken işlemler var',
 	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
@@ -619,8 +621,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s silindi.',
 	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s\'in silimi',
 	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$s sınıfına ait %1$d nesnelerinin silimi ',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => 'Otomatik silimesini mi istiyorsunuz, ancak buna yetkiniz yok',
-	'UI:Delete:MustBeDeletedManuallyButNotAllowed' => 'Manuel silinmeli - ancak bu nesneyi silmeye yetkiniz yok, lütfen sistem yöneticisiyle irtibata geçiniz.',
+//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Otomatik silimesini mi istiyorsunuz, ancak buna yetkiniz yok',
+//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Manuel silinmeli - ancak bu nesneyi silmeye yetkiniz yok, lütfen sistem yöneticisiyle irtibata geçiniz.',
 	'UI:Delete:WillBeDeletedAutomatically' => 'Otomatik olarak silinecek',
 	'UI:Delete:MustBeDeletedManually' => 'Manuel silinmeli',
 	'UI:Delete:CannotUpdateBecause_Issue' => 'Otomatik güncellenmeli, ancak: %1$s',
@@ -845,10 +847,14 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Portal:Title' => 'iTop Kullanıcı Portalı',
 	'Portal:Refresh' => 'Yenile',
 	'Portal:Back' => 'Geri',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Yeni istek yarat',
 	'Portal:ChangeMyPassword' => 'Şifre değiştir',
 	'Portal:Disconnect' => 'Çıkış',
 	'Portal:OpenRequests' => 'Açık isteklerim',
+	'Portal:ClosedRequests'  => 'My closed requests',
 	'Portal:ResolvedRequests'  => 'Çözdüğüm istekler',
 	'Portal:SelectService' => 'Kataloğdan servis seçiniz:',
 	'Portal:PleaseSelectOneService' => 'Sevis seçiniz',
@@ -857,7 +863,10 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Portal:DescriptionOfTheRequest' => 'İstek tanımlaması:',
 	'Portal:TitleRequestDetailsFor_Request' => 'İsteğin detayı %1$s:',
 	'Portal:NoOpenRequest' => 'Bu kategoride istek yok.',
+	'Portal:NoClosedRequest' => 'Bu kategoride istek yok.',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
 	'Portal:Button:CloseTicket' => 'Çağrıyı kapat',
+	'Portal:Button:UpdateRequest' => 'Update the request',
 	'Portal:EnterYourCommentsOnTicket' => 'İsteğin çözümüne yönelik açıklamalar:',
 	'Portal:ErrorNoContactForThisUser' => 'Hata: mevcut kullanıcının irtibat bilgisi yok. Sistem yöneticisi ile irtibata geçiniz.',
 

dictionaries/zh.dictionary.itop.core.php

@@ -107,6 +107,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Change:ObjectCreated' => 'Object created',
 	'Change:ObjectDeleted' => 'Object deleted',
 	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s set to %2$s (previous value: %3$s)',
+	'Change:AttName_SetTo' => '%1$s set to %2$s',
 	'Change:Text_AppendedTo_AttName' => '%1$s appended to %2$s',
 	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modified, previous value: %2$s',
 	'Change:AttName_Changed' => '%1$s modified',

dictionaries/zh.dictionary.itop.ui.php

@@ -404,6 +404,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:History:Changes+' => '对该对象所做的变更',
 	'UI:Loading' => '载入...',
 	'UI:Menu:Actions' => '动作',
+	'UI:Menu:OtherActions' => '其他操作',
 	'UI:Menu:New' => '新建...',
 	'UI:Menu:Add' => '添加...',
 	'UI:Menu:Manage' => '管理...',
@@ -607,6 +608,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '批量删除 %1$d 个 %2$s 类的对象',
 	'UI:Delete:NotAllowedToDelete' => '您未被允许删除该对象',
 	'UI:Delete:NotAllowedToUpdate_Fields' => '您未被允许更新下述栏目: %1$s',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
 	'UI:Error:NotEnoughRightsToDelete' => '该对象不能被删除, 因为当前用户没有足够权限',
 	'UI:Error:CannotDeleteBecauseOfDepencies' => '该对象不能被删除, 因为一些手工操作必须事先完成',
 	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
@@ -618,8 +620,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s 删除了.',
 	'UI:Delete:ConfirmDeletionOf_Name' => '删除 %1$s',
 	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '删除 %2$s 类的 %1$d 个对象',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotAllowed' => '应该自动删除, 但您未被允许这样做',
-	'UI:Delete:MustBeDeletedManuallyButNotAllowed' => '必须手工删除 - 但您未被允许删除该对象, 请联系您的应用程序系统管理员',
+//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => '应该自动删除, 但您未被允许这样做',
+//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => '必须手工删除 - 但您未被允许删除该对象, 请联系您的应用程序系统管理员',
 	'UI:Delete:WillBeDeletedAutomatically' => '将被自动删除',
 	'UI:Delete:MustBeDeletedManually' => '必须手工删除',
 	'UI:Delete:CannotUpdateBecause_Issue' => '应该被自动更新, 但是: %1$s',
@@ -844,10 +846,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:Title' => 'iTop 用户门户',
 	'Portal:Refresh' => '刷新',
 	'Portal:Back' => '返回',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => '创建一个新的请求',
 	'Portal:ChangeMyPassword' => '改变我的密码',
 	'Portal:Disconnect' => '断开',
 	'Portal:OpenRequests' => '我的待解决的请求',
+	'Portal:ClosedRequests'  => 'My closed requests',
 	'Portal:ResolvedRequests'  => '我的已解决的请求',
 	'Portal:SelectService' => '从类目中选择一个服务:',
 	'Portal:PleaseSelectOneService' => '请选择一个服务',
@@ -856,7 +862,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:DescriptionOfTheRequest' => '输入您的请求描述:',
 	'Portal:TitleRequestDetailsFor_Request' => '请求明细内容 %1$s:',
 	'Portal:NoOpenRequest' => '该类目中没有请求.',
+	'Portal:NoClosedRequest' => 'No request in this category',
 	'Portal:Button:CloseTicket' => '关闭这个单据',
+	'Portal:Button:UpdateRequest' => 'Update the request',
 	'Portal:EnterYourCommentsOnTicket' => '输入您对于该单据解决情况的评述:',
 	'Portal:ErrorNoContactForThisUser' => '错误: 当前用户没有和一个联系人或人员关联. 请联系您的系统管理员.',
 	

doc/itop-documentation.htm

@@ -62,11 +62,47 @@ a.internal {
 a.internal:hover {
 	text-decoration: underline;
 }
+.code {
+	background-color: #ccc;
+	padding: 10px;
+	border: 1px solid #999;
+	font-family: Courier, Courier-New, monospace;
+}
 </style>
 </head>
 <body>
 <div id="banner"><span>Installation Help</span></div>
 <div id="content">
+<h1><a name="Installation">Completing the iTop installation</a></h1>
+<h2>cron.php - overview</h2>
+<p>In order to operate properly, iTop maintenance operations and asynchronous tasks must be executed on a regular basis.
+In order to ease the installation, all the background tasks have been grouped to be launched from a single file: <tt>webservices/cron.php</tt></p>
+<p>The following features require the activation of cron.php</p>
+<ul>
+   <li><b>Asynchronous emails</b>. By default, this option is disabled. To enable it, set 'email_asynchronous' to 1 in the configuration file</li>
+   <li><b>Check ticket SLA</b>. Tickets reaching the limits will be passed into Escalation TTO/TTR states</li>
+</ul>
+</p>
+<p>For more information about cron.php, check the <a href="https://sourceforge.net/apps/mediawiki/itop/index.php?title=Cron.php">Wiki</a></p>
+<h2>Scheduling cron.php on Windows</h2>
+<ol>
+<li>Edit the file <em>&lt;itop root&gt</em>/webservices/<b>cron.params</b> to set the credentials used for cronified tasks (requires administator privileges)</li>
+<li>Edit the file <em>&lt;itop root&gt</em>/webservices/<b>cron.cmd</b>, and set the relevant path for your installation of PHP. If you care about security, it is recommended to change also the path to the parameters file <em>&lt;itop root&gt</em>/webservices/<b>cron.params</b> and move this file to a place where its content is not served by the web server.</li>
+<li>Schedule the execution of cron.cmd:
+  <pre>schtasks.exe /create /tn "iTop CRON" /sc minute /mo 1 /tr "\"<em>&lt;itop root&gt</em>/webservices/cron.cmd\""</pre>
+</li> 
+</ol>
+
+
+<h2>Scheduling cron.php on Linux/Unix</h2>
+<ol>
+<li>Edit the file <em>&lt;itop root&gt</em>/webservices/<b>cron.params</b> to set the credentials used for cronified tasks (requires administator privileges)</li>
+<li>If you care about security: move the file <em>&lt;itop root&gt</em>/webservices/<b>cron.params</b> into a directory not in the scope of the web server (Apache), and make it be readable only by the account that will execute the cron</li>
+<li>Edit the crontab and add the following line:
+   <pre>* * * * * /usr/bin/php <em>&lt;itop root&gt</em>/webservices/cron.php --param_file=<em>&lt;itop root&gt</em>/webservices/cron.params</pre>
+</li>
+</ol>
+
 <h1><a name="Modules">iTop Modules</a></h1>
 
 <!-- Configuration Management Module -->
@@ -75,7 +111,7 @@ a.internal:hover {
 <p>This module allows IT operators to document all items they have under their control, it implements a CMDB following the ITIL best practices. The module provides a logical model of the IT infrastructure by identifying, controlling, maintaining and verifying the version of all existing Configuration Items (CIs).
 Relationships between CIs are also documented in the Configuration Management module, so that IT engineers can easily analyze dependencies within the infrastructure and understand the impact due to incidents or changes.</p>
 <p>Out of the box, iTop 1.0 allows you to manage:</p>
-<ul>
+<ul>           
 <li>Persons and Teams</li> 
 <li>Locations</li>
 <li>Business Processes</li>
@@ -89,7 +125,7 @@ Relationships between CIs are also documented in the Configuration Management mo
 <p><i>This module is the base for all other iTop modules and is automatically installed with iTop</i></p>
 
 <!-- Service Management Module -->
-
+                                       
 <h2 id="Service"><a name="ServiceMgmt">Service Management</a></h2>
 <p>This module allows you to define and maintain the Services provided by your organization, the contracts with your customers and providers and the available Service Levels for each of Service.</p>
 <p>Using this module, you can document:</p>