Created branch 1.2.0 (now the branch 1.2 means 1.2.1)

SVN:1.2.0[1722]

addons/userrights/userrightsmatrix.class.inc.php

@@ -274,7 +274,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		return true;
 	}
 
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	public function GetSelectFilter($oUser, $sClass)
 	{
 		$oNullFilter  = new DBObjectSearch($sClass);
 		return $oNullFilter;

addons/userrights/userrightsnull.class.inc.php

@@ -47,7 +47,7 @@ class UserRightsNull extends UserRightsAddOnAPI
 		return true;
 	}
 
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	public function GetSelectFilter($oUser, $sClass)
 	{
 		$oNullFilter  = new DBObjectSearch($sClass);
 		return $oNullFilter;

addons/userrights/userrightsprofile.class.inc.php

@@ -597,12 +597,12 @@ class UserRightsProfile extends UserRightsAddOnAPI
 	}
 
 
-	protected $m_aAdmins = array(); // id -> bool, true if the user has the well-known admin profile
-	protected $m_aPortalUsers = array(); // id -> bool, true if the user has the well-known portal user profile
+	protected $m_aAdmins; // id of users being linked to the well-known admin profile
+	protected $m_aPortalUsers; // id of users being linked to the well-known admin profile
 
 	protected $m_aProfiles; // id -> object
-	protected $m_aUserProfiles = array(); // userid,profileid -> object
-	protected $m_aUserOrgs = array(); // userid -> array of orgid
+	protected $m_aUserProfiles; // userid,profileid -> 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)
@@ -611,80 +611,20 @@ 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();
 
-	/**
-	 * Read and cache organizations allowed to the given user
-	 * 
-	 * @param oUser
-	 * @param sClass -not used here but can be used in overloads
-	 */
 	protected function GetUserOrgs($oUser, $sClass)
 	{
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aUserOrgs))
-		{
-			$this->m_aUserOrgs[$iUser] = array();
-
-			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
-			if ($sHierarchicalKeyCode !== false)
-			{
-				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
-				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), array(), array('userid' => $iUser));
-				while ($aRow = $oUserOrgSet->FetchAssoc())
-				{
-					$oUserOrg = $aRow['UserOrg'];
-					$oOrg = $aRow['Org'];
-					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
-				}
-			}
-			else
-			{
-				$oSearch = new DBObjectSearch('URP_UserOrg');
-				$oSearch->AllowAllData();
-				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
-				$oSearch->AddConditionExpression($oCondition);
-				
-				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
-				while ($oUserOrg = $oUserOrgSet->Fetch())
-				{
-					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
-				}
-			}
-		}
-		return $this->m_aUserOrgs[$iUser];
-	}
-
-	/**
-	 * Read and cache profiles of the given user
-	 */
-	protected function GetUserProfiles($iUser)
-	{
-		if (!array_key_exists($iUser, $this->m_aUserProfiles))
-		{
-			$oSearch = new DBObjectSearch('URP_UserProfile');
-			$oSearch->AllowAllData();
-			$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
-			$oSearch->AddConditionExpression($oCondition);
-			
-			$this->m_aUserProfiles[$iUser] = array();
-			$oUserProfileSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
-			while ($oUserProfile = $oUserProfileSet->Fetch())
-			{
-				$this->m_aUserProfiles[$iUser][$oUserProfile->Get('profileid')] = $oUserProfile;
-			}
-		}
-		return $this->m_aUserProfiles[$iUser];
-
+		return @$this->m_aUserOrgs[$oUser->GetKey()];
 	}
 
 	public function ResetCache()
 	{
 		// Loaded by Load cache
 		$this->m_aProfiles = null; 
-		$this->m_aUserProfiles = array();
-		$this->m_aUserOrgs = array();
+		$this->m_aUserProfiles = null;
+		$this->m_aUserOrgs = null;
 
-		$this->m_aAdmins = array();
-		$this->m_aPortalUsers = array();
+		$this->m_aAdmins = null;
+		$this->m_aPortalUsers = null;
 
 		// Loaded on demand (time consuming as compared to the others)
 		$this->m_aClassActionGrants = null;
@@ -719,11 +659,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 		$oKPI = new ExecutionKPI();
 
-		if (self::HasSharing())
-		{
-			SharedObject::InitSharedClassProperties();
-		}
-
 		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
 		$this->m_aProfiles = array(); 
 		while ($oProfile = $oProfileSet->Fetch())
@@ -731,6 +666,30 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
 		}
 
+		$oUserProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_UserProfile"));
+		$this->m_aUserProfiles = array();
+		$this->m_aAdmins = array();
+		$this->m_aPortalUsers = array();
+		while ($oUserProfile = $oUserProfileSet->Fetch())
+		{
+			$this->m_aUserProfiles[$oUserProfile->Get('userid')][$oUserProfile->Get('profileid')] = $oUserProfile;
+			if ($oUserProfile->Get('profile') == ADMIN_PROFILE_NAME)
+			{
+				$this->m_aAdmins[] = $oUserProfile->Get('userid');
+			}
+			elseif ($oUserProfile->Get('profile') == PORTAL_PROFILE_NAME)
+			{
+				$this->m_aPortalUsers[] = $oUserProfile->Get('userid');
+			}
+		}
+
+		$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_UserOrg"));
+		$this->m_aUserOrgs = array();
+		while ($oUserOrg = $oUserOrgSet->Fetch())
+		{
+			$this->m_aUserOrgs[$oUserOrg->Get('userid')][] = $oUserOrg->Get('allowed_org_id');
+		}
+
 		$this->m_aClassStimulusGrants = array();
 		$oStimGrantSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_StimulusGrant"));
 		$this->m_aStimGrants = array();
@@ -757,45 +716,33 @@ exit;
 
 	public function IsAdministrator($oUser)
 	{
-		//$this->LoadCache();
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aAdmins))
+		$this->LoadCache();
+
+		if (in_array($oUser->GetKey(), $this->m_aAdmins))
 		{
-			$bIsAdmin = false;
-			foreach($this->GetUserProfiles($iUser) as $oUserProfile)
+			return true;
+		}
+		else
 		{
-				if ($oUserProfile->Get('profile') == ADMIN_PROFILE_NAME)
-				{
-					$bIsAdmin = true;
-					break;
+			return false;
 		}
 	}
-			$this->m_aAdmins[$iUser] = $bIsAdmin;
-		}
-		return $this->m_aAdmins[$iUser];
-	}
 
 	public function IsPortalUser($oUser)
 	{
-		//$this->LoadCache();
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aPortalUsers))
+		$this->LoadCache();
+
+		if (in_array($oUser->GetKey(), $this->m_aPortalUsers))
 		{
-			$bIsPortalUser = false;
-			foreach($this->GetUserProfiles($iUser) as $oUserProfile)
+			return true;
+		}
+		else
 		{
-				if ($oUserProfile->Get('profile') == PORTAL_PROFILE_NAME)
-				{
-					$bIsPortalUser = true;
-					break;
+			return false;
 		}
 	}
-			$this->m_aPortalUsers[$iUser] = $bIsPortalUser;
-		}
-		return $this->m_aPortalUsers[$iUser];
-	}
 
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	public function GetSelectFilter($oUser, $sClass)
 	{
 		$this->LoadCache();
 
@@ -807,18 +754,41 @@ exit;
 
 		// Determine how to position the objects of this class
 		//
-		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
-		if (is_null($sAttCode))
+		$aCallSpec = array($sClass, 'MapContextParam');
+		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
 		{
-			// No filtering for this object
+			$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';
+		}
+		else
+		{
+			// The objects of this class are not positioned in this dimension
+			// All of them are visible
 			return true;
 		}
 		// Position the user
 		//
 		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-		if (count($aUserOrgs) == 0)
+		if (is_null($aUserOrgs) || count($aUserOrgs) == 0)
 		{
-			// No org means 'any org'
+			// No position means 'Everywhere'
 			return true;
 		}
 
@@ -826,65 +796,48 @@ exit;
 		$oFilter  = new DBObjectSearch($sClass);
 		$oListExpr = ListExpression::FromScalars($aUserOrgs);
 		
-		$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
-		$oFilter->AddConditionExpression($oCondition);
+		// Check if the condition points to a hierarchical key
+		$bConditionAdded = false;
 
-		if (self::HasSharing())
+		if ($sAttCode == 'id')
 		{
-			if (($sAttCode == 'id') && isset($aSettings['bSearchMode']) && $aSettings['bSearchMode'])
+			// Filtering on the objects themselves
+			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sClass);
+			
+			if ($sHierarchicalKeyCode !== false)
 			{
-				// Querying organizations (or derived)
-				// and the expected list of organizations will be used as a search criteria
-				// Therefore the query can also return organization having objects shared with the allowed organizations
-				//
-				// 1) build the list of organizations sharing something with the allowed organizations
-				// Organization <== sharing_org_id == SharedObject having org_id IN {user orgs}
-				$oShareSearch = new DBObjectSearch('SharedObject');
-				$oOrgField = new FieldExpression('org_id', 'SharedObject');
-				$oShareSearch->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
-	
-				$oSearchSharers = new DBObjectSearch('Organization');
-				$oSearchSharers->AllowAllData();
-				$oSearchSharers->AddCondition_ReferencedBy($oShareSearch, 'sharing_org_id');
-				$aSharers = array();
-				foreach($oSearchSharers->ToDataArray(array('id')) as $aRow)
+				$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)
 				{
-					$aSharers[] = $aRow['id'];
-				}
-				// 2) Enlarge the overall results: ... OR id IN(id1, id2, id3)
-				if (count($aSharers) > 0)
-				{
-					$oSharersList = ListExpression::FromScalars($aSharers);
-					$oFilter->MergeConditionExpression(new BinaryExpression($oExpression, 'IN', $oSharersList));
+					$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;
 				}
 			}
-	
-			$aShareProperties = SharedObject::GetSharedClassProperties($sClass);
-			if ($aShareProperties)
-			{
-				$sShareClass = $aShareProperties['share_class'];
-				$sShareAttCode = $aShareProperties['attcode'];
-	
-				$oSearchShares = new DBObjectSearch($sShareClass);
-				$oSearchShares->AllowAllData();
-	
-				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
-				$oOrgField = new FieldExpression('org_id', $sShareClass);
-				$oSearchShares->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
-				$aShared = array();
-				foreach($oSearchShares->ToDataArray(array($sShareAttCode)) as $aRow)
-				{
-					$aShared[] = $aRow[$sShareAttCode];
-				}
-				if (count($aShared) > 0)
-				{
-					$oObjId = new FieldExpression('id', $sClass);
-					$oSharedIdList = ListExpression::FromScalars($aShared);
-					$oFilter->MergeConditionExpression(new BinaryExpression($oObjId, 'IN', $oSharedIdList));
-				}
-			}
-		} // if HasSharing
-
+		}
+		if (!$bConditionAdded)
+		{
+			$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
+			$oFilter->AddConditionExpression($oCondition);
+		}
 		return $oFilter;
 	}
 
@@ -930,8 +883,10 @@ exit;
 
 		$iPermission = UR_ALLOWED_NO;
 		$aAttributes = array();
-		foreach($this->GetUserProfiles($iUser) as $iProfile => $oProfile)
+		if (isset($this->m_aUserProfiles[$iUser]))
 		{
+			foreach($this->m_aUserProfiles[$iUser] as $iProfile => $oProfile)
+			{
 				$iGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
 				if (is_null($iGrant) || !$iGrant)
 				{
@@ -940,7 +895,7 @@ exit;
 				else
 				{
 					$iPermission = UR_ALLOWED_YES;
-
+	
 					// update the list of attributes with those allowed for this profile
 					//
 					$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_AttributeGrant WHERE actiongrantid = :actiongrantid");
@@ -957,6 +912,7 @@ exit;
 					}
 				}
 			}
+		}
 
 		$aRes = array(
 			'permission' => $iPermission,
@@ -970,76 +926,10 @@ exit;
 	{
 		$this->LoadCache();
 
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
-		$iPermission = $aObjectPermissions['permission'];
-
-		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
-
-		if ($iPermission != UR_ALLOWED_YES)
-		{
-			// It is already NO for everyone... that's the final word!
-		}
-		elseif ($iActionCode == UR_ACTION_READ)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
-		elseif ($iActionCode == UR_ACTION_BULK_READ)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
-		elseif ($oInstanceSet)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-			// We have to answer NO for objects shared for reading purposes
-			if (self::HasSharing())
-			{
-				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
-				if ($aClassProps)
-				{
-					// This class is shared, GetSelectFilter may allow some objects for read only
-					// But currently we are checking wether the objects might be written...
-					// Let's exclude the objects based on the relevant criteria
-
-					$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
-					if (!is_null($sOrgAttCode))
-					{
-						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
-						{
-							$iCountNO = 0;
-							$iCountYES = 0;
-							$oInstanceSet->Rewind();
-							while($oObject = $oInstanceSet->Fetch())
-							{
-								$iOrg = $oObject->Get($sOrgAttCode);
-								if (in_array($iOrg, $aUserOrgs))
-								{
-									$iCountYES++;
-								}
-								else
-								{
-									$iCountNO++;
-								}
-							}
-							if ($iCountNO == 0)
-							{
-								$iPermission = UR_ALLOWED_YES;
-							}
-							elseif ($iCountYES == 0)
-							{
-								$iPermission = UR_ALLOWED_NO;
-							}
-							else
-							{
-								$iPermission = UR_ALLOWED_DEPENDS;
-							}
-						}
-					}
-				}
-			}
-		}
-		return $iPermission;
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		return $aObjectPermissions['permission'];
 	}
 
 	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
@@ -1084,8 +974,10 @@ exit;
 		// Note: The object set is ignored because it was interesting to optimize for huge data sets
 		//       and acceptable to consider only the root class of the object set
 		$iPermission = UR_ALLOWED_NO;
-		foreach($this->GetUserProfiles($iUser) as $iProfile => $oProfile)
+		if (isset($this->m_aUserProfiles[$iUser]))
 		{
+			foreach($this->m_aUserProfiles[$iUser] as $iProfile => $oProfile)
+			{
 				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
 				if (!is_null($oGrantRecord))
 				{
@@ -1093,6 +985,7 @@ exit;
 					$iPermission = UR_ALLOWED_YES;
 				}
 			}
+		}
 		return $iPermission;
 	}
 
@@ -1100,49 +993,6 @@ exit;
 	{
 		$this->ResetCache();
 	}
-
-	/**
-	 * Find out which attribute is corresponding the the dimension 'owner org'
-	 * returns null if no such attribute has been found (no filtering should occur)	 
-	 */	 	
-	public static function GetOwnerOrganizationAttCode($sClass)
-	{
-		$sAttCode = null;
-
-		$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 (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				// Skip silently. The data model checker will tell you something about this...
-				$sAttCode = null;
-			}
-		}
-		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
-		{
-			$sAttCode = 'org_id';
-		}
-
-		return $sAttCode;
-	}
-
-	/**
-	 * Determine wether the objects can be shared by the mean of a class SharedObject
-	 **/
-	protected static function HasSharing()
-	{
-		static $bHasSharing;
-		if (!isset($bHasSharing))
-		{
-			$bHasSharing = class_exists('SharedObject');
-		}
-		return $bHasSharing;
-	}
 }
 
 

addons/userrights/userrightsprojection.class.inc.php

@@ -734,7 +734,7 @@ exit;
 		return true;
 	}
 
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	public function GetSelectFilter($oUser, $sClass)
 	{
 		$aConditions = array();
 		foreach ($this->m_aDimensions as $iDimension => $oDimension)

application/application.inc.php

@@ -29,7 +29,6 @@ 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

@@ -77,16 +77,12 @@ class ApplicationContext
 	protected $aValues;
 	protected static $aDefaultValues; // Cache shared among all instances
 	
-	public function __construct($bReadContext = true)
+	public function __construct()
 	{
 		$this->aNames = array(
 			'org_id', 'menu'
 		);
-		if ($bReadContext)
-		{
-			$this->ReadContext();			
-		}
-
+		$this->ReadContext();
 	}
 	
 	/**
@@ -115,7 +111,6 @@ class ApplicationContext
 					if (MetaModel::IsValidClass('Organization'))
 					{
 						$oSearchFilter = new DBObjectSearch('Organization');
-						$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 						$oSet = new CMDBObjectSet($oSearchFilter);
 						$iCount = $oSet->Count();
 						if ($iCount == 1)
@@ -304,58 +299,5 @@ class ApplicationContext
 			return '';
 		}	
 	}
-
-	protected static $m_aPluginProperties = null;
-
-	/**
-	 * Load plugin properties for the current session
-	 * @return void
-	 */
-	protected static function LoadPluginProperties()
-	{
-		if (isset($_SESSION['PluginProperties']))
-		{
-			self::$m_aPluginProperties = $_SESSION['PluginProperties'];
-		}
-		else
-		{
-			self::$m_aPluginProperties = array();
-		}
-	}
-
-	/**
-	 * Set plugin properties
-	 * @param sPluginClass string Class implementing any plugin interface
-	 * @param sProperty string Name of the property
-	 * @param value scalar Value (numeric or string)
-	 * @return void
-	 */
-	public static function SetPluginProperty($sPluginClass, $sProperty, $value)
-	{
-		if (is_null(self::$m_aPluginProperties)) self::LoadPluginProperties();
-
-		self::$m_aPluginProperties[$sPluginClass][$sProperty] = $value;
-		$_SESSION['PluginProperties'][$sPluginClass][$sProperty] = $value;
-	}
-
-	/**
-	 * Get plugin properties
-	 * @param sPluginClass string Class implementing any plugin interface
-	 * @return array of sProperty=>value pairs
-	 */
-	public static function GetPluginProperties($sPluginClass)
-	{
-		if (is_null(self::$m_aPluginProperties)) self::LoadPluginProperties();
-
-		if (array_key_exists($sPluginClass, self::$m_aPluginProperties))
-		{
-			return self::$m_aPluginProperties[$sPluginClass];
-		}
-		else
-		{
-			return array();
-		}
-	}
-
 }
 ?>

application/cmdbabstract.class.inc.php

@@ -185,7 +185,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				$sTip .= Dict::S('Core:Synchro:LastSynchro').'<br/>'.$aStruct['last_synchro']."</p>";
 			}
 			$sSynchroIcon = '&nbsp;<img style="vertical-align:middle;" id="synchro_icon" src="../images/locked.png"/>';
-			$oPage->add_ready_script("$('#synchro_icon').qtip( { content: '$sTip', show: 'mouseover', hide: { fixed: true }, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+			$oPage->add_ready_script("$('#synchro_icon').qtip( { content: '$sTip', show: 'mouseover', hide: 'unfocus', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
 		}
 	
 		$oPage->add("<div class=\"page_header\"><h1>".$this->GetIcon()."&nbsp;\n");
@@ -208,11 +208,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	{
 		$aFieldsMap = $this->GetBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);		
 
-		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
-		{
-			$oExtensionInstance->OnDisplayProperties($this, $oPage, $bEditMode);
-		}
-		
 		// Special case to display the case log, if any...
 		// WARNING: if you modify the loop below, also check the corresponding code in UpdateObject and DisplayModifyForm
 		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
@@ -224,6 +219,11 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 			}
 		}
 
+		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
+		{
+			$oExtensionInstance->OnDisplayProperties($this, $oPage, $bEditMode);
+		}
+		
 		return $aFieldsMap;
 	}
 
@@ -252,17 +252,16 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				$sCount = " ($iCount)";
 			}
 			$oPage->SetCurrentTab($oAttDef->GetLabel().$sCount);
-			if ($this->IsNew())
-			{
-				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
-			}
-			else
-			{
-				$iFlags = $this->GetAttributeFlags($sAttCode);
-			}
-			$bReadOnly = ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE));
-			if ($bEditMode && (!$bReadOnly))
+			if ($bEditMode)
 			{
+				if ($this->IsNew())
+				{
+					$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
+				}
+				else
+				{
+					$iFlags = $this->GetAttributeFlags($sAttCode);
+				}
 				$sInputId = $this->m_iFormId.'_'.$sAttCode;
 				if (get_class($oAttDef) == 'AttributeLinkedSet')
 				{
@@ -656,26 +655,8 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 		$bTruncated = isset($aExtraParams['truncated']) ? $aExtraParams['truncated'] == true : true;
 		$bSelectMode = isset($aExtraParams['selection_mode']) ? $aExtraParams['selection_mode'] == true : false;
 		$bSingleSelectMode = isset($aExtraParams['selection_type']) ? ($aExtraParams['selection_type'] == 'single') : false;
-
-		$aExtraFieldsRaw = isset($aExtraParams['extra_fields']) ? explode(',', trim($aExtraParams['extra_fields'])) : array();
-		$aExtraFields = array();
-		foreach ($aExtraFieldsRaw as $sFieldName)
-		{
-			// Ignore attributes not of the main queried class
-			if (preg_match('/^(.*)\.(.*)$/', $sFieldName, $aMatches))
-			{
-				$sClassAlias = $aMatches[1];
-				$sAttCode = $aMatches[2];
-				if ($sClassAlias == $oSet->GetFilter()->GetClassAlias())
-				{
-					$aExtraFields[] = $sAttCode;
-				}
-			}
-			else
-			{
-				$aExtraFields[] = $sFieldName;
-			}
-		}
+		$aExtraFields = isset($aExtraParams['extra_fields']) ? explode(',', trim($aExtraParams['extra_fields'])) : array();
+		
 		$sHtml = '';
 		$oAppContext = new ApplicationContext();
 		$sClassName = $oSet->GetFilter()->GetClass();
@@ -902,9 +883,7 @@ EOF
 			$sDisplayList = json_encode($aList);
 			$sCssCount = isset($aExtraParams['cssCount']) ? ", cssCount: '{$aExtraParams['cssCount']}'" : '';
 			$iPageSize = MetaModel::GetConfig()->GetMinDisplayLimit();
-			$oSet->ApplyParameters();
-			$sOQL = addslashes($oSet->GetFilter()->serialize());
-			$oPage->add_ready_script("$('#{$iListId} table.listResults').tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectMode', displayKey: $sDisplayKey, displayList: $sDisplayList $sCssCount});\n");
+			$oPage->add_ready_script("$('#{$iListId} table.listResults').tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sFilter', extra_params: '$sExtraParams', select_mode: '$sSelectMode', displayKey: $sDisplayKey, displayList: $sDisplayList $sCssCount});\n");
 		}
 		else
 		{
@@ -961,28 +940,7 @@ EOF
 		$bDisplayMenu = isset($aExtraParams['menu']) ? $aExtraParams['menu'] == true : true;
 		// Check if there is a list of aliases to limit the display to...
 		$aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : array();
-		$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
-
-		$aExtraFieldsRaw = isset($aExtraParams['extra_fields']) ? explode(',', trim($aExtraParams['extra_fields'])) : array();
-		$aExtraFields = array();
-		foreach ($aExtraFieldsRaw as $sFieldName)
-		{
-			// Ignore attributes not of the main queried class
-			if (preg_match('/^(.*)\.(.*)$/', $sFieldName, $aMatches))
-			{
-				$sClassAlias = $aMatches[1];
-				$sAttCode = $aMatches[2];
-				if (array_key_exists($sClassAlias, $oSet->GetSelectedClasses()))
-				{
-					$aExtraFields[$sClassAlias][] = $sAttCode;
-				}
-			}
-			else
-			{
-				$aExtraFields['*'] = $sAttCode;
-			}
-		}
-
+		
 		$sHtml = '';
 		$oAppContext = new ApplicationContext();
 		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
@@ -998,36 +956,12 @@ EOF
 		$aAttribs = array();
 		foreach($aAuthorizedClasses as $sAlias => $sClassName) // TO DO: check if the user has enough rights to view the classes of the list...
 		{
-			if (array_key_exists($sAlias, $aExtraFields))
-			{
-				$aList[$sAlias] = $aExtraFields[$sAlias];
-			}
-			else
-			{
-				$aList[$sAlias] = array();
-			}
-			if ($sZListName !== false)
-			{
-				$aDefaultList = self::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
-				
-				$aList[$sAlias] = array_merge($aDefaultList, $aList[$sAlias]);
-			}
-	
-			// Filter the list to removed linked set since we are not able to display them here
-			foreach($aList[$sAlias] as $index => $sAttCode)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
-				if ($oAttDef instanceof AttributeLinkedSet)
-				{
-					// Removed from the display list
-					unset($aList[$sAlias][$index]);
-				}
-			}
+			$aList[$sClassName] = MetaModel::GetZListItems($sClassName, 'list');
 			if ($bViewLink)
 			{
 				$aAttribs['key_'.$sAlias] = array('label' => MetaModel::GetName($sClassName), 'description' => '');
 			}
-			foreach($aList[$sAlias] as $sAttCode)
+			foreach($aList[$sClassName] as $sAttCode)
 			{
 				$aAttribs[$sAttCode.'_'.$sAlias] = array('label' => MetaModel::GetLabel($sClassName, $sAttCode), 'description' => MetaModel::GetDescription($sClassName, $sAttCode));
 			}
@@ -1036,7 +970,7 @@ EOF
 		$aAttToLoad = array(); // attributes to load
 		foreach($aAuthorizedClasses as $sAlias => $sClassName)
 		{
-			foreach($aList[$sAlias] as $sAttCode)
+			foreach($aList[$sClassName] as $sAttCode)
 			{
 				$aAttToLoad[$sAlias][] = $sAttCode;
 			}
@@ -1070,7 +1004,7 @@ EOF
 						$aRow['key_'.$sAlias] = $aObjects[$sAlias]->GetHyperLink();
 					}
 				}
-				foreach($aList[$sAlias] as $sAttCode)
+				foreach($aList[$sClassName] as $sAttCode)
 				{
 					if (is_null($aObjects[$sAlias]))
 					{
@@ -1153,8 +1087,6 @@ EOF
 		$aHeader = array();
 		foreach($aAuthorizedClasses as $sAlias => $sClassName)
 		{
-			$aList[$sAlias] = array();
-
 			foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef)
 			{
 				if (is_null($aFields) || (count($aFields) == 0))
@@ -1162,20 +1094,20 @@ EOF
 					// Standard list of attributes (no link sets)
 					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField()))
 					{
-						$aList[$sAlias][$sAttCode] = $oAttDef;
+						$aList[$sClassName][$sAttCode] = $oAttDef;
 					}
 				}
 				else
 				{
 					// User defined list of attributes
-					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields))
+					if (in_array($sAttCode, $aFields))
 					{
-						$aList[$sAlias][$sAttCode] = $oAttDef;
+						$aList[$sClassName][$sAttCode] = $oAttDef;
 					}
 				}
 			}
 			$aHeader[] = 'id';
-			foreach($aList[$sAlias] as $sAttCode => $oAttDef)
+			foreach($aList[$sClassName] as $sAttCode => $oAttDef)
 			{
 				$sStar = '';
 				if ($oAttDef->IsExternalField())
@@ -1222,7 +1154,7 @@ EOF
 				{
 					$aRow[] = $oObj->GetKey();
 				}
-				foreach($aList[$sAlias] as $sAttCode => $oAttDef)
+				foreach($aList[$sClassName] as $sAttCode => $oAttDef)
 				{
 					if (is_null($oObj))
 					{
@@ -1240,149 +1172,6 @@ EOF
 		return $sHtml;
 	}
 	
-	static function DisplaySetAsHTMLSpreadsheet(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array())
-	{
-		$oPage->add(self::GetSetAsHTMLSpreadsheet($oSet, $aParams));
-	}
-	
-	/**
-	 * Spreadsheet output: designed for end users doing some reporting
-	 * Then the ids are excluded and replaced by the corresponding friendlyname
-	 */	 	 	
-	static function GetSetAsHTMLSpreadsheet(DBObjectSet $oSet, $aParams = array())
-	{
-		$aFields = null;
-		if (isset($aParams['fields']) && (strlen($aParams['fields']) > 0))
-		{
-			$aFields = explode(',', $aParams['fields']);
-		}
-
-		$aList = array();
-
-		$oAppContext = new ApplicationContext();
-		$aClasses = $oSet->GetFilter()->GetSelectedClasses();
-		$aAuthorizedClasses = array();
-		foreach($aClasses as $sAlias => $sClassName)
-		{
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
-			{
-				$aAuthorizedClasses[$sAlias] = $sClassName;
-			}
-		}
-		$aAttribs = array();
-		$aHeader = array();
-		foreach($aAuthorizedClasses as $sAlias => $sClassName)
-		{
-			$aList[$sAlias] = array();
-
-			foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef)
-			{
-				if (is_null($aFields) || (count($aFields) == 0))
-				{
-					// Standard list of attributes (no link sets)
-					if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField()))
-					{
-						$aList[$sAlias][$sAttCode] = $oAttDef;
-					}
-				}
-				else
-				{
-					// User defined list of attributes
-					if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields))
-					{
-						$aList[$sAlias][$sAttCode] = $oAttDef;
-					}
-				}
-			}
-			// Replace external key by the corresponding friendly name (if not already in the list)
-			foreach($aList[$sAlias] as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsExternalKey())
-				{
-					unset($aList[$sAlias][$sAttCode]);
-					$sFriendlyNameAttCode = $sAttCode.'_friendlyname';
-					if (!array_key_exists($sFriendlyNameAttCode, $aList[$sAlias]) && MetaModel::IsValidAttCode($sClassName, $sFriendlyNameAttCode))
-					{
-						$oFriendlyNameAtt = MetaModel::GetAttributeDef($sClassName, $sFriendlyNameAttCode);
-						$aList[$sAlias][$sFriendlyNameAttCode] = $oFriendlyNameAtt;
-					}
-				}
-			}
-
-			foreach($aList[$sAlias] as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsExternalField())
-				{
-					$sExtKeyLabel = MetaModel::GetLabel($sClassName, $oAttDef->GetKeyAttCode());
-					$oExtKeyAttDef = MetaModel::GetAttributeDef($sClassName, $oAttDef->GetKeyAttCode());
-					$sRemoteAttLabel = MetaModel::GetLabel($oAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
-					$oTargetAttDef = MetaModel::GetAttributeDef($oAttDef->GetTargetClass(), $oAttDef->GetExtAttCode());
-					$sSuffix = '';
-					if ($oTargetAttDef->IsExternalKey())
-					{
-						$sSuffix = '->id';
-					}
-					$sColLabel = $sExtKeyLabel.'->'.$sRemoteAttLabel.$sSuffix;
-				}
-				else
-				{
-					$sColLabel = MetaModel::GetLabel($sClassName, $sAttCode);
-				}
-				$oFinalAttDef = $oAttDef->GetFinalAttDef();
-				if (get_class($oFinalAttDef) == 'AttributeDateTime')
-				{
-					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Date').')';
-					$aHeader[] = $sColLabel.' ('.Dict::S('UI:SplitDateTime-Time').')';
-				}
-				else
-				{
-					$aHeader[] = $sColLabel;
-				}
-			}
-		}
-
-
-		$sHtml = "<table border=\"1\">\n";
-		$sHtml .= "<tr>\n";
-		$sHtml .= "<td>".implode("</td><td>", $aHeader)."</td>\n";
-		$sHtml .= "</tr>\n";
-		$oSet->Seek(0);
-		while ($aObjects = $oSet->FetchAssoc())
-		{
-			$aRow = array();
-			foreach($aAuthorizedClasses as $sAlias => $sClassName)
-			{
-				$oObj = $aObjects[$sAlias];
-				foreach($aList[$sAlias] as $sAttCode => $oAttDef)
-				{
-					if (is_null($oObj))
-					{
-						$aRow[] = '<td></td>';
-					}
-					else
-					{
-						$oFinalAttDef = $oAttDef->GetFinalAttDef();
-						if (get_class($oFinalAttDef) == 'AttributeDateTime')
-						{
-							$iDate = AttributeDateTime::GetAsUnixSeconds($oObj->Get($sAttCode));
-							$aRow[] = '<td>'.date('Y-m-d', $iDate).'</td>';
-							$aRow[] = '<td>'.date('H:i:s', $iDate).'</td>';
-						}
-						else
-						{
-							$aRow[] = '<td>'.(string) $oObj->Get($sAttCode).'</td>';
-						}
-					}
-				}
-			}
-			$sHtml .= implode("\n", $aRow);
-			$sHtml .= "</tr>\n";
-		}
-		$sHtml .= "</table>\n";
-		
-		return $sHtml;
-	}
-	
 	static function DisplaySetAsXML(WebPage $oPage, CMDBObjectSet $oSet, $aParams = array())
 	{
 		$oAppContext = new ApplicationContext();
@@ -1397,7 +1186,7 @@ EOF
 		}
 		$aAttribs = array();
 		$aList = array();
-		$aList[$sAlias] = MetaModel::GetZListItems($sClassName, 'details');
+		$aList[$sClassName] = MetaModel::GetZListItems($sClassName, 'details');
 		$oPage->add("<Set>\n");
 		$oSet->Seek(0);
 		while ($aObjects = $oSet->FetchAssoc())
@@ -1516,14 +1305,12 @@ EOF
 			$aMapCriteria[$aCriteria['filtercode']][] = array('value' => $aCriteria['value'], 'opcode' => $aCriteria['opcode']);
 		}
 		$aList = MetaModel::GetZListItems($sClassName, 'standard_search');
-		$aConsts = $oSet->ListConstantFields(); // Some fields are constants based on the query/context
-		$sClassAlias = $oSet->GetFilter()->GetClassAlias();
 		foreach($aList as $sFilterCode)
 		{
 			//$oAppContext->Reset($sFilterCode); // Make sure the same parameter will not be passed twice
 			$sHtml .= '<span style="white-space: nowrap;padding:5px;display:inline-block;">';
-			$sFilterValue = isset($aConsts[$sClassAlias][$sFilterCode]) ? $aConsts[$sClassAlias][$sFilterCode] : '';
-			$sFilterValue = utils::ReadParam($sFilterCode, $sFilterValue, false, 'raw_data');
+			$sFilterValue = '';
+			$sFilterValue = utils::ReadParam($sFilterCode, '', false, 'raw_data');
 			$sFilterOpCode = null; // Use the default 'loose' OpCode
 			if (empty($sFilterValue))
 			{
@@ -1549,9 +1336,7 @@ EOF
 			if ($oAttDef->IsExternalKey())
 			{
 				$sTargetClass = $oAttDef->GetTargetClass();
-				$oSearch = new DBObjectSearch($sTargetClass);
-				$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-				$oAllowedValues = new DBObjectSet($oSearch);
+				$oAllowedValues = new DBObjectSet(new DBObjectSearch($sTargetClass));
 
 				$iFieldSize = $oAttDef->GetMaxSize();
 				$iMaxComboLength = $oAttDef->GetMaximumComboLength();
@@ -1695,7 +1480,7 @@ EOF
 				$aEventsList[] ='validate';
 				$aEventsList[] ='keyup';
 				$aEventsList[] ='change';
-				$sHTMLValue = "<input title=\"$sHelpText\" class=\"datetime-pick\" type=\"text\" size=\"20\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" id=\"$iId\"/>&nbsp;{$sValidationField}";
+				$sHTMLValue = "<input title=\"$sHelpText\" class=\"date-pick\" type=\"text\" size=\"20\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" id=\"$iId\"/>&nbsp;{$sValidationField}";
 				break;
 
 				case 'Duration':
@@ -1722,7 +1507,6 @@ EOF
 					$sHTMLValue = "<input title=\"$sHelpText\" type=\"password\" size=\"30\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" id=\"$iId\"/>&nbsp;{$sValidationField}";
 				break;
 				
-				case 'OQLExpression':
 				case 'Text':
 					$aEventsList[] ='validate';
 					$aEventsList[] ='keyup';
@@ -1744,21 +1528,7 @@ EOF
 					{
 						$sStyle = 'style="'.implode('; ', $aStyles).'"';
 					}
-					if ($oAttDef->GetEditClass() == 'OQLExpression')
-					{
-						$sTestResId = 'query_res_'.$sFieldPrefix.$sAttCode.$sNameSuffix; //$oPage->GetUniqueId();
-						$sBaseUrl = utils::GetAbsoluteUrlAppRoot().'pages/run_query.php?expression=';
-						$sInitialUrl = $sBaseUrl.urlencode($sEditValue);
-						$sAdditionalStuff = "<a id=\"$sTestResId\" target=\"_blank\" href=\"$sInitialUrl\">".Dict::S('UI:Edit:TestQuery')."</a>";
-						$oPage->add_ready_script("$('#$iId').bind('change keyup', function(evt, sFormId) { $('#$sTestResId').attr('href', '$sBaseUrl'+encodeURIComponent($(this).val())); } );");
-					}
-					else
-					{
-						$sAdditionalStuff = "";
-					}
-					// Ok, the text area is drawn here
-					$sHTMLValue = "<table><tr><td><textarea class=\"resizable\" title=\"$sHelpText\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\" $sStyle>".htmlentities($sEditValue, ENT_QUOTES, 'UTF-8')."</textarea>$sAdditionalStuff</td><td>{$sValidationField}</td></tr></table>";
-
+					$sHTMLValue = "<table><tr><td><textarea class=\"resizable\" title=\"$sHelpText\" name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" rows=\"8\" cols=\"40\" id=\"$iId\" $sStyle>".htmlentities($sEditValue, ENT_QUOTES, 'UTF-8')."</textarea></td><td>{$sValidationField}</td></tr></table>";
 				break;
 
 				case 'CaseLog':
@@ -1837,7 +1607,7 @@ EOF
 					$aExtKeyParams = $aArgs;
 					$aExtKeyParams['iFieldSize'] = $oAttDef->GetMaxSize();
 					$aExtKeyParams['iMinChars'] = $oAttDef->GetMinAutoCompleteChars();	
-					$sHTMLValue = UIExtKeyWidget::DisplayFromAttCode($oPage, $sAttCode, $sClass, $oAttDef->GetLabel(), $oAllowedValues, $value, $iId, $bMandatory, $sFieldName, $sFormPrefix, $aExtKeyParams);
+					$sHTMLValue = UIExtKeyWidget::DisplayFromAttCode($oPage, $sAttCode, $sClass, $oAttDef->GetLabel(), $oAllowedValues, $value, $iId, $bMandatory, $sFieldName, $sFormPrefix, $aArgs);
 					$sHTMLValue .= "<!-- iFlags: $iFlags bMandatory: $bMandatory -->\n";
 					break;
 					
@@ -2381,7 +2151,7 @@ EOF
 		$current = HILIGHT_CLASS_NONE; // Not hilighted by default
 
 		// Invoke extensions before the deletion (the deletion will do some cleanup and we might loose some information
-		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
+		foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
 			$new = $oExtensionInstance->GetHilightClass($this);
 			@$current = self::$m_highlightComparison[$current][$new];
@@ -2666,7 +2436,7 @@ EOF
 		$this->UpdateObjectFromArray($aFinalValues);
 
 		// Invoke extensions after the update of the object from the form
-		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
+		foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
 			$oExtensionInstance->OnFormSubmit($this, $sFormPrefix);
 		}

application/displayblock.class.inc.php

@@ -348,11 +348,7 @@ class DisplayBlock
 				$aGroupBy = array();
 				$sLabels = array();
 				$iTotalCount = $this->m_oSet->Count();
-				$oTmpSet = clone $this->m_oSet;
-				// Speed up the load, load only the needed field to group on
-				$sAlias = $oTmpSet->GetFilter()->GetClassAlias();
-				$oTmpSet->OptimizeColumnLoad(array($sAlias => array($sGroupByField)));
-				while($oObj = $oTmpSet->Fetch())
+				while($oObj = $this->m_oSet->Fetch())
 				{
 					if (isset($aExtraParams['group_by_expr']))
 					{
@@ -750,7 +746,7 @@ EOF
 			$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(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=open_flash_chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[chart_title]=$sTitle&params[currentId]=$sId&id=$sId&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']))
 			{
@@ -1085,12 +1081,12 @@ class MenuBlock extends DisplayBlock
 				$sDefault.= "&default[$sKey]=$sValue";
 			}
 		}
-		$bIsCreationAllowed =  (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES);
 		switch($oSet->Count())
 		{
 			case 0:
 			// No object in the set, the only possible action is "new"
-			if ($bIsCreationAllowed) { $aActions['UI:Menu:New'] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=new&class=$sClass{$sContext}{$sDefault}"); }
+			$bIsModifyAllowed =  (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES);
+			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:
@@ -1104,7 +1100,7 @@ class MenuBlock extends DisplayBlock
 			if (!isset($aExtraParams['link_attr']))
 			{
 				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 ($bIsCreationAllowed) { $aActions['UI:Menu:New'] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "{$sRootUrl}pages/$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}"); }
 				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();
@@ -1173,16 +1169,13 @@ class MenuBlock extends DisplayBlock
 			else
 			{
 				// many objects in the set, possible actions are: new / modify all / delete all
-				if ($bIsCreationAllowed) { $aActions['UI:Menu:New'] = array ('label' => Dict::S('UI:Menu:New'), 'url' => "{$sRootUrl}pages/$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}"); }
 				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);
-				// Do not perform time consuming computations if there are too may objects in the list
-				$iLimit = MetaModel::GetConfig()->Get('complex_actions_limit');
-				
-				if ((count($aStates) > 0) && (($iLimit == 0) || ($oSet->Count() < $iLimit)))
+				if (count($aStates) > 0)
 				{
 					// Life cycle actions may be available... if all objects are in the same state
 					$oSet->Rewind();

application/itopwebpage.class.inc.php

@@ -32,13 +32,13 @@ require_once(APPROOT."/application/user.preferences.class.inc.php");
 class iTopWebPage extends NiceWebPage
 {
 	private $m_sMenu;
-	//	private $m_currentOrganization;
+//	private $m_currentOrganization;
 	private $m_aTabs;
 	private $m_sCurrentTabContainer;
 	private $m_sCurrentTab;
 	private $m_sMessage;
 	private $m_sInitScript;
-
+	
 	public function __construct($sTitle)
 	{
 		parent::__construct($sTitle);
@@ -159,7 +159,7 @@ class iTopWebPage extends NiceWebPage
 		alert(err);
 	}
 EOF
-		;
+;
 		$this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
@@ -317,15 +317,6 @@ EOF
 			changeMonth: true,
 			changeYear: true
 		});
-		$(".datetime-pick").datepicker({
-			showOn: 'button',
-			buttonImage: '../images/calendar.png',
-			buttonImageOnly: true,
-			dateFormat: 'yy-mm-dd 00:00:00',
-			constrainInput: false,
-			changeMonth: true,
-			changeYear: true
-		});
 	// Restore the persisted sortable order, for all sortable lists... if any
 	$('.sortable').each(function()
 	{
@@ -363,7 +354,7 @@ EOF
 	
 	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry').toggle(); });
 EOF
-		);
+);
 		$sUserPrefs = appUserPreferences::GetAsJSON();
 		$this->add_script(
 <<<EOF
@@ -416,11 +407,6 @@ EOF
 			return '$sAbsURLAppRoot';
 		}
 		
-		function GetAbsoluteUrlModulesRoot()
-		{
-			return '$sAbsURLAppRoot'+'modules/';
-		}
-		
 		function AddAppContext(sURL)
 		{
 			var sContext = '$sAppContext';
@@ -452,10 +438,10 @@ EOF
 		});
 
 EOF
-		);
-
-		// Build menus from module handlers
-		//
+);
+		
+    	// Build menus from module handlers
+    	//
 		foreach(get_declared_classes() as $sPHPClass)
 		{
 			if (is_subclass_of($sPHPClass, 'ModuleHandlerAPI'))
@@ -465,7 +451,7 @@ EOF
 			}
 		}
 	}
-
+	
 	public function AddToMenu($sHtml)
 	{
 		$this->m_sMenu .= $sHtml;
@@ -481,13 +467,11 @@ EOF
 			// 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');
-			$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 			$oSet = new CMDBObjectSet($oSearchFilter);
 			$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());
-			$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
 			if (!empty($aFavoriteOrgs))
 			{
 				$oSearchFilter->AddCondition('id', $aFavoriteOrgs, 'IN');
@@ -497,76 +481,76 @@ EOF
 		switch($iCount)
 		{
 			case 0:
-				// No such dimension/silo => nothing to select
-				$sHtml = '<div id="SiloSelection"><!-- nothing to select --></div>';
-				break;
-					
+			// No such dimension/silo => nothing to select
+			$sHtml = '<div id="SiloSelection"><!-- nothing to select --></div>';
+			break;
+			
 			case 1:
-				// Only one possible choice... no selection, but display the value
-				$oOrg = $oSet->Fetch();
-				$sHtml = '<div id="SiloSelection">'.$oOrg->GetName().'</div>';
-				$sHtml .= '';
-				break;
-					
+			// Only one possible choice... no selection, but display the value
+			$oOrg = $oSet->Fetch();
+			$sHtml = '<div id="SiloSelection">'.$oOrg->GetName().'</div>';
+			$sHtml .= '';
+			break;
+			
 			default:
-				$sHtml = '';
-				$oAppContext = new ApplicationContext();
-				$iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
-				$sHtml = '<div id="SiloSelection">';
-				$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())
-				 {
-				 if ($iCurrentOrganization == $oOrg->GetKey())
-				 {
-				 //					$oCurrentOrganization = $oOrg;
+			$sHtml = '';
+			$oAppContext = new ApplicationContext();
+			$iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
+			$sHtml = '<div id="SiloSelection">';
+			$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())
+			{
+				if ($iCurrentOrganization == $oOrg->GetKey())
+				{
+//					$oCurrentOrganization = $oOrg;
 					$sSelected = " selected";
-						
-					}
-					else
-					{
+			
+				}
+				else
+				{
 					$sSelected = "";
-					}
-					$sHtml .= '<option title="'.$oOrg->GetName().'" value="'.$oOrg->GetKey().'"'.$sSelected.'>'.$oOrg->GetName().'</option>';
-					}
-					$sHtml .= '</select>';
-					*/
-				$sFavoriteOrgs = '';
-				$oWidget = new UIExtKeyWidget('Organization', 'org_id', '', true /* search mode */);
-				$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')));
-				$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->Reset('org_id'); // org_id is handled above and we want to be able to change it here !
-				$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>';
+				}
+				$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, '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->Reset('org_id'); // org_id is handled above and we want to be able to change it here !
+			$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>';
 		}
-		return $sHtml;
+		return $sHtml;		
 	}
-
-	public function DisplayMenu()
-	{
+	
+    public function DisplayMenu()
+    {
 		// Display the menu
 		$oAppContext = new ApplicationContext();
 		$iAccordionIndex = 0;
 
 		ApplicationMenu::DisplayMenu($this, $oAppContext->GetAsHash());
-	}
+    }
 
 	/**
 	 * Outputs (via some echo) the complete HTML page by assembling all its elements
 	 */
-	public function output()
-	{
+    public function output()
+    {
 		$sForm = $this->GetSiloSelectionForm();
 		$this->DisplayMenu(); // Compute the menu
 
 		// Put here the 'ready scripts' that must be executed after all others
-		$this->add_ready_script(
+    	$this->add_ready_script(
 <<<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.
@@ -576,87 +560,78 @@ EOF
 	$('table.listResults').each( function() { FixTableSorter($(this)); } );
 
 EOF
-		);
-		if ($this->GetOutputFormat() == 'html')
-		{
-			foreach($this->a_headers as $s_header)
-			{
-				header($s_header);
-			}
-		}
-		$s_captured_output = ob_get_contents();
-		ob_end_clean();
-		$sHtml = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
-		$sHtml .= "<html>\n";
-		$sHtml .= "<head>\n";
-		// Make sure that Internet Explorer renders the page using its latest/highest/greatest standards !
-		$sHtml .= "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n";
-		$sHtml .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-		$sHtml .= "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
-		$sHtml .= $this->get_base_tag();
-		// Stylesheets MUST be loaded before any scripts otherwise
-		// jQuery scripts may face some spurious problems (like failing on a 'reload')
-		foreach($this->a_linked_stylesheets as $a_stylesheet)
-		{
+);
+        foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+        $s_captured_output = ob_get_contents();
+        ob_end_clean();
+        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";
+        // 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>".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')
+        foreach($this->a_linked_stylesheets as $a_stylesheet)
+        {
 			if ($a_stylesheet['condition'] != "")
 			{
-				$sHtml .= "<!--[if {$a_stylesheet['condition']}]>\n";
+				echo "<!--[if {$a_stylesheet['condition']}]>\n";
 			}
-			$sHtml .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$a_stylesheet['link']}\" />\n";
+            echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$a_stylesheet['link']}\" />\n";
 			if ($a_stylesheet['condition'] != "")
 			{
-				$sHtml .= "<![endif]-->\n";
+				echo "<![endif]-->\n";
 			}
+        }
+        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("\nonDelayedReady = function() {\n".implode("\n", $this->m_aReadyScripts)."\n}\n");
 		}
-		// special stylesheet for printing, hides the navigation gadgets
-		$sHtml .= "<link rel=\"stylesheet\" media=\"print\" type=\"text/css\" href=\"../css/print.css\" />\n";
-
-		if ($this->GetOutputFormat() == 'html')
-		{
-			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;
-				}
-				$sHtml .= "<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("\nonDelayedReady = function() {\n".implode("\n", $this->m_aReadyScripts)."\n}\n");
-			}
-			if (count($this->a_scripts)>0)
-			{
-				$sHtml .= "<script type=\"text/javascript\">\n";
-				foreach($this->a_scripts as $s_script)
-				{
-					$sHtml .= "$s_script\n";
-				}
-				$sHtml .= "</script>\n";
-			}
-		}
-
-		if (count($this->a_styles)>0)
-		{
-			$sHtml .= "<style>\n";
-			foreach($this->a_styles as $s_style)
-			{
-				$sHtml .= "$s_style\n";
-			}
-			$sHtml .= "</style>\n";
-		}
-		$sHtml .= "<link rel=\"search\" type=\"application/opensearchdescription+xml\" title=\"iTop\" href=\"".utils::GetAbsoluteUrlAppRoot()."pages/opensearch.xml.php\" />\n";
-		$sHtml .= "<link rel=\"shortcut icon\" href=\"".utils::GetAbsoluteUrlAppRoot()."images/favicon.ico\" />\n";
-
-		$sHtml .= "</head>\n";
-		$sHtml .= "<body>\n";
+        if (count($this->a_scripts)>0)
+        {
+            echo "<script type=\"text/javascript\">\n";
+            foreach($this->a_scripts as $s_script)
+            {
+                echo "$s_script\n";
+            }
+            echo "</script>\n";
+        }
+        
+        if (count($this->a_styles)>0)
+        {
+            echo "<style>\n";
+            foreach($this->a_styles as $s_style)
+            {
+                echo "$s_style\n";
+            }
+            echo "</style>\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";
 
 
 
@@ -686,7 +661,7 @@ EOF
 			// 2) clicking on it will erase it
 			$sText = Dict::S("UI:YourSearch");
 			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
-		}
+		}		
 		// Render the tabs in the page (if any)
 		foreach($this->m_aTabs as $sTabContainerName => $m_aTabs)
 		{
@@ -694,185 +669,149 @@ EOF
 			$container_index = 0;
 			if (count($m_aTabs) > 0)
 			{
-				$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$container_index}\" class=\"light\">\n";
-				$sTabs .= "<ul>\n";
-				// Display the unordered list that will be rendered as the tabs
-				$i = 0;
-				foreach($m_aTabs as $sTabName => $sTabContent)
-				{
-					$sTabs .= "<li><a href=\"#tab_$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
-					$i++;
-				}
-				$sTabs .= "</ul>\n";
-				// Now add the content of the tabs themselves
-				$i = 0;
-				foreach($m_aTabs as $sTabName => $sTabContent)
-				{
-					$sTabs .= "<div id=\"tab_$i\">".$sTabContent."</div>\n";
-					$i++;
-				}
-				$sTabs .= "</div>\n<!-- end of tabs-->\n";
-			}
+			  $sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$container_index}\" class=\"light\">\n";
+			  $sTabs .= "<ul>\n";
+			  // Display the unordered list that will be rendered as the tabs
+	          $i = 0;
+			  foreach($m_aTabs as $sTabName => $sTabContent)
+			  {
+			      $sTabs .= "<li><a href=\"#tab_$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
+			      $i++;
+	          }
+			  $sTabs .= "</ul>\n";
+			  // Now add the content of the tabs themselves
+			  $i = 0;
+			  foreach($m_aTabs as $sTabName => $sTabContent)
+			  {
+			      $sTabs .= "<div id=\"tab_$i\">".$sTabContent."</div>\n";
+			      $i++;
+	          }
+			  $sTabs .= "</div>\n<!-- end of tabs-->\n";
+	        }
 			$this->s_content = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $this->s_content);
 			$container_index++;
 		}
-
-		if ($this->GetOutputFormat() == 'html')
+		$sUserName = UserRights::GetUser();
+		$sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
+		if (UserRights::IsAdministrator())
 		{
-			$sUserName = UserRights::GetUser();
-			$sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
-			if (UserRights::IsAdministrator())
-			{
-				$sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
-			}
-			else
-			{
-				$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);
-			}
-			$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())
-			{
-				//$sLogOffMenu .= "<li><a href=\"../pages/UI.php?loginop=logoff\">".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=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?loginop=change_pwd\">".Dict::S('UI:ChangePwdMenu')."</a></li>\n";
-			}
-			$sLogOffMenu .= "</ul>\n</li>\n</ul></span>\n";
-
-			$sRestrictions = '';
-			if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE))
-			{
-				if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE))
-				{
-					$sRestrictions = Dict::S('UI:AccessRO-All');
-				}
-			}
-			elseif (!MetaModel::DBHasAccess(ACCESS_USER_WRITE))
-			{
-				$sRestrictions = Dict::S('UI:AccessRO-Users');
-			}
-
-			if (strlen($sRestrictions) > 0)
-			{
-				$sAdminMessage = trim(MetaModel::GetConfig()->Get('access_message'));
-				$sApplicationBanner = '<div id="admin-banner">';
-				$sApplicationBanner .= '<img src="../images/locked.png" style="vertical-align:middle;">';
-				$sApplicationBanner .= '&nbsp;<b>'.$sRestrictions.'</b>';
-				if (strlen($sAdminMessage) > 0)
-				{
-					$sApplicationBanner .= '&nbsp;<b>'.$sAdminMessage.'</b>';
-				}
-				$sApplicationBanner .= '</div>';
-			}
-			else if(strlen($this->m_sMessage))
-			{
-				$sApplicationBanner = '<div id="admin-banner"><span style="padding:5px;">'.$this->m_sMessage.'<span></div>';
-			}
-			else
-			{
-				$sApplicationBanner = '';
-			}
-
-			$sOnlineHelpUrl = MetaModel::GetConfig()->Get('online_help');
-			//$sLogOffMenu = "<span id=\"logOffBtn\" style=\"height:55px;padding:0;margin:0;\"><img src=\"../images/onOffBtn.png\"></span>";
-
-			$sHtml .= '<div id="left-pane" class="ui-layout-west">';
-			$sHtml .= '<!-- Beginning of the left pane -->';
-			$sHtml .= '	<div id="header-logo">';
-			$sHtml .= '	<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>';
-			$sHtml .= '	</div>';
-			$sHtml .= '	<div class="header-menu">';
-			$sHtml .= '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
-			$sHtml .= '		<div style="text-align:center;">'.self::FilterXSS($sForm).'</div>';
-			$sHtml .= '	</div>';
-			$sHtml .= '	<div id="menu" class="ui-layout-content">';
-			$sHtml .= '		<div id="inner_menu">';
-			$sHtml .= '			<div id="accordion">';
-			$sHtml .= self::FilterXSS($this->m_sMenu);
-			$sHtml .= '			<!-- Beginning of the accordion menu -->';
-			$sHtml .= '			<!-- End of the accordion menu-->';
-			$sHtml .= '			</div>';
-			$sHtml .= '		</div> <!-- /inner menu -->';
-			$sHtml .= '	</div> <!-- /menu -->';
-			$sHtml .= '	<div class="footer"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png"/></a></div>';
-			$sHtml .= '<!-- End of the left pane -->';
-			$sHtml .= '</div>';
-
-			$sHtml .= '<div class="ui-layout-center">';
-			$sHtml .= '	<div id="top-bar" style="width:100%">';
-			$sHtml .= self::FilterXSS($sApplicationBanner);
-			$sHtml .= '		<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>';
-			$sHtml .= '<td><input type="image" src="../images/searchBtn.png"/></a></td>';
-			$sHtml .= '<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>';
-			$sHtml .= '<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>';
-			$sHtml .= '	</div>';
-			$sHtml .= '	<div class="ui-layout-content">';
-			$sHtml .= '	<!-- Beginning of page content -->';
-			$sHtml .= self::FilterXSS($this->s_content);
-			$sHtml .= '	<!-- End of page content -->';
-			$sHtml .= '	</div>';
-			$sHtml .= '</div>';
-				
-			// Add the captured output
-			if (trim($s_captured_output) != "")
-			{
-				$sHtml .= "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">".self::FilterXSS($s_captured_output)."</div></div>\n";
-			}
-			$sHtml .= "<div id=\"at_the_end\">".self::FilterXSS($this->s_deferred_content)."</div>";
-			//		echo $this->s_deferred_content;
-			$sHtml .= "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
-			$sHtml .= "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
-			$sHtml .= "<div style=\"display:none\" id=\"ajax_content\"></div>";
+			$sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
 		}
 		else
 		{
-			$sHtml .= self::FilterXSS($this->s_content);
+			$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);		
 		}
-
-		$sHtml .= "</body>\n";
-		$sHtml .= "</html>\n";
-
-		if ($this->GetOutputFormat() == 'html')
+		$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())
 		{
-			echo $sHtml;
+			//$sLogOffMenu .= "<li><a href=\"../pages/UI.php?loginop=logoff\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
+			$sLogOffMenu .= "<li><a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
 		}
-		else if ($this->GetOutputFormat() == 'pdf' && $this->IsOutputFormatAvailable('pdf') )
+		if (UserRights::CanChangePassword())
 		{
-			require_once(APPROOT.'lib/MPDF/mpdf.php');
-			$oMPDF = new mPDF('c');
-			$oMPDF->mirroMargins = false;
-			if ($this->a_base['href'] != '')
-			{
-				$oMPDF->setBasePath($this->a_base['href']); // Seems that the <BASE> tag is not recognized by mPDF...
-			}
-			$oMPDF->showWatermarkText = true;
-			if ($this->GetOutputOption('pdf', 'template_path'))
-			{
-				$oMPDF->setImportUse(); // Allow templates
-				$oMPDF->SetDocTemplate ($this->GetOutputOption('pdf', 'template_path'), 1);
-			}
-			$oMPDF->WriteHTML($sHtml);
-			$sOutputName = $this->s_title.'.pdf';
-			if ($this->GetOutputOption('pdf', 'output_name'))
-			{
-				$sOutputName = $this->GetOutputOption('pdf', 'output_name');
-			}
-			$oMPDF->Output($sOutputName, 'I');
+			$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";
 
+		$sRestrictions = '';
+		if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE))
+		{
+			if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE))
+			{
+				$sRestrictions = Dict::S('UI:AccessRO-All');
+			}
+		}
+		elseif (!MetaModel::DBHasAccess(ACCESS_USER_WRITE))
+		{
+				$sRestrictions = Dict::S('UI:AccessRO-Users');
+		}
+
+		if (strlen($sRestrictions) > 0)
+		{
+			$sAdminMessage = trim(MetaModel::GetConfig()->Get('access_message'));
+			$sApplicationBanner = '<div id="admin-banner">';
+			$sApplicationBanner .= '<img src="../images/locked.png" style="vertical-align:middle;">';
+			$sApplicationBanner .= '&nbsp;<b>'.$sRestrictions.'</b>';
+			if (strlen($sAdminMessage) > 0)
+			{
+				$sApplicationBanner .= '&nbsp;<b>'.$sAdminMessage.'</b>';
+			}
+			$sApplicationBanner .= '</div>';
+		}
+		else if(strlen($this->m_sMessage))
+		{
+			$sApplicationBanner = '<div id="admin-banner"><span style="padding:5px;">'.$this->m_sMessage.'<span></div>';
+		}
+		else
+		{
+			$sApplicationBanner = '';
+		}
+
+		$sOnlineHelpUrl = MetaModel::GetConfig()->Get('online_help');
+		//$sLogOffMenu = "<span id=\"logOffBtn\" style=\"height:55px;padding:0;margin:0;\"><img src=\"../images/onOffBtn.png\"></span>";
+
+		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="'.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;">'.self::FilterXSS($sForm).'</div>';
+		echo '	</div>';
+		echo '	<div id="menu" class="ui-layout-content">';
+		echo '		<div id="inner_menu">';
+		echo '			<div id="accordion">';
+		echo self::FilterXSS($this->m_sMenu);
+		echo '			<!-- Beginning of the accordion menu -->';
+		echo '			<!-- End of the accordion menu-->';
+		echo '			</div>';
+		echo '		</div> <!-- /inner menu -->';
+		echo '	</div> <!-- /menu -->';
+		echo '	<div class="footer"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png"/></a></div>';
+		echo '<!-- End of the left pane -->';
+		echo '</div>';
+
+		echo '<div class="ui-layout-center">';
+		echo '	<div id="top-bar" style="width:100%">';
+		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;">'.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 self::FilterXSS($this->s_content);
+		echo '	<!-- End of page content -->';
+		echo '	</div>';
+		echo '</div>';
+
+        // Add the captured output
+        if (trim($s_captured_output) != "")
+        {
+            echo "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">".self::FilterXSS($s_captured_output)."</div></div>\n";
+        }
+		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>";
+
+		echo "</body>\n";
+        echo "</html>\n";
+    }
+	
 	public function AddTabContainer($sTabContainer)
 	{
 		$this->m_aTabs[$sTabContainer] = array();
 		$this->add("\$Tabs:$sTabContainer\$");
 	}
-
+	
 	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
 	{
 		if (!isset($this->m_aTabs[$sTabContainer][$sTabLabel]))
@@ -900,53 +839,12 @@ EOF
 		$this->m_sCurrentTab = $sTabLabel;
 		return $sPreviousTab;
 	}
-
+	
 	public function GetCurrentTab()
 	{
 		return $this->m_sCurrentTab;
 	}
-
-	public function RemoveTab($sTabLabel, $sTabContainer = null)
-	{
-		if ($sTabContainer == null)
-		{
-			$sTabContainer = $this->m_sCurrentTabContainer;
-		}
-		if (isset($this->m_aTabs[$sTabContainer][$sTabLabel]))
-		{
-			// Delete the content of the tab
-			unset($this->m_aTabs[$sTabContainer][$sTabLabel]);
-				
-			// If we just removed the active tab, let's reset the active tab
-			if (($this->m_sCurrentTabContainer == $sTabContainer) &&  ($this->m_sCurrentTab == $sTabLabel))
-			{
-				$this->m_sCurrentTab = '';
-			}
-		}
-	}
-
-	/**
-	 * Finds the tab whose title matches a given pattern
-	 * @return mixed The name of the tab as a string or false if not found
-	 */
-	public function FindTab($sPattern, $sTabContainer = null)
-	{
-		$return = false;
-		if ($sTabContainer == null)
-		{
-			$sTabContainer = $this->m_sCurrentTabContainer;
-		}
-		foreach($this->m_aTabs[$sTabContainer] as $sTabLabel => $void)
-		{
-			if (preg_match($sPattern, $sTabLabel))
-			{
-				$result = $sTabLabel;
-				break;
-			}
-		}
-		return $result;
-	}
-
+	
 	/**
 	 * Make the given tab the active one, as if it were clicked
 	 * DOES NOT WORK: apparently in the *old* version of jquery
@@ -968,7 +866,7 @@ EOF
 						break;
 					}
 					$tab_index++;
-				}
+				}	
 				break;
 			}
 			$container_index++;
@@ -976,7 +874,7 @@ EOF
 		$sSelector = '#tabbedContent_'.$container_index.' > ul';
 		$this->add_ready_script("$('$sSelector').tabs('select', $tab_index);");
 	}
-
+	
 	public function StartCollapsibleSection($sSectionLabel, $bOpen = false)
 	{
 		$this->add($this->GetStartCollapsibleSection($sSectionLabel, $bOpen));
@@ -1006,69 +904,91 @@ EOF
 		return "</div>";
 	}
 
-	public function add($sHtml)
-	{
-		if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_sCurrentTab))
-		{
-			$this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
-		}
-		else
-		{
-			parent::add($sHtml);
-		}
-	}
-
+    public function add($sHtml)
+    {
+        if (!empty($this->m_sCurrentTabContainer) && !empty($this->m_sCurrentTab))
+        {
+            $this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
+        }
+        else
+        {
+            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][$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();
-		}
-	}
+	 */    
+    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;
-	}
+    /**
+     * 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)
+    {
+    	$iSearchSectionId = 0;
+    	
+		$sStyle = $bOpen ? 'SearchDrawer' : 'SearchDrawer DrawerClosed';
+		$this->add("<div id=\"Search_$iSearchSectionId\" class=\"$sStyle\">\n");
+		$this->add("<h1>Search form for ".Metamodel::GetName($sClassName)."</h1>\n");
+		$this->add_ready_script("\$(\"#LnkSearch_$iSearchSectionId\").click(function() {\$(\"#Search_$iSearchSectionId\").slideToggle('normal'); $(\"#LnkSearch_$iSearchSectionId\").toggleClass('open');});");
+		$oFilter = new DBObjectSearch($sClassName);
+		$sFilter = $oFilter->serialize();
+		$oSet = new CMDBObjectSet($oFilter);
+		cmdbAbstractObject::DisplaySearchForm($this, $oSet, array('operation' => 'search', 'filter' => $sFilter, 'search_form' => true));
+ 		$this->add("</div>\n");
+ 		$this->add("<div class=\"HRDrawer\"/></div>\n");
+ 		$this->add("<div id=\"LnkSearch_$iSearchSectionId\" class=\"DrawerHandle\">Search</div>\n");
 
-	/**
-	 * 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;
+    	
+    	$iSearchSectionId++;
 	}
+	*/
 }
 
 ?>

application/loginwebpage.class.inc.php

@@ -29,12 +29,10 @@ require_once(APPROOT."/application/nicewebpage.class.inc.php");
  */
 
 class LoginWebPage extends NiceWebPage
-{
-	protected static $m_sLoginFailedMessage = '';
-	
+{	
     public function __construct()
     {
-        parent::__construct(Dict::S("UI:iTopLogin"));
+        parent::__construct("iTop Login");
         $this->add_style(<<<EOF
 body {
 	background: #eee;
@@ -91,11 +89,6 @@ EOF
 );
 	}
 	
-	public static function SetLoginFailedMessage($sMessage)
-	{
-		self::$m_sLoginFailedMessage = $sMessage;
-	}
-	
 	public function DisplayLoginForm($sLoginType, $bFailedLogin = false)
 	{
 		switch($sLoginType)
@@ -126,14 +119,7 @@ EOF
 			$this->add("<h1>".Dict::S('UI:Login:Welcome')."</h1>\n");
 			if ($bFailedLogin)
 			{
-				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");
-				}
+				$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectLoginPassword')."</p>\n");
 			}
 			else
 			{
@@ -147,7 +133,6 @@ EOF
 			$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;
 		}
@@ -265,17 +250,106 @@ EOF
 					// check CAS authentication
 					if (phpCAS::isAuthenticated())
 					{
-						$sAuthUser = phpCAS::getUser();
-						$sAuthPwd = '';
-						$sLoginMode = 'cas';
-						$sAuthentication = 'external';
+						// Check is a membership is required
+						$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;
+									$bIsMember = false;
+									foreach($aCASMemberships as $sCASPattern)
+									{
+										if (self::IsPattern($sCASPattern))
+										{
+											if (preg_match($sCASPattern, $sGroupName))
+											{
+												$bIsMember = true;
+												break;
+											}
+										}
+										else if ($sPattern == $sGroupName)
+										{
+											$bIsMember = true;
+											break;
+										}
+									}
+									if ($bIsMember)
+									{
+										$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');
+											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)
+						{
+							$sAuthUser = phpCAS::getUser();
+							$sAuthPwd = '';
+							$sLoginMode = 'cas';
+							$sAuthentication = 'external';
+						}
+						else
+						{
+							// 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
+						}
 					}
 					break;
 					
 					case 'form':
 					// iTop standard mode: form based authentication
-					$sAuthUser = utils::ReadPostedParam('auth_user', '', false, 'raw_data');
-					$sAuthPwd = utils::ReadPostedParam('auth_pwd', '', false, 'raw_data');
+					$sAuthUser = utils::ReadPostedParam('auth_user', '', 'raw_data');
+					$sAuthPwd = utils::ReadPostedParam('auth_pwd', '', 'raw_data');
 					if ($sAuthUser != '')
 					{
 						$sLoginMode = 'form';
@@ -314,9 +388,9 @@ EOF
 					case 'url':
 					// Credentials passed directly in the url
 					$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-					$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-					if (($sAuthUser != '') && ($sAuthPwd != null))
+					if ($sAuthUser != '')
 					{
+						$sAuthPwd = utils::ReadParam('auth_pwd', '', false, 'raw_data');
 						$sLoginMode = 'url';
 					}		
 					break;	
@@ -343,7 +417,7 @@ EOF
 			}
 			else
 			{
-				if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sLoginMode, $sAuthentication))
+				if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sAuthentication))
 				{
 					//echo "Check Credentials returned false for user $sAuthUser!";
 					self::ResetSession();
@@ -424,8 +498,8 @@ EOF
 		{
 			$sAuthUser = $_SESSION['auth_user'];
 			UserRights::Login($sAuthUser); // Set the user's language
-			$sOldPwd = utils::ReadPostedParam('old_pwd', '', false, 'raw_data');
-			$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
+			$sOldPwd = utils::ReadPostedParam('old_pwd', 'raw_data');
+			$sNewPwd = utils::ReadPostedParam('new_pwd', 'raw_data');
 			if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
 			{
 				$oPage = new LoginWebPage();
@@ -452,6 +526,124 @@ EOF
 			header('Location: '.utils::GetAbsoluteUrlAppRoot().'portal/index.php');
 		}
 		return $sMessage;
-	}	
+	}
+	
+	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;
+		}
+		
+		// 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;
+		}
+		
+		$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
+		$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)."'.");
+		
+		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);
+			}
+		}
+	}
+	
+	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;
+		}
+	}
 } // End of class
 ?>

application/menunode.class.inc.php

@@ -87,47 +87,25 @@ class ApplicationMenu
 	 * Main function to add a menu entry into the application, can be called during the definition
 	 * of the data model objects
 	 */
-	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
+	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex = -1, $fRank)
 	{
 		$index = self::GetMenuIndexById($oMenuNode->GetMenuId());
 		if ($index == -1)
 		{
 			// The menu does not already exist, insert it
 			$index = count(self::$aMenusIndex);
-
+			self::$aMenusIndex[$index] = array( 'node' => $oMenuNode, 'children' => array());
 			if ($iParentIndex == -1)
 			{
-				$sParentId = '';
 				self::$aRootMenus[] = array ('rank' => $fRank, 'index' => $index);
 			}
 			else
 			{
-				$sParentId = self::$aMenusIndex[$iParentIndex]['node']->GetMenuId();
 				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
 			}
-
-			// Note: At the time when 'parent', 'rank' and 'source_file' have been added for the reflection API,
-			//       they were not used to display the menus (redundant or unused)
-			//
-			$aBacktrace = debug_backtrace();
-			$sFile = $aBacktrace[2]["file"];
-			self::$aMenusIndex[$index] = array('node' => $oMenuNode, 'children' => array(), 'parent' => $sParentId, 'rank' => $fRank, 'source_file' => $sFile);
-		}
-		else
-		{
-			// the menu already exists, let's combine the conditions that make it visible
-			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
 		}
 		return $index;
 	}
-
-	/**
-	 * Reflection API - Get menu entries
-	 */
-	static public function ReflectionMenuNodes()
-	{
-		return self::$aMenusIndex;
-	}
 	
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
@@ -306,30 +284,25 @@ abstract class MenuNode
 	protected $sMenuId;
 	protected $index;
 
-	/**
-	 * Properties reflecting how the node has been declared
-	 */
-	protected $aReflectionProperties;
-
 	/**
 	 * Class of objects to check if the menu is enabled, null if none
 	 */
-	protected $m_aEnableClasses;
+	protected $m_sEnableClass;
 
 	/**
 	 * User Rights Action code to check if the menu is enabled, null if none
 	 */
-	protected $m_aEnableActions;
+	protected $m_iEnableAction;
 
 	/**
 	 * User Rights allowed results (actually a bitmask) to check if the menu is enabled, null if none
 	 */
-	protected $m_aEnableActionResults;
+	protected $m_iEnableActionResults;
 
 	/**
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
 	 */	
-	protected $m_aEnableStimuli;
+	protected $m_sEnableStimulus;
 	
 	/**
 	 * Create a menu item, sets the condition to have it displayed and inserts it into the application's main menu
@@ -345,25 +318,12 @@ 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->aReflectionProperties = array();
-		if (strlen($sEnableClass) > 0)
-		{
-			$this->aReflectionProperties['enable_class'] = $sEnableClass;
-			$this->aReflectionProperties['enable_action'] = $iActionCode;
-			$this->aReflectionProperties['enable_permission'] = $iAllowedResults;
-			$this->aReflectionProperties['enable_stimulus'] = $sEnableStimulus;
-		}
-		$this->m_aEnableClasses = array($sEnableClass);
-		$this->m_aEnableActions = array($iActionCode);
-		$this->m_aEnableActionResults = array($iAllowedResults);
-		$this->m_aEnableStimuli = array($sEnableStimulus);
+		$this->m_sEnableClass = $sEnableClass;
+		$this->m_iEnableAction = $iActionCode;
+		$this->m_iEnableActionResults = $iAllowedResults;
+		$this->m_sEnableStimulus = $sEnableStimulus;
 		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
 	}
-
-	public function ReflectionProperties()
-	{
-		return $this->aReflectionProperties;
-	}
 	
 	public function GetMenuId()
 	{
@@ -391,54 +351,38 @@ abstract class MenuNode
 		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()
 	{
-		foreach($this->m_aEnableClasses as $index => $sClass)
+		if ($this->m_sEnableClass != null)
 		{
-			if ($sClass != null)
+			if (MetaModel::IsValidClass($this->m_sEnableClass))
 			{
-				if (MetaModel::IsValidClass($sClass))
+				if ($this->m_sEnableStimulus != null)
 				{
-					if ($this->m_aEnableStimuli[$index] != null)
+					if (!UserRights::IsStimulusAllowed($this->m_sEnableClass, $this->m_sEnableStimulus))
 					{
-						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;
-						}
+						return false;
 					}
 				}
-				else
+				if ($this->m_iEnableAction != null)
 				{
-					return false;
+					$iResult = UserRights::IsActionAllowed($this->m_sEnableClass, $this->m_iEnableAction);
+					if (($iResult & $this->m_iEnableActionResults))
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
 				}
+				return true;
 			}
+			return false;
 		}
 		return true;
 	}
@@ -514,7 +458,6 @@ class TemplateMenuNode extends MenuNode
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sTemplateFile = $sTemplateFile;
-		$this->aReflectionProperties['template_file'] = $sTemplateFile;
 	}
 	
 	public function GetHyperlink($aExtraParams)
@@ -573,8 +516,6 @@ class OQLMenuNode extends MenuNode
 		$this->sOQL = $sOQL;
 		$this->bSearch = $bSearch;
 		$this->m_aParams = array();
-		$this->aReflectionProperties['oql'] = $sOQL;
-		$this->aReflectionProperties['do_search'] = $bSearch;
 		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
 		// of the class specified by the OQL...
 	}
@@ -586,10 +527,6 @@ class OQLMenuNode extends MenuNode
 	public function SetParameters($aParams)
 	{
 		$this->m_aParams = $aParams;
-		foreach($aParams as $sKey => $value)
-		{
-			$this->aReflectionProperties[$sKey] = $value;
-		}
 	}
 	
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
@@ -656,7 +593,6 @@ class SearchMenuNode extends MenuNode
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sPageTitle = "Menu:$sMenuId+";
 		$this->sClass = $sClass;
-		$this->aReflectionProperties['class'] = $sClass;
 	}
 	
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
@@ -696,7 +632,6 @@ class WebPageMenuNode extends MenuNode
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sHyperlink = $sHyperlink;
-		$this->aReflectionProperties['url'] = $sHyperlink;
 	}
 
 	public function GetHyperlink($aExtraParams)
@@ -734,7 +669,6 @@ class NewObjectMenuNode extends MenuNode
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank);
 		$this->sClass = $sClass;
-		$this->aReflectionProperties['class'] = $sClass;
 	}
 
 	public function GetHyperlink($aExtraParams)

application/portalwebpage.class.inc.php

@@ -212,10 +212,8 @@ EOF
 	}
 EOF
 );
-
-		// For Wizard helper to process the ajax replies
-		$this->add('<div id="ajax_content"></div>');
-}
+		
+	}
 
 	public function SetCurrentTab($sTabLabel = '')
 	{
@@ -275,9 +273,13 @@ EOF
 			{
 				// Home-made and very limited display of an object set
 
-				$sUniqueId = $sClass.$this->GetUniqueId();
-				$this->add("<div id=\"$sUniqueId\">\n"); // The id here MUST be the same as currentId, otherwise the pagination will be broken
-				cmdbAbstractObject::DisplaySet($this, $oSet, array('currentId' => $sUniqueId, 'menu' => false, 'zlist' => false, 'extra_fields' => implode(',', $aZList)));
+				//
+				//$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

application/query.class.inc.php

@@ -1,107 +0,0 @@
-<?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

@@ -40,15 +40,13 @@ class SqlBlock
 	protected $m_aColumns;
 	protected $m_sTitle;
 	protected $m_sType;
-	protected $m_aParams;
 	                            
-	public function __construct($sQuery, $aColumns, $sTitle, $sType, $aParams = array())
+	public function __construct($sQuery, $aColumns, $sTitle, $sType)
 	{
 		$this->m_sQuery = $sQuery;
 		$this->m_aColumns = $aColumns;
 		$this->m_sTitle = $sTitle;
 		$this->m_sType = $sType;
-		$this->m_aParams = $aParams;
 	}
 	
 	/**
@@ -56,14 +54,9 @@ class SqlBlock
 	/*
 	 *
 	 *		<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>
+	 *			<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')</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>
@@ -80,11 +73,6 @@ class SqlBlock
 	 * - 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
@@ -156,96 +144,8 @@ class SqlBlock
 				}
 			}
 		}
-		$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;
+
+		return new SqlBlock($sQuery, $aColumns, $sTitle, $sType);		
 	}
 	
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
@@ -260,8 +160,7 @@ class SqlBlock
 		}
 //		$oPage->add($this->GetRenderContent($oPage, $aExtraParams, $sId));
 
-		$sQuery = $this->BuildQuery();
-		$res = CMDBSource::Query($sQuery);
+		$res = CMDBSource::Query($this->m_sQuery);
 		$aQueryCols = CMDBSource::GetColumns($res);
 
 		// Prepare column definitions (check + give default values)

application/ui.extkeywidget.class.inc.php

@@ -65,8 +65,6 @@ class UIExtKeyWidget
 {
 	protected $iId;
 	protected $sTargetClass;
-	protected $sAttCode;
-	protected $bSearchMode;
 	
 	//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)
@@ -83,16 +81,14 @@ class UIExtKeyWidget
 		{
 			$sDisplayStyle = 'select'; // In search mode, always use a drop-down list
 		}
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
-		return $oWidget->Display($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix, $aArgs, null, $sDisplayStyle);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
+		return $oWidget->Display($oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix, $aArgs, $bSearchMode, $sDisplayStyle);
 	}
 
-	public function __construct($sTargetClass, $iInputId, $sAttCode = '', $bSearchMode = false)
+	public function __construct($sTargetClass, $iInputId)
 	{
 		$this->sTargetClass = $sTargetClass;
 		$this->iId = $iInputId;
-		$this->sAttCode = $sAttCode;
-		$this->bSearchMode = $bSearchMode;
 	}
 	
 	/**
@@ -101,41 +97,28 @@ class UIExtKeyWidget
 	 * @param Hash $aArgs Extra context arguments
 	 * @return string The HTML fragment to be inserted into the page
 	 */
-	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), $bSearchMode = null, $sDisplayStyle = 'select')
+	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), $bSearchMode = false, $sDisplayStyle = 'select')
 	{
-		if (!is_null($bSearchMode))
-		{
-			$this->bSearchMode = $bSearchMode;
-		}
 		$sTitle = addslashes($sTitle);	
 		$oPage->add_linked_script('../js/extkeywidget.js');
 		$oPage->add_linked_script('../js/forms-json-utils.js');
 		
-		$bCreate = (!$this->bSearchMode) && (!MetaModel::IsAbstract($this->sTargetClass)) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
+		$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 = ($this->bSearchMode) ? '' : 'attr_';
+		$sAttrFieldPrefix = ($bSearchMode) ? '' : 'attr_';
 
 		$sHTMLValue = "<span style=\"white-space:nowrap\">"; // no wrap
 		$sFilter = addslashes($oAllowedValues->GetFilter()->ToOQL());
-		if($this->bSearchMode)
+		if($bSearchMode)
 		{
 			$sWizHelper = 'null';
 			$sWizHelperJSON = "''";
-			$sJSSearchMode = 'true';
 		} 
 		else
 		{
-			if (isset($aArgs['wizHelper']))
-			{
-				$sWizHelper = $aArgs['wizHelper'];
-			}
-			else
-			{
-				$sWizHelper = 'oWizardHelper'.$sFormPrefix;
-			}
-			$sWizHelperJSON = $sWizHelper.'.UpdateWizardToJSON()';
-			$sJSSearchMode = 'false';
+			$sWizHelper = 'oWizardHelper'.$sFormPrefix;
+			$sWizHelperJSON = $sWizHelper.'.ToJSON()';
 		}
 		if (is_null($oAllowedValues))
 		{
@@ -170,7 +153,7 @@ class UIExtKeyWidget
 				$sHelpText = ''; //$this->oAttDef->GetHelpOnEdition();
 				
 				$sHTMLValue = "<select title=\"$sHelpText\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" id=\"$this->iId\">\n";
-				if ($this->bSearchMode)
+				if ($bSearchMode)
 				{
 					$sDisplayValue = isset($aArgs['sDefaultValue']) ? $aArgs['sDefaultValue'] : Dict::S('UI:SearchValue:Any');
 					$sHTMLValue .= "<option value=\"\">$sDisplayValue</option>\n";			
@@ -199,7 +182,7 @@ class UIExtKeyWidget
 				$sHTMLValue .= "</select>\n";
 				$oPage->add_ready_script(
 <<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', true, $sWizHelper);
 		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') } );
@@ -230,14 +213,13 @@ EOF
 	
 			// another hidden input to store & pass the object's Id
 			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"$value\" />\n";
-
-			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';	
+	
 			// Scripts to start the autocomplete and bind some events to it
 			$oPage->add_ready_script(
 <<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode);
+		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper);
 		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
-		$('#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',bSearchMode:$JSSearchMode, json: function() { return $sWizHelperJSON; } }});
+		$('#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); } );
 		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
@@ -280,24 +262,13 @@ EOF
 		return $sHTMLValue;
 	}
 	
-	public function GetSearchDialog(WebPage $oPage, $sTitle, $oCurrObject = null)
+	public function GetSearchDialog(WebPage $oPage, $sTitle)
 	{
 		$sHTML = '<div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">';
 
-		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
-		{
-			$aParams = array();
-			$oFilter = new DBObjectSearch($this->sTargetClass);
-		}
-		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
+		$oFilter = new DBObjectSearch($this->sTargetClass);
+		$oSet = new CMDBObjectSet($oFilter);
+		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$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";
@@ -323,7 +294,7 @@ EOF
 	/**
 	 * Search for objects to be selected
 	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
-	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of sTargetClass
+	 * @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, $sFilter, $sRemoteClass = '', $oObj = null)
@@ -334,24 +305,8 @@ EOF
 		}
 		try
 		{
-			if ($sRemoteClass != $this->sTargetClass)
-			{
-				//$oBaseClassFilter = DBObjectSearch::FromOQL($sFilter);
-				//$oFilter = new DBObjectSearch($sRemoteClass);
-				//$oFilter->AddConditionExpression($oBaseClassFilter->GetCriteria());
-				//$oFilter->TransferConditionExpression($oBaseClassFilter, array());
-				//$oFilter->TransferConditionExpression($oBaseClassFilter, array($this->sTargetClass => array('*' => $sRemoteClass.'_'.strtolower($this->sTargetClass))));
-				$sFilter = str_replace(" $this->sTargetClass ", " $sRemoteClass ", $sFilter);
-				$sFilter = str_replace("`$this->sTargetClass`", "`$sRemoteClass`", $sFilter);
-				$oFilter = DBObjectSearch::FromOQL($sFilter);
-			}
-			else
-			{
-				$oFilter = DBObjectSearch::FromOQL($sFilter);
-			}
-			//$oP->p($oFilter->ToOQL());
-			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-			$oBlock = new DisplayBlock($oFilter, 'list', false, array('query_params' => array('this' => $oObj)));
+			$oFilter = DBObjectSearch::FromOQL($sFilter);
+			$oBlock = new DisplayBlock($oFilter, 'list', false);
 			$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)
@@ -360,9 +315,8 @@ EOF
 			// TODO check if we can improve this behavior...
 			$sOQL = 'SELECT '.$sRemoteClass;
 			$oFilter = DBObjectSearch::FromOQL($sOQL);
-			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-			//$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
+			$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
 		}
 	}
 	
@@ -380,7 +334,6 @@ EOF
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
 		$oValuesSet = new ValueSetObjects($sFilter, 'friendlyname'); // Bypass GetName() to avoid the encoding by htmlentities
-		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$aValues = $oValuesSet->GetValues(array('this' => $oObj), $sContains);
 		foreach($aValues as $sKey => $sFriendlyName)
 		{
@@ -393,24 +346,14 @@ EOF
 	 */
 	public function GetObjectName($iObjId)
 	{
-		$aModifierProps = array();
-		$aModifierProps['UserRightsGetSelectFilter']['bSearchMode'] = $this->bSearchMode;
-
-		$oObj = MetaModel::GetObject($this->sTargetClass, $iObjId, false, false, $aModifierProps);
-		if ($oObj)
-		{
-			return $oObj->GetName();
-		}
-		else
-		{
-			return '';
-		}
+		$oObj = MetaModel::GetObject($this->sTargetClass, $iObjId);
+		return $oObj->GetName();
 	}
 	
 	/**
 	 * Get the form to create a new object of the 'target' class
 	 */
-	public function GetObjectCreationForm(WebPage $oPage, $oCurrObject)
+	public function GetObjectCreationForm(WebPage $oPage)
 	{
 		// Set all the default values in an object and clone this "default" object
 		$oNewObj = MetaModel::NewObject($this->sTargetClass);
@@ -419,24 +362,7 @@ EOF
 		$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'
+		// 2nd - set values from the page argument 'default'
 		$oNewObj->UpdateObjectFromArg('default');
 
 		$sDialogTitle = addslashes($this->sTitle);
@@ -465,7 +391,6 @@ EOF
 		try
 		{
 			$oFilter = DBObjectSearch::FromOQL($sFilter);
-			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 			$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj));
 		}
 		catch(MissingQueryArgument $e)
@@ -474,7 +399,6 @@ EOF
 			// TODO check if we can improve this behavior...
 			$sOQL = 'SELECT '.$this->m_sTargetClass;
 			$oFilter = DBObjectSearch::FromOQL($sOQL);
-			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 			$oSet = new DBObjectSet($oFilter);
 		}
 

application/ui.linkswidget.class.inc.php

@@ -62,9 +62,8 @@ class UILinksWidget
 		$this->m_aTableConfig = array();
 		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_iInputId.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
 
-		foreach(MetaModel::FlattenZList(MetaModel::GetZListItems($this->m_sLinkedClass, 'list')) as $sAttCode)
+		foreach(MetaModel::ListAttributeDefs($this->m_sLinkedClass) as $sAttCode=>$oAttDef)
 		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sAttCode);
 			if ($sStateAttCode == $sAttCode)
 			{
 				// State attribute is always hidden from the UI
@@ -104,94 +103,45 @@ class UILinksWidget
 	{
 		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
 		$aRow = array();
-		$aFieldsMap = array();
 		if(is_object($linkObjOrId))
 		{
 			$key = $linkObjOrId->GetKey();
-			$iRemoteObjKey =  $linkObjOrId->Get($this->m_sExtKeyToRemote);
 			$sPrefix .= "[$key][";
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
-			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$key}";
 			$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)
 			{
 				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId->GetKey().']';
-				$sSafeId = self::MakeID($sFieldId);
+				$sSafeId = str_replace(array('[',']','-'), '_', $sFieldId);
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
 				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $linkObjOrId->Get($sFieldCode), '' /* DisplayValue */, $sSafeId, $sNameSuffix, 0, $aArgs);
-				$aFieldsMap[$sFieldCode] = $sSafeId;
 			}
-			$sState = $linkObjOrId->GetState();
 		}
 		else
 		{
 			// form for creating a new record
 			$sPrefix .= "[$linkObjOrId][";
-			$iRemoteObjKey = -$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 also 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['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".(-$linkObjOrId);
 			$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)
 			{
 				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId.']';
-				$sSafeId = self::MakeID($sFieldId);
+				$sSafeId = str_replace(array('[',']','-'), '_', $sFieldId);
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
 				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, '' /* TO DO/ call GetDefaultValue($oObject->ToArgs()) */, '' /* DisplayValue */, $sSafeId /* id */, $sNameSuffix, 0, $aArgs);
-				$aFieldsMap[$sFieldCode] = $sSafeId;
 			}
-			$sState = '';
-			$oP->add_script(
-<<<EOF
-$(".date-pick").datepicker({
-		showOn: 'button',
-		buttonImage: '../images/calendar.png',
-		buttonImageOnly: true,
-		dateFormat: 'yy-mm-dd',
-		constrainInput: false,
-		changeMonth: true,
-		changeYear: true
-	});
-$(".datetime-pick").datepicker({
-		showOn: 'button',
-		buttonImage: '../images/calendar.png',
-		buttonImageOnly: true,
-		dateFormat: 'yy-mm-dd 00:00:00',
-		constrainInput: false,
-		changeMonth: true,
-		changeYear: true
-});
-EOF
-			);
 		}
-		
-		$sExtKeyToMeId = self::MakeID($sPrefix.$this->m_sExtKeyToMe);
-		$aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
-		$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
 
-		$sExtKeyToRemoteId = self::MakeID($sPrefix.$this->m_sExtKeyToRemote);
-		$aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
-		$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";
-		
-		$iFieldsCount = count($aFieldsMap);
-		$sJsonFieldsMap = json_encode($aFieldsMap);
-		
-		$oP->add_script(
-<<<EOF
-var {$aArgs['wizHelper']} = new WizardHelper('{$this->m_sLinkedClass}', '', '$sState');
-{$aArgs['wizHelper']}.SetFieldsMap($sJsonFieldsMap);
-{$aArgs['wizHelper']}.SetFieldsCount($iFieldsCount);
-EOF
-		);
 		$aRow['static::key'] = $oLinkedObj->GetHyperLink();
 		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
 		{
@@ -199,11 +149,6 @@ EOF
 		}
 		return $aRow;
 	}
-	
-	protected function MakeID($sName)
-	{
-		return str_replace(array('[', ']'), '_', $sName);
-	}
 
 	/**
 	 * Display one row of the whole form
@@ -306,10 +251,10 @@ EOF
 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 id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></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>\n";
 		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
 		$sHtmlValue .= "</div>\n";
-		$oPage->add_at_the_end("<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\"></div>"); // To prevent adding forms inside the main form
+		$oPage->add_at_the_end($this->GetObjectPickerDialog($oPage), "dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}"); // To prevent adding forms inside the main form
 		return $sHtmlValue;
 	}
 	         
@@ -332,11 +277,12 @@ EOF
 		return $sTargetClass;
 	}
 	
-	public function GetObjectPickerDialog($oPage, $oCurrentObj)
+	protected function GetObjectPickerDialog($oPage)
 	{
-		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+		$sHtml = "<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\">";
+		$sHtml .= "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
-		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+		$oSet = new CMDBObjectSet($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";
@@ -347,11 +293,12 @@ EOF
 		$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";
-		$oPage->add($sHtml);
+		$sHtml .= "</div>\n";
 		$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;
 	}
 
 	/**
@@ -426,47 +373,5 @@ 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/utils.inc.php

@@ -46,7 +46,6 @@ class utils
 
 	// 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)
 	{
@@ -83,7 +82,6 @@ class utils
 				$sParam = $aMatches[1];
 				$value = trim($aMatches[2]);
 				self::$m_aParamsFromFile[$sParam] = $value;
-				self::$m_aParamSource[$sParam] = $sParamFile;
 			}
 		}
 	}
@@ -101,25 +99,6 @@ class utils
 		}
 	}
 
-	/**
-	 * 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()
 	{
 		$sSAPIName = php_sapi_name();
@@ -173,18 +152,10 @@ class utils
 	
 	public static function Sanitize($value, $defaultValue, $sSanitizationFilter)
 	{
-		if ($value === $defaultValue)
+		$retValue = self::Sanitize_Internal($value, $sSanitizationFilter);
+		if ($retValue === false)
 		{
-			// 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;
-			}
+			$retValue = $defaultValue;
 		}
 		return $retValue;		
 	}
@@ -460,6 +431,8 @@ class utils
 
     /**
      * Returns the absolute URL to the server's root path
+     * @param $sCurrentRelativePath string NO MORE USED, kept for backward compatibility only !
+     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
      * @return string The absolute URL to the server's root, without the first slash
      */                   
 	static public function GetAbsoluteUrlAppRoot()
@@ -548,17 +521,6 @@ class utils
 		return $sAppRootUrl;
 	}
 
-    /**
-     * 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 GetAbsoluteUrlModulesRoot()
-	{
-		$sUrl = self::GetAbsoluteUrlAppRoot().'modules/';
-		return $sUrl;
-	}
-
 	/**
 	 * Tells whether or not log off operation is supported.
 	 * Actually in only one case:
@@ -639,86 +601,5 @@ class utils
 		}
 		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

@@ -50,8 +50,6 @@ class WebPage
 	protected $sContentType;
 	protected $sContentDisposition;
 	protected $sContentFileName;
-	protected $s_sOutputFormat;
-	protected $a_OutputOptions;
 	    
     public function __construct($s_title)
     {
@@ -69,8 +67,6 @@ class WebPage
         $this->sContentType = '';
         $this->sContentDisposition = '';
         $this->sContentFileName = '';
-		$this->s_OutputFormat = utils::ReadParam('output_format', 'html');
-		$this->a_OutputOptions = array();
         ob_start(); // Start capturing the output
     }
 	
@@ -519,67 +515,5 @@ class WebPage
 	{
 		return str_ireplace('<script', '&lt;script', $sHTML);
 	}
-	
-	/**
-	 * What is the currently selected output format
-	 * @return string The selected output format: html, pdf...
-	 */
-	public function GetOutputFormat()
-	{
-		return $this->s_OutputFormat;
-	}
-
-	/**
-	 * Check whether the desired output format is possible or not
-	 * @param string $sOutputFormat The desired output format: html, pdf...
-	 * @return bool True if the format is Ok, false otherwise
-	 */
-	function IsOutputFormatAvailable($sOutputFormat)
-	{
-		$bResult = false;
-		switch($sOutputFormat)
-		{
-			case 'html':
-			$bResult = true; // Always supported
-			break;
-			
-			case 'pdf':
-			$bResult = @is_readable(APPROOT.'lib/MPDF/mpdf.php');
-			break;
-		}
-		return $bResult;
-	}
-	
-	/** 
-	 * Retrieves the value of a named output option for the given format
-	 * @param string $sFormat The format: html or pdf
-	 * @param string $sOptionName The name of the option
-	 * @return mixed false if the option was never set or the options's value
-	 */
-	public function GetOutputOption($sFormat, $sOptionName)
-	{
-		if (isset($this->a_OutputOptions[$sFormat][$sOptionName]))
-		{
-			return $this->a_OutputOptions[$sFormat][$sOptionName];
-		}
-		return false;
-	}
-	/**
-	 * Sets a named output option for the given format
-	 * @param string $sFormat The format for which to set the option: html or pdf
-	 * @param string $sOptionName the name of the option
-	 * @param mixed $sValue The value of the option
-	 */
-	public function SetOutputOption($sFormat, $sOptionName, $sValue)
-	{
-		if (!isset($this->a_OutputOptions[$sFormat]))
-		{
-			$this->a_OutputOptions[$sFormat] = array($sOptionName => $sValue);
-		}
-		else
-		{
-			$this->a_OutputOptions[$sFormat][$sOptionName] = $sValue;
-		}
-	}
 }
 ?>

approot.inc.php

@@ -1,6 +1,5 @@
 <?php
 define('APPROOT', dirname(__FILE__).'/');
-define('MODULESROOT', APPROOT.'modules/');
 if (function_exists('microtime'))
 {
 	$fItopStarted = microtime(true); 

core/action.class.inc.php

@@ -42,7 +42,7 @@ abstract class Action extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array('name'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_action",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
@@ -106,7 +106,7 @@ abstract class ActionNotification extends Action
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array('name'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_action_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -139,7 +139,7 @@ class ActionEmail extends ActionNotification
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array('name'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_action_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -305,8 +305,7 @@ class ActionEmail extends ActionNotification
   			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
   			throw $e;
   		}
-		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-		
+
 		if (!is_null($oLog))
 		{
 			// Note: we have to secure this because those values are calculated

core/asynctask.class.inc.php

@@ -140,7 +140,7 @@ class AsyncSendEmail extends AsyncTask
 
 		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 AttributeLongText("body", array("allowed_values"=>null, "sql"=>"body", "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

core/attributedef.class.inc.php

@@ -116,8 +116,6 @@ abstract class AttributeDefinition
 		$this->m_aParams = $aParams;
 		$this->ConsistencyCheck();
 	}
-
-	// Left here for backward compatibility, deprecated in 2.0
 	public function OverloadParams($aParams)
 	{
 		foreach ($aParams as $sParam => $value)
@@ -132,12 +130,6 @@ abstract class AttributeDefinition
 			}
 		}
 	}
-
-	public function GetParams()
-	{
-		return $this->m_aParams;
-	}
-
 	public function SetHostClass($sHostClass)
 	{
 		$this->m_sHostClass = $sHostClass;
@@ -149,7 +141,7 @@ abstract class AttributeDefinition
 
 	// Note: I could factorize this code with the parameter management made for the AttributeDef class
 	// to be overloaded
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array();
 	}
@@ -178,10 +170,6 @@ abstract class AttributeDefinition
 		return "";
 		// e.g: return array("Site", "infrid", "name");
 	} 
-	public function GetFinalAttDef()
-	{
-		return $this;
-	}
 	public function IsDirectField() {return false;} 
 	public function IsScalar() {return false;} 
 	public function IsLinkSet() {return false;} 
@@ -452,7 +440,7 @@ abstract class AttributeDefinition
  */
 class AttributeLinkedSet extends AttributeDefinition
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "linked_class", "ext_key_to_me", "count_min", "count_max"));
 	}
@@ -762,7 +750,7 @@ class AttributeLinkedSet extends AttributeDefinition
  */
 class AttributeLinkedSetIndirect extends AttributeLinkedSet
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("ext_key_to_remote"));
 	}
@@ -779,7 +767,7 @@ class AttributeLinkedSetIndirect extends AttributeLinkedSet
  */
 class AttributeDBFieldVoid extends AttributeDefinition
 {	
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "sql"));
 	}
@@ -865,7 +853,7 @@ class AttributeDBFieldVoid extends AttributeDefinition
  */
 class AttributeDBField extends AttributeDBFieldVoid
 {	
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed"));
 	}
@@ -880,7 +868,7 @@ class AttributeDBField extends AttributeDBFieldVoid
  */
 class AttributeInteger extends AttributeDBField
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -976,7 +964,7 @@ class AttributeInteger extends AttributeDBField
  */
 class AttributeDecimal extends AttributeDBField
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array('digits', 'decimals' /* including precision */));
 	}
@@ -1071,7 +1059,7 @@ class AttributeDecimal extends AttributeDBField
  */
 class AttributeBoolean extends AttributeInteger
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -1102,7 +1090,7 @@ class AttributeBoolean extends AttributeInteger
  */
 class AttributeString extends AttributeDBField
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -1228,7 +1216,7 @@ class AttributeString extends AttributeDBField
  */
 class AttributeClass extends AttributeString
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("class_category", "more_values"));
 	}
@@ -1280,7 +1268,7 @@ class AttributeClass extends AttributeString
  */
 class AttributeApplicationLanguage extends AttributeString
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 	}
@@ -1370,7 +1358,7 @@ class AttributeFinalClass extends AttributeString
  */
 class AttributePassword extends AttributeString
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -1651,7 +1639,7 @@ class AttributeLongText extends AttributeText
  *
  * @package     iTopORM
  */
-class AttributeCaseLog extends AttributeLongText
+class AttributeCaseLog extends AttributeText
 {
 	public function GetNullValue()
 	{
@@ -1837,7 +1825,7 @@ class AttributeCaseLog extends AttributeLongText
  *
  * @package     iTopORM
  */
-class AttributeHTML extends AttributeLongText
+class AttributeHTML extends AttributeText
 {
 	public function GetEditClass() {return "HTML";}
 
@@ -1888,7 +1876,6 @@ class AttributeIPAddress extends AttributeString
  */
 class AttributeOQL extends AttributeText
 {
-	public function GetEditClass() {return "OQLExpression";}
 }
 
 /**
@@ -1932,7 +1919,7 @@ class AttributeTemplateHTML extends AttributeText
  */
 class AttributeEnum extends AttributeString
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -2102,7 +2089,7 @@ class AttributeDateTime extends AttributeDBField
 		return "Y-m-d H:i:s";
 	}
 
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -2316,7 +2303,6 @@ class AttributeDateTime extends AttributeDBField
 						
 			default:
 			$oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams);
-
 		}
 
 		return $oNewCondition;
@@ -2414,7 +2400,7 @@ class AttributeDate extends AttributeDateTime
 		return "Y-m-d";
 	}
 
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return parent::ListExpectedParams();
 		//return array_merge(parent::ListExpectedParams(), array());
@@ -2500,7 +2486,7 @@ class AttributeDeadline extends AttributeDateTime
  */
 class AttributeExternalKey extends AttributeDBFieldVoid
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("targetclass", "is_null_allowed", "on_target_delete"));
 	}
@@ -2617,7 +2603,7 @@ class AttributeHierarchicalKey extends AttributeExternalKey
 {
 	protected $m_sTargetClass;
 
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		$aParams = parent::ListExpectedParams();
 		$idx = array_search('targetclass', $aParams);
@@ -2741,19 +2727,12 @@ class AttributeHierarchicalKey extends AttributeExternalKey
  */
 class AttributeExternalField extends AttributeDefinition
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("extkey_attcode", "target_attcode"));
 	}
 
 	public function GetEditClass() {return "ExtField";}
-
-	public function GetFinalAttDef()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetFinalAttDef(); 
-	}
-
 	protected function GetSQLCol()
 	{
 		// throw new CoreException("external attribute: does it make any sense to request its type ?");  
@@ -2968,7 +2947,7 @@ class AttributeExternalField extends AttributeDefinition
  */
 class AttributeURL extends AttributeString
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		//return parent::ListExpectedParams();
 		return array_merge(parent::ListExpectedParams(), array("target"));
@@ -3002,7 +2981,7 @@ class AttributeURL extends AttributeString
  */
 class AttributeBlob extends AttributeDefinition
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("depends_on"));
 	}
@@ -3149,7 +3128,7 @@ class AttributeBlob extends AttributeDefinition
  */
 class AttributeOneWayPassword extends AttributeDefinition
 {
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array("depends_on"));
 	}
@@ -3299,26 +3278,16 @@ class AttributeOneWayPassword extends AttributeDefinition
 }
 
 // Indexed array having two dimensions
-class AttributeTable extends AttributeDBField
+class AttributeTable extends AttributeText
 {
-	public function GetEditClass() {return "Table";}
-	protected function GetSQLCol() {return "LONGTEXT";}
+	public function GetEditClass() {return "Text";}
+	protected function GetSQLCol() {return "TEXT";}
 
 	public function GetMaxSize()
 	{
 		return null;
 	}
 
-	public function GetNullValue()
-	{
-		return array();
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return (count($proposedValue) == 0);
-	} 
-
 	// Facilitate things: allow the user to Set the value from a string
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
@@ -3381,39 +3350,13 @@ class AttributeTable extends AttributeDBField
 		$sRes .= "</TABLE>";
 		return $sRes;
 	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null)
-	{
-		// Not implemented
-		return '';
-	}
-
-	public function GetAsXML($value, $oHostObject = null)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "";
-		foreach($value as $iRow => $aRawData)
-		{
-			$sRes .= "<row>";
-			foreach ($aRawData as $iCol => $cell)
-			{
-				$sCell = Str::pure2xml((string)$cell);
-				$sRes .= "<cell icol=\"$iCol\">$sCell</cell>";
-			}
-			$sRes .= "</row>";
-		}
-		return $sRes;
-	}
 }
 
 // The PHP value is a hash array, it is stored as a TEXT column
 class AttributePropertySet extends AttributeTable
 {
-	public function GetEditClass() {return "PropertySet";}
+	public function GetEditClass() {return "Text";}
+	protected function GetSQLCol() {return "TEXT";}
 
 	// Facilitate things: allow the user to Set the value from a string
 	public function MakeRealValue($proposedValue, $oHostObj)
@@ -3440,10 +3383,6 @@ class AttributePropertySet extends AttributeTable
 		$sRes .= "<TBODY>";
 		foreach($value as $sProperty => $sValue)
 		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
 			$sRes .= "<TR>";
 			$sCell = str_replace("\n", "<br>\n", Str::pure2html((string)$sValue));
 			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
@@ -3453,53 +3392,6 @@ class AttributePropertySet extends AttributeTable
 		$sRes .= "</TABLE>";
 		return $sRes;
 	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$aRes = array();
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sFrom = array(',', '=');
-			$sTo = array('\,', '\=');
-			$aRes[] = $sProperty.'='.str_replace($sFrom, $sTo, (string)$sValue);
-		}
-		$sRaw = implode(',', $aRes);
-
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, $sRaw);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	public function GetAsXML($value, $oHostObject = null)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "";
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sRes .= "<property id=\"$sProperty\">";
-			$sRes .= Str::pure2xml((string)$sValue);
-			$sRes .= "</property>";
-		}
-		return $sRes;
-	}
 }
 
 /**
@@ -3509,7 +3401,7 @@ class AttributePropertySet extends AttributeTable
  */
 class AttributeComputedFieldVoid extends AttributeDefinition
 {	
-	static public function ListExpectedParams()
+	static protected function ListExpectedParams()
 	{
 		return array_merge(parent::ListExpectedParams(), array());
 	}
@@ -3602,43 +3494,6 @@ class AttributeFriendlyName extends AttributeComputedFieldVoid
 
 	public function GetKeyAttCode() {return $this->Get("extkey_attcode");} 
 
-	public function GetLabel($sDefault = null)
-	{
-		$sLabel = parent::GetLabel('');
-		if (strlen($sLabel) == 0)
-		{
-			$sKeyAttCode = $this->Get("extkey_attcode");
-			if ($sKeyAttCode == 'id')
-			{
-				return Dict::S('Core:FriendlyName-Label');
-			}
-			else
-			{
-				$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
-				$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
-			}
-		}
-		return $sLabel;
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = parent::GetDescription('');
-		if (strlen($sLabel) == 0)
-		{
-			$sKeyAttCode = $this->Get("extkey_attcode");
-			if ($sKeyAttCode == 'id')
-			{
-				return Dict::S('Core:FriendlyName-Description');
-			}
-			else
-			{
-				$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
-				$sLabel = $oExtKeyAttDef->GetDescription('');
-			}
-		}
-		return $sLabel;
-	} 
-
 	// n/a, the friendly name is made of a complex expression (see GetNameSpec)
 	protected function GetSQLCol() {return "";}	
 

core/bulkchange.class.inc.php

@@ -401,13 +401,7 @@ class BulkChange
 			if ($sAttCode == 'id') continue;
 
 			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-			$aReasons = array();
-			$iFlags = $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
-			if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) )
-			{
-					$aErrors[$sAttCode] = "the attribute '$sAttCode' is read-only and cannot be modified (current value: ".$oTargetObj->Get($sAttCode).", proposed value: {$aRowData[$iCol]}).";
-			}
-			else if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
+			if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
 			{
 				try
 				{

core/cmdbobject.class.inc.php

@@ -93,23 +93,6 @@ abstract class CMDBObject extends DBObject
 	protected static $m_oCurrChange = null;
 
 
-	public static function SetCurrentChange(CMDBChange $oChange)
-	{
-		self::$m_oCurrChange = $oChange;
-	}
-
-	//
-	// Todo: simplify the APIs and do not pass the current change as an argument anymore
-	//       SetCurrentChange to be invoked in very few cases (UI.php, CSV import, Data synchro)
-	//			GetCurrentChange to be called ONCE (!) by CMDBChangeOp::OnInsert ($this->Set('change', ..GetCurrentChange())
-	//			GetCurrentChange to create a default change if not already done in the current context
-	//
-	public static function GetCurrentChange()
-	{
-		return self::$m_oCurrChange;
-	}
-
-
 	private function RecordObjCreation(CMDBChange $oChange)
 	{
 		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpCreate");

core/config.class.inc.php

@@ -124,14 +124,6 @@ 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',
@@ -197,14 +189,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
-		'csv_import_history_display' => array(
-			'type' => 'bool',
-			'description' => 'Display the history tab in the import wizard',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
 		'access_mode' => array(
 			'type' => 'integer',
 			'description' => 'Combination of flags (ACCESS_USER_WRITE | ACCESS_ADMIN_WRITE, or ACCESS_FULL)',
@@ -408,15 +392,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-		'cas_update_profiles' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not to update the profiles of an existing user from the CAS information',
-			// 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',
@@ -426,15 +401,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-		'cas_default_profiles' => array(
-			'type' => 'string',
-			'description' => 'A semi-colon separated list of iTop Profiles to use when creating a new user if no profile is retrieved from CAS',
-			// examples... not used (nor 'description')
-			'default' => 'Portal user',
-			'value' => 'Portal user',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
 		'cas_debug' => array(
 			'type' => 'bool',
 			'description' => 'Activate the CAS debug',
@@ -471,15 +437,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
-		'complex_actions_limit' => array(
-			'type' => 'integer',
-			'description' => 'Display the "actions" menu items that require long computation only if the list of objects is contains less objects than this number (0 means no limit)',
-			// examples... not used
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
 	);
 
 	public function IsProperty($sPropCode)
@@ -605,7 +562,6 @@ class Config
 			'application/menunode.class.inc.php',
 			'application/user.preferences.class.inc.php',
 			'application/audit.rule.class.inc.php',
-			'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

core/dbobject.class.php

@@ -302,53 +302,30 @@ abstract class DBObject
 			$this->Reload();
 		}
 
-		if ($oAttDef->IsExternalKey())
+		if ($oAttDef->IsExternalKey() && is_object($value))
 		{
-			if (is_object($value))
+			// Setting an external key with a whole object (instead of just an ID)
+			// let's initialize also the external fields that depend on it
+			// (useful when building objects in memory and not from a query)
+			if ( (get_class($value) != $oAttDef->GetTargetClass()) && (!is_subclass_of($value, $oAttDef->GetTargetClass())))
 			{
-				// Setting an external key with a whole object (instead of just an ID)
-				// let's initialize also the external fields that depend on it
-				// (useful when building objects in memory and not from a query)
-				if ( (get_class($value) != $oAttDef->GetTargetClass()) && (!is_subclass_of($value, $oAttDef->GetTargetClass())))
-				{
-					throw new CoreUnexpectedValue("Trying to set the value of '$sAttCode', to an object of class '".get_class($value)."', whereas it's an ExtKey to '".$oAttDef->GetTargetClass()."'. Ignored");
-				}
-				else
-				{	
-					$this->m_aCurrValues[$sAttCode] = $value->GetKey();
-					foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
-					{
-						if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sAttCode))
-						{
-							$this->m_aCurrValues[$sCode] = $value->Get($oDef->GetExtAttCode());
-						}
-					}
-					$this->m_aCurrValues[$sAttCode.'_friendlyname'] = $value->GetName();
-				}
+				throw new CoreUnexpectedValue("Trying to set the value of '$sAttCode', to an object of class '".get_class($value)."', whereas it's an ExtKey to '".$oAttDef->GetTargetClass()."'. Ignored");
 			}
-			else if ($this->m_aCurrValues[$sAttCode] != $value)
+			else
 			{
-				// If the external key changed, invalidate all the external fields (and friendly name) related to this external key
-				$this->m_aCurrValues[$sAttCode] = $value;
+				// The object has changed, reset caches
+				$this->m_bCheckStatus = null;
+				$this->m_aAsArgs = null;
+
+				$this->m_aCurrValues[$sAttCode] = $value->GetKey();
 				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
 				{
 					if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sAttCode))
 					{
-						unset($this->m_aLoadedAtt[$sCode]);
-						$this->m_aCurrValues[$sCode] = null;
+						$this->m_aCurrValues[$sCode] = $value->Get($oDef->GetExtAttCode());
 					}
 				}
-				$this->m_aCurrValues[$sAttCode.'_friendlyname'] = null;
-				unset($this->m_aLoadedAtt[$sAttCode.'_friendlyname']);			
 			}
-
-			// The object has changed, reset caches
-			$this->m_bCheckStatus = null;
-			$this->m_aAsArgs = null;
-			
-			// Make sure we do not reload it anymore... before saving it
-			$this->RegisterAsDirty();
-			
 			return;
 		}
 		if(!$oAttDef->IsScalar() && !is_object($value))
@@ -423,60 +400,10 @@ abstract class DBObject
 		{
 			throw new CoreException("Unknown attribute code '$sAttCode' for the class ".get_class($this));
 		}
-		if ($this->m_bIsInDB && !isset($this->m_aLoadedAtt[$sAttCode]))
+		if ($this->m_bIsInDB && !isset($this->m_aLoadedAtt[$sAttCode]) && !$this->m_bDirty)
 		{
 			// #@# non-scalar attributes.... handle that differently
-			if (!$this->m_bDirty)
-			{
-				$this->Reload();
-			}
-			else
-			{
-				// If the missing attribute is an external fields (or a friendlyname), try to selectively reload it
-				// from the value of its external key... and reload the related external fields & friendlyname as well
-				$sTargetClass = '';
-				$iCurrKey = 0;
-				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-				if ($oAttDef->IsExternalField())
-				{
-					$sKeyAttCode = $oAttDef->GetKeyAttCode();
-					$iCurrKey = $this->m_aCurrValues[$oAttDef->GetKeyAttCode()];
-					$sTargetClass= $oAttDef->GetTargetClass();
-				}
-				else if ($oAttDef instanceof AttributeFriendlyName)
-				{
-					$sKeyAttCode = $oAttDef->GetKeyAttCode();
-					$oKeyAttDef =  MetaModel::GetAttributeDef(get_class($this), $sKeyAttCode);
-					$iCurrKey = $this->m_aCurrValues[$oAttDef->GetKeyAttCode()];
-					$sTargetClass = $oKeyAttDef->GetTargetClass();
-				}
-				
-				if (($sTargetClass != '') && ($iCurrKey != 0))
-				{
-					$oTargetObj = MetaModel::GetObject($sTargetClass, $iCurrKey, false);
-					if (is_object($oTargetObj))
-					{
-						foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
-						{
-							if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sKeyAttCode))
-							{
-								$this->m_aLoadedAtt[$sCode] = true;
-								$this->m_aCurrValues[$sCode] = $oTargetObj->Get($oDef->GetExtAttCode());
-							}
-						}
-						if ($oAttDef instanceof AttributeFriendlyName)
-						{
-							$this->m_aLoadedAtt[$sAttCode] = true;
-							$this->m_aCurrValues[$sAttCode] = $oTargetObj->GetName();
-						}
-						else
-						{
-							$this->m_aLoadedAtt[$sKeyAttCode.'_friendlyname'] = true;
-							$this->m_aCurrValues[$sKeyAttCode.'_friendlyname'] = $oTargetObj->GetName();
-						}
-					}						
-				}
-			}
+			$this->Reload();
 		}
 		$value = $this->m_aCurrValues[$sAttCode];
 		if ($value instanceof DBObjectSet)
@@ -561,7 +488,7 @@ abstract class DBObject
 		}
 
 		// That's a standard attribute (might be an ext field or a direct field, etc.)
-		return $oAtt->GetAsHTML($this->Get($sAttCode), $this);
+		return $oAtt->GetAsHTML($this->Get($sAttCode));
 	}
 
 	public function GetEditValue($sAttCode)
@@ -1005,7 +932,7 @@ abstract class DBObject
 
 					$oDeletionPlan->AddToDelete($oReplica, DEL_SILENT);
 
-					if ($oDataSource->GetKey() == SynchroExecution::GetCurrentTaskId())
+					if ($oDataSource->GetKey() == SynchroDataSource::GetCurrentTaskId())
 					{
 						// The current task has the right to delete the object
 						continue;
@@ -1054,35 +981,30 @@ abstract class DBObject
 		$aDelta = array();
 		foreach ($aProposal as $sAtt => $proposedValue)
 		{
-			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAtt);
-			// Ignore external fields and friendly names that change only  as a consequence of modifying another field
-			if ((!$oAttDef->IsExternalField() && !($oAttDef instanceof AttributeFriendlyName)))
+			if (!array_key_exists($sAtt, $this->m_aOrigValues))
 			{
-				if (!array_key_exists($sAtt, $this->m_aOrigValues))
+				// The value was not set
+				$aDelta[$sAtt] = $proposedValue;
+			}
+			elseif(is_object($proposedValue))
+			{
+				$oLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sAtt);
+				// The value is an object, the comparison is not strict
+				if (!$oLinkAttDef->Equals($proposedValue, $this->m_aOrigValues[$sAtt]))
 				{
-					// The value was not set
 					$aDelta[$sAtt] = $proposedValue;
 				}
-				elseif(is_object($proposedValue))
-				{
-					$oLinkAttDef = MetaModel::GetAttributeDef(get_class($this), $sAtt);
-					// The value is an object, the comparison is not strict
-					if (!$oLinkAttDef->Equals($proposedValue, $this->m_aOrigValues[$sAtt]))
-					{
-						$aDelta[$sAtt] = $proposedValue;
-					}
-				}
-				else
-				{
-					// The value is a scalar, the comparison must be 100% strict
-					if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-					{	
-						//echo "$sAtt:<pre>\n";
-						//var_dump($this->m_aOrigValues[$sAtt]);
-						//var_dump($proposedValue);
-						//echo "</pre>\n";
-						$aDelta[$sAtt] = $proposedValue;
-					}
+			}
+			else
+			{
+				// The value is a scalar, the comparison must be 100% strict
+				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
+				{	
+					//echo "$sAtt:<pre>\n";
+					//var_dump($this->m_aOrigValues[$sAtt]);
+					//var_dump($proposedValue);
+					//echo "</pre>\n";
+					$aDelta[$sAtt] = $proposedValue;
 				}
 			}
 		}
@@ -1381,11 +1303,6 @@ abstract class DBObject
 		return $this->DBInsert();
 	}
 
-	public function DBInsertTrackedNoReload(CMDBChange $oVoid)
-	{
-		return $this->DBInsertNoReload();
-	}
-
 	// Creates a copy of the current object into the database
 	// Returns the id of the newly created object
 	public function DBClone($iNewKey = null)
@@ -1739,7 +1656,7 @@ abstract class DBObject
 					// #@# Note: This has been proven to be quite slow, this can slow down bulk load
 					$sAsHtml = $this->GetAsHtml($sAttCode);
 					$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = $sAsHtml;
-					$aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = $this->GetEditValue($sAttCode); // "Nice" display value, but without HTML tags and entities
+					$aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = strip_tags($sAsHtml);
 				}
 				// Do something for case logs... quick N' dirty...
 				if ($aScalarArgs[$sArgName.'->'.$sAttCode] instanceof ormCaseLog)
@@ -1945,7 +1862,7 @@ abstract class DBObject
 		$oSet = $this->GetMasterReplica();
 		while($aData = $oSet->FetchAssoc())
 		{
-			if ($aData['datasource']->GetKey() == SynchroExecution::GetCurrentTaskId())
+			if ($aData['datasource']->GetKey() == SynchroDataSource::GetCurrentTaskId())
 			{
 				// Ignore the current task (check to write => ok)
 				continue;

core/dbobjectsearch.class.php

@@ -66,8 +66,6 @@ class DBObjectSearch
 		$this->m_aRelatedTo = array();
 		$this->m_bDataFiltered = false;
 		$this->m_aParentConditions = array();
-
-		$this->m_aModifierProperties = array();
 	}
 
 	public function AllowAllData() {$this->m_bAllowAllData = true;}
@@ -75,18 +73,7 @@ class DBObjectSearch
 	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()
@@ -128,23 +115,6 @@ class DBObjectSearch
 	}
 
 
-	public function SetModifierProperty($sPluginClass, $sProperty, $value)
-	{
-		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
-	}
-
-	public function GetModifierProperties($sPluginClass)
-	{
-		if (array_key_exists($sPluginClass, $this->m_aModifierProperties))
-		{
-			return $this->m_aModifierProperties[$sPluginClass];
-		}
-		else
-		{
-			return array();
-		}
-	}
-
 	public function IsAny()
 	{
 		// #@# todo - if (!$this->m_oSearchCondition->IsTrue()) return false;
@@ -767,47 +737,20 @@ 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);
-		return base64_encode(serialize(array($sOql, $this->m_aParams, $this->m_aModifierProperties)));
+		return base64_encode(serialize(array($sOql, $this->m_aParams)));
 	}
 	
 	static public function unserialize($sValue)
@@ -818,9 +761,7 @@ class DBObjectSearch
 		// We've tried to use gzcompress/gzuncompress, but for some specific queries
 		// it was not working at all (See Trac #193)
 		// gzuncompress was issuing a warning "data error" and the return object was null
-		$oRetFilter = self::FromOQL($sOql, $aParams);
-		$oRetFilter->m_aModifierProperties = $aData[2];
-		return $oRetFilter;
+		return self::FromOQL($sOql, $aParams);
 	}
 
 	// SImple BUt Structured Query Languag - SubuSQL

core/dbobjectset.class.php

@@ -687,56 +687,6 @@ class DBObjectSet
 		$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);
-	}
 }
 
 /**

core/dict.class.inc.php

@@ -220,20 +220,6 @@ class Dict
 		}
 	}
 
-	/**
-	 * Clone a string in every language (if it exists in that language)
-	 */	 	
-	public static function CloneString($sSourceCode, $sDestCode)
-	{
-		foreach(self::$m_aLanguages as $sLanguageCode => $foo)
-		{
-			if (isset(self::$m_aData[$sLanguageCode][$sSourceCode]))
-			{
-				self::$m_aData[$sLanguageCode][$sDestCode] = self::$m_aData[$sLanguageCode][$sSourceCode];
-			}
-		}
-	}
-
 	public static function MakeStats($sLanguageCode, $sLanguageRef = 'EN US')
 	{
 		$aMissing = array(); // Strings missing for the target language

core/email.class.inc.php

@@ -95,7 +95,7 @@ class EMail
 		$bRes = mail
 		(
 			str_replace(array("\n", "\r"), ' ', $this->m_sTo), // Prevent header injection
-			$this->EncodeHeaderField($this->m_sSubject), // Prevent header injection & MIME Encode charsets
+			str_replace(array("\n", "\r"), ' ', $this->m_sSubject), // Prevent header injection
 			$this->m_sBody,
 			$sHeaders
 		);
@@ -137,18 +137,13 @@ class EMail
 		}
 	}
 
-	public function AddToHeader($sKey, $sValue)
+	protected function AddToHeader($sKey, $sValue)
 	{
 		if (strlen($sValue) > 0)
 		{
 			$this->m_aHeaders[$sKey] = $sValue;
 		}
 	}
-
-	public function SetMessageId($sId)
-	{
-		$this->AddToHeader('Message-ID', $sId);
-	}
 	
 	public function SetReferences($sReferences)
 	{
@@ -208,7 +203,7 @@ class EMail
 		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"';
+ 		$sContentType = isset($this->m_aHeaders['Content-Type']) ? $this->m_aHeaders['Content-Type'] : 'text/html';
  		$sContentHeader = "Content-Type: $sContentType\r\n";
  		$this->m_aHeaders['Content-Type'] = "multipart/mixed; boundary=\"{$sDelimiter}\"";
 
@@ -225,18 +220,6 @@ class EMail
 	  	$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

@@ -103,7 +103,7 @@ class Event extends DBObject implements iDisplay
 		$this->DisplayBareProperties($oPage, $bEditMode);
 	}
 	
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $aExtraParams = array())
 	{
 		if ($bEditMode) return; // Not editable
 		
@@ -174,7 +174,7 @@ class EventNotificationEmail extends EventNotification
 		MetaModel::Init_AddAttribute(new AttributeText("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// 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
@@ -340,22 +340,14 @@ class EventLoginUsage extends Event
 		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())));
-		$aZList = array('date', 'user_id');
-		if (MetaModel::IsValidAttCode('Contact', 'name'))
-		{
-			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())));
-			$aZList[] = 'contact_name';
-		}
-		if (MetaModel::IsValidAttCode('Contact', 'email'))
-		{
-			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())));
-			$aZList[] = 'contact_email';
-		}
+		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_merge($aZList, array('userinfo', 'message'))); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array_merge($aZList, array('userinfo'))); // Attributes to be displayed for a list
+		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', $aZList); // Criteria of the std search form
+		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

@@ -36,16 +36,11 @@ abstract class Expression
 	// 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 !
@@ -113,10 +108,6 @@ class SQLExpression extends Expression
 		return $this->m_sSQL;
 	}
 
-	public function ApplyParameters($aArgs)
-	{
-	}
-	
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 	}
@@ -131,11 +122,6 @@ class SQLExpression extends Expression
 		return array();
 	}
 	
-	public function ListConstantFields()
-	{
-		return array();
-	}
-	
 	public function RenameParam($sOldName, $sNewName)
 	{
 		// Do nothing, since there is nothing to rename
@@ -178,11 +164,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_oRightExpr->IsTrue()) return true;
+			if ($this->m_oLeftExpr->IsTrue() && $this->m_oLeftExpr->IsTrue()) return true;
 		}
 		return false;
 	}
-	
+
 	public function GetLeftExpr()
 	{
 		return $this->m_oLeftExpr;
@@ -206,27 +192,7 @@ class BinaryExpression extends Expression
 		$sRight = $this->GetRightExpr()->Render($aArgs, $bRetrofitParams);
 		return "($sLeft $sOperator $sRight)";
 	}
-	
-	public function ApplyParameters($aArgs)
-	{
-		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);
@@ -247,44 +213,6 @@ class BinaryExpression extends Expression
 		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);
@@ -316,13 +244,18 @@ class UnaryExpression extends Expression
 	// recursive rendering
 	public function Render(&$aArgs = null, $bRetrofitParams = false)
 	{
-		return CMDBSource::Quote($this->m_value);
+		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);
+		}
 	}
 
-	public function ApplyParameters($aArgs)
-	{
-	}
-	
 	public function GetUnresolvedFields($sAlias, &$aUnresolved)
 	{
 	}
@@ -336,11 +269,6 @@ class UnaryExpression extends Expression
 	{
 		return array();
 	}
-
-	public function ListConstantFields()
-	{
-		return array();
-	}
 	
 	public function RenameParam($sOldName, $sNewName)
 	{
@@ -512,7 +440,7 @@ class VariableExpression extends UnaryExpression
 		}
 		elseif ($bRetrofitParams)
 		{
-			$aArgs[$this->m_sName] = null;
+			//$aArgs[$this->m_sName] = null;
 			return ':'.$this->m_sName;
 		}
 		else
@@ -528,20 +456,6 @@ class VariableExpression extends UnaryExpression
 			$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!
@@ -587,22 +501,6 @@ class ListExpression extends Expression
 		return '('.implode(', ', $aRes).')';
 	}
 
-	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)
@@ -631,16 +529,6 @@ 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();
@@ -690,22 +578,6 @@ class FunctionExpression extends Expression
 		return $this->m_sVerb.'('.implode(', ', $aRes).')';
 	}
 
-	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)
@@ -734,16 +606,6 @@ 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)
@@ -786,18 +648,6 @@ class IntervalExpression extends Expression
 		return 'INTERVAL '.$this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
 	}
 
-	public function ApplyParameters($aArgs)
-	{
-		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);
@@ -812,11 +662,6 @@ class IntervalExpression extends Expression
 	{
 		return array();
 	}
-
-	public function ListConstantFields()
-	{
-		return array();
-	}
 	
 	public function RenameParam($sOldName, $sNewName)
 	{
@@ -857,22 +702,6 @@ class CharConcatExpression extends Expression
 		return "CAST(CONCAT(".implode(', ', $aRes).") AS CHAR)";
 	}
 
-	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)
@@ -901,16 +730,6 @@ 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)
@@ -953,10 +772,10 @@ class QueryBuilderExpressions
 	protected $m_aSelectExpr;
 	protected $m_aJoinFields;
 
-	public function __construct($oCondition)
+	public function __construct($aSelect, $oCondition)
 	{
 		$this->m_oConditionExpr = $oCondition;
-		$this->m_aSelectExpr = array();
+		$this->m_aSelectExpr = $aSelect;
 		$this->m_aJoinFields = array();
 	}
 

core/filterdef.class.inc.php

@@ -50,7 +50,6 @@ abstract class FilterDefinition
 		$this->ConsistencyCheck();
 	}
 
-	// Left here for backward compatibility, deprecated in 2.0
 	public function OverloadParams($aParams)
 	{
 		foreach ($aParams as $sParam => $value)

core/kpi.class.inc.php

@@ -191,16 +191,6 @@ 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

core/metamodel.class.php

@@ -15,9 +15,6 @@
 //   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require_once(APPROOT.'core/modulehandler.class.inc.php');
-require_once(APPROOT.'core/querybuildercontext.class.inc.php');
-require_once(APPROOT.'core/querymodifier.class.inc.php');
-require_once(APPROOT.'core/metamodelmodifier.inc.php');
 
 /**
  * Metamodel
@@ -28,6 +25,8 @@ require_once(APPROOT.'core/metamodelmodifier.inc.php');
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
 
+
+
 // #@# todo: change into class const (see Doctrine)
 // Doctrine example
 // class toto
@@ -1173,33 +1172,6 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 
 		self::$m_sTablePrefix = $sTablePrefix;
 
-		// Build the list of available extensions
-		//
-		$aInterfaces = array('iApplicationUIExtension', 'iApplicationObjectExtension', 'iQueryModifier', 'iOnClassInitialization');
-		foreach($aInterfaces as $sInterface)
-		{
-			self::$m_aExtensionClasses[$sInterface] = array();
-		}
-
-		foreach(get_declared_classes() as $sPHPClass)
-		{
-			$oRefClass = new ReflectionClass($sPHPClass);
-			$oExtensionInstance = null;
-			foreach($aInterfaces as $sInterface)
-			{
-				if ($oRefClass->implementsInterface($sInterface))
-				{
-					if (is_null($oExtensionInstance))
-					{
-						$oExtensionInstance = new $sPHPClass;
-					}
-					self::$m_aExtensionClasses[$sInterface][$sPHPClass] = $oExtensionInstance;
-				}
-			}
-		}
-
-		// Initialize the classes (declared attributes, etc.)
-		//
 		foreach(get_declared_classes() as $sPHPClass) {
 			if (is_subclass_of($sPHPClass, 'DBObject'))
 			{
@@ -1212,10 +1184,6 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 				if (method_exists($sPHPClass, 'Init'))
 				{
 					call_user_func(array($sPHPClass, 'Init'));
-					foreach (MetaModel::EnumPlugins('iOnClassInitialization') as $sPluginClass => $oClassInit)
-					{
-						$oClassInit->OnAfterClassInitialization($sPHPClass);
-					}
 				}
 			}
 		}
@@ -1433,6 +1401,31 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			//	}
 			//}
 		}
+
+		// Build the list of available extensions
+		//
+		$aInterfaces = array('iApplicationUIExtension', 'iApplicationObjectExtension');
+		foreach($aInterfaces as $sInterface)
+		{
+			self::$m_aExtensionClasses[$sInterface] = array();
+		}
+
+		foreach(get_declared_classes() as $sPHPClass)
+		{
+			$oRefClass = new ReflectionClass($sPHPClass);
+			$oExtensionInstance = null;
+			foreach($aInterfaces as $sInterface)
+			{
+				if ($oRefClass->implementsInterface($sInterface))
+				{
+					if (is_null($oExtensionInstance))
+					{
+						$oExtensionInstance = new $sPHPClass;
+					}
+					self::$m_aExtensionClasses[$sInterface][$sPHPClass] = $oExtensionInstance;
+				}
+			}
+		}
 	}
 
 	// To be overriden, must be called for any object class (optimization)
@@ -1549,8 +1542,6 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			self::$m_aChildClasses[$sAncestorClass][] = $sTargetClass;
 		}
 	}
-
-	// Left here for backward compatibility, deprecated in 2.0
 	public static function Init_OverloadAttributeParams($sAttCode, $aParams)
 	{
 		$sTargetClass = self::GetCallersPHPClass("Init");
@@ -1571,12 +1562,9 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		return true;
 	}
 
-	public static function Init_AddAttribute(AttributeDefinition $oAtt, $sTargetClass = null)
+	public static function Init_AddAttribute(AttributeDefinition $oAtt)
 	{
-		if (!$sTargetClass)
-		{
-			$sTargetClass = self::GetCallersPHPClass("Init");
-		}
+		$sTargetClass = self::GetCallersPHPClass("Init");
 
 		$sAttCode = $oAtt->GetCode();
 		if ($sAttCode == 'finalclass')
@@ -1637,14 +1625,11 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		// Note: it looks redundant to put targetclass there, but a mix occurs when inheritance is used		
 	}
 
-	public static function Init_SetZListItems($sListCode, $aItems, $sTargetClass = null)
+	public static function Init_SetZListItems($sListCode, $aItems)
 	{
 		MyHelpers::CheckKeyInArray('list code', $sListCode, self::$m_aListInfos);
 
-		if (!$sTargetClass)
-		{
-			$sTargetClass = self::GetCallersPHPClass("Init");
-		}
+		$sTargetClass = self::GetCallersPHPClass("Init");
 
 		// Discard attributes that do not make sense
 		// (missing classes in the current module combination, resulting in irrelevant ext key or link set)
@@ -1931,7 +1916,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		//
 		if (!$oFilter->IsAllDataAllowed() && !$oFilter->IsDataFiltered())
 		{
-			$oVisibleObjects = UserRights::GetSelectFilter($oFilter->GetClass(), $oFilter->GetModifierProperties('UserRightsGetSelectFilter'));
+			$oVisibleObjects = UserRights::GetSelectFilter($oFilter->GetClass());
 			if ($oVisibleObjects === false)
 			{
 				// Make sure this is a valid search object, saying NO for all
@@ -1949,26 +1934,12 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			}
 		}
 
-		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
-		//
-		$aModifierProperties = self::MakeModifierProperties($oFilter);
-
 		if (self::$m_bQueryCacheEnabled || self::$m_bTraceQueries)
 		{
 			// Need to identify the query
 			$sOqlQuery = $oFilter->ToOql();
 
-			if (count($aModifierProperties))
-			{
-				array_multisort($aModifierProperties);
-				$sModifierProperties = json_encode($aModifierProperties);
-			}
-			else
-			{
-				$sModifierProperties = '';
-			}
-
-			$sRawId = $sOqlQuery.$sModifierProperties;
+			$sRawId = $sOqlQuery;
 			if (!is_null($aAttToLoad))
 			{
 				foreach($aAttToLoad as $sAlias => $aAttributes)
@@ -2028,10 +1999,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		$aOrderSpec = array();
 		foreach ($aOrderBy as $sFieldAlias => $bAscending)
 		{
-			if ($sFieldAlias != 'id')
-			{
-				MyHelpers::CheckValueInArray('field name in ORDER BY spec', $sFieldAlias, self::GetAttributesList($oFilter->GetFirstJoinedClass()));
-			}
+			MyHelpers::CheckValueInArray('field name in ORDER BY spec', $sFieldAlias, self::GetAttributesList($oFilter->GetFirstJoinedClass()));
 			if (!is_bool($bAscending))
 			{
 				throw new CoreException("Wrong direction in ORDER BY spec, found '$bAscending' and expecting a boolean value");
@@ -2064,10 +2032,12 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 
 		if (!isset($oSelect))
 		{
-			$oBuild = new QueryBuilderContext($oFilter, $aModifierProperties);
+			$aClassAliases = array();
+			$aTableAliases = array();
+			$oQBExpr = new QueryBuilderExpressions(array(), $oFilter->GetCriteria());
 
 			$oKPI = new ExecutionKPI();
-			$oSelect = self::MakeQuery($oBuild, $oFilter, $aAttToLoad, array(), true /* main query */);
+			$oSelect = self::MakeQuery($oFilter->GetSelectedClasses(), $oQBExpr, $aClassAliases, $aTableAliases, $oFilter, $aAttToLoad, array(), true /* main query */);
 			$oSelect->SetSourceOQL($sOqlQuery);
 			$oKPI->ComputeStats('MakeQuery (select)', $sOqlQuery);
 
@@ -2176,33 +2146,12 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		}
 	}
 
-	protected static function MakeModifierProperties($oFilter)
-	{
-		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
-		//
-		$aModifierProperties = array();
-		foreach (MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
-		{
-			// Lowest precedence: the application context
-			$aPluginProps = ApplicationContext::GetPluginProperties($sPluginClass);
-			// Highest precedence: programmatically specified (or OQL)
-			foreach($oFilter->GetModifierProperties($sPluginClass) as $sProp => $value)
-			{
-				$aPluginProps[$sProp] = $value;
-			}
-			if (count($aPluginProps) > 0)
-			{
-				$aModifierProperties[$sPluginClass] = $aPluginProps;
-			}
-		}
-		return $aModifierProperties;
-	}
-	
 	public static function MakeDeleteQuery(DBObjectSearch $oFilter, $aArgs = array())
 	{
-		$aModifierProperties = self::MakeModifierProperties($oFilter);
-		$oBuild = new QueryBuilderContext($oFilter, $aModifierProperties);
-		$oSelect = self::MakeQuery($oBuild, $oFilter, null, array(), true /* main query */);
+		$aClassAliases = array();
+		$aTableAliases = array();
+		$oQBExpr = new QueryBuilderExpressions(array(), $oFilter->GetCriteria());
+		$oSelect = self::MakeQuery($oFilter->GetSelectedClasses(), $oQBExpr, $aClassAliases, $aTableAliases, $oFilter, null, array(), true /* main query */);
 		$aScalarArgs = array_merge(self::PrepareQueryArguments($aArgs), $oFilter->GetInternalParams());
 		return $oSelect->RenderDelete($aScalarArgs);
 	}
@@ -2210,21 +2159,26 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 	public static function MakeUpdateQuery(DBObjectSearch $oFilter, $aValues, $aArgs = array())
 	{
 		// $aValues is an array of $sAttCode => $value
-		$aModifierProperties = self::MakeModifierProperties($oFilter);
-		$oBuild = new QueryBuilderContext($oFilter, $aModifierProperties);
-		$oSelect = self::MakeQuery($oBuild, $oFilter, null, $aValues, true /* main query */);
+		$aClassAliases = array();
+		$aTableAliases = array();
+		$oQBExpr = new QueryBuilderExpressions(array(), $oFilter->GetCriteria());
+		$oSelect = self::MakeQuery($oFilter->GetSelectedClasses(), $oQBExpr, $aClassAliases, $aTableAliases, $oFilter, null, $aValues, true /* main query */);
 		$aScalarArgs = array_merge(self::PrepareQueryArguments($aArgs), $oFilter->GetInternalParams());
 		return $oSelect->RenderUpdate($aScalarArgs);
 	}
 
-	private static function MakeQuery(&$oBuild, DBObjectSearch $oFilter, $aAttToLoad = null, $aValues = array(), $bIsMainQuery = false)
+	private static function MakeQuery($aSelectedClasses, &$oQBExpr, &$aClassAliases, &$aTableAliases, DBObjectSearch $oFilter, $aAttToLoad = null, $aValues = array(), $bIsMainQuery = false)
 	{
 		// Note: query class might be different than the class of the filter
 		// -> this occurs when we are linking our class to an external class (referenced by, or pointing to)
 		$sClass = $oFilter->GetFirstJoinedClass();
 		$sClassAlias = $oFilter->GetFirstJoinedClassAlias();
 
-		$bIsOnQueriedClass = array_key_exists($sClassAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
+		$bIsOnQueriedClass = array_key_exists($sClassAlias, $aSelectedClasses);
+		if ($bIsOnQueriedClass)
+		{
+			$aClassAliases = array_merge($aClassAliases, $oFilter->GetJoinedClasses());
+		}
 
 		self::DbgTrace("Entering: ".$oFilter->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
 
@@ -2234,7 +2188,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		if ($bIsOnQueriedClass)
 		{
 			// default to the whole list of attributes + the very std id/finalclass
-			$oBuild->m_oQBExpressions->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
+			$oQBExpr->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
 
 			if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
 			{
@@ -2250,7 +2204,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 				
 				foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
 				{
-					$oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
+					$oQBExpr->AddSelect($sClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
 				}
 			}
 
@@ -2270,14 +2224,14 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 				foreach($aFullText as $sFTNeedle)
 				{
 					$oNewCond = new BinaryExpression($oTextFields, 'LIKE', new ScalarExpression("%$sFTNeedle%"));
-					$oBuild->m_oQBExpressions->AddCondition($oNewCond);
+					$oQBExpr->AddCondition($oNewCond);
 				}
 			}
 		}
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."</pre></p>\n";
 		$aExpectedAtts = array(); // array of (attcode => fieldexpression)
 //echo "<p>".__LINE__.": GetUnresolvedFields($sClassAlias, ...)</p>\n";
-		$oBuild->m_oQBExpressions->GetUnresolvedFields($sClassAlias, $aExpectedAtts);
+		$oQBExpr->GetUnresolvedFields($sClassAlias, $aExpectedAtts);
 
 		// Compute a clear view of required joins (from the current class)
 		// Build the list of external keys:
@@ -2314,9 +2268,9 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		{
 			$aTranslateNow = array();
 			$aTranslateNow[$sClassAlias]['friendlyname'] = self::GetNameExpression($sClass, $sClassAlias);
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
-			$oBuild->m_oQBExpressions->Translate($aTranslateNow, false);
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."</pre></p>\n";
+			$oQBExpr->Translate($aTranslateNow, false);
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."</pre></p>\n";
 
 			$aNameSpec = self::GetNameSpec($sClass);
 			foreach($aNameSpec[1] as $i => $sAttCode)
@@ -2358,7 +2312,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		self::DbgTrace("Main (=leaf) class, call MakeQuerySingleTable()");
 		if (self::HasTable($sClass))
 		{
-			$oSelectBase = self::MakeQuerySingleTable($oBuild, $oFilter, $sClass, $aExtKeys, $aValues);
+			$oSelectBase = self::MakeQuerySingleTable($aSelectedClasses, $oQBExpr, $aClassAliases, $aTableAliases, $oFilter, $sClass, $aExtKeys, $aValues);
 		}
 		else
 		{
@@ -2367,7 +2321,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			// As the join will not filter on the expected classes, we have to specify it explicitely
 			$sExpectedClasses = implode("', '", self::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
 			$oFinalClassRestriction = Expression::FromOQL("`$sClassAlias`.finalclass IN ('$sExpectedClasses')");
-			$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
+			$oQBExpr->AddCondition($oFinalClassRestriction);
 		}
 
 		// Then we join the queries of the eventual parent classes (compound model)
@@ -2376,7 +2330,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			if (!self::HasTable($sParentClass)) continue;
 //echo "<p>Parent class: $sParentClass... let's call MakeQuerySingleTable()</p>";
 			self::DbgTrace("Parent class: $sParentClass... let's call MakeQuerySingleTable()");
-			$oSelectParentTable = self::MakeQuerySingleTable($oBuild, $oFilter, $sParentClass, $aExtKeys, $aValues);
+			$oSelectParentTable = self::MakeQuerySingleTable($aSelectedClasses, $oQBExpr, $aClassAliases, $aTableAliases, $oFilter, $sParentClass, $aExtKeys, $aValues);
 			if (is_null($oSelectBase))
 			{
 				$oSelectBase = $oSelectParentTable;
@@ -2401,11 +2355,11 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 				//self::DbgTrace($oSelectForeign->RenderSelect(array()));
 
 				$sForeignClassAlias = $oForeignFilter->GetFirstJoinedClassAlias();
-				$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression($sForeignKeyAttCode, $sForeignClassAlias));
+				$oQBExpr->PushJoinField(new FieldExpression($sForeignKeyAttCode, $sForeignClassAlias));
 
-				$oSelectForeign = self::MakeQuery($oBuild, $oForeignFilter, $aAttToLoad);
+				$oSelectForeign = self::MakeQuery($aSelectedClasses, $oQBExpr, $aClassAliases, $aTableAliases, $oForeignFilter, $aAttToLoad);
 
-				$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
+				$oJoinExpr = $oQBExpr->PopJoinField();
 				$sForeignKeyTable = $oJoinExpr->GetParent();
 				$sForeignKeyColumn = $oJoinExpr->GetName();
 				$oSelectBase->AddInnerJoin($oSelectForeign, $sKeyField, $sForeignKeyColumn, $sForeignKeyTable);
@@ -2444,8 +2398,8 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		//
 		if ($bIsMainQuery)
 		{
-			$oSelectBase->SetCondition($oBuild->m_oQBExpressions->GetCondition());
-			$oSelectBase->SetSelect($oBuild->m_oQBExpressions->GetSelect());
+			$oSelectBase->SetCondition($oQBExpr->GetCondition());
+			$oSelectBase->SetSelect($oQBExpr->GetSelect());
 		}
 
 		// That's all... cross fingers and we'll get some working query
@@ -2456,7 +2410,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		return $oSelectBase;
 	}
 
-	protected static function MakeQuerySingleTable(&$oBuild, $oFilter, $sTableClass, $aExtKeys, $aValues)
+	protected static function MakeQuerySingleTable($aSelectedClasses, &$oQBExpr, &$aClassAliases, &$aTableAliases, $oFilter, $sTableClass, $aExtKeys, $aValues)
 	{
 		// $aExtKeys is an array of sTableClass => array of (sAttCode (keys) => array of sAttCode (fields))
 //echo "MAKEQUERY($sTableClass)-liste des clefs externes($sTableClass): <pre>".print_r($aExtKeys, true)."</pre><br/>\n";
@@ -2470,13 +2424,13 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		$sTargetClass = $oFilter->GetFirstJoinedClass();
 		$sTargetAlias = $oFilter->GetFirstJoinedClassAlias();
 		$sTable = self::DBGetTable($sTableClass);
-		$sTableAlias = $oBuild->GenerateTableAlias($sTargetAlias.'_'.$sTable, $sTable);
+		$sTableAlias = self::GenerateUniqueAlias($aTableAliases, $sTargetAlias.'_'.$sTable, $sTable);
 
 		$aTranslation = array();
 		$aExpectedAtts = array();
-		$oBuild->m_oQBExpressions->GetUnresolvedFields($sTargetAlias, $aExpectedAtts);
+		$oQBExpr->GetUnresolvedFields($sTargetAlias, $aExpectedAtts);
 		
-		$bIsOnQueriedClass = array_key_exists($sTargetAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
+		$bIsOnQueriedClass = array_key_exists($sTargetAlias, $aSelectedClasses);
 		
 		self::DbgTrace("Entering: tableclass=$sTableClass, filter=".$oFilter->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
 
@@ -2525,18 +2479,6 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 					$aUpdateValues[$sColumn] = $sValue;
 				}
 			}
-		}
-
-		// 2 - The SQL query, for this table only
-		//
-		$oSelectBase = new SQLQuery($sTable, $sTableAlias, array(), $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
-
-		// 3 - Resolve expected expressions (translation table: alias.attcode => table.column)
-		//
-		foreach(self::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if (self::$m_aAttribOrigins[$sTargetClass][$sAttCode] != $sTableClass) continue;
 
 			// Select...
 			//
@@ -2553,17 +2495,16 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 				{
 					if (array_key_exists($sAttCode, $aExpectedAtts))
 					{
-						$oFieldSQLExp = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
-						foreach (MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
-						{
-							$oFieldSQLExp = $oQueryModifier->GetFieldExpression($oBuild, $sTargetClass, $sAttCode, $sColId, $oFieldSQLExp, $oSelectBase);
-						}
-						$aTranslation[$sTargetAlias][$sAttCode.$sColId] = $oFieldSQLExp;
+						$aTranslation[$sTargetAlias][$sAttCode.$sColId] = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
 					}
 				}
 			}
 		}
 
+		// 3 - The whole stuff, for this table only
+		//
+		$oSelectBase = new SQLQuery($sTable, $sTableAlias, array(), $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
+
 //echo "MAKEQUERY- Classe $sTableClass<br/>\n";
 		// 4 - The external keys -> joins...
 		//
@@ -2583,7 +2524,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 					// The join was not explicitely defined in the filter,
 					// we need to do it now
 					$sKeyClass =  $oKeyAttDef->GetTargetClass();
-					$sKeyClassAlias = $oBuild->GenerateClassAlias($sKeyClass.'_'.$sKeyAttCode, $sKeyClass);
+					$sKeyClassAlias = self::GenerateUniqueAlias($aClassAliases, $sKeyClass.'_'.$sKeyAttCode, $sKeyClass);
 					$oExtFilter = new DBObjectSearch($sKeyClass, $sKeyClassAlias);
 
 					$aAllPointingTo[$sKeyAttCode][TREE_OPERATOR_EQUALS][$sKeyClassAlias] = $oExtFilter;
@@ -2640,18 +2581,18 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 							}
 							// Translate prior to recursing
 							//
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."\n".print_r($aTranslateNow, true)."</pre></p>\n";
-							$oBuild->m_oQBExpressions->Translate($aTranslateNow, false);
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."\n".print_r($aTranslateNow, true)."</pre></p>\n";
+							$oQBExpr->Translate($aTranslateNow, false);
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."</pre></p>\n";
 		
 //echo "<p>External key $sKeyAttCode (class: $sKeyClass), call MakeQuery()/p>\n";
 							self::DbgTrace("External key $sKeyAttCode (class: $sKeyClass), call MakeQuery()");
-							$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression('id', $sKeyClassAlias));
+							$oQBExpr->PushJoinField(new FieldExpression('id', $sKeyClassAlias));
 			
-//echo "<p>Recursive MakeQuery ".__LINE__.": <pre>\n".print_r($oBuild->GetRootFilter()->GetSelectedClasses(), true)."</pre></p>\n";
-							$oSelectExtKey = self::MakeQuery($oBuild, $oExtFilter);
+//echo "<p>Recursive MakeQuery ".__LINE__.": <pre>\n".print_r($aSelectedClasses, true)."</pre></p>\n";
+							$oSelectExtKey = self::MakeQuery($aSelectedClasses, $oQBExpr, $aClassAliases, $aTableAliases, $oExtFilter);
 			
-							$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
+							$oJoinExpr = $oQBExpr->PopJoinField();
 							$sExternalKeyTable = $oJoinExpr->GetParent();
 							$sExternalKeyField = $oJoinExpr->GetName();
 			
@@ -2671,9 +2612,9 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 					}
 					elseif(self::$m_aAttribOrigins[$sKeyClass][$sKeyAttCode] == $sTableClass)
 					{
-						$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression($sKeyAttCode, $sKeyClassAlias));
-						$oSelectExtKey = self::MakeQuery($oBuild, $oExtFilter);
-						$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
+						$oQBExpr->PushJoinField(new FieldExpression($sKeyAttCode, $sKeyClassAlias));
+						$oSelectExtKey = self::MakeQuery($aSelectedClasses, $oQBExpr, $aClassAliases, $aTableAliases, $oExtFilter);
+						$oJoinExpr = $oQBExpr->PopJoinField();
 //echo "MAKEQUERY-PopJoinField pour $sKeyAttCode, $sKeyClassAlias: <pre>".print_r($oJoinExpr, true)."</pre><br/>\n";
 						$sExternalKeyTable = $oJoinExpr->GetParent();
 						$sExternalKeyField = $oJoinExpr->GetName();
@@ -2692,9 +2633,9 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 
 		// Translate the selected columns
 		//
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
-		$oBuild->m_oQBExpressions->Translate($aTranslation, false);
-//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."</pre></p>\n";
+		$oQBExpr->Translate($aTranslation, false);
+//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oQBExpr, true)."</pre></p>\n";
 
 		//MyHelpers::var_dump_html($oSelectBase->RenderSelect());
 		return $oSelectBase;
@@ -3131,36 +3072,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 					}
 				}
 			}
-
-			// Check unicity of the SQL columns
-			//
-			if (self::HasTable($sClass))
-			{
-				$aTableColumns = array(); // array of column => attcode (the column is used by this attribute)
-				$aTableColumns[self::DBGetKey($sClass)] = 'id';
-				
-				// Check that SQL columns are declared only once
-				//
-				foreach(self::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
-				{
-					// Skip this attribute if not originaly defined in this class
-					if (self::$m_aAttribOrigins[$sClass][$sAttCode] != $sClass) continue;
-	
-					foreach($oAttDef->GetSQLColumns() as $sField => $sDBFieldType)
-					{
-						if (array_key_exists($sField, $aTableColumns))
-						{
-							$aErrors[$sClass][] = "Column '$sField' declared for attribute $sAttCode, but already used for attribute ".$aTableColumns[$sField];
-							$aSugFix[$sClass][] = "Please find another name for the SQL column";
-						}
-						else
-						{
-							$aTableColumns[$sField] = $sAttCode;
-						}
-					}
-				}
-			}
-		} // foreach class
+		}
 		
 		if (count($aErrors) > 0)
 		{
@@ -4201,15 +4113,17 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		// Note: load the dictionary as soon as possible, because it might be
 		//       needed when some error occur
 		$sAppIdentity = self::GetConfig()->Get('session_name');
-		$bDictInitializedFromData = false;
 		if (!self::$m_bUseAPCCache || !Dict::InCache($sAppIdentity))
 		{
-			$bDictInitializedFromData = true;
 			foreach (self::$m_oConfig->GetDictionaries() as $sModule => $sToInclude)
 			{
 				self::IncludeModule($sConfigFile, 'dictionaries', $sToInclude);
 			}
-		}		
+			if (self::$m_bUseAPCCache)
+			{
+				Dict::InitCache($sAppIdentity);
+			}
+		}
 		// Set the language... after the dictionaries have been loaded!
 		Dict::SetDefaultLanguage(self::$m_oConfig->GetDefaultLanguage());
 
@@ -4313,11 +4227,6 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			}
 		}
 
-		if (self::$m_bUseAPCCache && $bDictInitializedFromData)
-		{
-			Dict::InitCache($sAppIdentity);
-		}
-		
 		self::$m_sDBName = $sSource;
 		self::$m_sTablePrefix = $sTablePrefix;
 
@@ -4377,31 +4286,17 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 	{
 		$aRes = array();
 		$iTotalHits = 0;
-		foreach(self::$aQueryCacheGetObjectHits as $sClassSign => $iHits)
+		foreach(self::$aQueryCacheGetObjectHits as $sClass => $iHits)
 		{
-			$aRes[] = "$sClassSign: $iHits";
+			$aRes[] = "$sClass: $iHits";
 			$iTotalHits += $iHits;
 		}
 		return $iTotalHits.' ('.implode(', ', $aRes).')';
 	}
 
-	public static function MakeSingleRow($sClass, $iKey, $bMustBeFound = true, $bAllowAllData = false, $aModifierProperties = null)
+	public static function MakeSingleRow($sClass, $iKey, $bMustBeFound = true, $bAllowAllData = false)
 	{
-		// Build the query cache signature
-		//
-		$sQuerySign = $sClass;
-		if($bAllowAllData)
-		{
-			$sQuerySign .= '_all_';
-		}
-		if (count($aModifierProperties))
-		{
-			array_multisort($aModifierProperties);
-			$sModifierProperties = json_encode($aModifierProperties);
-			$sQuerySign .= '_all_'.md5($sModifierProperties);
-		}
-
-		if (!array_key_exists($sQuerySign, self::$aQueryCacheGetObject))
+		if (!array_key_exists($sClass, self::$aQueryCacheGetObject))
 		{
 			// NOTE: Quick and VERY dirty caching mechanism which relies on
 			//       the fact that the string '987654321' will never appear in the
@@ -4410,30 +4305,20 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 			//       but this would slow down -by how much time?- the application
 			$oFilter = new DBObjectSearch($sClass);
 			$oFilter->AddCondition('id', 987654321, '=');
-			if ($aModifierProperties)
-			{
-				foreach ($aModifierProperties as $sPluginClass => $aProperties)
-				{
-					foreach ($aProperties as $sProperty => $value)
-					{
-						$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
-					}
-				}
-			}
 			if ($bAllowAllData)
 			{
 				$oFilter->AllowAllData();
 			}
 	
 			$sSQL = self::MakeSelectQuery($oFilter);
-			self::$aQueryCacheGetObject[$sQuerySign] = $sSQL;
-			self::$aQueryCacheGetObjectHits[$sQuerySign] = 0;
+			self::$aQueryCacheGetObject[$sClass] = $sSQL;
+			self::$aQueryCacheGetObjectHits[$sClass] = 0;
 		}
 		else
 		{
-			$sSQL = self::$aQueryCacheGetObject[$sQuerySign];
-			self::$aQueryCacheGetObjectHits[$sQuerySign] += 1;
-//			echo " -load $sClass/$iKey- ".self::$aQueryCacheGetObjectHits[$sQuerySign]."<br/>\n";
+			$sSQL = self::$aQueryCacheGetObject[$sClass];
+			self::$aQueryCacheGetObjectHits[$sClass] += 1;
+//			echo " -load $sClass/$iKey- ".self::$aQueryCacheGetObjectHits[$sClass]."<br/>\n";
 		}
 		$sSQL = str_replace(CMDBSource::Quote(987654321), CMDBSource::Quote($iKey), $sSQL);
 		$res = CMDBSource::Query($sSQL);
@@ -4479,10 +4364,10 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 		return new $sClass($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
 	}
 
-	public static function GetObject($sClass, $iKey, $bMustBeFound = true, $bAllowAllData = false, $aModifierProperties = null)
+	public static function GetObject($sClass, $iKey, $bMustBeFound = true, $bAllowAllData = false)
 	{
 		self::_check_subclass($sClass);	
-		$aRow = self::MakeSingleRow($sClass, $iKey, $bMustBeFound, $bAllowAllData, $aModifierProperties);
+		$aRow = self::MakeSingleRow($sClass, $iKey, $bMustBeFound, $bAllowAllData);
 		if (empty($aRow))
 		{
 			return null;
@@ -4712,9 +4597,6 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 	 */
 	static public function ApplyParams($aInput, $aParams)
 	{
-		$aParams['APP_URL'] = utils::GetAbsoluteUrlAppRoot();
-		$aParams['MODULES_URL'] = utils::GetAbsoluteUrlModulesRoot();
-
 		$aSearches = array();
 		$aReplacements = array();
 		foreach($aParams as $sSearch => $replace)
@@ -4729,7 +4611,7 @@ if (!array_key_exists($sAttCode, self::$m_aAttribDefs[$sClass]))
 	}
 
 	/**
-	 * Returns an array of classes=>instance implementing the given interface
+	 * Returns an array of classes implementing the given interface
 	 */
 	public static function EnumPlugins($sInterface)
 	{
@@ -4814,4 +4696,5 @@ MetaModel::RegisterZList("preview", array("description"=>"All attributes visible
 MetaModel::RegisterZList("standard_search", array("description"=>"List of criteria for the standard search", "type"=>"filters"));
 MetaModel::RegisterZList("advanced_search", array("description"=>"List of criteria for the advanced search", "type"=>"filters"));
 
+
 ?>

core/metamodelmodifier.inc.php

@@ -1,31 +0,0 @@
-<?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
-
-/**
- * Any extension to hook the initialization of the metamodel 
- *
- * @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 iOnClassInitialization
-{
-	public function OnAfterClassInitialization($sClass);
-}
-
-?>

core/oql/oql-lexer.php

@@ -168,7 +168,7 @@ class OQLLexerRaw
                 '/\GABOVE STRICT/ ',
                 '/\GNOT ABOVE/ ',
                 '/\GNOT ABOVE STRICT/ ',
-                '/\G(0x[0-9a-fA-F]+|[0-9]+)/ ',
+                '/\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]*)/ ',

core/oql/oql-lexer.plex

@@ -140,23 +140,7 @@ above            = "ABOVE"
 above_strict     = "ABOVE STRICT"
 not_above        = "NOT ABOVE"
 not_above_strict = "NOT ABOVE STRICT"
-//
-// WARNING: there seems to be a bug in the Lexer about matching the longest pattern
-//          when there are alternates in the regexp.
-//
-// For instance:
-// numval     = /[0-9]+|0x[0-9a-fA-F]+/
-// Does not work: SELECT Toto WHERE name = 'Text0xCTest' => Fails because 0xC is recongnized as a numval (inside the string) instead of a strval !!
-//
-// Inserting a ^ after the alternate (see comment at the top of this file) does not work either
-// numval     = /[0-9]+|'.chr(94).'0x[0-9a-fA-F]+/
-// SELECT Toto WHERE name = 'Text0xCTest' => works but
-// SELECT Toto WHERE id = 0xC => does not work, 'xC' is found as a name (apparently 0 is recognized as a numval and the remaining is a name !)
-//
-// numval     = /([0-9]+|0x[0-9a-fA-F]+)/
-// Does not work either, the hexadecimal numbers are not matched properly
-// The following seems to work...
-numval     = /(0x[0-9a-fA-F]+|[0-9]+)/
+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]*|`[^`]+`)/
 varname    = /:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/

core/querybuildercontext.class.inc.php

@@ -1,74 +0,0 @@
-<?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
-
-/**
- * Associated with the metamodel -> MakeQuery/MakeQuerySingleTable
- *
- * @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 QueryBuilderContext
-{
-	protected $m_oRootFilter;
-	protected $m_aClassAliases;
-	protected $m_aTableAliases;
-	protected $m_aModifierProperties;
-
-	public $m_oQBExpressions;
-
-	public function __construct($oFilter, $aModifierProperties)
-	{
-		$this->m_oRootFilter = $oFilter;
-		$this->m_oQBExpressions = new QueryBuilderExpressions($oFilter->GetCriteria());
-
-		$this->m_aClassAliases = $oFilter->GetJoinedClasses();
-		$this->m_aTableAliases = array();
-
-		$this->m_aModifierProperties = $aModifierProperties;
-	}
-
-	public function GetRootFilter()
-	{
-		return $this->m_oRootFilter;
-	}
-
-	public function GenerateTableAlias($sNewName, $sRealName)
-	{
-		return MetaModel::GenerateUniqueAlias($this->m_aTableAliases, $sNewName, $sRealName);
-	}
-
-	public function GenerateClassAlias($sNewName, $sRealName)
-	{
-		return MetaModel::GenerateUniqueAlias($this->m_aClassAliases, $sNewName, $sRealName);
-	}
-
-	public function GetModifierProperties($sPluginClass)
-	{
-		if (array_key_exists($sPluginClass, $this->m_aModifierProperties))
-		{
-			return $this->m_aModifierProperties[$sPluginClass];
-		}
-		else
-		{
-			return array();
-		}
-	}
-}
-
-?>

core/querymodifier.class.inc.php

@@ -1,33 +0,0 @@
-<?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
-
-/**
- * Interface iQueryModifier
- * Defines the API to tweak queries (e.g. translate data on the fly) 
- *
- * @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 iQueryModifier
-{
-	public function __construct();
-
-	public function GetFieldExpression(QueryBuilderContext &$oBuild, $sClass, $sAttCode, $sColId, Expression $oFieldSQLExp, SQLQuery &$oSelect);
-}
-?>

core/sqlquery.class.inc.php

@@ -68,11 +68,6 @@ class SQLQuery
 		$this->m_oSelectedIdField = $oSelectedIdField;
 	}
 
-	public function GetTableAlias()
-	{
-		return $this->m_sTableAlias;
-	}
-
 	public function SetSourceOQL($sOQL)
 	{
 		$this->m_SourceOQL = $sOQL;
@@ -106,20 +101,11 @@ class SQLQuery
 			{
 				$sJoinType = $aJoinInfo["jointype"];
 				$oSQLQuery = $aJoinInfo["select"];
-				if (isset($aJoinInfo["on_expression"]))
-				{
-					$sOnCondition = $aJoinInfo["on_expression"]->Render();
+				$sLeftField = $aJoinInfo["leftfield"];
+				$sRightField = $aJoinInfo["rightfield"];
+				$sRightTableAlias = $aJoinInfo["righttablealias"];
 
-					echo "<li>Join '$sJoinType', ON ($sOnCondition)".$oSQLQuery->DisplayHtml()."</li>\n";
-				}
-				else
-				{
-					$sLeftField = $aJoinInfo["leftfield"];
-					$sRightField = $aJoinInfo["rightfield"];
-					$sRightTableAlias = $aJoinInfo["righttablealias"];
-	
-					echo "<li>Join '$sJoinType', $sLeftField, $sRightTableAlias.$sRightField".$oSQLQuery->DisplayHtml()."</li>\n";
-				}
+				echo "<li>Join '$sJoinType', $sLeftField, $sRightTableAlias.$sRightField".$oSQLQuery->DisplayHtml()."</li>\n";
 			}
 			echo "</ul>";
 		}
@@ -210,24 +196,6 @@ class SQLQuery
 	{
 		return $this->AddJoin("left", $oSQLQuery, $sLeftField, $sRightField);
 	}
-
-	public function AddInnerJoinEx(SQLQuery $oSQLQuery, Expression $oOnExpression)
-	{
-		$this->m_aJoinSelects[] = array(
-			"jointype" => 'inner',
-			"select" => $oSQLQuery,
-			"on_expression" => $oOnExpression
-		);
-	}
-
-	public function AddLeftJoinEx(SQLQuery $oSQLQuery, Expression $oOnExpression)
-	{
-		$this->m_aJoinSelects[] = array(
-			"jointype" => 'left',
-			"select" => $oSQLQuery,
-			"on_expression" => $oOnExpression
-		);
-	}
 	
 	// Interface, build the SQL query
 	public function RenderDelete($aArgs = array())
@@ -444,14 +412,8 @@ class SQLQuery
 				break;
 			case "inner":
 			case "left":
-				if (isset($aJoinData["on_expression"]))
-				{
-					$sJoinCond = $aJoinData["on_expression"]->Render();
-				}
-				else
-				{
-					$sJoinCond = "`$sCallerAlias`.`{$aJoinData['leftfield']}` = `$sRightTableAlias`.`{$aJoinData['rightfield']}`";
-				}
+			// table or tablealias ???
+				$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":
@@ -526,6 +488,10 @@ class SQLQuery
 		foreach ($this->m_aJoinSelects as $aJoinData)
 		{
 			$oRightSelect = $aJoinData["select"];
+//			$sJoinType = $aJoinData["jointype"];
+//			$sLeftField = $aJoinData["leftfield"];
+//			$sRightField = $aJoinData["rightfield"];
+//			$sRightTableAlias = $aJoinData["righttablealias"];
 
 			$sJoinTableAlias = $oRightSelect->privRenderSingleTable($aTempFrom, $aFields, $aDelTables, $aSetValues, $aSelectedIdFields, $this->m_sTableAlias, $aJoinData);
 		}

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('description'),
+			"reconc_keys" => array(),
 			"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('description'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_trigger_onobject",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -114,11 +114,11 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,bizmodel",
+			"category" => "core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_trigger_onportalupdate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -144,7 +144,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_trigger_onstatechange",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -173,7 +173,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_trigger_onstateenter",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -201,7 +201,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_trigger_onstateleave",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -229,7 +229,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array('description'),
+			"reconc_keys" => array(),
 			"db_table" => "priv_trigger_onobjcreate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -257,7 +257,7 @@ class lnkTriggerAction extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
-			"reconc_keys" => array('action_id', 'trigger_id'),
+			"reconc_keys" => array(""),
 			"db_table" => "priv_link_action_trigger",
 			"db_key_field" => "link_id",
 			"db_finalclass_field" => "",

core/userrights.class.inc.php

@@ -55,7 +55,7 @@ abstract class UserRightsAddOnAPI
 	abstract public function Init(); // loads data (possible optimizations)
 
 	// Used to build select queries showing only objects visible for the given user
-	abstract public function GetSelectFilter($sLogin, $sClass, $aSettings = array()); // returns a filter object
+	abstract public function GetSelectFilter($sLogin, $sClass); // returns a filter object
 
 	abstract public function IsActionAllowed($oUser, $sClass, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null);
 	abstract public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, /*dbObjectSet*/ $oInstanceSet = null);
@@ -295,35 +295,6 @@ 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  
  *
@@ -334,7 +305,6 @@ class UserRights
 	protected static $m_oAddOn;
 	protected static $m_oUser;
 	protected static $m_oRealUser;
-	protected static $m_sSelfRegisterAddOn = null;
 
 	public static function SelectModule($sModuleName)
 	{
@@ -354,15 +324,6 @@ 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;
@@ -400,38 +361,21 @@ class UserRights
 		return true;
 	}
 
-	public static function CheckCredentials($sName, $sPassword, $sLoginMode = 'form', $sAuthentication = 'any')
+	public static function CheckCredentials($sName, $sPassword, $sAuthentication = 'any')
 	{
 		$oUser = self::FindUser($sName, $sAuthentication);
 		if (is_null($oUser))
 		{
-			return self::CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
+			return false;
 		}
 
 		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))
@@ -647,7 +591,7 @@ class UserRights
 		return true;
 	}
 
-	public static function GetSelectFilter($sClass, $aSettings = array())
+	public static function GetSelectFilter($sClass)
 	{
 		// When initializing, we need to let everything pass trough
 		if (!self::CheckLogin()) return true;
@@ -656,7 +600,7 @@ class UserRights
 
 		if (MetaModel::HasCategory($sClass, 'bizmodel'))
 		{
-			return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings);
+			return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass);
 		}
 		else
 		{
@@ -1021,339 +965,4 @@ class StimulusChecker extends ActionChecker
 		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)
-	{
-		$bOk = true;
-		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;
-					$bIsMember = false;
-					foreach($aCASMemberships as $sCASPattern)
-					{
-						if (self::IsPattern($sCASPattern))
-						{
-							if (preg_match($sCASPattern, $sGroupName))
-							{
-								$bIsMember = true;
-								break;
-							}
-						}
-						else if ($sPattern == $sGroupName)
-						{
-							$bIsMember = true;
-							break;
-						}
-					}
-					if ($bIsMember)
-					{
-						$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');
-							$bOk = self::CreateCASUser(phpCAS::getUser(), $aMemberOf);
-							if($bOk)
-							{
-								$bFound = true;
-							}
-							else
-							{
-								phpCAS::log("User ".phpCAS::getUser()." cannot be created in iTop. Logging off...");
-							}
-						}
-						else
-						{
-							phpCAS::log('Info: cas_user_synchro is OFF');
-							$bFound = true;
-						}
-						break;
-					}	
-				}
-				if($bOk && !$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)
-	{
-		$bCASUpdateProfiles = MetaModel::GetConfig()->Get('cas_update_profiles');
-		if (($sLoginMode == 'cas') && $bCASUpdateProfiles && (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 false;
-
-				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 false;
-			}
-			
-			$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])];
-					phpCAS::log("Info: Adding the profile '{$aMatches[1]}' from CAS.");
-				}
-				else
-				{
-					phpCAS::log("Warning: {$aMatches[1]} is not a valid iTop profile (extracted from group name: '$sGroupName'). Ignored.");
-				}
-			}
-			else
-			{
-				phpCAS::log("Info: The CAS group '$sGroupName' does not seem to match an iTop pattern. Ignored.");
-			}
-		}
-		if (count($aProfiles) == 0)
-		{
-			phpCAS::log("Info: The user '".$oUser->GetName()."' has no profiles retrieved from CAS. Default profile(s) will be used.");
-
-			// Second attempt: check if there is/are valid default profile(s)
-			$sCASDefaultProfiles = MetaModel::GetConfig()->Get('cas_default_profiles');
-			$aCASDefaultProfiles = explode(';', $sCASDefaultProfiles);
-			foreach($aCASDefaultProfiles as $sDefaultProfileName)
-			{
-				if (array_key_exists(strtolower($sDefaultProfileName), $aAllProfiles))
-				{
-					$aProfiles[] = $aAllProfiles[strtolower($sDefaultProfileName)];
-					phpCAS::log("Info: Adding the default profile '".$aAllProfiles[strtolower($sDefaultProfileName)]."' from CAS.");
-				}
-				else
-				{
-					phpCAS::log("Warning: the default profile {$sDefaultProfileName} is not a valid iTop profile. Ignored.");
-				}
-			}
-			
-			if (count($aProfiles) == 0)
-			{
-				phpCAS::log("Error: The user '".$oUser->GetName()."' 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 '".$oUser->GetName()."' (id=".$oUser->GetKey().") now has the following profiles: '".implode("', '", $aProfiles)."'.");
-		if ($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;
-	}
-	/**
-	 * 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

@@ -97,24 +97,17 @@ class ValueSetObjects extends ValueSetDefinition
 	protected $m_aOrderBy;
 	protected $m_aExtraConditions;
 	private $m_bAllowAllData;
-	private $m_aModifierProperties;
 
-	public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false, $aModifierProperties = array())
+	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_aModifierProperties = $aModifierProperties;
 		$this->m_aExtraConditions = array();
 	}
 
-	public function SetModifierProperty($sPluginClass, $sProperty, $value)
-	{
-		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
-	}
-
 	public function AddCondition(DBObjectSearch $oFilter)
 	{
 		$this->m_aExtraConditions[] = $oFilter;		
@@ -134,13 +127,6 @@ class ValueSetObjects extends ValueSetDefinition
 		{
 			$oFilter->MergeWith($oExtraFilter);
 		}
-		foreach($this->m_aModifierProperties as $sPluginClass => $aProperties)
-		{
-			foreach ($aProperties as $sProperty => $value)
-			{
-				$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
-			}
-		}
 
 		return new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
 	}
@@ -176,13 +162,6 @@ class ValueSetObjects extends ValueSetDefinition
 		{
 			$oFilter->MergeWith($oExtraFilter);
 		}
-		foreach($this->m_aModifierProperties as $sPluginClass => $aProperties)
-		{
-			foreach ($aProperties as $sProperty => $value)
-			{
-				$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
-			}
-		}
 
 		$oValueExpr = new ScalarExpression('%'.$sContains.'%');
 		$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
@@ -208,11 +187,6 @@ class ValueSetObjects extends ValueSetDefinition
 	{
 		return 'Filter: '.$this->m_sFilterExpr;
 	}
-
-	public function GetFilterExpression()
-	{
-		return $this->m_sFilterExpr;
-	}
 }
 
 
@@ -304,13 +278,6 @@ class ValueSetEnum extends ValueSetDefinition
 		$this->m_values = $Values;
 	}
 
-	// Helper to export the datat model
-	public function GetValueList()
-	{
-		$this->LoadValues($aArgs = array());
-		return $this->m_aValues;
-	}
-
 	protected function LoadValues($aArgs)
 	{
 		if (is_array($this->m_values))

css/light-grey.css

@@ -2,6 +2,7 @@
 body {
     font-family: Tahoma, Verdana, Arial, Helvetica;
     font-size: 10pt;
+    background-color: #fff;
     color:#000000;
 	margin: 0;			/* Remove body margin/padding */
 	padding: 0;
@@ -59,7 +60,6 @@ table.listContainer {
 	padding: 0;
 	margin:0;
 	width: 97%;
-	clear: both;
 }
 
 tr.containerHeader, tr.containerHeader td {

css/print.css

@@ -1,15 +0,0 @@
-@CHARSET "UTF-8";
-#left-pane { display: none; }
-span.ui-layout-resizer { display: none; }
-#header-logo { display: none; }
-#logo { display: none; }
-div.header-menu { display:none; }
-div.footer { display:none; }
-#top-bar { display: none; }
-#menu { display: none; }
-div.actions_button { display:none; }
-div.itop_popup { display:none; }
-div.HRDrawer { display:none; }
-div.DrawerHandle { display:none; }
-a.tab { display:none; }
-div.itop-tab { border: #ccc 1px solid; margin-top: 1em; padding-bottom:1em; }

dictionaries/dictionary.itop.core.php

@@ -140,12 +140,6 @@ Operators:<br/>
 
 	'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' => 'Friendly name',
-	'Core:FriendlyName-Description' => 'Friendly name',
 ));
 
 
@@ -570,8 +564,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.',
 	'SynchroDataSource:Description' => 'Description',
 	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
 	'SynchroDataSource:Deletion' => 'Deletion rules',
@@ -595,7 +587,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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...',
+	'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)',
@@ -620,7 +612,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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.',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.',
 	'Core:SynchroReplica:PublicData' => 'Public Data',
 	'Core:SynchroReplica:PrivateDetails' => 'Private Details',
 	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s',
@@ -648,7 +639,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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)',
@@ -743,8 +733,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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)',
 ));
 
 //

dictionaries/dictionary.itop.ui.php

@@ -76,26 +76,6 @@ 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'
 //////////////////////////////////////////////////////////////////////
@@ -449,8 +429,6 @@ 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',
@@ -470,7 +448,6 @@ 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',
@@ -569,7 +546,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',
@@ -629,8 +606,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: ',
@@ -643,6 +620,7 @@ 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',
@@ -845,9 +823,6 @@ 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',
 	
@@ -889,7 +864,6 @@ 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',
@@ -963,7 +937,5 @@ When associated with a trigger, each action is given an "order" number, specifyi
 								   '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: ',
-	'UI:Button:Refresh' => 'Refresh',
-	'UI:iTopLogin' => 'iTop Login',
 ));
 ?>

dictionaries/fr.dictionary.itop.core.php

@@ -280,8 +280,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlien vers une icône représentant l\'application source des données',
 	'Class:SynchroDataSource/Attribute:url_application' => 'Application (hyperlien)',
 	'Class:SynchroDataSource/Attribute:url_application+' => 'Un hyperlien vers l\'application source des données. Paramètres possibles: $this->nom_de_champ$ et $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Table de données',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nom de la table stockant les données de cette source. Un nom par défaut est calculé automatiquement si ce champ est laissé vide.',
 	'Class:SynchroAttribute' => 'Champs de synchronisation',
 	'Class:SynchroAttribute+' => '',
 	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Source de données',
@@ -487,13 +485,6 @@ Opérateurs :<br/>
 	'Core:AttributeTable+' => 'Tableau à deux dimensions',
 	'Core:AttributePropertySet' => 'Propriétés',
 	'Core:AttributePropertySet+' => 'Liste de propriétés (nom et valeur) non typées',
-
-	'Core:AttributeFriendlyName' => 'Nom usuel (convivial)',
-	'Core:AttributeFriendlyName+' => 'Attribut créé automatiquement ; sa valeur est calculée d\'après d\'autres attributs',
-
-	'Core:FriendlyName-Label' => 'Nom',
-	'Core:FriendlyName-Description' => 'Nom usuel',
-
 	'Change:ObjectCreated' => 'Elément créé',
 	'Change:ObjectDeleted' => 'Elément effacé',
 	'Change:ObjectModified' => 'Elément modifié',
@@ -565,7 +556,7 @@ Opérateurs :<br/>
 	'Core:Synchro:History' => 'Historique de synchronisation',
 	'Core:Synchro:NeverRun' => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
 	'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à %1$s)',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à $1$s)',
 	'Menu:DataSources' => 'Synchronisation',
 	'Menu:DataSources+' => '',
 	'Core:Synchro:label_repl_ignored' => 'Ignorés (%1$s)',
@@ -589,7 +580,6 @@ Opérateurs :<br/>
 	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Si la politique de réconciliation n\'est pas la clé primaire, au moins une clé de recherche doit être spécifiée',
 	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Pour que les objets soient effacés après avoir été obsoletés, il faut spécifier une durée de rétention',
 	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Les objets obsolètes doivent être mis à jour, mais aucune information de mise à jour n\'est spécifiée',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'La table %1$s existe déjà dans la base de données. Veuillez utiliser un autre nom pour la table des données de cette source.',
 	'Core:SynchroReplica:PublicData' => 'Données synchronisées',
 	'Core:SynchroReplica:PrivateDetails' => 'Informations internes',
 	'Core:SynchroReplica:BackToDataSource' => 'Retourner aux détails de la source de données: %1$s',
@@ -605,7 +595,7 @@ Opérateurs :<br/>
 	'Core:SynchroAtt:update_policy+' => '',
 	'Core:SynchroAtt:reconciliation_attcode' => 'Clé de recherche',
 	'Core:SynchroAtt:reconciliation_attcode+' => '',
-	'Core:SyncDataExchangeComment' => '(Synchronisation)',
+	'Core:SyncDataExchangeComment' => '(Synhcronisation)',
 	'Core:Synchro:ListOfDataSources' => 'Sources de données:',
 	'Core:Synchro:LastSynchro' => 'Dernière synchronisation:',
 	'Core:Synchro:ThisObjectIsSynchronized' => 'Cet objet est synchronisé avec une source de données',

dictionaries/fr.dictionary.itop.ui.php

@@ -50,18 +50,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'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',
@@ -328,8 +316,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Document:OpenInNewWindow:Download' => 'Ouvrir dans un nouvelle fenêtre: %1$s, Télécharger: %2$s',
 	'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)',
@@ -443,7 +429,6 @@ 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',
@@ -503,7 +488,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'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 la requête',
 	'UI:Combo:SelectValue' => '--- choisissez une valeur ---',
 	'UI:Label:SelectedObjects' => 'Objets sélectionnés: ',
 	'UI:Label:AvailableObjects' => 'Objets disponibles: ',
@@ -698,8 +682,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'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',
@@ -732,7 +714,6 @@ 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',
@@ -806,6 +787,5 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 								   '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: ',
-	'UI:Button:Refresh' => 'Rafraîchir',
 ));
 ?>

dictionaries/hu.dictionary.itop.core.php

@@ -422,7 +422,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'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.',
+	'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)',

dictionaries/hu.dictionary.itop.ui.php

@@ -772,6 +772,5 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az
 	'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.',
-	'UI:Button:Refresh' => 'Frissítés',
 ));
 ?>

dictionaries/it.dictionary.itop.ui.php

@@ -15,265 +15,76 @@
 //   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('IT IT', 'Italian', 'Italiano', array(
-	'Class:AuditCategory' => 'Categoria di Audit',
-	'Class:AuditCategory+' => 'Una sezione all\'interno del controllo globale',
-	'Class:AuditCategory/Attribute:name' => 'Nome della categoria',
-	'Class:AuditCategory/Attribute:name+' => 'Abbreviazione per questa categoria',
-	'Class:AuditCategory/Attribute:description' => 'Descrizione della categoria di Audit',
-	'Class:AuditCategory/Attribute:description+' => 'Descrizione dettagliata della categoria di audit',
-	'Class:AuditCategory/Attribute:definition_set' => 'Insieme di definizione',
-	'Class:AuditCategory/Attribute:definition_set+' => 'Espressione OQLche definisce l\'insieme di oggetti da controllare',
-	'Class:AuditCategory/Attribute:rules_list' => 'Regole di Audit',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Regolele di audit per queste categorie',
-));
-
-//
-// Class: AuditRule
-//
-
 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+' => 'Descrizione dettagliata per questa regola di audit ',
+	'Class:AuditRule/Attribute:description+' => '',
 	'Class:AuditRule/Attribute:query' => 'Query da eseguire',
-	'Class:AuditRule/Attribute:query+' => 'Espressio OQL da eseguire',
+	'Class:AuditRule/Attribute:query+' => '',
 	'Class:AuditRule/Attribute:valid_flag' => 'Oggetti validi?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'Vero se la regola ritorna oggetti validi, falso altrimenti ',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'vero',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'vero',
+	'Class:AuditRule/Attribute:valid_flag+' => '',
 	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'falso',
-	'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+' => 'Categoria per questa regola',
-	'Class:AuditRule/Attribute:category_name' => 'Categoria',
-	'Class:AuditRule/Attribute:category_name+' => 'Nome della categoria per questa regola',
-));
-
-//
-// Class: QueryOQL
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Query' => 'Query',
-	'Class:Query+' => 'Una query è un insieme di dati definito in modo dinamico',
-	'Class:Query/Attribute:name' => 'Nome',
-	'Class:Query/Attribute:name+' => 'Identificativi della query',
-	'Class:Query/Attribute:description' => 'Descrizione',
-	'Class:Query/Attribute:description+' => 'Descrizione dettagliata della query(scopo, usagoetc.)',
-	'Class:Query/Attribute:fields' => 'Campi',
-	'Class:Query/Attribute:fields+' => 'Lista di attributi separati da virgola (o alias.attributo) per l\'esportazione',
-
-	'Class:QueryOQL' => 'OQL Query',
-	'Class:QueryOQL+' => 'Una query basata su Object Query Language',
-	'Class:QueryOQL/Attribute:oql' => 'Espressione',
-	'Class:QueryOQL/Attribute:oql+' => 'Espressione OQL',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:User' => 'Utente',
-	'Class:User+' => 'Login Utente',
-	'Class:User/Attribute:finalclass' => 'Tipo di account',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => 'Contatto (persona)',
-	'Class:User/Attribute:contactid+' => 'Dettagli personali per dati aziendali',
-	'Class:User/Attribute:last_name' => 'Cognome',
-	'Class:User/Attribute:last_name+' => 'Cognome del contatto corrispondente',
-	'Class:User/Attribute:first_name' => 'Nome',
-	'Class:User/Attribute:first_name+' => 'Nome del contatto corrispondente',
-	'Class:User/Attribute:email' => 'Email',
-	'Class:User/Attribute:email+' => 'Email del contatto corrispondente',
-	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'Stringa di identificazione dell\'utente',
-	'Class:User/Attribute:language' => 'Lingua',
-	'Class:User/Attribute:language+' => 'Lingua utente',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:IT IT' => 'Italiano',
-	'Class:User/Attribute:language/Value:IT IT+' => 'Italiano (IT)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:profile_list' => 'Profili',
-	'Class:User/Attribute:profile_list+' => 'Regole per  la concessione dei diritti per quella persona',
-	'Class:User/Attribute:allowed_org_list' => 'Organizzazione Consentite',
-	'Class:User/Attribute:allowed_org_list+' => 'L\'utente finale è autorizzato a vedere i dati appartenenti alle seguenti organizzazioni. Se non è specificato organizzazione, vi è alcuna restrizione.',
-
-	'Class:User/Error:LoginMustBeUnique' => 'Il Login deve essere unico - "%1s" già usato',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Almeno un profilo deve essere assegnato all\'utente.',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'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+' => 'una linea di descrizione',
+	'Class:URP_Profiles/Attribute:description+' => '',
 	'Class:URP_Profiles/Attribute:user_list' => 'Utenti',
-	'Class:URP_Profiles/Attribute:user_list+' => 'Persone che hanno questo ruuolo',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_Dimensions' => 'dimensione',
-	'Class:URP_Dimensions+' => 'dimensione dell\'applicazione (definizione di silos))',
-	'Class:URP_Dimensions/Attribute:name' => 'Nome',
-	'Class:URP_Dimensions/Attribute:name+' => 'etichetta',
-	'Class:URP_Dimensions/Attribute:description' => 'Descrizione',
-	'Class:URP_Dimensions/Attribute:description+' => 'una linea di descrizione',
-	'Class:URP_Dimensions/Attribute:type' => 'Tipo',
-	'Class:URP_Dimensions/Attribute:type+' => 'nome della classe o tipo di dato (proiezione dell\'unità)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'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:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'User\'s login',
 	'Class:URP_UserProfile/Attribute:profileid' => 'Profilo',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'utilizzo del profilo',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profilo',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Nome del profilo',
+	'Class:URP_UserProfile/Attribute:profileid+' => '',
 	'Class:URP_UserProfile/Attribute:reason' => 'Motivo',
-	'Class:URP_UserProfile/Attribute:reason+' => 'spiega perchè questo utente dovrebbe avere questo ruolo',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'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+' => 'Account Utente',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login Utente',
+	'Class:URP_UserOrg/Attribute:userid+' => '',
 	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organizazione',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Organizzazione permesse',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organizzazione',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Organizzazione permesse',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
 	'Class:URP_UserOrg/Attribute:reason' => 'Motivo',
 	'Class:URP_UserOrg/Attribute:reason+' => '',
-
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_ProfileProjection' => 'profile_projection',
-	'Class:URP_ProfileProjection+' => 'proiezioni di profilo',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensione',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'dimensione applicazione',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensione',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'dimensione applicazione',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profilo',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'utilizzo di profilo',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Profilo',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Nome del profilo',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Valore dell\'espressione',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'Espressione OQL  (uso $user) | constante|  | +codice attributo',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attributo',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Codice attributo bersaglio (opzionale)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_ClassProjection' => 'class_projection',
-	'Class:URP_ClassProjection+' => 'proiezioni di classe',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensione',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'dimensione dell\'applicazione',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensione',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'dimensione applicazione',
-	'Class:URP_ClassProjection/Attribute:class' => 'Classe',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Classe bersaglio',
-	'Class:URP_ClassProjection/Attribute:value' => 'Valore dell\'espressione',
-	'Class:URP_ClassProjection/Attribute:value+' => 'Espressione OQL (uso $this) | constante|  | +codice attributo',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Attributo',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Codice attributo bersaglio (opzionale)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:URP_ActionGrant' => 'azione_autorizzazione',
-	'Class:URP_ActionGrant+' => 'permesso su classi',
+	'Class:URP_ActionGrant+' => '',
 	'Class:URP_ActionGrant/Attribute:profileid' => 'Profilo',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'Utilizzo del profilo',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profilo',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'Utilizzo del profilo',
+	'Class:URP_ActionGrant/Attribute:profileid+' => '',
 	'Class:URP_ActionGrant/Attribute:class' => 'Classe',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Classe bersaglio',
+	'Class:URP_ActionGrant/Attribute:class+' => '',
 	'Class:URP_ActionGrant/Attribute:permission' => 'Autorizzazione',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'permesso non permesso',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'si',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'si',
+	'Class:URP_ActionGrant/Attribute:permission+' => '',
 	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_ActionGrant/Attribute:action' => 'Azione',
-	'Class:URP_ActionGrant/Attribute:action+' => 'operazioni da effettuare sulla data classe',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'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',
@@ -284,32 +95,92 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:URP_StimulusGrant/Attribute:class+' => '',
 	'Class:URP_StimulusGrant/Attribute:permission' => 'Autorizzazione',
 	'Class:URP_StimulusGrant/Attribute:permission+' => '',
-'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'si',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'si',
 	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
-	'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+' => 'Codice per lo Stimolus',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => '',
 	'Class:URP_AttributeGrant' => 'attributo_autorizzazione',
-	'Class:URP_AttributeGrant+' => 'autorizzazioni a livello di attributi',
+	'Class:URP_AttributeGrant+' => '',
 	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Azione di sovvenzione',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'azione di sovvenzione',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '',
 	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attributo',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'codice attributo',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'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',
@@ -409,7 +280,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
         '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.',
@@ -443,7 +313,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Menu:CSVExport' => 'CSV Export',
 	'UI:Menu:Modify' => 'Modifica...',
 	'UI:Menu:Delete' => 'Cancella...',
-	'UI:Menu:Manage' => 'Gestisci...',
 	'UI:Menu:BulkDelete' => 'Cancella...',
 	'UI:UndefinedObject' => 'non definito',
 	'UI:Document:OpenInNewWindow:Download' => 'Apri in una nuova finestra: %1$s, Scarica: %2$s',
@@ -908,6 +777,5 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'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.',
-	'UI:Button:Refresh' => 'Ricarica',
 ));
 ?>

dictionaries/ja.dictionary.itop.ui.php

@@ -588,7 +588,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 					       '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: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',
@@ -613,7 +613,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 					       '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: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',
@@ -860,8 +860,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'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: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',
@@ -907,7 +907,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'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',
-	'UI:Button:Refresh' => '更新', // 'Refresh',
 ));
 
 

dictionaries/ru.dictionary.itop.ui.php

@@ -872,7 +872,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Portal:ErrorNoContactForThisUser' => 'Ошибка: текющий пользователь не ассоциирован с Контактом/Человеком. Пожалуйста свяжитесь с вашим администратором.',
 	
 	'Enum:Undefined' => 'Неопределён',
-	'UI:Button:Refresh' => 'Обновить',
 ));
 
 

dictionaries/tr.dictionary.itop.ui.php

@@ -871,6 +871,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Portal:ErrorNoContactForThisUser' => 'Hata: mevcut kullanıcının irtibat bilgisi yok. Sistem yöneticisi ile irtibata geçiniz.',
 
 	'Enum:Undefined' => 'Tanımsız',
-	'UI:Button:Refresh' => 'Yenile',
 ));
+
+
+
 ?>

dictionaries/zh.dictionary.itop.ui.php

@@ -869,7 +869,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:ErrorNoContactForThisUser' => '错误: 当前用户没有和一个联系人或人员关联. 请联系您的系统管理员.',
 	
 	'Enum:Undefined' => '未定义',
-	'UI:Button:Refresh' => '刷新',
 ));
 
 

js/extkeywidget.js

@@ -13,19 +13,17 @@
 //   along with this program; if not, write to the Free Software
 //   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper, sAttCode, bSearchMode)
+function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper)
 {
 	this.id = id;
 	this.sTargetClass = sTargetClass;
 	this.sFilter = sFilter;
 	this.sTitle = sTitle;
-	this.sAttCode = sAttCode;
 	this.emptyHtml = ''; // content to be displayed when the search results are empty (when opening the dialog) 
 	this.emptyOnClose = true; // Workaround for the JQuery dialog being very slow when opening and closing if the content contains many INPUT tags
 	this.oWizardHelper = oWizHelper;
 	this.ajax_request = null;
 	this.bSelectMode = bSelectMode; // true if the edited field is a SELECT, false if it's an autocomplete
-	this.bSearchMode = bSearchMode; // true if selecting a value in the context of a search form
 	this.v_html = '';
 	var me = this;
 	
@@ -63,23 +61,10 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		var theMap = { sAttCode: me.sAttCode,
 				   iInputId: me.id,
 				   sTitle: me.sTitle,
-				   sAttCode: me.sAttCode,
 				   sTargetClass: me.sTargetClass,
-				   bSearchMode: me.bSearchMode,
 				   operation: 'objectSearchForm'
 				 }
 	
-		if (me.oWizardHelper == null)
-		{
-			theMap['json'] = '';
-		}
-		else
-		{
-			// Not inside a "search form", updating a real object
-			me.oWizardHelper.UpdateWizard();
-			theMap['json'] = me.oWizardHelper.ToJSON();
-		}
-
 		// Make sure that we cancel any pending request before issuing another
 		// since responses may arrive in arbitrary order
 		me.StopPendingRequest();
@@ -140,8 +125,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 	{
 		var theMap = { sTargetClass: me.sTargetClass,
 					   iInputId: me.id,
-					   sFilter: me.sFilter,
-					   bSearchMode: me.bSearchMode
+					   sFilter: me.sFilter
 					 }
 		
 		// Gather the parameters from the search form
@@ -168,7 +152,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		
 		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
 		theMap.operation = 'searchObjectsToSelect'; // Override what is defined in the form itself
-		theMap.sAttCode = me.sAttCode,
 		
 		sSearchAreaId = '#dr_'+me.id;
 		//$(sSearchAreaId).html('<div style="text-align:center;width:100%;height:24px;vertical-align:middle;"><img src="../images/indicator.gif" /></div>');
@@ -217,8 +200,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		var theMap = { sTargetClass: me.sTargetClass,
 				   iInputId: me.id,
 				   iObjectId: iObjectId,
-				   sAttCode: me.sAttCode,
-				   bSearchMode: me.bSearchMode,
 				   operation: 'getObjectName'
 				 }
 	
@@ -281,7 +262,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		me.oWizardHelper.UpdateWizard();
 		var theMap = { sTargetClass: me.sTargetClass,
 				   iInputId: me.id,
-				   sAttCode: me.sAttCode,
 				   'json': me.oWizardHelper.ToJSON(),
 				   operation: 'objectCreationForm'
 				 }
@@ -343,7 +323,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 			$('#'+sFormId).block();
 			var theMap = { sTargetClass: me.sTargetClass,
 					   iInputId: me.id,
-					   sAttCode: me.sAttCode,
 					   'json': me.oWizardHelper.ToJSON()
 					 }
 
@@ -424,8 +403,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		var theMap = { sTargetClass: me.sTargetClass,
 				   	   sInputId: me.id,
 				   	   sFilter: me.sFilter,
-				   	   bSearchMode: me.bSearchMode,
-				   	   sAttCode: me.sAttCode,
 				   	   value: $('#'+me.id).val()
 					};
 	
@@ -507,8 +484,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 		var theMap = { sTargetClass: me.sTargetClass,
 				   iInputId: me.id,
 				   iObjectId: iObjectId,
-				   sAttCode: me.sAttCode,
-				   bSearchMode: me.bSearchMode,
 				   operation: 'getObjectName'
 				 }
 	

js/linkswidget.js

@@ -64,28 +64,9 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 	
 	this.AddObjects  = function()
 	{
-		var me = this;
-		$('#'+me.id+'_indicatorAdd').html('&nbsp;<img src="../images/indicator.gif"/>');
-		me.oWizardHelper.UpdateWizard();
-		var theMap = { sAttCode: me.sAttCode,
-				   iInputId: me.iInputId,
-				   sSuffix: me.sSuffix,
-				   bDuplicates: me.bDuplicates,
-				   'class' : me.sClass,
-				   operation: 'addObjects',
-				   json: me.oWizardHelper.ToJSON()
-				 };
-		$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
-				function(data)
-				{
-					$('#dlg_'+me.id).html(data);
-					$('#dlg_'+me.id).dialog('open');
-					me.UpdateSizes(null, null);
-					me.SearchObjectsToAdd();
-					$('#'+me.id+'_indicatorAdd').html('');
-				},
-				'html'
-			);
+		$('#dlg_'+me.id).dialog('open');
+		this.UpdateSizes(null, null);
+		this.SearchObjectsToAdd();
 	}
 	
 	this.SearchObjectsToAdd = function()

js/utils.js

@@ -119,18 +119,8 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext)
 	}
 	sAction =  $('#ds_'+divId+' form').attr('action');
 
-	// Save the current values in the form
-	var oMap = {};
-	$('#ds_'+divId+" form :input[name!='']").each(function() {
-		oMap[this.name] = this.value;
-	});
-	oMap.operation = 'search_form';
-	oMap.className = sClassName;
-	oMap.baseClass = sBaseClass;
-	oMap.currentId = divId;
-	oMap.action = sAction;
-	
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext,
+	   { operation: 'search_form', className: sClassName, baseClass: sBaseClass, currentId: divId, action: sAction },
 	   function(data) {
 		   oDiv.empty();
 		   oDiv.append(data);

js/wizardhelper.js

@@ -136,12 +136,6 @@ function WizardHelper(sClass, sFormPrefix, sState)
 		}
 	}
 	
-	this.UpdateWizardToJSON = function ()
-	{
-		this.UpdateWizard();
-		return this.ToJSON()
-	}
-	
 	this.AjaxQueryServer = function ()
 	{
 		//console.log('data sent:', this.ToJSON());

modules/authent-ldap/model.authent-ldap.php

@@ -120,7 +120,7 @@ class UserLDAP extends UserInternal
 				$aEntry = ldap_get_entries($hDS, $hSearchResult);
 				$sUserDN = $aEntry[0]['dn'];
 				$bUserBind =  @ldap_bind($hDS, $sUserDN, $sPassword);
-				if (($bUserBind !== false) && !empty($sPassword))
+				if ($bUserBind !== false)
 				{
 					ldap_unbind($hDS);
 					return true; // Password Ok

modules/authent-local/de.dict.authent-local.php

@@ -1,32 +1,50 @@
-<?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>
- * @author	Stephan Rosenke <stephan.rosenke@itomig.de>
-
- * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:UserLocal' => 'iTop-Benutzer',
-	'Class:UserLocal+' => 'Benutzer, der von iTop authentifiziert wird',
-	'Class:UserLocal/Attribute:password' => 'Passwort',
-	'Class:UserLocal/Attribute:password+' => 'Benutzerpasswort',
-));
-?>
+<?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      Stephan Rosenke <stephan.rosenke@itomig.de>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:UserLocal' => 'iTop-Benutzer',
+	'Class:UserLocal+' => 'Benutzer von iTop authentifiziert',
+	'Class:UserLocal/Attribute:password' => 'Passwort',
+	'Class:UserLocal/Attribute:password+' => 'Benutzerpasswort',
+));
+
+
+
+?>

modules/itop-attachments/model.attachments.php

@@ -468,7 +468,7 @@ EOF
 			$oPage->p(Dict::S('Attachments:AddAttachment').'<input type="file" name="file" id="file" onChange="ajaxFileUpload();"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
 			//$oPage->p('<input type="button" onClick="ajaxFileUpload();" value=" Upload !">');
 			$oPage->p('<span style="display:none;" id="attachment_loading">Loading, please wait...</span>');
-			$oPage->p('<input type="hidden" id="attachment_plugin" name="attachment_plugin"/>');
+			$oPage->p('<input type="hidden" id="attachment_plugin"/>');
 			$oPage->add('</fieldset>');
 			if ($this->m_bDeleteEnabled)
 			{
@@ -499,12 +499,6 @@ EOF
 
 	protected static function UpdateAttachments($oObject, $oChange = null)
 	{
-		if (utils::ReadParam('attachment_plugin', 'not-in-form') == 'not-in-form')
-		{
-			// Workaround to an issue in iTop < 2.0
-			// Leave silently if there is no trace of the attachment form
-			return;
-		}
 		$iTransactionId = utils::ReadParam('transaction_id', null);
 		if (!is_null($iTransactionId))
 		{

modules/itop-change-mgmt-1.0.0/de.dict.itop-change-mgmt.php

@@ -1,304 +1,348 @@
-<?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>
- * @author	Stephan Rosenke <stephan.rosenke@itomig.de>
-
- * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:RoutineChange' => 'Routine Change',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => 'Validieren',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Ablehnen',
-	'Class:RoutineChange/Stimulus:ev_assign' => 'Zuweisen',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Planen',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Genehmigen',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Umplanen',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Nicht genehmigen',
-	'Class:RoutineChange/Stimulus:ev_implement' => 'Implementieren',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => 'Überwachen',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => 'Abschließen',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-	'Class:NormalChange' => 'Normaler Change',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => 'Datum der Bewilligung',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => 'Kommentar zur Bewilligung',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => 'Validieren',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => 'Ablehnen',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => 'Zuweisen',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Planen',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => 'Bestätigen',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Umplanen',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => 'Bestätigen zurücknehmen',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => 'Implementieren',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => 'Überwachen',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => 'Abschließen',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-	'Class:EmergencyChange' => 'Emergency Change',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validieren',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => 'Ablehnen',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => 'Zuweisen',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planen',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => 'Bestätigen',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Umplanen',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Bestätigen zurücknehmen',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implementieren',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Überwachen',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => 'Abschließen',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
-	'Menu:ChangeManagement' => 'Change Management',
-	'Menu:Change:Overview' => 'Übersicht',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Neuer Change',
-	'Menu:NewChange+' => 'Ein neues Change Ticket erstellen',
-	'Menu:SearchChanges' => 'Nach Changes suchen',
-	'Menu:SearchChanges+' => 'Nach Change Tickets suchen',
-	'Menu:Change:Shortcuts' => 'Shortcuts',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Changes, die auf Bestätigung warten',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Changes, die auf Genehmigung warten',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Offene Changes',
-	'Menu:Changes+' => 'Alle Offene Changes',
-	'Menu:MyChanges' => 'An mich zugewiesene Changes',
-	'Menu:MyChanges+' => 'An mich zugewiesene Changes (als Bearbeiter)',
-	'Class:Change' => 'Change',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:start_date' => 'Geplanter Start',
-	'Class:Change/Attribute:start_date+' => '',
-	'Class:Change/Attribute:status' => 'Status',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Neu',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:validated' => 'Validiert',
-	'Class:Change/Attribute:status/Value:validated+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Abgelehnt',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Zugewiesen',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
-	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Genehmigt',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Nicht genehmigt',
-	'Class:Change/Attribute:status/Value:notapproved+' => '',
-	'Class:Change/Attribute:status/Value:implemented' => 'Implementiert',
-	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => 'Überwacht',
-	'Class:Change/Attribute:status/Value:monitored+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Geschlossen',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Ursache',
-	'Class:Change/Attribute:reason+' => '',
-	'Class:Change/Attribute:requestor_id' => 'Antragsteller',
-	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => 'Antragsteller',
-	'Class:Change/Attribute:requestor_email+' => '',
-	'Class:Change/Attribute:org_id' => 'Kunde',
-	'Class:Change/Attribute:org_id+' => '',
-	'Class:Change/Attribute:org_name' => 'Kunde',
-	'Class:Change/Attribute:org_name+' => '',
-	'Class:Change/Attribute:workgroup_id' => 'Arbeitsgruppe',
-	'Class:Change/Attribute:workgroup_id+' => '',
-	'Class:Change/Attribute:workgroup_name' => 'Arbeitsgruppe',
-	'Class:Change/Attribute:workgroup_name+' => '',
-	'Class:Change/Attribute:creation_date' => 'Erstellt',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:last_update' => 'Letzte Aktualisierung',
-	'Class:Change/Attribute:last_update+' => '',
-	'Class:Change/Attribute:end_date' => 'Enddatum',
-	'Class:Change/Attribute:end_date+' => '',
-	'Class:Change/Attribute:close_date' => 'Geschlossen',
-	'Class:Change/Attribute:close_date+' => '',
-	'Class:Change/Attribute:impact' => 'Auswirkung',
-	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:agent_id' => 'Bearbeiter',
-	'Class:Change/Attribute:agent_id+' => '',
-	'Class:Change/Attribute:agent_name' => 'Bearbeiter',
-	'Class:Change/Attribute:agent_name+' => '',
-	'Class:Change/Attribute:agent_email' => 'Bearbeiter',
-	'Class:Change/Attribute:agent_email+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => 'Aufsichts-Team',
-	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => 'Aufsichts-Team',
-	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => 'Aufsicht',
-	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => 'Aufsicht',
-	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => 'Manager-Team',
-	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => 'Manager-Team',
-	'Class:Change/Attribute:manager_group_name+' => '',
-	'Class:Change/Attribute:manager_id' => 'Manager',
-	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => 'Manager',
-	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => 'Ausfall',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Ja',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'Nein',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:change_request' => 'Anfrage',
-	'Class:Change/Attribute:change_request+' => '',
-	'Class:Change/Attribute:fallback' => 'Fallback-Plan',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Stimulus:ev_validate' => 'Validieren',
-	'Class:Change/Stimulus:ev_validate+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Ablehnen',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Zuweisen',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Wiedereröffnen',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Planen',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Bestätigen',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Umplanen',
-	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => 'Ablehnen',
-	'Class:Change/Stimulus:ev_notapprove+' => '',
-	'Class:Change/Stimulus:ev_implement' => 'Implementieren',
-	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => 'Überwachen',
-	'Class:Change/Stimulus:ev_monitor+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Abschließen',
-	'Class:Change/Stimulus:ev_finish+' => '',
-	'Class:RoutineChange/Attribute:status/Value:new' => 'Neu',
-	'Class:RoutineChange/Attribute:status/Value:new+' => '',
-	'Class:RoutineChange/Attribute:status/Value:assigned' => 'Zugewiesen',
-	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:RoutineChange/Attribute:status/Value:approved' => 'Bestätigt',
-	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
-	'Class:RoutineChange/Attribute:status/Value:implemented' => 'Implementiert',
-	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
-	'Class:RoutineChange/Attribute:status/Value:monitored' => 'Überwachen',
-	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
-	'Class:RoutineChange/Attribute:status/Value:closed' => 'Geschlossen',
-	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
-	'Class:ApprovedChange' => 'Bewilligte Changes',
-	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => 'Datum der Bewilligung',
-	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => 'Kommentar zur Bewilligung',
-	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => 'Validieren',
-	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => 'Ablehnen',
-	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => 'Zuweisen',
-	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
-	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planen',
-	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_approve' => 'Bestätigen',
-	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Umplanen',
-	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Bestätigen zurücknehmen',
-	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implementieren',
-	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Überwachen',
-	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
-	'Class:ApprovedChange/Stimulus:ev_finish' => 'Abschließen',
-	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
-	'Class:NormalChange/Attribute:status/Value:new' => 'Neu',
-	'Class:NormalChange/Attribute:status/Value:new+' => '',
-	'Class:NormalChange/Attribute:status/Value:validated' => 'Validiert',
-	'Class:NormalChange/Attribute:status/Value:validated+' => '',
-	'Class:NormalChange/Attribute:status/Value:rejected' => 'Abgelehnt',
-	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
-	'Class:NormalChange/Attribute:status/Value:assigned' => 'Zugewiesen',
-	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:NormalChange/Attribute:status/Value:approved' => 'Bestätigt',
-	'Class:NormalChange/Attribute:status/Value:approved+' => '',
-	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Nicht bestätigt',
-	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
-	'Class:NormalChange/Attribute:status/Value:implemented' => 'Implementiert',
-	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
-	'Class:NormalChange/Attribute:status/Value:monitored' => 'Überwachen',
-	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
-	'Class:NormalChange/Attribute:status/Value:closed' => 'Geschlossen',
-	'Class:NormalChange/Attribute:status/Value:closed+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:new' => 'Neu',
-	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:validated' => 'Validiert',
-	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:rejected' => 'Abgelehnt',
-	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:assigned' => 'Zugewiesen',
-	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Bestätigt',
-	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Nicht bestätigt',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Implementiert',
-	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:monitored' => 'Überwachen',
-	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:closed' => 'Geschlossen',
-	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
-));
-?>
+<?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      Stephan Rosenke <stephan.rosenke@itomig.de>
+ * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:ChangeManagement' => 'Change Management',
+	'Menu:Change:Overview' => 'Übersicht',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Neuer Change',
+	'Menu:NewChange+' => 'Ein neues Change Ticket erstellen',
+	'Menu:SearchChanges' => 'Nach Changes suchen',
+	'Menu:SearchChanges+' => 'Nach Change Tickets suchen',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changes, die auf Bestätigung warten',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Changes, die auf Genehmigung warten',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Offene Changes',
+	'Menu:Changes+' => 'Alle Offene Changes',
+	'Menu:MyChanges' => 'An mich zugewiesene Changes',
+	'Menu:MyChanges+' => 'An mich zugewiesene Changes (als Bearbeiter)',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Change' => 'Change',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:start_date' => 'Geplanter Start',
+	'Class:Change/Attribute:start_date+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Neu',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:validated' => 'Validiert',
+	'Class:Change/Attribute:status/Value:validated+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Abgelehnt',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Zugewiesen',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
+	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Genehmigt',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Nicht genehmigt',
+	'Class:Change/Attribute:status/Value:notapproved+' => '',
+	'Class:Change/Attribute:status/Value:implemented' => 'Implementiert',
+	'Class:Change/Attribute:status/Value:implemented+' => '',
+	'Class:Change/Attribute:status/Value:monitored' => 'Überwacht',
+	'Class:Change/Attribute:status/Value:monitored+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Geschlossen',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:reason' => 'Ursache',
+	'Class:Change/Attribute:reason+' => '',
+	'Class:Change/Attribute:requestor_id' => 'Antragsteller',
+	'Class:Change/Attribute:requestor_id+' => '',
+	'Class:Change/Attribute:requestor_email' => 'Antragsteller',
+	'Class:Change/Attribute:requestor_email+' => '',
+	'Class:Change/Attribute:org_id' => 'Kunde',
+	'Class:Change/Attribute:org_id+' => '',
+	'Class:Change/Attribute:org_name' => 'Kunde',
+	'Class:Change/Attribute:org_name+' => '',
+	'Class:Change/Attribute:workgroup_id' => 'Arbeitsgruppe',
+	'Class:Change/Attribute:workgroup_id+' => '',
+	'Class:Change/Attribute:workgroup_name' => 'Arbeitsgruppe',
+	'Class:Change/Attribute:workgroup_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Erstellt',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:last_update' => 'Letzte Aktualisierung',
+	'Class:Change/Attribute:last_update+' => '',
+	'Class:Change/Attribute:end_date' => 'Enddatum',
+	'Class:Change/Attribute:end_date+' => '',
+	'Class:Change/Attribute:close_date' => 'Geschlossen',
+	'Class:Change/Attribute:close_date+' => '',
+	'Class:Change/Attribute:impact' => 'Auswirkung',
+	'Class:Change/Attribute:impact+' => '',
+	'Class:Change/Attribute:agent_id' => 'Bearbeiter',
+	'Class:Change/Attribute:agent_id+' => '',
+	'Class:Change/Attribute:agent_name' => 'Bearbeiter',
+	'Class:Change/Attribute:agent_name+' => '',
+	'Class:Change/Attribute:agent_email' => 'Bearbeiter',
+	'Class:Change/Attribute:agent_email+' => '',
+	'Class:Change/Attribute:supervisor_group_id' => 'Aufsichts-Team',
+	'Class:Change/Attribute:supervisor_group_id+' => '',
+	'Class:Change/Attribute:supervisor_group_name' => 'Aufsichts-Team',
+	'Class:Change/Attribute:supervisor_group_name+' => '',
+	'Class:Change/Attribute:supervisor_id' => 'Aufsicht',
+	'Class:Change/Attribute:supervisor_id+' => '',
+	'Class:Change/Attribute:supervisor_email' => 'Aufsicht',
+	'Class:Change/Attribute:supervisor_email+' => '',
+	'Class:Change/Attribute:manager_group_id' => 'Manager-Team',
+	'Class:Change/Attribute:manager_group_id+' => '',
+	'Class:Change/Attribute:manager_group_name' => 'Manager-Team',
+	'Class:Change/Attribute:manager_group_name+' => '',
+	'Class:Change/Attribute:manager_id' => 'Manager',
+	'Class:Change/Attribute:manager_id+' => '',
+	'Class:Change/Attribute:manager_email' => 'Manager',
+	'Class:Change/Attribute:manager_email+' => '',
+	'Class:Change/Attribute:outage' => 'Ausfall',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Ja',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'Nein',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:change_request' => 'Anfrage',
+	'Class:Change/Attribute:change_request+' => '',
+	'Class:Change/Attribute:fallback' => 'Fallback-Plan',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Stimulus:ev_validate' => 'Validieren',
+	'Class:Change/Stimulus:ev_validate+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Ablehnen',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Zuweisen',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Wiedereröffnen',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Planen',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Bestätigen',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_replan' => 'Umplanen',
+	'Class:Change/Stimulus:ev_replan+' => '',
+	'Class:Change/Stimulus:ev_notapprove' => 'Ablehnen',
+	'Class:Change/Stimulus:ev_notapprove+' => '',
+	'Class:Change/Stimulus:ev_implement' => 'Implementieren',
+	'Class:Change/Stimulus:ev_implement+' => '',
+	'Class:Change/Stimulus:ev_monitor' => 'Überwachen',
+	'Class:Change/Stimulus:ev_monitor+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Abschließen',
+	'Class:Change/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: RoutineChange
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:RoutineChange' => 'Routine Change',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Attribute:status/Value:new' => 'Neu',
+	'Class:RoutineChange/Attribute:status/Value:new+' => '',
+	'Class:RoutineChange/Attribute:status/Value:assigned' => 'Zugewiesen',
+	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:RoutineChange/Attribute:status/Value:approved' => 'Bestätigt',
+	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
+	'Class:RoutineChange/Attribute:status/Value:implemented' => 'Implementiert',
+	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
+	'Class:RoutineChange/Attribute:status/Value:monitored' => 'Überwachen',
+	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
+	'Class:RoutineChange/Attribute:status/Value:closed' => 'Geschlossen',
+	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => 'Validieren',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Zuweisen',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Planen',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Umplanen',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Implementieren',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => 'Überwachen',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => 'Abschließen',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: ApprovedChange
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:ApprovedChange' => 'Bewilligte Changes',
+	'Class:ApprovedChange+' => '',
+	'Class:ApprovedChange/Attribute:approval_date' => 'Datum der Bewilligung',
+	'Class:ApprovedChange/Attribute:approval_date+' => '',
+	'Class:ApprovedChange/Attribute:approval_comment' => 'Kommentar zur Bewilligung',
+	'Class:ApprovedChange/Attribute:approval_comment+' => '',
+	'Class:ApprovedChange/Stimulus:ev_validate' => 'Validieren',
+	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Ablehnen',
+	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
+	'Class:ApprovedChange/Stimulus:ev_assign' => 'Zuweisen',
+	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
+	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planen',
+	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_approve' => 'Bestätigen',
+	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Umplanen',
+	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Bestätigen zurücknehmen',
+	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
+	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implementieren',
+	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Überwachen',
+	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
+	'Class:ApprovedChange/Stimulus:ev_finish' => 'Abschließen',
+	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
+));
+//
+// Class: NormalChange
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:NormalChange' => 'Normaler Change',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:status/Value:new' => 'Neu',
+	'Class:NormalChange/Attribute:status/Value:new+' => '',
+	'Class:NormalChange/Attribute:status/Value:validated' => 'Validiert',
+	'Class:NormalChange/Attribute:status/Value:validated+' => '',
+	'Class:NormalChange/Attribute:status/Value:rejected' => 'Abgelehnt',
+	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
+	'Class:NormalChange/Attribute:status/Value:assigned' => 'Zugewiesen',
+	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:NormalChange/Attribute:status/Value:approved' => 'Bestätigt',
+	'Class:NormalChange/Attribute:status/Value:approved+' => '',
+	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Nicht bestätigt',
+	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
+	'Class:NormalChange/Attribute:status/Value:implemented' => 'Implementiert',
+	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
+	'Class:NormalChange/Attribute:status/Value:monitored' => 'Überwachen',
+	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
+	'Class:NormalChange/Attribute:status/Value:closed' => 'Geschlossen',
+	'Class:NormalChange/Attribute:status/Value:closed+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => 'Datum der Bewilligung',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => 'Kommentar zur Bewilligung',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => 'Validieren',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Ablehnen',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => 'Zuweisen',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Planen',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => 'Bestätigen',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Umplanen',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Bestätigen zurücknehmen',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Implementieren',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => 'Überwachen',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => 'Abschließen',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: EmergencyChange
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:EmergencyChange' => 'Emergency Change',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:new' => 'Neu',
+	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:validated' => 'Validiert',
+	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:rejected' => 'Abgelehnt',
+	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:assigned' => 'Zugewiesen',
+	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => 'Geplant und angesetzt',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Bestätigt',
+	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Nicht bestätigt',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Implementiert',
+	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:monitored' => 'Überwachen',
+	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:closed' => 'Geschlossen',
+	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validieren',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Ablehnen',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => 'Zuweisen',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Wiedereröffnen',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planen',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => 'Bestätigen',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Umplanen',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Bestätigen zurücknehmen',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implementieren',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Überwachen',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => 'Abschließen',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+));
+
+?>

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -257,7 +257,7 @@ abstract class Document extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeExternalField("org_name", array("allowed_values"=>null, "extkey_attcode"=>"org_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('contract,networkmap,presentation,training,whitePaper,workinginstructions'), "sql"=>"type", "default_value"=>"presentation", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('draft,published,obsolete'), "sql"=>"status", "default_value"=>"draft", "is_null_allowed"=>false, "depends_on"=>array('org_id'))));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('draft,published,obsolete'), "sql"=>"status", "default_value"=>"draft", "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("contract_list", array("linked_class"=>"lnkContractToDoc", "ext_key_to_me"=>"document_id", "ext_key_to_remote"=>"contract_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("service_list", array("linked_class"=>"lnkServiceToDoc", "ext_key_to_me"=>"document_id", "ext_key_to_remote"=>"service_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("ticket_list", array("linked_class"=>"lnkTicketToDoc", "ext_key_to_me"=>"document_id", "ext_key_to_remote"=>"ticket_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
@@ -365,7 +365,7 @@ class FileDoc extends Document
 			$oPage->add($this->DisplayDocumentInline($oPage, 'contents'));
 			$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
 		}
-		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix);
 		
 	}
 }

modules/itop-config-mgmt-1.0.0/pt_br.dict.itop-config-mgmt.php

@@ -38,8 +38,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Organization/Attribute:status/Value:inactive+' => 'Inativo',
 	'Class:Organization/Attribute:parent_id' => 'Matriz',
 	'Class:Organization/Attribute:parent_id+' => 'Organização matriz',
-	'Class:Location' => 'Localização',
-	'Class:Location+' => 'Qualquer tipo localização: Região, Pais, Cidade, Site, Construção, Piso, Sala, Rack,...',
+	'Class:Location' => 'Localizacao',
+	'Class:Location+' => 'Qualquer tipo localizacao: Região, Pais, Cidade, Site, Construção, Piso, Sala, Rack,...',
 	'Class:Location/Attribute:name' => 'Nome',
 	'Class:Location/Attribute:name+' => '',
 	'Class:Location/Attribute:status' => 'Status',
@@ -416,17 +416,17 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Contact/Attribute:status/Value:active+' => 'Ativo',
 	'Class:Contact/Attribute:status/Value:inactive' => 'Inativo',
 	'Class:Contact/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Contact/Attribute:org_id' => 'Organização',
+	'Class:Contact/Attribute:org_id' => 'Organizacao',
 	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organização',
+	'Class:Contact/Attribute:org_name' => 'Organizacao',
 	'Class:Contact/Attribute:org_name+' => '',
 	'Class:Contact/Attribute:email' => 'Email',
 	'Class:Contact/Attribute:email+' => '',
 	'Class:Contact/Attribute:phone' => 'Telefone',
 	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:location_id' => 'Localização',
+	'Class:Contact/Attribute:location_id' => 'Localizacao',
 	'Class:Contact/Attribute:location_id+' => '',
-	'Class:Contact/Attribute:location_name' => 'Localização',
+	'Class:Contact/Attribute:location_name' => 'Localizacao',
 	'Class:Contact/Attribute:location_name+' => '',
 	'Class:Contact/Attribute:ci_list' => 'CIs',
 	'Class:Contact/Attribute:ci_list+' => 'CIs relacionados para o contato',

modules/itop-incident-mgmt-1.0.0/de.dict.itop-incident-mgmt.php

@@ -1,59 +1,75 @@
-<?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('DE DE', 'German', 'Deutsch', array(
-	'Class:Incident' => 'Incident',
-	'Class:Incident+' => '',
-	'Class:Incident/Stimulus:ev_assign' => '"Zuweisen"',
-	'Class:Incident/Stimulus:ev_assign+' => '',
-	'Class:Incident/Stimulus:ev_reassign' => 'Neu zuweisen',
-	'Class:Incident/Stimulus:ev_reassign+' => '',
-	'Class:Incident/Stimulus:ev_timeout' => 'ev-Timeout',
-	'Class:Incident/Stimulus:ev_timeout+' => '',
-	'Class:Incident/Stimulus:ev_resolve' => 'Als gelöst markieren',
-	'Class:Incident/Stimulus:ev_resolve+' => '',
-	'Class:Incident/Stimulus:ev_close' => 'Schließen',
-	'Class:Incident/Stimulus:ev_close+' => '',
-	'Class:lnkTicketToIncident' => 'Ticket zu Incident',
-	'Class:lnkTicketToIncident/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToIncident/Attribute:incident_id' => 'Incident',
-	'Class:lnkTicketToIncident/Attribute:reason' => 'Grund',
-	'Menu:IncidentManagement' => 'Incident Management',
-	'Menu:IncidentManagement+' => 'Incident Management',
-	'Menu:Incident:Overview' => 'Übersicht',
-	'Menu:Incident:Overview+' => 'Übersicht',
-	'Menu:NewIncident' => 'Neuer Incident',
-	'Menu:NewIncident+' => 'Ein neues Incident-Ticket erstellen',
-	'Menu:SearchIncidents' => 'Nach Incidents suchen',
-	'Menu:SearchIncidents+' => 'Nach Incidents suchen',
-	'Menu:Incident:Shortcuts' => 'Shortcuts',
-	'Menu:Incident:Shortcuts+' => '',
-	'Menu:Incident:MyIncidents' => 'Incidents, die mich betreffen',
-	'Menu:Incident:MyIncidents+' => 'Incidents, die mich betreffen (als Bearbeiter)',
-	'Menu:Incident:EscalatedIncidents' => 'Eskalierte Incidents',
-	'Menu:Incident:EscalatedIncidents+' => 'Eskalierte Incidents',
-	'Menu:Incident:OpenIncidents' => 'Alle offenen Incidents',
-	'Menu:Incident:OpenIncidents+' => 'Alle offenen Incidents',
-));
-?>
+<?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>
+ * @license   http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Menu:IncidentManagement' => 'Incident Management',
+	'Menu:IncidentManagement+' => 'Incident Management',
+	'Menu:Incident:Overview' => 'Übersicht',
+	'Menu:Incident:Overview+' => 'Übersicht',
+	'Menu:NewIncident' => 'Neuer Incident',
+	'Menu:NewIncident+' => 'Ein neues Incident-Ticket erstellen',
+	'Menu:SearchIncidents' => 'Nach Incidents suchen',
+	'Menu:SearchIncidents+' => 'Nach Incidents suchen',
+	'Menu:Incident:Shortcuts' => 'Shortcuts',
+	'Menu:Incident:Shortcuts+' => '',
+	'Menu:Incident:MyIncidents' => 'Incidents, die mich betreffen',
+	'Menu:Incident:MyIncidents+' => 'Incidents, die mich betreffen (als Bearbeiter)',
+	'Menu:Incident:EscalatedIncidents' => 'Eskalierte Incidents',
+	'Menu:Incident:EscalatedIncidents+' => 'Eskalierte Incidents',
+	'Menu:Incident:OpenIncidents' => 'Alle offenen Incidents',
+	'Menu:Incident:OpenIncidents+' => 'Alle offenen Incidents',
+
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: Incident
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Incident' => 'Incident',
+	'Class:Incident+' => '',
+	'Class:Incident/Stimulus:ev_assign' => '"Zuweisen"',
+	'Class:Incident/Stimulus:ev_assign+' => '',
+	'Class:Incident/Stimulus:ev_reassign' => 'Neu zuweisen',
+	'Class:Incident/Stimulus:ev_reassign+' => '',
+	'Class:Incident/Stimulus:ev_timeout' => 'ev-Timeout',
+	'Class:Incident/Stimulus:ev_timeout+' => '',
+	'Class:Incident/Stimulus:ev_resolve' => 'Als gelöst markieren',
+	'Class:Incident/Stimulus:ev_resolve+' => '',
+	'Class:Incident/Stimulus:ev_close' => 'Schließen',
+	'Class:Incident/Stimulus:ev_close+' => '',
+));
+
+?>

modules/itop-incident-mgmt-1.0.0/model.itop-incident-mgmt.php

@@ -188,7 +188,7 @@ class Incident extends ResponseTicket
 		$sIcon = '';
 		if ($sIconName != '')
 		{
-			$sPath = utils::GetAbsoluteUrlModulesRoot().'itop-incident-mgmt-1.0.0/images/'.$sIconName;
+			$sPath = '../modules/itop-incident-mgmt-1.0.0/images/'.$sIconName;
 			if ($bImgTag)
 			{
 				$sIcon = "<img src=\"$sPath\" style=\"vertical-align:middle;\"/>";

modules/itop-service-mgmt-1.0.0/de.dict.itop-service-mgmt.php

@@ -1,315 +1,456 @@
-<?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>
- * @author	Stephan Rosenke <stephan.rosenke@itomig.de>
-
- * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:ProviderContract' => 'Provider-Vertrag',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:provider_id' => 'Anbieter',
-	'Class:ProviderContract/Attribute:provider_id+' => '',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-	'Class:ProviderContract/Attribute:coverage' => 'Abdeckung',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-	'Class:CustomerContract' => 'Kundenvertrag',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:org_id' => 'Kunde',
-	'Class:CustomerContract/Attribute:org_id+' => '',
-	'Class:CustomerContract/Attribute:provider_id' => 'Anbieter',
-	'Class:CustomerContract/Attribute:provider_id+' => '',
-	'Class:CustomerContract/Attribute:support_team_id' => 'Support-Team',
-	'Class:CustomerContract/Attribute:support_team_id+' => '',
-	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
-	'Class:CustomerContract/Attribute:sla_list+' => '',
-	'Class:CustomerContract/Attribute:provider_list' => 'Zugrunde liegende Verträge',
-	'Class:CustomerContract/Attribute:provider_list+' => '',
-	'Class:lnkCustomerContractToProviderContract' => 'Verbindung Kundenvertratg zu Provider-Vertrag',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => 'Kundenvertrag',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => 'Provider Contract',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
-	'Class:lnkContractToSLA' => 'Contract/SLA',
-	'Class:lnkContractToSLA+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_id' => 'Vertrag',
-	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
-	'Class:lnkContractToSLA/Attribute:coverage' => 'Abdeckung',
-	'Class:lnkContractToSLA/Attribute:coverage+' => '',
-	'Class:lnkContractToDoc' => 'Vertrag/Dokument',
-	'Class:lnkContractToDoc+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_id' => 'Vertrag',
-	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
-	'Class:lnkContractToDoc/Attribute:document_id' => 'Dokument',
-	'Class:lnkContractToDoc/Attribute:document_id+' => '',
-	'Class:lnkContractToContact' => 'Vertrag/Kontakt',
-	'Class:lnkContractToContact+' => '',
-	'Class:lnkContractToContact/Attribute:contract_id' => 'Vertrag',
-	'Class:lnkContractToContact/Attribute:contract_id+' => '',
-	'Class:lnkContractToContact/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContractToContact/Attribute:contact_id+' => '',
-	'Class:lnkContractToContact/Attribute:role' => 'Rolle',
-	'Class:lnkContractToContact/Attribute:role+' => '',
-	'Class:lnkContractToCI' => 'Vertrag/CI',
-	'Class:lnkContractToCI+' => '',
-	'Class:lnkContractToCI/Attribute:contract_id' => 'Vertrag',
-	'Class:lnkContractToCI/Attribute:contract_id+' => '',
-	'Class:lnkContractToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkContractToCI/Attribute:ci_id+' => '',
-	'Class:Service' => 'Service',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:org_id' => 'Anbieter',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:name' => 'Name',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:description' => 'Beschreibung',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:type' => 'Typ',
-	'Class:Service/Attribute:type+' => '',
-	'Class:Service/Attribute:type/Value:IncidentManagement' => 'Incident Management',
-	'Class:Service/Attribute:type/Value:IncidentManagement+' => 'Incident Management',
-	'Class:Service/Attribute:type/Value:RequestManagement' => 'Request Management',
-	'Class:Service/Attribute:type/Value:RequestManagement+' => 'Request Management',
-	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:design' => 'Design',
-	'Class:Service/Attribute:status/Value:design+' => '',
-	'Class:Service/Attribute:status/Value:obsolete' => 'Veraltet',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'Produktion',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:subcategory_list' => 'Service-Unterkategorien',
-	'Class:Service/Attribute:subcategory_list+' => '',
-	'Class:Service/Attribute:sla_list' => 'SLAs',
-	'Class:Service/Attribute:sla_list+' => '',
-	'Class:Service/Attribute:document_list' => 'Dokumente',
-	'Class:Service/Attribute:document_list+' => 'Dokumente beigefügt zu dem Service',
-	'Class:Service/Attribute:contact_list' => 'Kontakte',
-	'Class:Service/Attribute:contact_list+' => 'Kontakte, die für diesen Service eine Rolle wahrnehmen',
-	'Class:ServiceSubcategory' => 'Service-Unterkategorien',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Name',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Beschreibung',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Name',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:service_id' => 'Service',
-	'Class:SLA/Attribute:service_id+' => '',
-	'Class:SLA/Attribute:slt_list' => 'SLTs',
-	'Class:SLA/Attribute:slt_list+' => 'Auflistung der Service Level-Grenzbereiche',
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Name',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:metric' => 'Metrisch',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
-	'Class:SLT/Attribute:ticket_priority' => 'Ticketpriorität',
-	'Class:SLT/Attribute:ticket_priority+' => '',
-	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
-	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
-	'Class:SLT/Attribute:value' => 'Wert',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:value_unit' => 'Einheit',
-	'Class:SLT/Attribute:value_unit+' => '',
-	'Class:SLT/Attribute:value_unit/Value:days' => 'Tage',
-	'Class:SLT/Attribute:value_unit/Value:days+' => 'Tage',
-	'Class:SLT/Attribute:value_unit/Value:hours' => 'Stunden',
-	'Class:SLT/Attribute:value_unit/Value:hours+' => 'Stunden',
-	'Class:SLT/Attribute:value_unit/Value:minutes' => 'Minuten',
-	'Class:SLT/Attribute:value_unit/Value:minutes+' => 'Minuten',
-	'Class:SLT/Attribute:sla_list' => 'SLAs',
-	'Class:SLT/Attribute:sla_list+' => 'SLAs, die den SLT nutzen',
-	'Class:lnkSLTToSLA' => 'SLT/SLA',
-	'Class:lnkSLTToSLA+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
-	'Class:lnkServiceToDoc' => 'Service/Dokument',
-	'Class:lnkServiceToDoc+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_id' => 'Service',
-	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_id' => 'Dokument',
-	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
-	'Class:lnkServiceToContact' => 'Service/Kontakt',
-	'Class:lnkServiceToContact+' => '',
-	'Class:lnkServiceToContact/Attribute:service_id' => 'Service',
-	'Class:lnkServiceToContact/Attribute:service_id+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
-	'Class:lnkServiceToContact/Attribute:role' => 'Rolle',
-	'Class:lnkServiceToContact/Attribute:role+' => '',
-	'Class:lnkServiceToCI' => 'Service/CI',
-	'Class:lnkServiceToCI+' => '',
-	'Class:lnkServiceToCI/Attribute:service_id' => 'Service',
-	'Class:lnkServiceToCI/Attribute:service_id+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
-	'Menu:ServiceManagement' => 'Service Management',
-	'Menu:ServiceManagement+' => 'Service Management-Übersicht',
-	'Menu:Service:Overview' => 'Übersicht',
-	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service Level',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen enden',
-	'Menu:ServiceType' => 'Service Typen',
-	'Menu:ServiceType+' => 'Service Typen',
-	'Menu:ProviderContract' => 'Provider-Verträge',
-	'Menu:ProviderContract+' => 'Provider-Verträge',
-	'Menu:CustomerContract' => 'Kundenverträge',
-	'Menu:CustomerContract+' => 'Kundenverträge',
-	'Menu:ServiceSubcategory' => 'Service-Unterkategorien',
-	'Menu:ServiceSubcategory+' => 'Service-Unterkategorien',
-	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Services',
-	'Menu:SLA' => 'SLAs',
-	'Menu:SLA+' => 'Service Level Agreements',
-	'Menu:SLT' => 'SLTs',
-	'Menu:SLT+' => 'Service Level Targets',
-	'Class:Contract' => 'Vertrag',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Name',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:description' => 'Beschreibung',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Anfangsdatum',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Ablaufdatum',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Kosten',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Währung',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollar',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euro',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Kosteneinheit',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Abrechnungshäufigkeit',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:contact_list' => 'Kontakte',
-	'Class:Contract/Attribute:contact_list+' => 'Kontakte zu diesem Vertrag',
-	'Class:Contract/Attribute:document_list' => 'Dokumente',
-	'Class:Contract/Attribute:document_list+' => 'Dokumente zu diesem Vertrag',
-	'Class:Contract/Attribute:ci_list' => 'CIs',
-	'Class:Contract/Attribute:ci_list+' => 'CI, die von dem Vertrag unterstützt werden',
-	'Class:Contract/Attribute:finalclass' => 'Typ',
-	'Class:Contract/Attribute:finalclass+' => '',
-	'Class:ProviderContract/Attribute:provider_name' => 'Providername',
-	'Class:ProviderContract/Attribute:provider_name+' => '',
-	'Class:CustomerContract/Attribute:org_name' => 'Kundenname',
-	'Class:CustomerContract/Attribute:org_name+' => '',
-	'Class:CustomerContract/Attribute:provider_name' => 'Providername',
-	'Class:CustomerContract/Attribute:provider_name+' => '',
-	'Class:CustomerContract/Attribute:support_team_name' => 'Support-Team',
-	'Class:CustomerContract/Attribute:support_team_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => 'Name',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => 'Name',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => 'Provider-SLA',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => 'Service Level Agreement',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => 'Service-Stunden',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_name' => 'Vertrag',
-	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_name' => 'Vertrag',
-	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_name' => 'Dokument',
-	'Class:lnkContractToDoc/Attribute:document_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_type' => 'Dokumententyp',
-	'Class:lnkContractToDoc/Attribute:document_type+' => '',
-	'Class:lnkContractToDoc/Attribute:document_status' => 'Dokumentenstatus',
-	'Class:lnkContractToDoc/Attribute:document_status+' => '',
-	'Class:lnkContractToContact/Attribute:contract_name' => 'Vertrag',
-	'Class:lnkContractToContact/Attribute:contract_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_name' => 'Kontakt',
-	'Class:lnkContractToContact/Attribute:contact_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_email' => 'Kontaktemail',
-	'Class:lnkContractToContact/Attribute:contact_email+' => '',
-	'Class:lnkContractToCI/Attribute:contract_name' => 'Vertrag',
-	'Class:lnkContractToCI/Attribute:contract_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkContractToCI/Attribute:ci_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_status' => 'CI-Status',
-	'Class:lnkContractToCI/Attribute:ci_status+' => '',
-	'Class:Service/Attribute:provider_name' => 'Anbieter',
-	'Class:Service/Attribute:provider_name+' => '',
-	'Class:Service/Tab:Related_Contracts' => 'Zugehörige Verträge',
-	'Class:Service/Tab:Related_Contracts+' => 'Verträge, die für diesen Service unterschrieben wurden',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Service',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:SLA/Attribute:service_name' => 'Service',
-	'Class:SLA/Attribute:service_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metrik',
-	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => 'Ticketpriorität',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value' => 'Wert',
-	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => 'Einheit',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_name' => 'Service',
-	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_name' => 'Dokument',
-	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_type' => 'Dokumententyp',
-	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_status' => 'Dokumentenstatus',
-	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
-	'Class:lnkServiceToContact/Attribute:service_name' => 'Service',
-	'Class:lnkServiceToContact/Attribute:service_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_name' => 'Kontakt',
-	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_email' => 'Kontaktemail',
-	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
-	'Class:lnkServiceToCI/Attribute:service_name' => 'Service',
-	'Class:lnkServiceToCI/Attribute:service_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_status' => 'CI-Status',
-	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
-));
-?>
+<?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   Stephan Rosenke <stephan.rosenke@itomig.de>
+ * @license   http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+'Menu:ServiceManagement' => 'Service Management',
+'Menu:ServiceManagement+' => 'Service Management-Übersicht',
+'Menu:Service:Overview' => 'Übersicht',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Verträge nach Service Level',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen enden',
+
+'Menu:ServiceType' => 'Service Typen',
+'Menu:ServiceType+' => 'Service Typen',
+'Menu:ProviderContract' => 'Provider-Verträge',
+'Menu:ProviderContract+' => 'Provider-Verträge',
+'Menu:CustomerContract' => 'Kundenverträge',
+'Menu:CustomerContract+' => 'Kundenverträge',
+'Menu:ServiceSubcategory' => 'Service-Unterkategorien',
+'Menu:ServiceSubcategory+' => 'Service-Unterkategorien',
+'Menu:Service' => 'Services',
+'Menu:Service+' => 'Services',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Service Level Agreements',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Service Level Targets',
+
+));
+
+
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
+
+//
+// Class: Contract
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Contract' => 'Vertrag',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Name',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:description' => 'Beschreibung',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Anfangsdatum',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Ablaufdatum',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Kosten',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Währung',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollar',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euro',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Kosteneinheit',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Abrechnungshäufigkeit',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:contact_list' => 'Kontakte',
+	'Class:Contract/Attribute:contact_list+' => 'Kontakte zu diesem Vertrag',
+	'Class:Contract/Attribute:document_list' => 'Dokumente',
+	'Class:Contract/Attribute:document_list+' => 'Dokumente zu diesem Vertrag',
+	'Class:Contract/Attribute:ci_list' => 'CIs',
+	'Class:Contract/Attribute:ci_list+' => 'CI, die von dem Vertrag unterstützt werden',
+	'Class:Contract/Attribute:finalclass' => 'Typ',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:ProviderContract' => 'Provider-Vertrag',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:provider_id' => 'Anbieter',
+	'Class:ProviderContract/Attribute:provider_id+' => '',
+	'Class:ProviderContract/Attribute:provider_name' => 'Providername',
+	'Class:ProviderContract/Attribute:provider_name+' => '',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Abdeckung',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:CustomerContract' => 'Kundenvertrag',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:org_id' => 'Kunde',
+	'Class:CustomerContract/Attribute:org_id+' => '',
+	'Class:CustomerContract/Attribute:org_name' => 'Kundenname',
+	'Class:CustomerContract/Attribute:org_name+' => '',
+	'Class:CustomerContract/Attribute:provider_id' => 'Anbieter',
+	'Class:CustomerContract/Attribute:provider_id+' => '',
+	'Class:CustomerContract/Attribute:provider_name' => 'Providername',
+	'Class:CustomerContract/Attribute:provider_name+' => '',
+	'Class:CustomerContract/Attribute:support_team_id' => 'Support-Team',
+	'Class:CustomerContract/Attribute:support_team_id+' => '',
+	'Class:CustomerContract/Attribute:support_team_name' => 'Support-Team',
+	'Class:CustomerContract/Attribute:support_team_name+' => '',
+	'Class:CustomerContract/Attribute:provider_list' => 'Anbieter',
+	'Class:CustomerContract/Attribute:provider_list+' => '',
+	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
+	'Class:CustomerContract/Attribute:sla_list+' => 'Liste der SLAs zu dem Vertrag',
+	'Class:CustomerContract/Attribute:provider_list' => 'Zugrunde liegende Verträge',
+	'Class:CustomerContract/Attribute:sla_list+' => '',
+));
+
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkCustomerContractToProviderContract' => 'Verbindung Kundenvertratg zu Provider-Vertrag',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => 'Kundenvertrag',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => 'Name',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => 'Provider Contract',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => 'Name',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => 'Provider-SLA',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => 'Service Level Agreement',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => 'Service-Stunden',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
+));
+
+
+//
+// Class: lnkContractToSLA
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContractToSLA' => 'Contract/SLA',
+	'Class:lnkContractToSLA+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_id' => 'Vertrag',
+	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_name' => 'Vertrag',
+	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
+	'Class:lnkContractToSLA/Attribute:coverage' => 'Abdeckung',
+	'Class:lnkContractToSLA/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContractToDoc
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContractToDoc' => 'Vertrag/Dokument',
+	'Class:lnkContractToDoc+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_id' => 'Vertrag',
+	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_name' => 'Vertrag',
+	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_id' => 'Dokument',
+	'Class:lnkContractToDoc/Attribute:document_id+' => '',
+	'Class:lnkContractToDoc/Attribute:document_name' => 'Dokument',
+	'Class:lnkContractToDoc/Attribute:document_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_type' => 'Dokumententyp',
+	'Class:lnkContractToDoc/Attribute:document_type+' => '',
+	'Class:lnkContractToDoc/Attribute:document_status' => 'Dokumentenstatus',
+	'Class:lnkContractToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkContractToContact
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContractToContact' => 'Vertrag/Kontakt',
+	'Class:lnkContractToContact+' => '',
+	'Class:lnkContractToContact/Attribute:contract_id' => 'Vertrag',
+	'Class:lnkContractToContact/Attribute:contract_id+' => '',
+	'Class:lnkContractToContact/Attribute:contract_name' => 'Vertrag',
+	'Class:lnkContractToContact/Attribute:contract_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContractToContact/Attribute:contact_id+' => '',
+	'Class:lnkContractToContact/Attribute:contact_name' => 'Kontakt',
+	'Class:lnkContractToContact/Attribute:contact_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_email' => 'Kontaktemail',
+	'Class:lnkContractToContact/Attribute:contact_email+' => '',
+	'Class:lnkContractToContact/Attribute:role' => 'Rolle',
+	'Class:lnkContractToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkContractToCI
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkContractToCI' => 'Vertrag/CI',
+	'Class:lnkContractToCI+' => '',
+	'Class:lnkContractToCI/Attribute:contract_id' => 'Vertrag',
+	'Class:lnkContractToCI/Attribute:contract_id+' => '',
+	'Class:lnkContractToCI/Attribute:contract_name' => 'Vertrag',
+	'Class:lnkContractToCI/Attribute:contract_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkContractToCI/Attribute:ci_id+' => '',
+	'Class:lnkContractToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkContractToCI/Attribute:ci_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_status' => 'CI-Status',
+	'Class:lnkContractToCI/Attribute:ci_status+' => '',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Service' => 'Service',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:org_id' => 'Anbieter',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:provider_name' => 'Anbieter',
+	'Class:Service/Attribute:provider_name+' => '',
+	'Class:Service/Attribute:name' => 'Name',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:description' => 'Beschreibung',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:type' => 'Typ',
+	'Class:Service/Attribute:type+' => '',
+	'Class:Service/Attribute:type/Value:IncidentManagement' => 'Incident Management',
+	'Class:Service/Attribute:type/Value:IncidentManagement+' => 'Incident Management',
+	'Class:Service/Attribute:type/Value:RequestManagement' => 'Request Management',
+	'Class:Service/Attribute:type/Value:RequestManagement+' => 'Request Management',
+	'Class:Service/Attribute:status' => 'Status',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:design' => 'Design',
+	'Class:Service/Attribute:status/Value:design+' => '',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Veraltet',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Produktion',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:subcategory_list' => 'Service-Unterkategorien',
+	'Class:Service/Attribute:subcategory_list+' => '',
+	'Class:Service/Attribute:sla_list' => 'SLAs',
+	'Class:Service/Attribute:sla_list+' => '',
+	'Class:Service/Attribute:document_list' => 'Dokumente',
+	'Class:Service/Attribute:document_list+' => 'Dokumente beigefügt zu dem Service',
+	'Class:Service/Attribute:contact_list' => 'Kontakte',
+	'Class:Service/Attribute:contact_list+' => 'Kontakte, die für diesen Service eine Rolle wahrnehmen',
+	'Class:Service/Tab:Related_Contracts' => 'Zugehörige Verträge',
+	'Class:Service/Tab:Related_Contracts+' => 'Verträge, die für diesen Vertrag unterschrieben wurden',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:ServiceSubcategory' => 'Service-Unterkategorien',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Name',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Beschreibung',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Service',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Name',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:service_id' => 'Service',
+	'Class:SLA/Attribute:service_id+' => '',
+	'Class:SLA/Attribute:service_name' => 'Service',
+	'Class:SLA/Attribute:service_name+' => '',
+	'Class:SLA/Attribute:slt_list' => 'SLTs',
+	'Class:SLA/Attribute:slt_list+' => 'Auflistung der Service Level-Grenzbereiche',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Name',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:metric' => 'Metrisch',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
+	'Class:SLT/Attribute:ticket_priority' => 'Ticketpriorität',
+	'Class:SLT/Attribute:ticket_priority+' => '',
+	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
+	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
+	'Class:SLT/Attribute:value' => 'Wert',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:value_unit' => 'Einheit',
+	'Class:SLT/Attribute:value_unit+' => '',
+	'Class:SLT/Attribute:value_unit/Value:days' => 'Tage',
+	'Class:SLT/Attribute:value_unit/Value:days+' => 'Tage',
+	'Class:SLT/Attribute:value_unit/Value:hours' => 'Stunden',
+	'Class:SLT/Attribute:value_unit/Value:hours+' => 'Stunden',
+	'Class:SLT/Attribute:value_unit/Value:minutes' => 'Minuten',
+	'Class:SLT/Attribute:value_unit/Value:minutes+' => 'Minuten',
+	'Class:SLT/Attribute:sla_list' => 'SLAs',
+	'Class:SLT/Attribute:sla_list+' => 'SLAs, die den SLT nutzen',
+));
+
+//
+// Class: lnkSLTToSLA
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkSLTToSLA' => 'SLT/SLA',
+	'Class:lnkSLTToSLA+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metrisch',
+	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => 'Ticketpriorität',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value' => 'Wert',
+	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => 'Einheit',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
+));
+
+//
+// Class: lnkServiceToDoc
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkServiceToDoc' => 'Service/Dokument',
+	'Class:lnkServiceToDoc+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_id' => 'Service',
+	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_name' => 'Service',
+	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_id' => 'Dokument',
+	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_name' => 'Dokument',
+	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_type' => 'Dokumententyp',
+	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_status' => 'Dokumentenstatus',
+	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkServiceToContact
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkServiceToContact' => 'Service/Kontakt',
+	'Class:lnkServiceToContact+' => '',
+	'Class:lnkServiceToContact/Attribute:service_id' => 'Service',
+	'Class:lnkServiceToContact/Attribute:service_id+' => '',
+	'Class:lnkServiceToContact/Attribute:service_name' => 'Service',
+	'Class:lnkServiceToContact/Attribute:service_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_name' => 'Kontakt',
+	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_email' => 'Kontaktemail',
+	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
+	'Class:lnkServiceToContact/Attribute:role' => 'Rolle',
+	'Class:lnkServiceToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkServiceToCI
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkServiceToCI' => 'Service/CI',
+	'Class:lnkServiceToCI+' => '',
+	'Class:lnkServiceToCI/Attribute:service_id' => 'Service',
+	'Class:lnkServiceToCI/Attribute:service_id+' => '',
+	'Class:lnkServiceToCI/Attribute:service_name' => 'Service',
+	'Class:lnkServiceToCI/Attribute:service_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_status' => 'CI-Status',
+	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
+));
+
+
+?>

modules/itop-tickets-1.0.0/de.dict.itop-tickets.php

@@ -1,220 +1,274 @@
-<?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>
- * @author	Stephan Rosenke <stephan.rosenke@itomig.de>
-
- * @licence	http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-Dict::Add('DE DE', 'German', 'Deutsch', array(
-	'Class:lnkTicketToDoc' => 'Ticket/Document',
-	'Class:lnkTicketToDoc+' => '',
-	'Class:lnkTicketToDoc/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToDoc/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToDoc/Attribute:document_id' => 'Dokument',
-	'Class:lnkTicketToDoc/Attribute:document_id+' => '',
-	'Class:lnkTicketToContact' => 'Ticket/Kontakt',
-	'Class:lnkTicketToContact+' => '',
-	'Class:lnkTicketToContact/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToContact/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkTicketToContact/Attribute:contact_id+' => '',
-	'Class:lnkTicketToContact/Attribute:role' => 'Rolle',
-	'Class:lnkTicketToContact/Attribute:role+' => '',
-	'Class:lnkTicketToCI' => 'Ticket/CI',
-	'Class:lnkTicketToCI+' => '',
-	'Class:lnkTicketToCI/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToCI/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkTicketToCI/Attribute:ci_id+' => '',
-	'Class:lnkTicketToCI/Attribute:impact' => 'Auswirkung',
-	'Class:lnkTicketToCI/Attribute:impact+' => '',
-	'Class:Ticket' => 'Ticket',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => 'Referenz',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:title' => 'Titel',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => 'Beschreibung',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:ticket_log' => 'Protokoll',
-	'Class:Ticket/Attribute:ticket_log+' => '',
-	'Class:Ticket/Attribute:start_date' => 'Gestartet',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:document_list' => 'Dokumente',
-	'Class:Ticket/Attribute:document_list+' => 'Dokumente zu diesem Ticket',
-	'Class:Ticket/Attribute:ci_list' => 'CIs',
-	'Class:Ticket/Attribute:ci_list+' => 'CIs, die diesen Incident betreffen',
-	'Class:Ticket/Attribute:contact_list' => 'Kontakte',
-	'Class:Ticket/Attribute:contact_list+' => 'Beteiligtes Team und beteiligte Personen',
-	'Class:Ticket/Attribute:incident_list' => 'Dazugehörige Incidents',
-	'Class:Ticket/Attribute:incident_list+' => '',
-	'Class:Ticket/Attribute:finalclass' => 'Typ',
-	'Class:Ticket/Attribute:finalclass+' => '',
-	'Ticket:baseinfo' => 'Allgemeine Informationen',
-	'Ticket:date' => 'Daten',
-	'Ticket:contact' => 'Kontakte',
-	'Ticket:moreinfo' => 'weitergehende Informationen',
-	'Ticket:relation' => 'Beziehungen',
-	'Ticket:log' => 'Kommunikation',
-	'Class:lnkTicketToDoc/Attribute:ticket_ref' => 'Ticket #',
-	'Class:lnkTicketToDoc/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToDoc/Attribute:document_name' => 'Dokument',
-	'Class:lnkTicketToDoc/Attribute:document_name+' => '',
-	'Class:lnkTicketToContact/Attribute:ticket_ref' => 'Ticket #',
-	'Class:lnkTicketToContact/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_name' => 'Kontakt',
-	'Class:lnkTicketToContact/Attribute:contact_name+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_email' => 'Email',
-	'Class:lnkTicketToContact/Attribute:contact_email+' => '',
-	'Class:lnkTicketToCI/Attribute:ticket_ref' => 'Ticket #',
-	'Class:lnkTicketToCI/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkTicketToCI/Attribute:ci_name+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_status' => 'CI-Status',
-	'Class:lnkTicketToCI/Attribute:ci_status+' => '',
-	'Class:ResponseTicket' => 'Antwortticket',
-	'Class:ResponseTicket+' => '',
-	'Class:ResponseTicket/Attribute:status' => 'Status',
-	'Class:ResponseTicket/Attribute:status+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:new' => 'Neu',
-	'Class:ResponseTicket/Attribute:status/Value:new+' => 'Neu eröffnet',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_tto' => 'Eskalation/TTO',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_tto+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:assigned' => 'Zugeteilt',
-	'Class:ResponseTicket/Attribute:status/Value:assigned+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr' => 'Eskalation/TTR',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:frozen' => 'Anstehend',
-	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:resolved' => 'Gelöst',
-	'Class:ResponseTicket/Attribute:status/Value:resolved+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:closed' => 'Geschlossen',
-	'Class:ResponseTicket/Attribute:status/Value:closed+' => '',
-	'Class:ResponseTicket/Attribute:caller_id' => 'Melder',
-	'Class:ResponseTicket/Attribute:caller_id+' => '',
-	'Class:ResponseTicket/Attribute:caller_email' => 'Email',
-	'Class:ResponseTicket/Attribute:caller_email+' => '',
-	'Class:ResponseTicket/Attribute:org_id' => 'Kunde',
-	'Class:ResponseTicket/Attribute:org_id+' => '',
-	'Class:ResponseTicket/Attribute:org_name' => 'Kunde',
-	'Class:ResponseTicket/Attribute:org_name+' => '',
-	'Class:ResponseTicket/Attribute:service_id' => 'Service',
-	'Class:ResponseTicket/Attribute:service_id+' => '',
-	'Class:ResponseTicket/Attribute:service_name' => 'Name',
-	'Class:ResponseTicket/Attribute:service_name+' => '',
-	'Class:ResponseTicket/Attribute:servicesubcategory_id' => 'Service-Element',
-	'Class:ResponseTicket/Attribute:servicesubcategory_id+' => '',
-	'Class:ResponseTicket/Attribute:servicesubcategory_name' => 'Name',
-	'Class:ResponseTicket/Attribute:servicesubcategory_name+' => '',
-	'Class:ResponseTicket/Attribute:product' => 'Produkt',
-	'Class:ResponseTicket/Attribute:product+' => '',
-	'Class:ResponseTicket/Attribute:impact' => 'Auswirkung',
-	'Class:ResponseTicket/Attribute:impact+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:1' => 'Eine Person',
-	'Class:ResponseTicket/Attribute:impact/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:2' => 'Ein Service',
-	'Class:ResponseTicket/Attribute:impact/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:3' => 'Eine Abteilung',
-	'Class:ResponseTicket/Attribute:impact/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:urgency' => 'Dringlichkeit',
-	'Class:ResponseTicket/Attribute:urgency+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:1' => 'Niedrig',
-	'Class:ResponseTicket/Attribute:urgency/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:2' => 'Medium',
-	'Class:ResponseTicket/Attribute:urgency/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:3' => 'Hoch',
-	'Class:ResponseTicket/Attribute:urgency/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:priority' => 'Priorität',
-	'Class:ResponseTicket/Attribute:priority+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:1' => 'Niedrig',
-	'Class:ResponseTicket/Attribute:priority/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:2' => 'Medium',
-	'Class:ResponseTicket/Attribute:priority/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:3' => 'Hoch',
-	'Class:ResponseTicket/Attribute:priority/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:workgroup_id' => 'Arbeitsgruppe',
-	'Class:ResponseTicket/Attribute:workgroup_id+' => '',
-	'Class:ResponseTicket/Attribute:workgroup_name' => 'Arbeitsgruppe',
-	'Class:ResponseTicket/Attribute:workgroup_name+' => '',
-	'Class:ResponseTicket/Attribute:agent_id' => 'Bearbeiter',
-	'Class:ResponseTicket/Attribute:agent_id+' => '',
-	'Class:ResponseTicket/Attribute:agent_name' => 'Bearbeiter',
-	'Class:ResponseTicket/Attribute:agent_name+' => '',
-	'Class:ResponseTicket/Attribute:agent_email' => 'Bearbeiter schreiben (Email)',
-	'Class:ResponseTicket/Attribute:agent_email+' => '',
-	'Class:ResponseTicket/Attribute:related_problem_id' => 'Dazugehöriges Problem',
-	'Class:ResponseTicket/Attribute:related_problem_id+' => '',
-	'Class:ResponseTicket/Attribute:related_problem_ref' => 'Referenz',
-	'Class:ResponseTicket/Attribute:related_problem_ref+' => '',
-	'Class:ResponseTicket/Attribute:related_change_id' => 'Verbundene Changes',
-	'Class:ResponseTicket/Attribute:related_change_id+' => '',
-	'Class:ResponseTicket/Attribute:related_change_ref' => 'Verbundene Changes',
-	'Class:ResponseTicket/Attribute:related_change_ref+' => '',
-	'Class:ResponseTicket/Attribute:close_date' => 'Geschlossen',
-	'Class:ResponseTicket/Attribute:close_date+' => '',
-	'Class:ResponseTicket/Attribute:last_update' => 'Letzte Aktualisierung',
-	'Class:ResponseTicket/Attribute:last_update+' => '',
-	'Class:ResponseTicket/Attribute:assignment_date' => 'Zugeteilt',
-	'Class:ResponseTicket/Attribute:assignment_date+' => '',
-	'Class:ResponseTicket/Attribute:resolution_date' => 'Lösungsdatum',
-	'Class:ResponseTicket/Attribute:resolution_date+' => '',
-	'Class:ResponseTicket/Attribute:tto_escalation_deadline' => 'TTO Eskaltionsfrist',
-	'Class:ResponseTicket/Attribute:tto_escalation_deadline+' => '',
-	'Class:ResponseTicket/Attribute:ttr_escalation_deadline' => 'TTR Eskaltionsfrist',
-	'Class:ResponseTicket/Attribute:ttr_escalation_deadline+' => '',
-	'Class:ResponseTicket/Attribute:closure_deadline' => 'Abschlussfrist',
-	'Class:ResponseTicket/Attribute:closure_deadline+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code' => 'Code für Lösung',
-	'Class:ResponseTicket/Attribute:resolution_code+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce' => 'Konnte nicht reproduziert werden',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate' => 'Duplikat eines bestehenden Tickets',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed' => 'Repariert',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant' => 'Irrelevant',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant+' => '',
-	'Class:ResponseTicket/Attribute:solution' => 'Lösung',
-	'Class:ResponseTicket/Attribute:solution+' => '',
-	'Class:ResponseTicket/Attribute:user_satisfaction' => 'Benutzerzufriedenheit',
-	'Class:ResponseTicket/Attribute:user_satisfaction+' => '',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1' => '1',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1+' => '1',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2' => '2',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2+' => '2',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3' => '3',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3+' => '3',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4' => '4',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4+' => '4',
-	'Class:ResponseTicket/Attribute:user_commment' => 'Benutzerkommentar',
-	'Class:ResponseTicket/Attribute:user_commment+' => '',
-	'Class:ResponseTicket/Stimulus:ev_assign' => 'Zuweisen',
-	'Class:ResponseTicket/Stimulus:ev_assign+' => '',
-	'Class:ResponseTicket/Stimulus:ev_reassign' => 'Neu zuweisen',
-	'Class:ResponseTicket/Stimulus:ev_reassign+' => '',
-	'Class:ResponseTicket/Stimulus:ev_timeout' => 'ev-Timeout',
-	'Class:ResponseTicket/Stimulus:ev_timeout+' => '',
-	'Class:ResponseTicket/Stimulus:ev_resolve' => 'Als gelöst markieren',
-	'Class:ResponseTicket/Stimulus:ev_resolve+' => '',
-	'Class:ResponseTicket/Stimulus:ev_close' => 'Schließen',
-	'Class:ResponseTicket/Stimulus:ev_close+' => '',
-));
-?>
+<?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   Stephan Rosenke <stephan.rosenke@itomig.de>
+ * @license   http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Ticket
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:Ticket' => 'Ticket',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Referenz',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:title' => 'Titel',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Beschreibung',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:ticket_log' => 'Protokoll',
+	'Class:Ticket/Attribute:ticket_log+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Gestartet',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:document_list' => 'Dokumente',
+	'Class:Ticket/Attribute:document_list+' => 'Dokumente zu diesem Ticket',
+	'Class:Ticket/Attribute:ci_list' => 'CIs',
+	'Class:Ticket/Attribute:ci_list+' => 'CIs, die diesen Incident betreffen',
+	'Class:Ticket/Attribute:contact_list' => 'Kontakte',
+	'Class:Ticket/Attribute:contact_list+' => 'Beteiligtes Team und beteiligte Personen',
+	'Class:Ticket/Attribute:incident_list' => 'Dazugehörige Incidents',
+	'Class:Ticket/Attribute:incident_list+' => '',
+	'Class:Ticket/Attribute:finalclass' => 'Typ',
+	'Class:Ticket/Attribute:finalclass+' => '',
+));
+
+// Fieldset translation
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+
+	'Ticket:baseinfo' => 'Allgemeine Informationen',
+	'Ticket:date' => 'Daten',
+	'Ticket:contact' => 'Kontakte',
+	'Ticket:moreinfo' => 'weitergehende Informationen',
+	'Ticket:relation' => 'Beziehungen',
+	'Ticket:log' => 'Kommunikation',
+
+));
+
+//
+// Class: lnkTicketToDoc
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkTicketToDoc' => 'Ticket/Document',
+	'Class:lnkTicketToDoc+' => '',
+	'Class:lnkTicketToDoc/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkTicketToDoc/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToDoc/Attribute:ticket_ref' => 'Ticket #',
+	'Class:lnkTicketToDoc/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToDoc/Attribute:document_id' => 'Dokument',
+	'Class:lnkTicketToDoc/Attribute:document_id+' => '',
+	'Class:lnkTicketToDoc/Attribute:document_name' => 'Dokument',
+	'Class:lnkTicketToDoc/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkTicketToContact
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkTicketToContact' => 'Ticket/Kontakt',
+	'Class:lnkTicketToContact+' => '',
+	'Class:lnkTicketToContact/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkTicketToContact/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToContact/Attribute:ticket_ref' => 'Ticket #',
+	'Class:lnkTicketToContact/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkTicketToContact/Attribute:contact_id+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_name' => 'Kontakt',
+	'Class:lnkTicketToContact/Attribute:contact_name+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_email' => 'Email',
+	'Class:lnkTicketToContact/Attribute:contact_email+' => '',
+	'Class:lnkTicketToContact/Attribute:role' => 'Rolle',
+	'Class:lnkTicketToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkTicketToCI
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:lnkTicketToCI' => 'Ticket/CI',
+	'Class:lnkTicketToCI+' => '',
+	'Class:lnkTicketToCI/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkTicketToCI/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToCI/Attribute:ticket_ref' => 'Ticket #',
+	'Class:lnkTicketToCI/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkTicketToCI/Attribute:ci_id+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkTicketToCI/Attribute:ci_name+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_status' => 'CI-Status',
+	'Class:lnkTicketToCI/Attribute:ci_status+' => '',
+	'Class:lnkTicketToCI/Attribute:impact' => 'Auswirkung',
+	'Class:lnkTicketToCI/Attribute:impact+' => '',
+));
+
+//
+// Class: ResponseTicket
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', array(
+	'Class:ResponseTicket' => 'Antwortticket',
+	'Class:ResponseTicket+' => '',
+	'Class:ResponseTicket/Attribute:status' => 'Status',
+	'Class:ResponseTicket/Attribute:status+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:new' => 'Neu',
+	'Class:ResponseTicket/Attribute:status/Value:new+' => 'Neu eröffnet',
+	'Class:ResponseTicket/Attribute:status/Value:frozen' => 'Unerledigt',
+	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_tto' => 'Eskalation/TTO',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_tto+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:assigned' => 'Zugeteilt',
+	'Class:ResponseTicket/Attribute:status/Value:assigned+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr' => 'Eskalation/TTR',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:frozen' => 'Anstehend',
+	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:resolved' => 'Gelöst',
+	'Class:ResponseTicket/Attribute:status/Value:resolved+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:closed' => 'Geschlossen',
+	'Class:ResponseTicket/Attribute:status/Value:closed+' => '',
+	'Class:ResponseTicket/Attribute:caller_id' => 'Melder',
+	'Class:ResponseTicket/Attribute:caller_id+' => '',
+	'Class:ResponseTicket/Attribute:caller_email' => 'Email',
+	'Class:ResponseTicket/Attribute:caller_email+' => '',
+	'Class:ResponseTicket/Attribute:org_id' => 'Kunde',
+	'Class:ResponseTicket/Attribute:org_id+' => '',
+	'Class:ResponseTicket/Attribute:org_name' => 'Kunde',
+	'Class:ResponseTicket/Attribute:org_name+' => '',
+	'Class:ResponseTicket/Attribute:service_id' => 'Service',
+	'Class:ResponseTicket/Attribute:service_id+' => '',
+	'Class:ResponseTicket/Attribute:service_name' => 'Name',
+	'Class:ResponseTicket/Attribute:service_name+' => '',
+	'Class:ResponseTicket/Attribute:servicesubcategory_id' => 'Service-Element',
+	'Class:ResponseTicket/Attribute:servicesubcategory_id+' => '',
+	'Class:ResponseTicket/Attribute:servicesubcategory_name' => 'Name',
+	'Class:ResponseTicket/Attribute:servicesubcategory_name+' => '',
+	'Class:ResponseTicket/Attribute:product' => 'Produkt',
+	'Class:ResponseTicket/Attribute:product+' => '',
+	'Class:ResponseTicket/Attribute:impact' => 'Auswirkung',
+	'Class:ResponseTicket/Attribute:impact+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:1' => 'Eine Person',
+	'Class:ResponseTicket/Attribute:impact/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:2' => 'Ein Service',
+	'Class:ResponseTicket/Attribute:impact/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:3' => 'Eine Abteilung',
+	'Class:ResponseTicket/Attribute:impact/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:urgency' => 'Dringlichkeit',
+	'Class:ResponseTicket/Attribute:urgency+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:1' => 'Niedrig',
+	'Class:ResponseTicket/Attribute:urgency/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:2' => 'Medium',
+	'Class:ResponseTicket/Attribute:urgency/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:3' => 'Hoch',
+	'Class:ResponseTicket/Attribute:urgency/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:priority' => 'Priorität',
+	'Class:ResponseTicket/Attribute:priority+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:1' => 'Niedrig',
+	'Class:ResponseTicket/Attribute:priority/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:2' => 'Medium',
+	'Class:ResponseTicket/Attribute:priority/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:3' => 'Hoch',
+	'Class:ResponseTicket/Attribute:priority/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:workgroup_id' => 'Arbeitsgruppe',
+	'Class:ResponseTicket/Attribute:workgroup_id+' => '',
+	'Class:ResponseTicket/Attribute:workgroup_name' => 'Arbeitsgruppe',
+	'Class:ResponseTicket/Attribute:workgroup_name+' => '',
+	'Class:ResponseTicket/Attribute:agent_id' => 'Bearbeiter',
+	'Class:ResponseTicket/Attribute:agent_id+' => '',
+	'Class:ResponseTicket/Attribute:agent_name' => 'Bearbeiter',
+	'Class:ResponseTicket/Attribute:agent_name+' => '',
+	'Class:ResponseTicket/Attribute:agent_email' => 'Bearbeiter schreiben (Email)',
+	'Class:ResponseTicket/Attribute:agent_email+' => '',
+	'Class:ResponseTicket/Attribute:related_problem_id' => 'Dazugehöriges Problem',
+	'Class:ResponseTicket/Attribute:related_problem_id+' => '',
+	'Class:ResponseTicket/Attribute:related_problem_ref' => 'Referenz',
+	'Class:ResponseTicket/Attribute:related_problem_ref+' => '',
+	'Class:ResponseTicket/Attribute:related_change_id' => 'Verbundene Änderungen',
+	'Class:ResponseTicket/Attribute:related_change_id+' => '',
+	'Class:ResponseTicket/Attribute:related_change_ref' => 'Verbundene Änderungen',
+	'Class:ResponseTicket/Attribute:related_change_ref+' => '',
+	'Class:ResponseTicket/Attribute:close_date' => 'Geschlossen',
+	'Class:ResponseTicket/Attribute:close_date+' => '',
+	'Class:ResponseTicket/Attribute:last_update' => 'Letzte Aktualisierung',
+	'Class:ResponseTicket/Attribute:last_update+' => '',
+	'Class:ResponseTicket/Attribute:assignment_date' => 'Zugeteilt',
+	'Class:ResponseTicket/Attribute:assignment_date+' => '',
+	'Class:ResponseTicket/Attribute:resolution_date' => 'Lösungsdatum',
+	'Class:ResponseTicket/Attribute:resolution_date+' => '',
+	'Class:ResponseTicket/Attribute:tto_escalation_deadline' => 'TTO Eskaltionsfrist',
+	'Class:ResponseTicket/Attribute:tto_escalation_deadline+' => '',
+	'Class:ResponseTicket/Attribute:ttr_escalation_deadline' => 'TTR Eskaltionsfrist',
+	'Class:ResponseTicket/Attribute:ttr_escalation_deadline+' => '',
+	'Class:ResponseTicket/Attribute:closure_deadline' => 'Abschlussfrist',
+	'Class:ResponseTicket/Attribute:closure_deadline+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code' => 'Code für Lösung',
+	'Class:ResponseTicket/Attribute:resolution_code+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce' => 'Konnte nicht reproduziert werden',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate' => 'Duplikat eines bestehenden Tickets',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed' => 'Repariert',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant' => 'Irrelevant',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant+' => '',
+	'Class:ResponseTicket/Attribute:solution' => 'Lösung',
+	'Class:ResponseTicket/Attribute:solution+' => '',
+	'Class:ResponseTicket/Attribute:user_satisfaction' => 'Benutzerzufriedenheit',
+	'Class:ResponseTicket/Attribute:user_satisfaction+' => '',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1' => '1',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1+' => '1',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2' => '2',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2+' => '2',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3' => '3',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3+' => '3',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4' => '4',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4+' => '4',
+	'Class:ResponseTicket/Attribute:user_commment' => 'Benutzerkommentar',
+	'Class:ResponseTicket/Attribute:user_commment+' => '',
+	'Class:ResponseTicket/Stimulus:ev_assign' => 'Zuweisen',
+	'Class:ResponseTicket/Stimulus:ev_assign+' => '',
+	'Class:ResponseTicket/Stimulus:ev_reassign' => 'Neu zuweisen',
+	'Class:ResponseTicket/Stimulus:ev_reassign+' => '',
+	'Class:ResponseTicket/Stimulus:ev_timeout' => 'ev-Timeout',
+	'Class:ResponseTicket/Stimulus:ev_timeout+' => '',
+	'Class:ResponseTicket/Stimulus:ev_resolve' => 'Als gelöst markieren',
+	'Class:ResponseTicket/Stimulus:ev_resolve+' => '',
+	'Class:ResponseTicket/Stimulus:ev_close' => 'Schließen',
+	'Class:ResponseTicket/Stimulus:ev_close+' => '',
+));
+
+
+?>

modules/itop-welcome-itil/model.itop-welcome-itil.php

@@ -51,12 +51,11 @@ class ItopWelcome extends ModuleHandlerAPI
 		if (UserRights::IsAdministrator())
 		{
 			$oAdminMenu = new MenuGroup('AdminTools', 80 /* fRank */);
-			new OQLMenuNode('UserAccountsMenu', 'SELECT User', $oAdminMenu->GetIndex(), 1 /* fRank */, true /* bSearch */);
+			new OQLMenuNode('UserAccountsMenu', 'SELECT User', $oAdminMenu->GetIndex(), 1 /* fRank */);
 			new OQLMenuNode('ProfilesMenu', 'SELECT URP_Profiles', $oAdminMenu->GetIndex(), 2 /* fRank */);
 			new TemplateMenuNode('NotificationsMenu', APPROOT.'application/templates/notifications_menu.html', $oAdminMenu->GetIndex(), 3 /* fRank */);
 			new OQLMenuNode('AuditCategories', 'SELECT AuditCategory', $oAdminMenu->GetIndex(), 4 /* fRank */);
 			new WebPageMenuNode('RunQueriesMenu', utils::GetAbsoluteUrlAppRoot().'pages/run_query.php', $oAdminMenu->GetIndex(), 8 /* fRank */);
-			new OQLMenuNode('QueryMenu', 'SELECT Query', $oAdminMenu->GetIndex(), 8.5 /* fRank */);
 			new WebPageMenuNode('ExportMenu', utils::GetAbsoluteUrlAppRoot().'webservices/export.php', $oAdminMenu->GetIndex(), 9 /* fRank */);
 			new WebPageMenuNode('DataModelMenu', utils::GetAbsoluteUrlAppRoot().'pages/schema.php', $oAdminMenu->GetIndex(), 10 /* fRank */);
 			new WebPageMenuNode('UniversalSearchMenu', utils::GetAbsoluteUrlAppRoot().'pages/UniversalSearch.php', $oAdminMenu->GetIndex(), 11 /* fRank */);

navigator/iTop/Navigator.as

@@ -8,8 +8,6 @@
 	import fl.controls.Slider; 
 	import fl.events.SliderEvent; 
 	import fl.controls.Label; 
-	// For callbacks from Javascript
-	import flash.external.ExternalInterface;
 
 	// The main canvas
 	public class Navigator extends MovieClip
@@ -28,7 +26,6 @@
 		protected var m_sRelation:String;
 		protected var m_sObjClass:String;
 		protected var m_sObjId:String;
-		protected var m_sExclude:String;
 		
 		// Constants
 		protected var m_RADIUS = 150;
@@ -46,61 +43,14 @@
 		{
 			m_aLinks = new Array();
 			m_aNodes = new Array();
-			m_sExclude = '';
 			m_fZoom = 1;
-			m_oLoader = null;
 			initParameters();
-			var success = true;
-			if (ExternalInterface.available) 
-			{
-				//Security.allowDomain(loader.contentLoaderInfo.url);
-				//the addCallback registers a function to be called from javascript, and this is what you wanted to do:
-				try
-				{
-					ExternalInterface.addCallback("Filter", DoFilter);
-				}
-				catch(err)
-				{
-					m_sTitle.text = 'E: '+err.description;
-					success = false
-				}
-			}
-			
-			if (success)
-			{
-				//m_sTitle.text = 'Ok...';
-				doLoadData();
-			}
-			else
-			{
-				m_sTitle.text = 'Failed to addCallback';
-			}
-			
+			doLoadData();
 			addEventListener(Event.ENTER_FRAME, initGraphics);
 			//Stop scaling the flash content
 			stage.scaleMode = StageScaleMode.NO_SCALE;
 		}
 		
-		function Reset()
-		{
-			m_aLinks = new Array();
-			for (var i:String in m_aNodes)
-			{
-				m_oCanvas.removeChild(m_aNodes[i]);
-			}
-			m_aNodes = new Array();
-			removeEventListener(Event.ENTER_FRAME, drawLines);
-			stage.removeEventListener(MouseEvent.MOUSE_DOWN, mouseDown)  
-			stage.removeEventListener(MouseEvent.MOUSE_UP, mouseReleased);
-		}
-		
-		function DoFilter(sExcludeList:String):void
-		{
-			//do something
-			m_sExclude = sExcludeList;
-			doLoadData();
-		}
-
 		protected function initParameters():void
 		{
 			
@@ -120,8 +70,6 @@
 			m_oCanvas.scaleY = m_fZoom;
 			// Handle listeners...
 			removeEventListener(Event.ENTER_FRAME,initGraphics);
-			m_oZoomSlider.value = 100;
-			m_oZoomSlider.addEventListener(SliderEvent.CHANGE, onZoomChange);
 		}
 		function mouseDown(event:MouseEvent):void 
 		{ 
@@ -151,28 +99,21 @@
 			m_oCanvas.scaleX = m_fZoom;
 			m_oCanvas.scaleY = m_fZoom;
 		}
-		function GetZoomLevel()
+		function GetZommLevel()
 		{
 			return m_fZoom;
 		}
 		
 		function doLoadData()
 		{
-			m_sTitle.text = "Loading...";
-			m_oPreloader.visible = true;
-			m_oZoomSlider.enabled = true;
 			var sSeparator:String = '?';
 			if (m_sDataUrl.indexOf(sSeparator) != -1)
 			{
 				sSeparator = '&';
 			}
-			var myString:String = m_sDataUrl+sSeparator+'relation='+m_sRelation+'&class='+m_sObjClass+'&id='+m_sObjId+'&exclude='+m_sExclude;
+			var myString:String = m_sDataUrl+sSeparator+'relation='+m_sRelation+'&class='+m_sObjClass+'&id='+m_sObjId;
 			trace("Requesting:"+myString);
 			var myXMLURL:URLRequest = new URLRequest(myString);
-			if (m_oLoader != null)
-			{
-				m_oLoader.close();
-			}
 			m_oLoader = new URLLoader();
 			m_oLoader.addEventListener(Event.COMPLETE, onXMLLoadComplete);
 			m_oLoader.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onXMLLoadError);
@@ -184,7 +125,6 @@
 		{
 			try
 			{
-				Reset();
 				var myXML:XML = XML(m_oLoader.data);
 				//trace("Data loaded." + myXML);
 				//trace("===========================");
@@ -192,6 +132,8 @@
 				m_sTitle.text = decodeEntities(myXML.attribute("title").toString());
 				m_oZoomSlider.enabled = true;
 				addEventListener(Event.ENTER_FRAME, drawLines);
+				m_oZoomSlider.value = 100;
+				m_oZoomSlider.addEventListener(SliderEvent.CHANGE, onZoomChange);
 				stage.addEventListener(MouseEvent.MOUSE_DOWN, mouseDown)  
 				stage.addEventListener(MouseEvent.MOUSE_UP, mouseReleased);
 				//trace('======= Initial Posistions =========');
@@ -213,7 +155,8 @@
 			{
 				if (m_oPreloader != null)
 				{
-					m_oPreloader.visible = false;
+					removeChild(m_oPreloader);
+					m_oPreloader = null;
 				}
 			}
 		}
@@ -222,7 +165,8 @@
 		{
 				if (m_oPreloader != null)
 				{
-					m_oPreloader.visible = false;
+					removeChild(m_oPreloader);
+					m_oPreloader = null;
 				}
 				m_sTitle.text = "I/O Error: unable to load the graph data ("+event+")";
 		}

pages/UI.php

@@ -674,7 +674,7 @@ try
 			else
 			{
 				$oP->set_title(Dict::S('UI:SearchResultsPageTitle'));
-				$oP->p("<h1>".Dict::Format('UI:FullTextSearchTitle_Text', htmlentities($sFullText, ENT_QUOTES, 'UTF-8'))."</h1>");
+				$oP->p("<h1>".Dict::Format('UI:FullTextSearchTitle_Text', $sFullText)."</h1>");
 				$iCount = 0;
 				$iBlock = 0;
 				// Search in full text mode in all the classes
@@ -1737,13 +1737,13 @@ EOF
 								{
 									$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 									$aErrors[] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $oAttDef->GetLabel());
-									unset($aExpectedAttributes[$sAttCode]);
+								}
+								else
+								{
+									$oObj->Set($sAttCode, $paramValue);
 								}
 							}
 						}
-						
-						$oObj->UpdateObjectFromPostedForm('', array_keys($aExpectedAttributes), $sTargetState);
-						
 						if (count($aErrors) == 0)
 						{
 							if ($oObj->ApplyStimulus($sStimulus))
@@ -1980,13 +1980,13 @@ EOF
 						{
 							$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 							$aErrors[] = Dict::Format('UI:AttemptingToChangeASlaveAttribute_Name', $oAttDef->GetLabel());
-							unset($aExpectedAttributes[$sAttCode]);
 						}
+						else
+						{
+						$oObj->Set($sAttCode, $paramValue);
 					}
 				}
-				
-				$oObj->UpdateObjectFromPostedForm('', array_keys($aExpectedAttributes), $sTargetState);
-				
+				}
 				if (count($aErrors) == 0)
 				{
 					if ($oObj->ApplyStimulus($sStimulus))
@@ -2029,102 +2029,24 @@ EOF
 		$oP->AddTabContainer('Navigator');
 		$oP->SetCurrentTabContainer('Navigator');
 		$oP->SetCurrentTab(Dict::S('UI:RelationshipGraph'));
-
-		$oP->add("<div id=\"ds_flash\" class=\"SearchDrawer\">\n");
-		$oP->add_ready_script(
-<<<EOF
-	$("#dh_flash").click( function() {
-		$("#ds_flash").slideToggle('normal', function() { $("#ds_flash").parent().resize(); } );
-		$("#dh_flash").toggleClass('open');
-	});
-EOF
-		);
-		$aResults = array();
-		$aSortedElements = array();
-		$oObj = MetaModel::GetObject($sClass, $id);
-		$oObj->GetRelatedObjects($sRelation, 20 /* iMaxDepth */, $aResults);
-		foreach($aResults as $sClassIdx => $aObjects)
-		{
-			foreach($aObjects as $oCurrObj)
-			{
-				$sSubClass = get_class($oCurrObj);
-				$aSortedElements[$sSubClass] = MetaModel::GetName($sSubClass);
-			}
-		}
-		
-		asort($aSortedElements);
-		$idx = 0;
-		foreach($aSortedElements as $sSubClass => $sClassName)
-		{
-			$oP->add("<span style=\"padding-right:2em; white-space:nowrap;\"><input type=\"checkbox\" id=\"exclude_$idx\" name=\"excluded[]\" value=\"$sSubClass\" checked onChange=\"$('#ReloadMovieBtn').button('enable')\"><label for=\"exclude_$idx\">&nbsp;".MetaModel::GetClassIcon($sSubClass)."&nbsp;$sClassName</label></span> ");
-			$idx++;	
-		}
-		$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"DoReload()\">".Dict::S('UI:Button:Refresh')."</button></p>");
-		$oP->add("</div>\n");
- 		$oP->add("<div class=\"HRDrawer\"></div>\n");
- 		$oP->add("<div id=\"dh_flash\" class=\"DrawerHandle\">".Dict::S('UI:ElementsDisplayed')."</div>\n");
-		
 		$width = 1000;
 		$height = 700;
 		$sDrillUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details&'.$oAppContext->GetForLink();
 		$sParams = "pWidth=$width&pHeight=$height&drillUrl=".urlencode($sDrillUrl)."&displayController=false&xmlUrl=".urlencode("./xml.navigator.php")."&obj_class=$sClass&obj_id=$id&relation=$sRelation";
 		
-		$oP->add("<div style=\"z-index:1;background:white;width:100%;height:{$height}px\"><object style=\"z-index:2\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0\" width=\"100%\" height=\"$height\" id=\"navigator\" align=\"middle\">
-		<param name=\"allowScriptAccess\" value=\"always\" />
+		$oP->add("<div style=\"z-index:1;background:white\"><object style=\"z-index:2\" classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0\" width=\"$width\" height=\"$height\" id=\"navigator\" align=\"middle\">
+		<param name=\"allowScriptAccess\" value=\"sameDomain\" />
 		<param name=\"allowFullScreen\" value=\"false\" />
 		<param name=\"FlashVars\" value=\"$sParams\" />
 		<param name=\"wmode\" value=\"transparent\"> 
 		<param name=\"movie\" value=\"../navigator/navigator.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"bgcolor\" value=\"#ffffff\" />
-		<embed src=\"../navigator/navigator.swf\" wmode=\"transparent\" flashVars=\"$sParams\" quality=\"high\" bgcolor=\"#ffffff\" width=\"100%\" height=\"$height\" name=\"navigator\" align=\"middle\" swliveconnect=\"true\" allowScriptAccess=\"always\" allowFullScreen=\"false\" type=\"application/x-shockwave-flash\" pluginspage=\"http://www.adobe.com/go/getflashplayer\" />
+		<embed src=\"../navigator/navigator.swf\" wmode=\"transparent\" flashVars=\"$sParams\" quality=\"high\" bgcolor=\"#ffffff\" width=\"$width\" height=\"$height\" name=\"navigator\" align=\"middle\" allowScriptAccess=\"sameDomain\" allowFullScreen=\"false\" type=\"application/x-shockwave-flash\" pluginspage=\"http://www.adobe.com/go/getflashplayer\" />
 		</object></div>\n");
 		$oP->SetCurrentTab(Dict::S('UI:RelationshipList'));
 		$oP->add("<div id=\"impacted_objects\" style=\"width:100%;background-color:#fff;padding:10px;\"><p style=\"height:150px;\">&nbsp;</p></div>");
-		$oP->add_script(
-<<<EOF
-function getFlashMovieObject(movieName)
-{
-  if (window.document[movieName]) 
-  {
-      return window.document[movieName];
-  }
-  if (navigator.appName.indexOf("Microsoft Internet")==-1)
-  {
-    if (document.embeds && document.embeds[movieName])
-      return document.embeds[movieName]; 
-  }
-  else // if (navigator.appName.indexOf("Microsoft Internet")!=-1)
-  {
-    return document.getElementById(movieName);
-  }
-}
-
-	function DoReload()
-	{
-		var oMovie = getFlashMovieObject('navigator');
-		try
-		{
-			var aExcluded = [];
-			$('input[name^=excluded]').each( function() {
-				if (!$(this).attr('checked'))
-				{
-					aExcluded.push($(this).val());
-				}
-			} );
-			oMovie.Filter(aExcluded.join(','));
-		//oMovie.SetVariable("/:message", "foo");
-		}
-		catch(err)
-		{
-			alert(err);
-		}
-	}
-EOF
-);
 		$oP->add_ready_script(
 <<<EOF
 	var ajax_request = null;
-
-	$('#ReloadMovieBtn').button().button('disable');
 	
 	function UpdateImpactedObjects(sClass, iId, sRelation)
 	{
@@ -2263,4 +2185,4 @@ catch(Exception $e)
 		IssueLog::Error($e->getMessage());
 	}
 }
-?>
+?>

pages/ajax.csvimport.php

@@ -347,7 +347,6 @@ try
 			$aMoreReconciliationKeys = array(); // Store: key => void to automatically remove duplicates
 			foreach($aReconciliationKeys as $sAttCode)
 			{
-				if (!MetaModel::IsValidAttCode($sClassName, $sAttCode)) continue;
 				$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
 				if ($oAttDef->IsExternalKey())
 				{
@@ -404,7 +403,7 @@ EOF
 		}
 		else
 		{
-			$oPage = new ajax_page("Class $sClassName is not a valid class !");
+			$oPage = new ajax_page("");
 		}
 		break;
 	}

pages/ajax.render.php

@@ -73,6 +73,7 @@ try
 		$sSelectMode = utils::ReadParam('select_mode', '');
 		$bDisplayKey = utils::ReadParam('display_key', 'true') == 'true';
 		$aList = utils::ReadParam('display_list', array());
+
 		$sClassName = $oFilter->GetClass();
 		//$aList = cmdbAbstractObject::FlattenZList(MetaModel::GetZListItems($sClassName, 'list'));
 
@@ -168,28 +169,6 @@ try
 		}
 		break;
 		
-		// ui.linkswidget
-		case 'addObjects':
-		$oPage->SetContentType('text/html');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$iInputId = utils::ReadParam('iInputId', '');
-		$sSuffix = utils::ReadParam('sSuffix', '');
-		$bDuplicates = (utils::ReadParam('bDuplicates', 'false') == 'false') ? false : true;
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget = new UILinksWidget($sClass, $sAttCode, $iInputId, $sSuffix, $bDuplicates);
-		$oWidget->GetObjectPickerDialog($oPage, $oObj);	
-		break;
-		
 		// ui.linkswidget
 		case 'searchObjectsToAdd':
 		$oPage->SetContentType('text/html');
@@ -213,8 +192,6 @@ try
 		$sRemoteClass = utils::ReadParam('sRemoteClass', '', false, 'class');
 		$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
 		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
 		if (!empty($sJson))
 		{
 			$oWizardHelper = WizardHelper::FromJSON($sJson);
@@ -225,7 +202,7 @@ try
 			// Search form: no current object
 			$oObj = null;
 		}
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
 		$oWidget->SearchObjectsToSelect($oPage, $sFilter, $sRemoteClass, $oObj);	
 		break;
 	
@@ -236,22 +213,18 @@ try
 		$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
 		$sJson = utils::ReadParam('json', '', false, 'raw_data');
 		$sContains = utils::ReadParam('q', '', false, 'raw_data');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		if ($sContains !='')
+		if (!empty($sJson))
 		{
-			if (!empty($sJson))
-			{
-				$oWizardHelper = WizardHelper::FromJSON($sJson);
-				$oObj = $oWizardHelper->GetTargetObject();
-			}
-			else
-			{
-				// Search form: no current object
-				$oObj = null;
-			}
-			$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
-			$oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains);
+			$oWizardHelper = WizardHelper::FromJSON($sJson);
+			$oObj = $oWizardHelper->GetTargetObject();
 		}
+		else
+		{
+			// Search form: no current object
+			$oObj = null;
+		}
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
+		$oWidget->AutoComplete($oPage, $sFilter, $oObj, $sContains);
 		break;
 	
 		// ui.extkeywidget
@@ -260,41 +233,16 @@ try
 		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 		$iInputId = utils::ReadParam('iInputId', '');
 		$sTitle = utils::ReadParam('sTitle', '', false, 'raw_data');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, $bSearchMode);
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget->GetSearchDialog($oPage, $sTitle, $oObj);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
+		$oWidget->GetSearchDialog($oPage, $sTitle);
 		break;
 
 		// ui.extkeywidget
 		case 'objectCreationForm':
 		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 		$iInputId = utils::ReadParam('iInputId', '');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
-		$sJson = utils::ReadParam('json', '', false, 'raw_data');
-		if (!empty($sJson))
-		{
-			$oWizardHelper = WizardHelper::FromJSON($sJson);
-			$oObj = $oWizardHelper->GetTargetObject();
-		}
-		else
-		{
-			// Search form: no current object
-			$oObj = null;
-		}
-		$oWidget->GetObjectCreationForm($oPage, $oObj);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
+		$oWidget->GetObjectCreationForm($oPage);
 		break;
 		
 		// ui.extkeywidget
@@ -302,8 +250,7 @@ try
 		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 		$iInputId = utils::ReadParam('iInputId', '');
 		$sFormPrefix = utils::ReadParam('sFormPrefix', '');
-		$sAttCode = utils::ReadParam('sAttCode', '');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, $sAttCode, false);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
 		$aResult = $oWidget->DoCreateObject($oPage);
 		echo json_encode($aResult);
 		break;
@@ -313,8 +260,7 @@ try
 		$sTargetClass = utils::ReadParam('sTargetClass', '', false, 'class');
 		$iInputId = utils::ReadParam('iInputId', '');
 		$iObjectId = utils::ReadParam('iObjectId', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
-		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId, '', $bSearchMode);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $iInputId);
 		$sName = $oWidget->GetObjectName($iObjectId);
 		echo json_encode(array('name' => $sName));	
 		break;
@@ -327,7 +273,6 @@ try
 		$sFilter = utils::ReadParam('sFilter', '', false, 'raw_data');
 		$sJson = utils::ReadParam('json', '', false, 'raw_data');
 		$currValue = utils::ReadParam('value', '');
-		$bSearchMode = (utils::ReadParam('bSearchMode', 'false') == 'true');
 		if (!empty($sJson))
 		{
 			$oWizardHelper = WizardHelper::FromJSON($sJson);
@@ -338,7 +283,7 @@ try
 			// Search form: no current object
 			$oObj = null;
 		}
-		$oWidget = new UIExtKeyWidget($sTargetClass, $sInputId, '', $bSearchMode);
+		$oWidget = new UIExtKeyWidget($sTargetClass, $sInputId);
 		$oWidget->DisplayHierarchy($oPage, $sFilter, $currValue, $oObj);
 		break;
 		
@@ -450,18 +395,6 @@ try
 			{
 				$aExtraParams = json_decode(str_replace("'", '"', $sExtraParams), true /* associative array */);
 			}
-			// Restore the app context from the ExtraParams
-			$oAppContext = new ApplicationContext(false); // false => don't read the context yet !
-			$aContext = array();
-			foreach($oAppContext->GetNames() as $sName)
-			{
-				$sParamName = 'c['.$sName.']';
-				if (isset($aExtraParams[$sParamName]))
-				{
-					$aContext[$sName] = $aExtraParams[$sParamName];
-				}
-			}
-			$_REQUEST['c'] = $aContext;
 			if ($sEncoding == 'oql')
 			{
 				$oFilter = CMDBSearchFilter::FromOQL($sFilter);
@@ -527,7 +460,7 @@ try
 		$oPage->add_header("Pragma: public");
 
 		$oPage->SetContentType('application/json');
-		$aParams = utils::ReadParam('params', array(), false, 'raw_data');
+		$aParams = utils::ReadParam('params', array());
 		if ($sFilter != '')
 		{
 			$oFilter = CMDBSearchFilter::unserialize($sFilter);
@@ -627,7 +560,7 @@ try
 		// Let's take this opportunity to inform the plug-ins so that they can perform some cleanup
 		$iTransactionId = utils::ReadParam('transaction_id', 0);
 		$sTempId = session_id().'_'.$iTransactionId;
-		foreach (MetaModel::EnumPlugins('iApplicationUIExtension') as $oExtensionInstance)
+		foreach (MetaModel::EnumPlugins('iApplicationObjectExtension') as $oExtensionInstance)
 		{
 			$oExtensionInstance->OnFormCancel($sTempId);
 		}

pages/audit.php

@@ -83,7 +83,7 @@ function FilterByContext(DBObjectSearch &$oFilter, ApplicationContext $oAppConte
 	}
 }
 
-function GetRuleResultFilter($iRuleId, $oDefinitionFilter, $oAppContext)
+function GetRuleResultSet($iRuleId, $oDefinitionFilter, $oAppContext)
 {
 	$oRule = MetaModel::GetObject('AuditRule', $iRuleId);
 	$sOql = $oRule->Get('query');
@@ -95,36 +95,23 @@ function GetRuleResultFilter($iRuleId, $oDefinitionFilter, $oAppContext)
 		// The query returns directly the invalid elements
 		$oFilter = $oRuleFilter; 
 		$oFilter->MergeWith($oDefinitionFilter);
+		$oErrorObjectSet = new CMDBObjectSet($oFilter);
 	}
 	else
 	{
 		// The query returns only the valid elements, all the others are invalid
-		$aValidRows = $oRuleFilter->ToDataArray(array('id'));
-		$aValidIds = array();
-		foreach($aValidRows as $aRow)
+		$oFilter = $oRuleFilter; 
+		$oErrorObjectSet = new CMDBObjectSet($oFilter);
+		$aValidIds = array(0); // Make sure that we have at least one value in the list
+		while($oObj = $oErrorObjectSet->Fetch())
 		{
-			$aValidIds[] = $aRow['id'];
+			$aValidIds[] = $oObj->GetKey(); 
 		}
 		$oFilter = clone $oDefinitionFilter;
-		if (count($aValidIds) > 0)
-		{
-			$aInDefSet = array();
-			foreach($oDefinitionFilter->ToDataArray(array('id')) as $aRow)
-			{
-				$aInDefSet[] = $aRow['id'];
-			}
-			$aInvalids = array_diff($aInDefSet, $aValidIds);
-			if (count($aInvalids) > 0)
-			{
-				$oFilter->AddCondition('id', $aInvalids, 'IN');
-			}
-			else
-			{
-				$oFilter->AddCondition('id', 0, '=');
-			}
-		}
+		$oFilter->AddCondition('id', $aValidIds, 'NOTIN');
+		$oErrorObjectSet = new CMDBObjectSet($oFilter);
 	}
-	return $oFilter;
+	return $oErrorObjectSet;
 }
 
 function GetReportColor($iTotal, $iErrors)
@@ -166,8 +153,7 @@ try
 		$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
 		FilterByContext($oDefinitionFilter, $oAppContext);
 		$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
-		$oFilter = GetRuleResultFilter($iRuleIndex, $oDefinitionFilter, $oAppContext);
-		$oErrorObjectSet = new CMDBObjectSet($oFilter);
+		$oErrorObjectSet = GetRuleResultSet($iRuleIndex, $oDefinitionFilter, $oAppContext);
 		$oAuditRule = MetaModel::GetObject('AuditRule', $iRuleIndex);
 		$oP->add('<div class="page_header"><h1>Audit Errors: <span class="hilite">'.$oAuditRule->Get('description').'</span></h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/stop.png"/></div>');
 		$oP->p('<a href="./audit.php?'.$oAppContext->GetForLink().'">[Back to audit results]</a>');
@@ -225,12 +211,12 @@ try
 					{
 						try
 						{
-							$oFilter = GetRuleResultFilter($oAuditRule->GetKey(), $oDefinitionFilter, $oAppContext);
-							$aErrors = $oFilter->ToDataArray(array('id'));
-							$iErrorsCount = count($aErrors);
-							foreach($aErrors as $aErrorRow)
+							$oRuleFilter = DBObjectSearch::FromOQL($oAuditRule->Get('query'));
+							$oErrorObjectSet = GetRuleResultSet($oAuditRule->GetKey(), $oDefinitionFilter, $oAppContext);
+							$iErrorsCount = $oErrorObjectSet->Count();
+							while($oObj = $oErrorObjectSet->Fetch())
 							{
-								$aObjectsWithErrors[$aErrorRow['id']] = true;
+								$aObjectsWithErrors[$oObj->GetKey()] = true;
 							}
 							$aRow['nb_errors'] = ($iErrorsCount == 0) ? '0' : "<a href=\"?operation=errors&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."&".$oAppContext->GetForLink()."\">$iErrorsCount</a>"; 
 							$aRow['percent_ok'] = sprintf('%.2f', 100.0 * (($iCount - $iErrorsCount) / $iCount));
@@ -243,7 +229,7 @@ try
 							$aRow['class'] = 'red';
 							$sMessage = Dict::Format('UI:Audit:ErrorIn_Rule_Reason', $oAuditRule->GetHyperlink(), $e->getMessage());
 							$oP->p("<img style=\"vertical-align:middle\" src=\"../images/stop-mid.png\"/>&nbsp;".$sMessage);
-						}
+													}
 					}
 					$aResults[] = $aRow;
 					$iTotalErrors = count($aObjectsWithErrors);
@@ -277,6 +263,7 @@ try
 		$oP->add("</td></tr>\n");
 		$oP->add("</table>\n");
 	}
+		
 	$oP->output();
 }
 catch(CoreException $e)

pages/csvimport.php

@@ -304,9 +304,6 @@ try
 			$sUserString .= ' (CSV)';
 			$oMyChange->Set("userinfo", $sUserString);
 			$iChangeId = $oMyChange->DBInsert();		
-
-			// Todo - simplify that when reworking the change tracking
-			CMDBObject::SetCurrentChange($oMyChange);
 		}
 	
 		$oBulk = new BulkChange(
@@ -1405,18 +1402,14 @@ $('#select_template_class').change( function() {
 EOF
 	);
 
-		if (MetaModel::GetConfig()->Get('csv_import_history_display'))
-		{
 		$oPage->SetCurrentTabContainer('tabs1');
 		$oPage->SetCurrentTab(Dict::S('UI:History:BulkImports'));
 		BulkChange::DisplayImportHistory($oPage);
-		}
 	}
 			
 	switch($iStep)
 	{
 		case 10:
-			// Case generated by BulkChange::DisplayImportHistory
 			$iChange = (int)utils::ReadParam('changeid', 0);
 			BulkChange::DisplayImportHistoryDetails($oPage, $iChange);
 			break;

pages/run_query.php

@@ -120,81 +120,35 @@ try
 		// leave $sExpression as is
 	}
 
-	$oFilter = null;
-	$aArgs = array();
-	$sSyntaxError = null;
-
-	if (!empty($sExpression))
-	{
-		try
-		{
-			$oFilter = DBObjectSearch::FromOQL($sExpression);
-		}
-		catch(OqlException $e)
-		{
-			$sSyntaxError = $e->getHtmlDesc();
-		}
-		
-		if ($oFilter)
-		{
-			$aArgs = array();
-			foreach($oFilter->GetQueryParams() as $sParam => $foo)
-			{
-				$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
-				if (!is_null($value))
-				{
-					$aArgs[$sParam] = $value;
-				}
-				else
-				{
-					$aArgs[$sParam] = '';
-				}
-			}
-			$oFilter->SetInternalParams($aArgs);
-		}
-		elseif ($sSyntaxError)
-		{
-			// Query arguments taken from the page args
-		}
-	}
-
 	$oP->add("<form method=\"get\">\n");
 	$oP->add(Dict::S('UI:RunQuery:ExpressionToEvaluate')."<br/>\n");
-	$oP->add("<textarea cols=\"120\" rows=\"8\" name=\"expression\">".htmlentities($sExpression, ENT_QUOTES, 'UTF-8')."</textarea>\n");
-
-	if (count($aArgs) > 0)
-	{
-		$oP->add("<div class=\"wizContainer\">\n");
-		$oP->add("<h3>Query arguments</h3>\n");
-		foreach($aArgs as $sParam => $sValue)
-		{
-			$oP->p("$sParam: <input type=\"string\" name=\"arg_$sParam\" value=\"$sValue\">\n");
-		}
-		$oP->add("</div>\n"); 
-	}
-
+	$oP->add("<textarea cols=\"120\" rows=\"8\" name=\"expression\">$sExpression</textarea>\n");
 	$oP->add("<input type=\"submit\" value=\"".Dict::S('UI:Button:Evaluate')."\">\n");
 	$oP->add($oAppContext->GetForForm());
 	$oP->add("</form>\n");
 
-	if ($oFilter)
+	if (!empty($sExpression))
 	{
-		$oP->add("<h3>Query results</h3>\n");
-		
-		$oResultBlock = new DisplayBlock($oFilter, 'list', false);
-		$oResultBlock->Display($oP, 'runquery');
+		$oFilter = DBObjectSearch::FromOQL($sExpression);
+		if ($oFilter)
+		{
+			$oP->add("<h3>Query results</h3>\n");
+			
+			$oResultBlock = new DisplayBlock($oFilter, 'list', false);
+			$oResultBlock->Display($oP, 'runquery');
 
-		$oP->p('');
-		$oP->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false);
-		$oP->p(Dict::S('UI:RunQuery:DevelopedQuery').htmlentities($oFilter->ToOQL(), ENT_QUOTES, 'UTF-8'));
-		$oP->p(Dict::S('UI:RunQuery:SerializedFilter').$oFilter->serialize());
-		$oP->EndCollapsibleSection();
-	}
-	elseif ($sSyntaxError)
-	{
-		$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
+			$oP->p('');
+			$oP->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false);
+			$oP->p(Dict::S('UI:RunQuery:DevelopedQuery').$oFilter->ToOQL());
+			$oP->p(Dict::S('UI:RunQuery:SerializedFilter').$oFilter->serialize());
+			$oP->EndCollapsibleSection();
+		}
 	}
 }
+catch(CoreException $e)
+{
+	$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
+}
 catch(Exception $e)
 {
 	$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');

pages/schema.php

@@ -385,10 +385,6 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
 		{
 		   $sValue = Dict::Format('UI:Schema:ExternalKey_To',MakeClassHLink($oAttDef->GetTargetClass(), $sContext));
 		}
-		elseif ($oAttDef->IsLinkSet())
-		{
-			$sValue = MakeClassHLink($oAttDef->GetLinkedClass(), $sContext);
-		}
 		else
 		{
 		   $sValue = $oAttDef->GetDescription();

pages/xml.navigator.php

@@ -59,10 +59,9 @@ function AddNodeDetails(&$oNode, $oObj)
  * @param DBObject $oObj The current object
  * @param string $sRelation The name of the relation to search with
  */
-function GetRelatedObjectsAsXml(DBObject $oObj, $sRelationName, &$oLinks, &$oXmlDoc, &$oXmlNode, $iDepth = 0, $aExcludedClasses)
+function GetRelatedObjectsAsXml(DBObject $oObj, $sRelationName, &$oLinks, &$oXmlDoc, &$oXmlNode, $iDepth = 0)
 {
 	$aResults = array();
-	$bAddLinks = false;
 	$oObj->GetRelatedObjects($sRelationName, 1 /* iMaxDepth */, $aResults);
 	if ($iDepth > MAX_RECURSION_DEPTH) return;
 	
@@ -72,33 +71,25 @@ function GetRelatedObjectsAsXml(DBObject $oObj, $sRelationName, &$oLinks, &$oXml
 		{
 			if (is_object($oTargetObj))
 			{
-				if (in_array(get_class($oTargetObj), $aExcludedClasses))
-				{
-					GetRelatedObjectsAsXml($oTargetObj, $sRelationName, $oLinks, $oXmlDoc, $oXmlNode, $iDepth++, $aExcludedClasses);
-				}
-				else
-				{
-					$oLinkingNode =   $oXmlDoc->CreateElement('link');
-					$oLinkingNode->SetAttribute('relation', $sRelationName);
-					$oLinkingNode->SetAttribute('arrow', 1); // Such relations have a direction, display an arrow
-					$oLinkedNode = $oXmlDoc->CreateElement('node');
-					$oLinkedNode->SetAttribute('id', $oTargetObj->GetKey());
-					$oLinkedNode->SetAttribute('obj_class', get_class($oTargetObj));
-					$oLinkedNode->SetAttribute('obj_class_name', htmlspecialchars(MetaModel::GetName(get_class($oTargetObj))));
-					$oLinkedNode->SetAttribute('name', htmlspecialchars($oTargetObj->GetRawName())); // htmlentities is too much for XML
-					$oLinkedNode->SetAttribute('icon', BuildIconPath($oTargetObj->GetIcon(false /* No IMG tag */)));
-					AddNodeDetails($oLinkedNode, $oTargetObj);
-					$oSubLinks = $oXmlDoc->CreateElement('links');
-					// Recurse
-					GetRelatedObjectsAsXml($oTargetObj, $sRelationName, $oSubLinks, $oXmlDoc, $oLinkedNode, $iDepth++, $aExcludedClasses);
-					$oLinkingNode->AppendChild($oLinkedNode);
-					$oLinks->AppendChild($oLinkingNode);
-					$bAddLinks = true;
-				}
+				$oLinkingNode =   $oXmlDoc->CreateElement('link');
+				$oLinkingNode->SetAttribute('relation', $sRelationName);
+				$oLinkingNode->SetAttribute('arrow', 1); // Such relations have a direction, display an arrow
+				$oLinkedNode = $oXmlDoc->CreateElement('node');
+				$oLinkedNode->SetAttribute('id', $oTargetObj->GetKey());
+				$oLinkedNode->SetAttribute('obj_class', get_class($oTargetObj));
+				$oLinkedNode->SetAttribute('obj_class_name', htmlspecialchars(MetaModel::GetName(get_class($oTargetObj))));
+				$oLinkedNode->SetAttribute('name', htmlspecialchars($oTargetObj->GetRawName())); // htmlentities is too much for XML
+				$oLinkedNode->SetAttribute('icon', BuildIconPath($oTargetObj->GetIcon(false /* No IMG tag */)));
+				AddNodeDetails($oLinkedNode, $oTargetObj);
+				$oSubLinks = $oXmlDoc->CreateElement('links');
+				// Recurse
+				GetRelatedObjectsAsXml($oTargetObj, $sRelationName, $oSubLinks, $oXmlDoc, $oLinkedNode, $iDepth++);
+				$oLinkingNode->AppendChild($oLinkedNode);
+				$oLinks->AppendChild($oLinkingNode);
 			}
 		}
 	}
-	if ($bAddLinks)
+	if (count($aResults) > 0)
 	{
 		$oXmlNode->AppendChild($oLinks);
 	}
@@ -126,9 +117,6 @@ $id = utils::ReadParam('id', 1);
 $sRelation = utils::ReadParam('relation', 'impacts');
 $aValidRelations = MetaModel::EnumRelations();
 $sFormat = utils::ReadParam('format', 'xml');
-$sExcludedClasses = utils::ReadParam('exclude', '', false, 'raw_data');
-$aExcludedClasses = explode(',', $sExcludedClasses);
-
 
 if (!in_array($sRelation, $aValidRelations))
 {
@@ -179,7 +167,7 @@ try
 		
 			$oXmlRoot->SetAttribute('position', 'left');
 			$oXmlRoot->SetAttribute('title', MetaModel::GetRelationDescription($sRelation).' '. htmlspecialchars($oObj->GetRawName()));
-			GetRelatedObjectsAsXml($oObj, $sRelation, $oLinks, $oXmlDoc, $oXmlNode, 0, $aExcludedClasses);
+			GetRelatedObjectsAsXml($oObj, $sRelation, $oLinks, $oXmlDoc, $oXmlNode);
 			
 			$oXmlRoot->AppendChild($oXmlNode);
 			$oXmlDoc->AppendChild($oXmlRoot);

portal/index.php

@@ -122,8 +122,8 @@ function SelectService($oP, $oUserOrg)
 		{
 			$sChecked = "checked";
 		}
-		$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"svc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"svc_$id\">".$oService->GetName()."</label></b></p>");
-		$oP->p("<p>".$oService->Get('description')."</p></td></tr>");		
+		$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"svc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"svc_$id\">".htmlentities($oService->GetName(), ENT_QUOTES, 'UTF-8')."</label></b></p>");
+		$oP->p("<p>".htmlentities($oService->Get('description'), ENT_QUOTES, 'UTF-8')."</p></td></tr>");		
 	}
 	$oP->add("</table>\n");	
 	DumpHiddenParams($oP, array('service_id'), $aParameters);
@@ -163,7 +163,7 @@ function SelectSubService($oP, $oUserOrg)
 	if (is_object($oService))
 	{
 		$oP->add("<div class=\"wizContainer\" id=\"form_select_servicesubcategory\">\n");
-		$oP->add("<h1 id=\"select_subcategory\">".Dict::Format('Portal:SelectSubcategoryFrom_Service', $oService->GetName())."</h1>\n");
+		$oP->add("<h1 id=\"select_subcategory\">".Dict::Format('Portal:SelectSubcategoryFrom_Service', htmlentities($oService->GetName(), ENT_QUOTES, 'UTF-8'))."</h1>\n");
 		$oP->add("<form id=\"request_form\" method=\"get\">\n");
 		$oP->add("<table>\n");
 		while($oSubService = $oSet->Fetch())
@@ -174,8 +174,8 @@ function SelectSubService($oP, $oUserOrg)
 			{
 				$sChecked = "checked";
 			}
-			$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_servicesubcategory_id\" $sChecked type=\"radio\" id=\"subsvc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"subsvc_$id\">".$oSubService->GetName()."</label></b></p>");
-			$oP->p("<p>".$oSubService->Get('description')."</p></td></tr>");
+			$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_servicesubcategory_id\" $sChecked type=\"radio\" id=\"subsvc_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"subsvc_$id\">".htmlentities($oSubService->GetName(), ENT_QUOTES, 'UTF-8')."</label></b></p>");
+			$oP->p("<p>".htmlentities($oSubService->Get('description'), ENT_QUOTES, 'UTF-8')."</p></td></tr>");
 		}
 		$sMessage = Dict::S('Portal:PleaseSelectAServiceSubCategory');
 		$oP->add_ready_script(
@@ -220,9 +220,9 @@ function RequestCreationForm($oP, $oUserOrg)
 		$oRequest->Set('servicesubcategory_id', $aParameters['servicesubcategory_id']);
 		
 		$oAttDef = MetaModel::GetAttributeDef('UserRequest', 'service_id');
-		$aDetails[] = array('label' => '<span>'.$oAttDef->GetLabel().'</span>', 'value' => $oService->GetName());
+		$aDetails[] = array('label' => '<span>'.$oAttDef->GetLabel().'</span>', 'value' => htmlentities($oService->GetName(), ENT_QUOTES, 'UTF-8'));
 		$oAttDef = MetaModel::GetAttributeDef('UserRequest', 'servicesubcategory_id');
-		$aDetails[] = array('label' => '<span>'.$oAttDef->GetLabel().'</span>', 'value' => $oSubService->GetName());
+		$aDetails[] = array('label' => '<span>'.$oAttDef->GetLabel().'</span>', 'value' => htmlentities($oSubService->GetName(), ENT_QUOTES, 'UTF-8'));
 		$iFlags = 0;
 		foreach($aList as $sAttCode)
 		{
@@ -245,9 +245,8 @@ function RequestCreationForm($oP, $oUserOrg)
 			}
 			$aArgs = array('this' => $oRequest);
 				
-			$sInputId = 'attr_'.$sAttCode;
-			$aFieldsMap[$sAttCode] = $sInputId;
-			$sValue = "<span id=\"field_{$sInputId}\">".$oRequest->GetFormElementForField($oP, get_class($oRequest), $sAttCode, $oAttDef, $value, '', 'attr_'.$sAttCode, '', $iFlags, $aArgs).'</span>';
+			$aFieldsMap[$sAttCode] = 'attr_'.$sAttCode;
+			$sValue = $oRequest->GetFormElementForField($oP, get_class($oRequest), $sAttCode, $oAttDef, $value, '', 'attr_'.$sAttCode, '', $iFlags, $aArgs);
 			$aDetails[] = array('label' => '<span>'.$oAttDef->GetLabel().'</span>', 'value' => $sValue);
 		}
 		if (!class_exists('AttachmentPlugIn'))
@@ -290,7 +289,7 @@ function RequestCreationForm($oP, $oUserOrg)
 		$oP->add("</div>\n");
 		$iFieldsCount = count($aFieldsMap);
 		$sJsonFieldsMap = json_encode($aFieldsMap);
-		$oP->add_script(
+		$oP->add_ready_script(
 <<<EOF
 		// Create the object once at the beginning of the page... no state specified => new
 		var oWizardHelper = new WizardHelper('UserRequest', '');

readme.txt

@@ -1,4 +1,4 @@
-iTop - version 1.2.1 - 01-Feb-2012
+iTop - version 1.2.0 - 14-Sep-2011
 Readme file
 
 1.   ABOUT THIS RELEASE
@@ -7,14 +7,14 @@ Readme file
 2.2. Install procedure
 2.3. Migration from previous version
 3.   FEATURES
-3.1. Changes since 1.2
+3.1. Changes since 1.1
 3.2. Known limitations
 3.3. Known issues
 
 1. ABOUT THIS RELEASE
    ==================
-Thank you for downloading the eleventh packaged release of iTop.
-This version is mostly a maintenance release that fixes a few bugs of iTop 1.2.
+Thank you for downloading the tenth packaged release of iTop.
+This version comes with a few new features and bug fixes.
 
 A wiki is available: https://sourceforge.net/apps/mediawiki/itop/index.php?title=ITop_Documentation
 Additional documentation can be downloaded from there:
@@ -30,32 +30,21 @@ The source code of iTop can be found on SourceForge: http://itop.sourceforge.net
 
 1.1 What's new?
     ---------------------------
-This version mostly consists in bug fixes for iTop 1.2, however there are a few new features:
+- Japanese localization is now part of iTop
+- Paginated display: when a list contains lots of data it is displayed page per page
+- Quite a few performance improvements to make iTop behave properly with huge data sets
+- Hierarchical keys: parent/child relationships can now be described using a special type of key,
+  and then queried efficiently in the database (Used by Organization, Location and Group)
+- CAS authentication: iTop now supports single-sign-on with JA-SIG CAS
 
-- Better display of the impact analysis view: Allows to filter the classes of objects displayed in the
-  graphical view. The view now resizes to fit the window of your browser.
-
-- Query phrase book: create, test and store your OQL queries in the "Query Phrasebook" for an easy export
-  via the "Export" menu, without the limitation of the URL length in Excel web queries ! A new export format
-  "spreadsheet" has been added, specifically for running as Excel web queries (dates are split between date and time)
-
-- Enhanced data synchronization:
-  - For performing huge synchronizations with little memory (despite PHP's memory leaks), the execution of the data
-    synchronization (in CLI mode only) can be run by chunk of x elements by specifying --max_chunk_size=x on the
-    command line to synchro_import.php or synchro_exec.php. Try to set this value to 1000 to run with 128 MB of memory.
-    As of now, there is no easy mean to check wether the execution has been split or not, and to evaluate the real benefit of this feature.
-	 To do this, you will have to look into the database, in table priv_sync_log. The column memory_usage_peak gives you the maximum amount of memory used throughout the whole execution.  
-  - When an (optional) external key cannot be reconciled, log a warning on the replica. the replicas containing a
-    warning are then processed everytime in case the ext key changes.
-  - Also improved the search/display of replicas for an easier troubleshooting of the synchronization.
-
-
-1.2 Should I upgrade to 1.2.1?
+1.2 Should I upgrade to 1.2.0?
     ---------------------------
-Considering that there more than 30 bug fixes and very few new features, it's probably quite safe to upgrade to
-this new version. If you are using the data synchronization with big sets of data, you can benefit from the new
-"chunk" mode by just adding a parameter to the command line !
-The interactive audit is now faster and uses less memory when processing big numbers of elements.
+- If you are manipulating big sets of data (several thousands of objects in one go)
+- If you care about organizations or locations hierarchy
+- If you speak/read Japanese
+- If you already use JA-SIG CAS (www.jasig.org/cas) for example with a Liferay portal
+
+then you'll benefit from iTop 1.2 and it's probably worth upgrading.
 
 
 1.3 Special Thanks To:
@@ -67,7 +56,7 @@ Christian Lempereur and Olivier Fouquet for their feedbacks.
 Everaldo Coelho and the Oxygen Team for their wonderful icons.
 The JQuery team and the all the jQuery plugins authors for developing such a powerful library.
 Phil Eddies for the numerous feedbacks provided, and the first implementation of CKEdit
-Marco Túlio and Bruno Cassaro for the Portuguese (Brazilian) translation
+Marco Tulio and Bruno Cassaro for the Portuguese (Brazilian) translation
 Vladimir Shilov for the Russian translation
 Izzet Sirin for the Turkish translation
 Deng Lixin for the Chinese translation
@@ -78,7 +67,6 @@ Tadashi Kaneda for the Japanese translation
 Antoine Coetsier for the CAS support and tests
 Vincenzo Todisco for his contribution to the enhancement of the webservices
 Tobias Glemser and Sabri Saleh for their consulting about iTop security
-Claudio Cesar Sanchez Tejeda for his contribution to bug fixes on the export and data synchronization
 
 2. INSTALLATION
    ============
@@ -123,8 +111,8 @@ The following features will require the activation of CRON.PHP:
 
 More information into the Wiki: https://sourceforge.net/apps/mediawiki/itop/index.php?title=Cron.php
 
-2.4. Migrating from 1.0, 1.0.1, 1.0.2, 1.1 or 1.2
-     --------------------------------------------
+2.4. Migrating from 1.0, 1.0.1, 1.0.2 or 1.1
+     ---------------------------------------
 You can simply overwrite the files from the previous version with the new ones but we recommend that you copy the files of the new version to new directory.
 After installing the files, you MUST run the setup by
 1) Marking the file config-itop.php as read-write for the web server
@@ -152,102 +140,135 @@ Please refer to the migration guide available at http://www.combodo.com/itopdocu
 3. FEATURES
    ========
 
-3.1. Changes since 1.2
+3.1. Changes since 1.1
      -------------------
 
-Version 1.2.1 brings a few major changes.
+Version 1.2.0 brings a few major changes.
 
 Major changes
 -------------
-- Better display of the impact analysis view: Allows to filter the classes of objects displayed in the
-  graphical view. The view now resizes to fit your browser's window.
-
-- Query phrase book: create, test and store your OQL queries in the "Query Phrasebook" for an easy export
-  via the "Export" menu, without the limitation of the URL length in Excel web queries ! A new export format
-  "spreadsheet" was aded, specifically for running as Excel web queries (dates are split between date and time)
-
-- Enhanced data synchronization:
-  - For performing huge synchronizations with little memory (despite PHP's memory leaks), the execution of the data
-    synchronization (in CLI mode only) can be run by chunk of x elements by specifying --max_chunk_size=x on the
-    command line to synchro_import.php or synchro_exec.php. Try to set this value to 1000 to run with 128 MB of memory.
-  - When an (optional) external key cannot be reconciled, log a warning on the replica. the replicas containing a
-    warning are then processed everytime in case the ext key changes.
-  - Also improved the search/display of replicas for an easier troubleshooting of the synchronization.
+- Paginated display
+- Management of hierarchy of objects: implemented for Organizations, Groups and Locations and taken into account by the profiles/user rights.
+- CAS integration: added support of JA-SIG Central Authentication Service (CAS) with log-off support, using phpCAS API.
 
 Localization
 ------------
-This version contains some enhancements to the German and Brazilian translations thanks to David Gümbel and Marco Túlio
+The Japanese translation was added, thanks to Tadashi Kaneda.
+The German translation was updated by Stephan Rosenke
 
 More information on the localization (completion progress, how to contribute) here:
 http://www.combodo.com/itop-localization/
 
 Minor changes
 -------------
-Automatic synchro of CAS/LDAP users: it is possible to have iTop automatically create the user record when an authorized user connects through CAS
- - Use the default language when creating a new user from CAS
- - Support patterns for casMemberof
-
-Audit:
-Better error handling in case of OQL error in the audit page, now the error is properly trapped and indicates which query is the cause of the error.
-Optimized memory usage when auditing large volumes of CIs (10'000 items was requiring 200 Mb, it now runs with 32 Mb -including the 30Mb overhead!)
-
-Added a link to a favicon (icon in the browser's bar and tab)
-
-Allow a module to restrict the access to a given menu/group by redeclaring the menu with restricted rights.
-All rights are combined with the AND operator.
-
-Added the "search form" on top of the list of user accounts, useful to find a user in a huge list !
-
-Added the ability to display a custom welcome/disclaimer message at the bottom of the login form.
-Just put a non empty string (can contain HTML tags) in the dictionary entry 'UI:Login:About'
-
-In the Toolkit: Improved the check on data model consistency: detection of SQL columns used by two attributes
-
-Ticket's case log can now be bigger than 64 Kilobytes...
+Improved import.php and synchro_import.php: added 'date_format' (example: %d/%m/%Y %H:%i:%s)
+When needed the drop-down list of organizations is replaced by an autocomplete
+Templates: new type of block = sqlblock, allows for displaying tables/charts based in SQL queries (much quicker for some 'Group By' operations)
+Added support of 'drill-down' (i.e on_click) on bar and pie charts
+Added SQL blocks
+New feature: online help on search inputs (date format and operators) a tooltip appears when the user clicks a date/search field
+Better handling of object deletion issues during a data synchro...
+#130: keywords to narrow the scope of the global search (e.g. server:webserver searches "webserver" only in the "server" objects)
+Added a new web service to create UserRequest tickets (similarly to Incidents tickets). Based on code from Vincenzo Todisco.
+Bug fix: when changing the currently selected organization, go back to the initial (Welcome) menu instead of trying to stay on the same menu... which caused troubles (e.g. "New Contact" => assertion failed)
+Improved error handling when loading linkedset as attributes in one go in CSV import
+Don't make the Ticket's case log hidden in the 'New' state, since it's not hidden in the portal !
+Better error message if the configuration file exists but is not readable
+In CLI mode, do not depend on the current directory for synchro/import.php and synchro/synchro.php: the scripts can now be run from anywhere.
+New module to easily manage attachments in one click instead of creating a separate 'Document' object. If this module is installed, portal users will create attachments instead of linked documents when uploading files with their ticket
+Added a new type of 'Trigger': TriggerOnPortalUpdate, called when the end-user updates a ticket via the portal.
+The deadlines display format can be configured.
+Lists can be displayed either as combo boxes (default and original behavior) or radio buttons, either horizontal or vertical.
+In the templates or menus, the sort order can be specified.
+Developers: DisplayBareProperties now called both in read and edition modes.
+#446: XSS vulnerabilities
+Security: protected bulk modify against HTTP/Post piracy
+Added the display of the total count of objects in overviews.
+Different display for 'Date' fields: shorter field than DateTime since there is no "time" part.
+A mandatory case log field is now considered as 'filled' if it contains a previous entry
+#148 Allow overloading attribute/enum labels in the dictionary
+Warning (popup) message when navigating away from an edition form.
+#452 Export.php - field list can be specified also for HTML output
+German localization update, thanks to Stephan Rosenke.
+Shortcut actions (parameter in the config file)
+Notifications: case log in plain text (this->case_log) or the latest entry (this->head(case_log))
+Allow creation of an ticket in a different initial state via the new 'initial_state_path' attribute.
+Support update of CaseLog fields in bulk_modify mode.
+Detection of the Suhosin extension during the installation and tell the user if the get_max_value is too small.
+#284: Improved verification to the PHP file upload settings to avoid troubles later
 
 
 Bugs fixed
 ----------
 The complete list of active tickets can be reviewed at http://sourceforge.net/apps/trac/itop/report/1
 
-#522 issue with non-ASCII characters in notifications subject.
-#519 Change password bug: it was not possible to for a user to change their own passord, if the (new) password contained non-alphanumeric characters !
-#518 Properly pass the context (i.e. currently selected org) to the auto-refresh lists
-#516 and #517 Improved the export (specify fields for multi-column queries) and web queries (default field list)
-#512 Command line mode (CLI) is now supported for the 'export' page. With either the --auth_user and --auth_pwd parameters or --param_file
-#494 It seems that PHPSoap does not understand the <wsdl:documentation> tag, let's put them as comments
-#493 Incorrect display of Users' Grant Matrix
-#487 Resizable text areas disappeared when located on the second tab !
-#486 Fixed SQL dashboards limitations
-#485 Export.php improved for integration into Excel / web queries (bug with IIS/HTTPS, limitation on the size of the OQL)
-     Export for MS Excel web queries: format=spreadsheet Improved the end-user experience with Excel and the web queries (added a phrasebook)
-     + link to test the OQL attributes (query phrasebook or email actions, etc.) including the handlink of query arguments)
-     + fixed wrong prototypes for a few implementations of GetBareProperties()
-#484 Fixed issue with IIS ("Wrong password" at first prompt)
-#482 OpenSearch (integration with your browser's search bar) was broken.
-#482 The setting 'min_autocomplete_chars' was not taken into account
-#481 localized characters in Service / Service Category name and description were not properly displayed.
-#480 The 'min_autocomplete_chars' settings was not taken into account.
-#478 Fixed issue in the audit: the results are wrong whenever an organization is selected
-#477 Could not specify more than one reconciliation key (regression) + took the opportunity to enhance protection against XSS injection (using column names in the data)
-#473 Could not load NW interfaces (reconciliation issue) - merged from trunk
+#122 Optimized the load of data set (do not load unused columns, that can cause some tmp tables to get too big for memory)
+#403 Partial installation not working (error on ticket form)
+#404: context lost when doing certain actions. What was fixed:
+  - Run Query
+  - Display Data Model Schema
+  - Drill-down in charts (OQL & SQL)
+  - Paginated lists (actually a regression)
+  What remains:
+  - Global search...
+  - Drill-down in Flash "impacts / depends on"
+#405 Could not install without the module 'User Request Management'
+#408 Case log not working with PHP < 5.3 - the fix preserves the compatibility with installed version (but the dates are lost)
+#410 Added translation for ticket status (and other enum fields) when displaying the History tab.
+#415 Could not limit user on some organization (symptom: wrong queries... org_id does not exist...)
+#420 Data synchro logs: increased the size of the attribute last_error
+#422 (detection of magic_quotes_runtime)
+#423 Fixed issues with application root URL = f(mode CLI, modules, web server techno, etc.)
+#427 Unable to remove all items from a linkset when editing an object.
+#424 Error when updating the Data Synchro statistics
+#429: web browser can crash when a text field contains several times the same URL !!!
+#433: Database triggers creation was incorrect when iTop was installed with a 'prefix' for the DB tables.
+Dashboard templates: fixed issue with asynchronous mode (still some cosmetic issues) with itopblock and the table format
+n:n wizard, context was lost when searching for objects of a derived class to be added.
+'Apply stimulus multiple" was saying: "Please select at least one object"
+Make sure that the flash object respects the z-order otherwise the hierarchy/organization picker appears behind the Flash in Chrome and IE.
+Fixed issues when adding/removing modules during the setup:
+ - When adding modules: the data model was not refreshed in the cache before attempting to load "structure" (or "sample") data
+ - When removing a module: remaining (invalid) triggers were still used.
+A title was missing for the menu 'All Opened Changes' at the top of the page
+Fixed the parsing of OQL error messages: should be able to report the line number (usually 1) and the character where the error happened
+Don't display an error (assertion failed) if the user selects nothing (i.e -- select one --) in the "CSV template" tab.
+Display/download links on documents that were both doing exactly the same thing
+Fixed the display of 'Used IP Addresses' (i.e. Network interfaces) in the details of a Subnet object.
+Fixed the computation of IPs in a subnet that failed (returned negative numbers) on some versions of PHP compiled in 32-bit.
+Enhanced interface for complex SLA computations...
+#447: interfaces not showing up on the details of a server when an org is selected: there were collisions in the internal query parameters names ! This is now fixed.
+The default value for Date fields is different than for DateTime fields: no 'time' part at the end (use the attribute's own format)
+#458: back button was asking to fill the mandatory fields !
+Support the selection (via an autocomplete) in a list that contains duplicates
+#457: crash when deleting two organizations.
+Accented characters not displayed within autocomplete selection controls
+Email test: under IIS it was not detecting Windows correctly, and the help message was therefore completely wrong.
+Dictionary: English was proposed twice in the list of available languages!
+#465: incorrect logic when resetting the 'ConnectedToInterface'
+Upgrade: fails to recreate a view when is has become invalid (missing attribute)
+#363 Charts not displaying with IE8 + IIS + HTTPS
+#373 Error when deleting two network devices connected to each other
+#258 Context automatically set when specifying an organization in a search form
+#444 Sort order not visible / lost on refresh
+Crashing when displaying the details of a change in the CSV load history
+
+Productivity Enhancements
+-------------------------
+Quicker path to create or modify objects: buttons directly accessible next to the Actions popup menu.
+Limit the drop down menu to your favorite organizations: use the user preferences menu next to the Logoff button.
+For tickets, create/modify and apply an action in one step; E.g. Create and assign in one click. 
+Form validation buttons (Ok/Cancel) showed on top and bottom. Can be tuned (top, bottom or both).
+The paginated presentation allows a quicker navigation for really large data sets.
+
+
+Performance Enhancements
+------------------------
+Do not load the full set of items when it comes to displaying an autocomplete!
+Displaying 1000 object would take real long if many organizations are loaded into iTop (querying all the orgs for each object)
+Cache the Count of items in an object set
+Autocomplete = do not load every object when determining the list of matches
 
-Other bugs not listed in Trac:
-Security issue: the attachments were visible by anybody (by forming URLs manually), whatever the allowed organizations. The change requires the execution of the setup/migration procedure.
-Apply the AllowedValues constraints(as default values)  when selecting elements via the "magnifier" button or creating an new element via the "plus" button.
-Paginated lists were broken in the Impact Analysis "List" tab
-Incorrectly appending a parameter ?version= to linked scripts already containing a parameter in their URL, also changed the parameter name to 'itopversion' to avoid collisions
-Always apply the AllowedValues constraints(as default values)  when selecting elements via the "magnifier" button or creating an new element via the "plus" button... also make sure that allowed values is enforced
-When searching objects to add to the current object (when managing n:n relationships), set the default search params in order to stay in the current silo.
-Fixed issue: nobody in the list of persons to notify for portal users (security takes precedence)
-In the setup: increased Suhosin minimum value for get_max_value to 2048 due to a bug seen on some installations
-Fix to have the proper use of GetEditValue... thanks to C. Naud
-SQL Block with parameters were always displayed as table, whatever their type...
-Removed a (useless) hardcoded reference to FunctionalCI that may break inthe display of the Impact Analysis
-(Tried to) improve the display of the Synchronization Tooltip that "sometimes" does not work on IE 8...
-Put some default reconciliation keys on Actions and Triggers to ease the use of CSV import
-Protect against an empty list of reconciliation keys in the interactive CSV Import
-Export for spreadsheets: transform keys (id of the queried object or external keys) into the corresponding friendly name
 
 3.2. Known limitations (https://sourceforge.net/apps/trac/itop/report/3)
      -----------------
@@ -256,7 +277,7 @@ Export for spreadsheets: transform keys (id of the queried object or external ke
 
 Suhosin can interfere with iTop. More information can be found here: https://sourceforge.net/apps/mediawiki/itop/index.php?title=ITop_and_Suhosin
 Internet Explorer 6 is not supported (neither IE7 nor IE8 in compatibility mode)
-Tested with IE8 and IE9, Firefox 3.6 up to Firefox 8 and Chrome. Be aware that there are certain limitations when using IE8 in "security mode" (when running IE on a Windows 2008 Server for example)
+Tested with IE8 and IE9. Be aware that there are certain limitations when using IE8 in "security mode" (when running IE on a Windows 2008 Server for example)
 
 
 3.3. Known issues (https://sourceforge.net/apps/trac/itop/report/3)

synchro/priv_sync_chunk.php

@@ -1,135 +0,0 @@
-<?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
-
-/**
- * Internal: synchronize part of the records - cannot be invoked separately 
- *
- * @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
- */
-
-if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/webpage.class.inc.php');
-require_once(APPROOT.'/application/csvpage.class.inc.php');
-require_once(APPROOT.'/application/clipage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-
-function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter = 'parameter')
-{
-	$sValue = utils::ReadParam($sParam, null, true /* Allow CLI */, $sSanitizationFilter);
-	if (is_null($sValue))
-	{
-		$oP->p("ERROR: Missing argument '$sParam'\n");
-		exit(29);
-	}
-	return trim($sValue);
-}
-
-/////////////////////////////////
-// Main program
-
-if (!utils::IsModeCLI())
-{
-	$oP = new WebPage(Dict::S("TitleSynchroExecution"));
-	$oP->p("This page is used internally by iTop");		
-	$oP->output();
-	exit -2;
-}
-
-$oP = new CLIPage(Dict::S("TitleSynchroExecution"));
-
-try
-{
-	utils::UseParamFile();
-}
-catch(Exception $e)
-{
-	$oP->p("Error: ".$e->GetMessage());
-	$oP->output();
-	exit -2;
-}
-
-// Next steps:
-//   specific arguments: 'csvfile'
-//   
-$sAuthUser = ReadMandatoryParam($oP, 'auth_user', 'raw_data');
-$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd', 'raw_data');
-if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
-{
-	UserRights::Login($sAuthUser); // Login & set the user's language
-}
-else
-{
-	$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
-	$oP->output();
-	exit -1;
-}
-
-$iStepCount = ReadMandatoryParam($oP, 'step_count');
-$oP->p('Executing a partial synchro - step '.$iStepCount);
-
-$iSource = ReadMandatoryParam($oP, 'source');
-
-$iStatLog = ReadMandatoryParam($oP, 'log');
-$iChange = ReadMandatoryParam($oP, 'change');
-$sLastFullLoad = ReadMandatoryParam($oP, 'last_full_load', 'raw_data');
-$iChunkSize = ReadMandatoryParam($oP, 'chunk');
-
-$oP->p('Last full load: '.$sLastFullLoad);
-$oP->p('Chunk size: '.$iChunkSize);
-$oP->p('Source: '.$iSource);
-
-try
-{
-	$oSynchroDataSource = MetaModel::GetObject('SynchroDataSource', $iSource);
-	$oLog = MetaModel::GetObject('SynchroLog', $iStatLog);
-	$oChange = MetaModel::GetObject('CMDBChange', $iChange);
-	
-	if (strlen($sLastFullLoad) > 0)
-	{
-		$oLastFullLoad = new DateTime($sLastFullLoad);
-		$oSynchroExec = new SynchroExecution($oSynchroDataSource, $oLastFullLoad);
-	}
-	else
-	{
-		$oSynchroExec = new SynchroExecution($oSynchroDataSource);
-	}
-	if ($oSynchroExec->DoSynchronizeChunk($oLog, $oChange, $iChunkSize))
-	{
-		// The last line MUST follow this convention
-		$oP->p("continue");
-	}
-	else
-	{
-		// The last line MUST follow this convention
-		$oP->p("finished");
-	}
-	$oP->output();
-}
-catch(Exception $e)
-{
-	$oP->p("Error: ".$e->GetMessage());
-	$oP->add($e->getTraceAsString());
-	$oP->output();
-	exit(28);
-}
-?>

synchro/synchro_exec.php

@@ -51,7 +51,7 @@ function UsageAndExit($oP)
 	if ($bModeCLI)
 	{
 		$oP->p("USAGE:\n");
-		$oP->p("php -q synchro_exec.php --auth_user=<login> --auth_pwd=<password> --data_sources=<comma_separated_list_of_data_sources> [max_chunk_size=<limit the count of replica loaded in a single pass>]\n");		
+		$oP->p("php -q synchro_exec.php --auth_user=<login> --auth_pwd=<password> --data_sources=<comma_separated_list_of_data_sources>\n");		
 	}
 	else
 	{
@@ -147,8 +147,7 @@ foreach(explode(',', $sDataSourcesList) as $iSDS)
 		}
 		try
 		{
-			$oSynchroExec = new SynchroExecution($oSynchroDataSource);
-			$oStatLog = $oSynchroExec->Process();
+			$oStatLog = $oSynchroDataSource->Synchronize(null);
 			if ($bSimulate)
 			{
 				CMDBSource::Query('ROLLBACK');

synchro/synchro_import.php

@@ -104,7 +104,7 @@ $aPageParams = array
 		'mandatory' => false,
 		'modes' => 'http,cli',
 		'default' => ';',
-		'description' => 'column separator in CSV data (1 char, or \'tab\')',
+		'description' => 'column separator in CSV data',
 	),
 	'qualifier' => array
 	(
@@ -120,13 +120,6 @@ $aPageParams = array
 		'default' => 'summary',
 		'description' => '[retcode] to return the count of lines in error, [summary] to return a concise report, [details] to get a detailed report (each line listed)',
 	),
-	'max_chunk_size' => array
-	(
-		'mandatory' => false,
-		'modes' => 'cli',
-		'default' => '0',
-		'description' => 'Limit on the count of records that can be loaded at once while performing the synchronization',
-	),
 /*
 	'reportlevel' => array
 	(
@@ -309,11 +302,6 @@ try
 	$sComment = ReadParam($oP, 'comment', 'raw_data');
 	$sNoStopOnImportError = ReadParam($oP, 'no_stop_on_import_error');
 
-	if (strtolower(trim($sSep)) == 'tab')
-	{
-		$sSep = "\t";
-	}
-
 	$oLoadStartDate = new DateTime(); // Now
 
    // Note about date formatting: These MySQL settings are read-only... and in fact unused :-(
@@ -625,8 +613,7 @@ try
 		//
 		if ($bSynchronize)
 		{
-			$oSynchroExec = new SynchroExecution($oDataSource, $oLoadStartDate);
-			$oStatLog = $oSynchroExec->Process();
+			$oStatLog = $oDataSource->Synchronize($oLoadStartDate);
 			$oP->add_comment('Synchronization---');
 			$oP->add_comment('------------------');
 			if ($sOutput == 'details')

test/testlist.inc.php

@@ -2270,8 +2270,8 @@ class TestDataExchange extends TestBizModel
 					),
 				),
 			),
-//		);
-//		$aXXXXScenarios = array(
+		//);
+		//$aXXXXScenarios = array(
 			array(
 				'desc' => 'Update then delete with retention (to complete with manual testing) and reconciliation on org/name',
 				'login' => 'admin',

webservices/export.php

@@ -29,7 +29,6 @@ require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/nicewebpage.class.inc.php');
 require_once(APPROOT.'/application/csvpage.class.inc.php');
 require_once(APPROOT.'/application/xmlpage.class.inc.php');
-require_once(APPROOT.'/application/clipage.class.inc.php');
 
 require_once(APPROOT.'/application/startup.inc.php');
 
@@ -44,31 +43,11 @@ catch(Exception $e)
 	exit -2;
 }
 
-if (utils::IsModeCLI()) 
-{
-	$sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data'); 
-	$sAuthPwd = utils::ReadParam('auth_pwd', null, true /* Allow CLI */, 'raw_data'); 
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
 
-	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) 
-	{ 
-		UserRights::Login($sAuthUser); // Login & set the user's language 
-	} 
-	else 
-	{ 
-		$oP = new CLIPage("iTop - Export"); 
-		$oP->p("Access restricted or wrong credentials ('$sAuthUser')"); 
-		$oP->output(); 
-		exit -1; 
-	}
-} 
-else 
-{
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php'); 
-	LoginWebPage::DoLogin(); // Check user rights and prompt if needed 
-}
 ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
 
-
 $sOperation = utils::ReadParam('operation', 'menu');
 $oAppContext = new ApplicationContext();
 $iActiveNodeId = utils::ReadParam('menu', -1);
@@ -76,30 +55,9 @@ $currentOrganization = utils::ReadParam('org_id', '');
 
 // Main program
 $sExpression = utils::ReadParam('expression', '', true /* Allow CLI */, 'raw_data');
-$sFields = trim(utils::ReadParam('fields', '', true, 'raw_data')); // CSV field list (allows to specify link set attributes, still not taken into account for XML export)
-
-if (strlen($sExpression) == 0)
-{
-	$sQueryId = trim(utils::ReadParam('query', '', true /* Allow CLI */, 'raw_data'));
-	if (strlen($sQueryId) > 0)
-	{
-		$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
-		$oQueries = new DBObjectSet($oSearch);
-		if ($oQueries->Count() > 0)
-		{
-			$oQuery = $oQueries->Fetch();
-			$sExpression = $oQuery->Get('oql');
-			if (strlen($sFields) == 0)
-			{
-				$sFields = trim($oQuery->Get('fields'));
-			} 
-		}
-	}
-}
-
-$sFormat = strtolower(utils::ReadParam('format', 'html', true /* Allow CLI */));
-
+$sFormat = strtolower(utils::ReadParam('format', 'html'));
 
+$sFields = utils::ReadParam('fields', '', true, 'raw_data'); // CSV field list (allows to specify link set attributes, still not taken into account for XML export)
 $aFields = explode(',', $sFields);
 // Clean the list of columns (empty it if every string is empty)
 foreach($aFields as $index => $sField)
@@ -118,45 +76,9 @@ if (!empty($sExpression))
 	try
 	{
 		$oFilter = DBObjectSearch::FromOQL($sExpression);
-
-		// Check and adjust column names
-		//
-		foreach($aFields as $index => $sField)
-		{
-			if (preg_match('/^(.*)\.(.*)$/', $sField, $aMatches))
-			{
-				$sClassAlias = $aMatches[1];
-				$sAttCode = $aMatches[2];
-			}
-			else
-			{
-				$sClassAlias = $oFilter->GetClassAlias();
-				$sAttCode = $sField;
-				$aFields[$index] = $sClassAlias.'.'.$sAttCode;
-			}
-			$sClass = $oFilter->GetClassName($sClassAlias);
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				throw new CoreException("Invalid field specification $sField: $sAttCode is not a valid attribute for $sClass");
-			}
-		}
-
-		// Read query parameters
-		//
-		$aArgs = array();
-		foreach($oFilter->GetQueryParams() as $sParam => $foo)
-		{
-			$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
-			if (!is_null($value))
-			{
-				$aArgs[$sParam] = $value;
-			}
-		}
-		$oFilter->SetInternalParams($aArgs);
-
 		if ($oFilter)
 		{
-			$oSet = new CMDBObjectSet($oFilter, array(), $aArgs);
+			$oSet = new CMDBObjectSet($oFilter);
 			switch($sFormat)
 			{
 				case 'html':
@@ -204,19 +126,6 @@ if (!empty($sExpression))
 				cmdbAbstractObject::DisplaySetAsCSV($oP, $oSet, array('fields' => $sFields));
 				break;
 				
-				case 'spreadsheet':
-				$oP = new WebPage("iTop - Export for spreadsheet");
-
-				// Integration within MS-Excel web queries + HTTPS + IIS:
-				// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
-				// Then the fix is to force the reset of header values Pragma and Cache-control 
-				header("Pragma:", true);
-				header("Cache-control:", true);
-
-				$sFields = implode(',', $aFields);
-				cmdbAbstractObject::DisplaySetAsHTMLSpreadsheet($oP, $oSet, array('fields' => $sFields));
-				break;
-
 				case 'xml':
 				$oP = new XMLPage("iTop - Export", true /* passthrough */);
 				cmdbAbstractObject::DisplaySetAsXML($oP, $oSet);
@@ -224,43 +133,27 @@ if (!empty($sExpression))
 				
 				default:
 				$oP = new WebPage("iTop - Export");
-				$oP->add("Unsupported format '$sFormat'. Possible values are: html, csv, spreadsheet or xml.");
+				$oP->add("Unsupported format '$sFormat'. Possible values are: html, csv or xml.");
 			}
 		}
 	}
 	catch(Exception $e)
 	{
 		$oP = new WebPage("iTop - Export");
-		$oP->p("Error the query can not be executed.");
-		if ($e instanceof CoreException)
-		{		
-			$oP->p($e->GetHtmlDesc());
-		}
-		else
-		{
-			$oP->p($e->getMessage());
-		}		
+		$oP->p("Error the query can not be executed.");		
+		$oP->p($e->GetHtmlDesc());		
 	}
 }
 if (!$oP)
 {
 	// Display a short message about how to use this page
-	$bModeCLI = utils::IsModeCLI();
-	if ($bModeCLI)
-	{
-		$oP = new CLIPage("iTop - Export");
-	}
-	else
-	{
-		$oP = new WebPage("iTop - Export");
-	} 
-	$oP->p("General purpose export page.");
-	$oP->p("Parameters:");
-	$oP->p(" * expression: an OQL expression (URL encoded if needed)");
-	$oP->p(" * query: (alternative to 'expression') the id of an entry from the query phrasebook");
-	$oP->p(" * arg_xxx: (needed if the query has parameters) the value of the parameter 'xxx'");
-	$oP->p(" * format: (optional, default is html) the desired output format. Can be one of 'html', 'spreadsheet', 'csv' or 'xml'");
-	$oP->p(" * fields: (optional, no effect on XML format) list of fields (attribute codes, or alias.attcode) separated by a coma");
+	$oP = new WebPage("iTop - Export");
+	$oP->p("<strong>General purpose export page.</strong>");
+	$oP->p("<strong>Parameters:</strong>");
+	$oP->p("<ul><li>expression: an OQL expression (URL encoded if needed)</li>
+			    <li>format: (optional, default is html) the desired output format. Can be one of 'html', 'csv' or 'xml'</li>
+			    <li>fields: (optional, no effect on XML format) list of fields (attribute codes) separated by a coma</li>
+		    </ul>");
 }
 
 $oP->output();

webservices/import.php

@@ -102,7 +102,7 @@ $aPageParams = array
 		'mandatory' => false,
 		'modes' => 'http,cli',
 		'default' => ',',
-		'description' => 'column separator in CSV data (1 char, or \'tab\')',
+		'description' => 'column separator in CSV data',
 	),
 	'qualifier' => array
 	(
@@ -283,11 +283,6 @@ try
 	$sSimulate = ReadParam($oP, 'simulate');
 	$sComment = ReadParam($oP, 'comment', 'raw_data');
 
-	if (strtolower(trim($sSep)) == 'tab')
-	{
-		$sSep = "\t";
-	}
-
 	//////////////////////////////////////////////////
 	//
 	// Check parameters format/consistency

webservices/webservices.class.inc.php

@@ -283,26 +283,12 @@ abstract class WebServicesBase
 		$oLog->Set('userinfo', UserRights::GetUser());
 		$oLog->Set('verb', $sVerb);
 		$oLog->Set('result', $oRes->IsOk());
-		$this->TrimAndSetValue($oLog, 'log_info', $oRes->GetInfoAsText());
-		$this->TrimAndSetValue($oLog, 'log_warning', $oRes->GetWarningsAsText());
-		$this->TrimAndSetValue($oLog, 'log_error', $oRes->GetErrorsAsText());
-		$this->TrimAndSetValue($oLog, 'data', $oRes->GetReturnedDataAsText());
+		$oLog->Set('log_info', $oRes->GetInfoAsText());
+		$oLog->Set('log_warning', $oRes->GetWarningsAsText());
+		$oLog->Set('log_error', $oRes->GetErrorsAsText());
+		$oLog->Set('data', $oRes->GetReturnedDataAsText());
 		$oLog->DBInsertNoReload();
 	}
-	
-	protected function TrimAndSetValue($oLog, $sAttCode, $sValue)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($oLog), $sAttCode);
-		if (is_object($oAttDef))
-		{
-			$iMaxSize = $oAttDef->GetMaxSize();
-			if ($iMaxSize)
-			{
-				$sValue = substr($sValue, 0, $iMaxSize);
-			}
-			$oLog->Set($sAttCode, $sValue);
-		}
-	}
 
 	/**
 	 * Helper to set a scalar attribute