Creating SVN tag for iTop 2.5.0

SVN:2.5.0[5921]

addons/userrights/userrightsprofile.class.inc.php

@@ -54,7 +54,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	{
 		$aParams = array
 		(
-			"category" => "addon/userrights",
+			"category" => "addon/userrights,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -75,8 +75,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // 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
+		MetaModel::Init_SetZListItems('standard_search', array('name','description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array ('name','description'));
 	}
 
 	protected static $m_aCacheProfiles = null;
@@ -137,11 +137,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$oUserRights = UserRights::GetModuleInstance();
 	
 		$aDisplayData = array();
-		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
+		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass)
 		{
-			// Skip non instantiable classes
-			if (MetaModel::IsAbstract($sClass)) continue;
-
 			$aStimuli = array();
 			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
 			{
@@ -183,7 +180,7 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		if (!$bEditMode)
 		{
 			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage);		
+			$this->DoShowGrantSumary($oPage);
 		}
 	}
 
@@ -203,6 +200,12 @@ class URP_Profiles extends UserRightsBaseClassGUI
 	// preserve DB integrity by deleting links to users
 	protected function OnDelete()
 	{
+		// Don't remove admin profile
+		if ($this->Get('name') === ADMIN_PROFILE_NAME)
+		{
+			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
+		}
+
 		// Note: this may break the rule that says: "a user must have at least ONE profile" !
 		$oLnkSet = $this->Get('user_list');
 		while($oLnk = $oLnkSet->Fetch())
@@ -239,7 +242,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 	{
 		$aParams = array
 		(
-			"category" => "addon/userrights",
+			"category" => "addon/userrights,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "userid",
 			"state_attcode" => "",
@@ -284,6 +287,59 @@ class URP_UserProfile extends UserRightsBaseClassGUI
 		}
 		return parent::CheckToDelete($oDeletionPlan);
 	}
+
+	protected function OnInsert()
+	{
+		$this->CheckIfProfileIsAllowed(UR_ACTION_CREATE);
+	}
+
+	protected function OnUpdate()
+	{
+		$this->CheckIfProfileIsAllowed(UR_ACTION_MODIFY);
+	}
+
+	protected function OnDelete()
+	{
+		$this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
+	}
+
+	/**
+	 * @param $iActionCode
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \SecurityException
+	 */
+	protected function CheckIfProfileIsAllowed($iActionCode)
+	{
+		// When initializing or admin, we need to let everything pass trough
+		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
+
+		// Only administrators can manage administrators
+		$iOrigUserId = $this->GetOriginal('userid');
+		if (!empty($iOrigUserId))
+		{
+			$oUser = MetaModel::GetObject('User', $iOrigUserId, true, true);
+			if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
+			{
+				throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
+			}
+		}
+		$oUser = MetaModel::GetObject('User', $this->Get('userid'), true, true);
+		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
+		{
+			throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
+		}
+		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, DBObjectSet::FromObject($this)))
+		{
+			throw new SecurityException(Dict::Format('UI:Error:ObjectCannotBeUpdated'));
+		}
+		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME))
+		{
+			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
+		}
+	}
+
 }
 
 class URP_UserOrg extends UserRightsBaseClassGUI
@@ -292,7 +348,7 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 	{
 		$aParams = array
 		(
-			"category" => "addon/userrights",
+			"category" => "addon/userrights,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "userid",
 			"state_attcode" => "",
@@ -324,6 +380,42 @@ class URP_UserOrg extends UserRightsBaseClassGUI
 	{
 		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
 	}
+
+
+	protected function OnInsert()
+	{
+		$this->CheckIfOrgIsAllowed();
+	}
+
+	protected function OnUpdate()
+	{
+		$this->CheckIfOrgIsAllowed();
+	}
+
+	protected function OnDelete()
+	{
+		$this->CheckIfOrgIsAllowed();
+	}
+
+	/**
+	 * @throws \CoreException
+	 */
+	protected function CheckIfOrgIsAllowed()
+	{
+		if (UserRights::IsAdministrator()) { return; }
+
+		$oUser = UserRights::GetUserObject();
+		$oAddon = UserRights::GetModuleInstance();
+		$aOrgs = $oAddon->GetUserOrgs($oUser, '');
+		if (count($aOrgs) > 0)
+		{
+			$iOrigOrgId = $this->GetOriginal('allowed_org_id');
+			if ((!empty($iOrigOrgId) && !in_array($iOrigOrgId, $aOrgs)) || !in_array($this->Get('allowed_org_id'), $aOrgs))
+			{
+				throw new SecurityException(Dict::Format('Class:User/Error:OrganizationNotAllowed'));
+			}
+		}
+	}
 }
 
 
@@ -412,11 +504,15 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * Read and cache organizations allowed to the given user
-	 * 
-	 * @param oUser
-	 * @param sClass -not used here but can be used in overloads
+	 *
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \Exception
 	 */
-	protected function GetUserOrgs($oUser, $sClass)
+	public function GetUserOrgs($oUser, $sClass)
 	{
 		$iUser = $oUser->GetKey();
 		if (!array_key_exists($iUser, $this->m_aUserOrgs))
@@ -430,7 +526,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 				$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();
 				}

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

@@ -97,8 +97,8 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // 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
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
 	}
 
 	protected $m_bCheckReservedNames = true;
@@ -613,11 +613,15 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * Read and cache organizations allowed to the given user
-	 * 
-	 * @param oUser
-	 * @param sClass -not used here but can be used in overloads
+	 *
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \Exception
 	 */
-	protected function GetUserOrgs($oUser, $sClass)
+	public function GetUserOrgs($oUser, $sClass)
 	{
 		$iUser = $oUser->GetKey();
 		if (!array_key_exists($iUser, $this->m_aUserOrgs))
@@ -631,7 +635,6 @@ class UserRightsProfile extends UserRightsAddOnAPI
 				$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();
 				}

addons/userrights/userrightsprojection.class.inc.php

@@ -78,8 +78,8 @@ class URP_Profiles extends UserRightsBaseClass
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // 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
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
 	}
 
 	function GetGrantAsHtml($oUserRights, $sClass, $sAction)

application/ajaxwebpage.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -244,9 +244,18 @@ EOF
         //echo $this->s_deferred_content;
         if (count($this->a_scripts) > 0)
         {
-            echo "<script type=\"text/javascript\">\n";
-            echo implode("\n", $this->a_scripts);
-            echo "\n</script>\n";
+        	echo "<script type=\"text/javascript\">\n";
+        	echo implode("\n", $this->a_scripts);
+        	echo "\n</script>\n";
+        }
+        if (count($this->a_linked_scripts) > 0)
+        {
+        	echo "<script type=\"text/javascript\">\n";
+        	foreach($this->a_linked_scripts as $sScriptUrl)
+        	{
+        		echo '$.getScript('.json_encode($sScriptUrl).");\n";
+        	}
+        	echo "\n</script>\n";
         }
         if (!empty($this->s_deferred_content))
         {

application/applicationcontext.class.inc.php

@@ -1,362 +1,362 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class ApplicationContext
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/utils.inc.php");
-
-/**
- * Interface for directing end-users to the relevant application
- */ 
-interface iDBObjectURLMaker
-{
-	public static function MakeObjectURL($sClass, $iId);
-}
-
-/**
- * Direct end-users to the standard iTop application: UI.php
- */ 
-class iTopStandardURLMaker implements iDBObjectURLMaker
-{
-	public static function MakeObjectURL($sClass, $iId)
-	{
-		$sPage = DBObject::ComputeStandardUIPage($sClass);
-		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
-		$sUrl = "{$sAbsoluteUrl}pages/$sPage?operation=details&class=$sClass&id=$iId";
-		return $sUrl;
-	}
-}
-
-/**
- * Direct end-users to the standard Portal application
- */ 
-class PortalURLMaker implements iDBObjectURLMaker
-{
-	public static function MakeObjectURL($sClass, $iId)
-	{
-		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
-		$sUrl = "{$sAbsoluteUrl}portal/index.php?operation=details&class=$sClass&id=$iId";
-		return $sUrl;
-	}
-}
-
-
-/**
- * Helper class to store and manipulate the parameters that make the application's context
- *
- * Usage:
- * 1) Build the application's context by constructing the object
- *   (the object will read some of the page's parameters)
- *
- * 2) Add these parameters to hyperlinks or to forms using the helper, functions
- *    GetForLink(), GetForForm() or GetAsHash()
- */
-class ApplicationContext
-{
-	protected $aNames;
-	protected $aValues;
-	protected static $aDefaultValues; // Cache shared among all instances
-	
-	public function __construct($bReadContext = true)
-	{
-		$this->aNames = array(
-			'org_id', 'menu'
-		);
-		if ($bReadContext)
-		{
-			$this->ReadContext();			
-		}
-
-	}
-	
-	/**
-	 * Read the context directly in the PHP parameters (either POST or GET)
-	 * return nothing
-	 */
-	protected function ReadContext()
-	{
-		if (!isset(self::$aDefaultValues))
-		{
-			self::$aDefaultValues = array();
-			$aContext = utils::ReadParam('c', array(), false, 'context_param');
-			foreach($this->aNames as $sName)
-			{
-				$sValue = isset($aContext[$sName]) ? $aContext[$sName] : '';
-				// TO DO: check if some of the context parameters are mandatory (or have default values)
-				if (!empty($sValue))
-				{
-					self::$aDefaultValues[$sName] = $sValue;
-				}
-				// Hmm, there must be a better (more generic) way to handle the case below:
-				// When there is only one possible (allowed) organization, the context must be
-				// fixed to this org
-				if ($sName == 'org_id')
-				{
-					if (MetaModel::IsValidClass('Organization'))
-					{
-						$oSearchFilter = new DBObjectSearch('Organization');
-						$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-						$oSet = new CMDBObjectSet($oSearchFilter);
-						$iCount = $oSet->Count();
-						if ($iCount == 1)
-						{
-							// Only one possible value for org_id, set it in the context
-							$oOrg = $oSet->Fetch();
-							self::$aDefaultValues[$sName] = $oOrg->GetKey();
-						}
-					}					
-				}
-			}
-		}
-		$this->aValues = self::$aDefaultValues;
-	}
-	
-	/**
-	 * Returns the current value for the given parameter
-	 * @param string $sParamName Name of the parameter to read
-	 * @return mixed The value for this parameter
-	 */
-	public function GetCurrentValue($sParamName, $defaultValue = '')
-	{
-		if (isset($this->aValues[$sParamName]))
-		{
-			return $this->aValues[$sParamName];
-		}
-		return $defaultValue;
-	}
-	
-	/**
-	 * Returns the context as string with the format name1=value1&name2=value2....
-	 * return string The context as a string to be appended to an href property
-	 */
-	public function GetForLink()
-	{
-		$aParams = array();
-		foreach($this->aValues as $sName => $sValue)
-		{
-			$aParams[] = "c[$sName]".'='.urlencode($sValue);
-		}
-		return implode("&", $aParams);
-	}
-	
-	/**
-	 * Returns the context as sequence of input tags to be inserted inside a <form> tag
-	 * return string The context as a sequence of <input type="hidden" /> tags
-	 */
-	public function GetForForm()
-	{
-		$sContext = "";
-		foreach($this->aValues as $sName => $sValue)
-		{
-			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n";
-		}
-		return $sContext;
-	}
-
-	/**
-	 * Returns the context as a hash array 'parameter_name' => value
-	 * return array The context information
-	 */
-	public function GetAsHash()
-	{
-		$aReturn = array();
-		foreach($this->aValues as $sName => $sValue)
-		{
-			$aReturn["c[$sName]"] = $sValue;
-		}
-		return $aReturn;
-	}
-	
-	/**
-	 * Returns an array of the context parameters NAMEs
-	 * @return array The list of context parameters
-	 */
-	public function GetNames()
-	{
-		return $this->aNames;
-	}
-	/**
-	 * Removes the specified parameter from the context, for example when the same parameter
-	 * is already a search parameter
-	 * @param string $sParamName Name of the parameter to remove	 	 
-	 * @return none
-	 */	
-	public function Reset($sParamName)
-	{
-		if (isset($this->aValues[$sParamName]))
-		{
-			unset($this->aValues[$sParamName]);
-		}
-	}
-
-	/**
-	 * Initializes the given object with the default values provided by the context
-	 */
-	public function InitObjectFromContext(DBObject &$oObj)
-	{
-		$sClass = get_class($oObj);
-		foreach($this->GetNames() as $key)
-		{
-			$aCallSpec = array($sClass, 'MapContextParam');
-			if (is_callable($aCallSpec))
-			{
-				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
-
-				if (MetaModel::IsValidAttCode($sClass, $sAttCode))
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-					if ($oAttDef->IsWritable())
-					{
-						$value = $this->GetCurrentValue($key, null);
-						if (!is_null($value))
-						{
-							$oObj->Set($sAttCode, $value);
-						}
-					}
-				}
-			}
-		}		
-	}
-	
-	static $m_sUrlMakerClass = null;
-
-	/**
-	 * Set the current application url provider
-	 * @param sClass string Class implementing iDBObjectURLMaker	 
-	 * @return void
-	 */
-	public static function SetUrlMakerClass($sClass = 'iTopStandardURLMaker')
-	{
-		$sPrevious = self::GetUrlMakerClass();
-
-		self::$m_sUrlMakerClass = $sClass;
-		$_SESSION['UrlMakerClass'] = $sClass;
-
-		return $sPrevious;
-	}
-
-	/**
-	 * Get the current application url provider
-	 * @return string the name of the class
-	 */
-	public static function GetUrlMakerClass()
-	{
-		if (is_null(self::$m_sUrlMakerClass))
-		{
-			if (isset($_SESSION['UrlMakerClass']))
-			{
-				self::$m_sUrlMakerClass = $_SESSION['UrlMakerClass'];
-			}
-			else
-			{
-				self::$m_sUrlMakerClass = 'iTopStandardURLMaker';
-			}
-		}
-		return self::$m_sUrlMakerClass;
-	}
-
-	/**
-	 * Get the current application url provider
-	 * @return string the name of the class
-	 */
-   public static function MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass = null, $bWithNavigationContext = true)
-   {
-   	$oAppContext = new ApplicationContext();
-
-      if (is_null($sUrlMakerClass))
-      {
-			$sUrlMakerClass = self::GetUrlMakerClass();
-		}
-		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
-		if (strlen($sUrl) > 0)
-		{
-			if ($bWithNavigationContext)
-			{
-				return $sUrl."&".$oAppContext->GetForLink();
-			}
-			else
-			{
-				return $sUrl;
-			}
-		}
-		else
-		{
-			return '';
-		}	
-	}
-
-	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();
-		}
-	}
-
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class ApplicationContext
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/utils.inc.php");
+
+/**
+ * Interface for directing end-users to the relevant application
+ */ 
+interface iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId);
+}
+
+/**
+ * Direct end-users to the standard iTop application: UI.php
+ */ 
+class iTopStandardURLMaker implements iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId)
+	{
+		$sPage = DBObject::ComputeStandardUIPage($sClass);
+		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
+		$sUrl = "{$sAbsoluteUrl}pages/$sPage?operation=details&class=$sClass&id=$iId";
+		return $sUrl;
+	}
+}
+
+/**
+ * Direct end-users to the standard Portal application
+ */ 
+class PortalURLMaker implements iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId)
+	{
+		$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
+		$sUrl = "{$sAbsoluteUrl}portal/index.php?operation=details&class=$sClass&id=$iId";
+		return $sUrl;
+	}
+}
+
+
+/**
+ * Helper class to store and manipulate the parameters that make the application's context
+ *
+ * Usage:
+ * 1) Build the application's context by constructing the object
+ *   (the object will read some of the page's parameters)
+ *
+ * 2) Add these parameters to hyperlinks or to forms using the helper, functions
+ *    GetForLink(), GetForForm() or GetAsHash()
+ */
+class ApplicationContext
+{
+	protected $aNames;
+	protected $aValues;
+	protected static $aDefaultValues; // Cache shared among all instances
+	
+	public function __construct($bReadContext = true)
+	{
+		$this->aNames = array(
+			'org_id', 'menu'
+		);
+		if ($bReadContext)
+		{
+			$this->ReadContext();			
+		}
+
+	}
+	
+	/**
+	 * Read the context directly in the PHP parameters (either POST or GET)
+	 * return nothing
+	 */
+	protected function ReadContext()
+	{
+		if (!isset(self::$aDefaultValues))
+		{
+			self::$aDefaultValues = array();
+			$aContext = utils::ReadParam('c', array(), false, 'context_param');
+			foreach($this->aNames as $sName)
+			{
+				$sValue = isset($aContext[$sName]) ? $aContext[$sName] : '';
+				// TO DO: check if some of the context parameters are mandatory (or have default values)
+				if (!empty($sValue))
+				{
+					self::$aDefaultValues[$sName] = $sValue;
+				}
+				// Hmm, there must be a better (more generic) way to handle the case below:
+				// When there is only one possible (allowed) organization, the context must be
+				// fixed to this org
+				if ($sName == 'org_id')
+				{
+					if (MetaModel::IsValidClass('Organization'))
+					{
+						$oSearchFilter = new DBObjectSearch('Organization');
+						$oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
+						$oSet = new CMDBObjectSet($oSearchFilter);
+						$iCount = $oSet->CountWithLimit(2);
+						if ($iCount == 1)
+						{
+							// Only one possible value for org_id, set it in the context
+							$oOrg = $oSet->Fetch();
+							self::$aDefaultValues[$sName] = $oOrg->GetKey();
+						}
+					}					
+				}
+			}
+		}
+		$this->aValues = self::$aDefaultValues;
+	}
+	
+	/**
+	 * Returns the current value for the given parameter
+	 * @param string $sParamName Name of the parameter to read
+	 * @return mixed The value for this parameter
+	 */
+	public function GetCurrentValue($sParamName, $defaultValue = '')
+	{
+		if (isset($this->aValues[$sParamName]))
+		{
+			return $this->aValues[$sParamName];
+		}
+		return $defaultValue;
+	}
+	
+	/**
+	 * Returns the context as string with the format name1=value1&name2=value2....
+	 * return string The context as a string to be appended to an href property
+	 */
+	public function GetForLink()
+	{
+		$aParams = array();
+		foreach($this->aValues as $sName => $sValue)
+		{
+			$aParams[] = "c[$sName]".'='.urlencode($sValue);
+		}
+		return implode("&", $aParams);
+	}
+	
+	/**
+	 * Returns the context as sequence of input tags to be inserted inside a <form> tag
+	 * return string The context as a sequence of <input type="hidden" /> tags
+	 */
+	public function GetForForm()
+	{
+		$sContext = "";
+		foreach($this->aValues as $sName => $sValue)
+		{
+			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n";
+		}
+		return $sContext;
+	}
+
+	/**
+	 * Returns the context as a hash array 'parameter_name' => value
+	 * return array The context information
+	 */
+	public function GetAsHash()
+	{
+		$aReturn = array();
+		foreach($this->aValues as $sName => $sValue)
+		{
+			$aReturn["c[$sName]"] = $sValue;
+		}
+		return $aReturn;
+	}
+	
+	/**
+	 * Returns an array of the context parameters NAMEs
+	 * @return array The list of context parameters
+	 */
+	public function GetNames()
+	{
+		return $this->aNames;
+	}
+	/**
+	 * Removes the specified parameter from the context, for example when the same parameter
+	 * is already a search parameter
+	 * @param string $sParamName Name of the parameter to remove	 	 
+	 * @return none
+	 */	
+	public function Reset($sParamName)
+	{
+		if (isset($this->aValues[$sParamName]))
+		{
+			unset($this->aValues[$sParamName]);
+		}
+	}
+
+	/**
+	 * Initializes the given object with the default values provided by the context
+	 */
+	public function InitObjectFromContext(DBObject &$oObj)
+	{
+		$sClass = get_class($oObj);
+		foreach($this->GetNames() as $key)
+		{
+			$aCallSpec = array($sClass, 'MapContextParam');
+			if (is_callable($aCallSpec))
+			{
+				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
+
+				if (MetaModel::IsValidAttCode($sClass, $sAttCode))
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+					if ($oAttDef->IsWritable())
+					{
+						$value = $this->GetCurrentValue($key, null);
+						if (!is_null($value))
+						{
+							$oObj->Set($sAttCode, $value);
+						}
+					}
+				}
+			}
+		}		
+	}
+	
+	static $m_sUrlMakerClass = null;
+
+	/**
+	 * Set the current application url provider
+	 * @param sClass string Class implementing iDBObjectURLMaker	 
+	 * @return void
+	 */
+	public static function SetUrlMakerClass($sClass = 'iTopStandardURLMaker')
+	{
+		$sPrevious = self::GetUrlMakerClass();
+
+		self::$m_sUrlMakerClass = $sClass;
+		$_SESSION['UrlMakerClass'] = $sClass;
+
+		return $sPrevious;
+	}
+
+	/**
+	 * Get the current application url provider
+	 * @return string the name of the class
+	 */
+	public static function GetUrlMakerClass()
+	{
+		if (is_null(self::$m_sUrlMakerClass))
+		{
+			if (isset($_SESSION['UrlMakerClass']))
+			{
+				self::$m_sUrlMakerClass = $_SESSION['UrlMakerClass'];
+			}
+			else
+			{
+				self::$m_sUrlMakerClass = 'iTopStandardURLMaker';
+			}
+		}
+		return self::$m_sUrlMakerClass;
+	}
+
+	/**
+	 * Get the current application url provider
+	 * @return string the name of the class
+	 */
+   public static function MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass = null, $bWithNavigationContext = true)
+   {
+   	$oAppContext = new ApplicationContext();
+
+      if (is_null($sUrlMakerClass))
+      {
+			$sUrlMakerClass = self::GetUrlMakerClass();
+		}
+		$sUrl = call_user_func(array($sUrlMakerClass, 'MakeObjectUrl'), $sObjClass, $sObjKey);
+		if (strlen($sUrl) > 0)
+		{
+			if ($bWithNavigationContext)
+			{
+				return $sUrl."&".$oAppContext->GetForLink();
+			}
+			else
+			{
+				return $sUrl;
+			}
+		}
+		else
+		{
+			return '';
+		}	
+	}
+
+	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/audit.category.class.inc.php

@@ -34,7 +34,7 @@ class AuditCategory extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "application",
+			"category" => "application, grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -53,8 +53,8 @@ class AuditCategory extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'rules_list')); // 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', 'description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'definition_set')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
 	}
 }
 ?>

application/audit.rule.class.inc.php

@@ -35,7 +35,7 @@ class AuditRule extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "application",
+			"category" => "application, grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -57,8 +57,8 @@ class AuditRule extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('category_id', 'description', 'valid_flag')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
 	}
 }
 ?>

application/dashboard.class.inc.php

@@ -115,15 +115,13 @@ abstract class Dashboard
 					$aDashletOrder = array();
 					foreach($oDashletList as $oDomNode)
 					{
-						$sDashletClass = $oDomNode->getAttribute('xsi:type');
 						$oRank =  $oDomNode->getElementsByTagName('rank')->item(0);
 						if ($oRank)
 						{
 							$iRank = (float)$oRank->textContent;
 						}
-						$sId = $oDomNode->getAttribute('id');
-						$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
-						$oNewDashlet->FromDOMNode($oDomNode);
+
+						$oNewDashlet = $this->InitDashletFromDOMNode($oDomNode);
 						$aDashletOrder[] = array('rank' => $iRank, 'dashlet' => $oNewDashlet);
 					}
 					usort($aDashletOrder, array(get_class($this), 'SortOnRank'));
@@ -147,6 +145,20 @@ abstract class Dashboard
 		}
 	}
 
+	protected function InitDashletFromDOMNode($oDomNode)
+    {
+        $sId = $oDomNode->getAttribute('id');
+	    $sDashletType = $oDomNode->getAttribute('xsi:type');
+
+        // Test if dashlet can be instanciated, otherwise (uninstalled, broken, ...) we display a placeholder
+	    $sClass = static::GetDashletClassFromType($sDashletType);
+        $oNewDashlet = new $sClass($this->oMetaModel, $sId);
+        $oNewDashlet->SetDashletType($sDashletType);
+        $oNewDashlet->FromDOMNode($oDomNode);
+
+        return $oNewDashlet;
+    }
+
 	static function SortOnRank($aItem1, $aItem2)
 	{
 		return ($aItem1['rank'] > $aItem2['rank']) ? +1 : -1;
@@ -220,7 +232,7 @@ abstract class Dashboard
 				$oNode = $oDoc->createElement('dashlet');
 				$oDashletsNode->appendChild($oNode);
 				$oNode->setAttribute('id', $oDashlet->GetID());
-				$oNode->setAttribute('xsi:type', get_class($oDashlet));
+				$oNode->setAttribute('xsi:type', $oDashlet->GetDashletType());
 				$oDashletRank = $oDoc->createElement('rank', $iDashletRank);
 				$oNode->appendChild($oDashletRank);
 				$iDashletRank++;
@@ -245,7 +257,10 @@ abstract class Dashboard
 				$sDashletClass = $aDashletParams['dashlet_class'];
 				$sId = $aDashletParams['dashlet_id'];
 				$oNewDashlet = new $sDashletClass($this->oMetaModel, $sId);
-				
+				if (isset($aDashletParams['dashlet_type']))
+				{
+					$oNewDashlet->SetDashletType($aDashletParams['dashlet_type']);
+				}
 				$oForm = $oNewDashlet->GetForm();
 				$oForm->SetParamsContainer($sId);
 				$oForm->SetPrefix('');
@@ -414,24 +429,11 @@ EOF
 		$oPage->add('<div class="ui-widget-content ui-corner-all"><div class="ui-widget-header ui-corner-all" style="text-align:center; padding: 2px;">'.Dict::S('UI:DashboardEdit:Dashlets').'</div>');
 		$sUrl = utils::GetAbsoluteUrlAppRoot();
 
-		$oPage->add('<div id="select_dashlet" style="text-align:center">');
-		foreach( get_declared_classes() as $sDashletClass)
+		$oPage->add('<div id="select_dashlet" style="text-align:center; max-height:120px; overflow-y:auto;">');
+		$aAvailableDashlets = $this->GetAvailableDashlets();
+		foreach($aAvailableDashlets as $sDashletClass => $aInfo)
 		{
-			if (is_subclass_of($sDashletClass, 'Dashlet'))
-			{
-				$oReflection = new ReflectionClass($sDashletClass);
-				if (!$oReflection->isAbstract())
-				{
-					$aCallSpec = array($sDashletClass, 'IsVisible');
-					$bVisible = call_user_func($aCallSpec);
-					if ($bVisible)
-					{
-						$aCallSpec = array($sDashletClass, 'GetInfo');
-						$aInfo = call_user_func($aCallSpec);
-						$oPage->add('<span dashlet_class="'.$sDashletClass.'" class="dashlet_icon ui-widget-content ui-corner-all" id="dashlet_'.$sDashletClass.'" title="'.$aInfo['label'].'" style="width:34px; height:34px; display:inline-block; margin:2px;"><img src="'.$sUrl.$aInfo['icon'].'" /></span>');
-					}
-				}
-			}
+			$oPage->add('<span dashlet_class="'.$sDashletClass.'" class="dashlet_icon ui-widget-content ui-corner-all" id="dashlet_'.$sDashletClass.'" title="'.$aInfo['label'].'" style="width:34px; height:34px; display:inline-block; margin:2px;"><img src="'.$sUrl.$aInfo['icon'].'" /></span>');
 		}
 		$oPage->add('</div>');
 
@@ -465,6 +467,38 @@ EOF
 
 		$oPage->add('</div>');
 	}
+
+	/**
+	 * Return an array of dashlets available for selection.
+	 *
+	 * @return array
+	 */
+	protected function GetAvailableDashlets()
+	{
+		$aDashlets = array();
+
+		foreach( get_declared_classes() as $sDashletClass)
+		{
+			// DashletUnknown is not among the selection as it is just a fallback for dashlets that can't instanciated.
+			if ( is_subclass_of($sDashletClass, 'Dashlet') && !in_array($sDashletClass, array('DashletUnknown', 'DashletProxy')) )
+			{
+				$oReflection = new ReflectionClass($sDashletClass);
+				if (!$oReflection->isAbstract())
+				{
+					$aCallSpec = array($sDashletClass, 'IsVisible');
+					$bVisible = call_user_func($aCallSpec);
+					if ($bVisible)
+					{
+						$aCallSpec = array($sDashletClass, 'GetInfo');
+						$aInfo = call_user_func($aCallSpec);
+						$aDashlets[$sDashletClass] = $aInfo;
+					}
+				}
+			}
+		}
+
+		return $aDashlets;
+	}
 	
 	protected function GetNewDashletId()
 	{
@@ -480,6 +514,15 @@ EOF
 	}
 	
 	abstract protected function SetFormParams($oForm);
+
+	public static function GetDashletClassFromType($sType, $oFactory = null)
+	{
+		if (is_subclass_of($sType, 'Dashlet'))
+		{
+			return $sType;
+		}
+		return 'DashletUnknown';
+	}
 }
 
 class RuntimeDashboard extends Dashboard
@@ -755,33 +798,65 @@ EOF
 	
 	public static function GetDashletCreationForm($sOQL = null)
 	{
+		$oAppContext = new ApplicationContext();
+		$sContextMenuId = $oAppContext->GetCurrentValue('menu', null);
+
 		$oForm = new DesignerForm();
 	
 		// Get the list of all 'dashboard' menus in which we can insert a dashlet
 		$aAllMenus = ApplicationMenu::ReflectionMenuNodes();
+		$sRootMenuId = ApplicationMenu::GetRootMenuId($sContextMenuId);
 		$aAllowedDashboards = array();
-		foreach($aAllMenus as $idx => $aMenu)
+		$sDefaultDashboard = null;
+
+		// Store the parent menus for acces check
+        $aParentMenus = array();
+        foreach($aAllMenus as $idx => $aMenu)
+        {
+            /** @var MenuNode $oMenu */
+            $oMenu = $aMenu['node'];
+            if (count(ApplicationMenu::GetChildren($oMenu->GetIndex())) > 0)
+            {
+                $aParentMenus[$oMenu->GetMenuId()] = $aMenu;
+            }
+        }
+
+        foreach($aAllMenus as $idx => $aMenu)
 		{
 			$oMenu = $aMenu['node'];
-			$sParentId = $aMenu['parent'];
-			if ($oMenu instanceof DashboardMenuNode)
-			{
-				$sMenuLabel = $oMenu->GetTitle();
-				$sParentLabel = Dict::S('Menu:'.$sParentId);
-				if ($sParentLabel != $sMenuLabel)
-				{
-					$aAllowedDashboards[$oMenu->GetMenuId()] = $sParentLabel.' - '.$sMenuLabel;
-				}
-				else
-				{
-					$aAllowedDashboards[$oMenu->GetMenuId()] = $sMenuLabel;
-				}
-			}
+            if ($oMenu instanceof DashboardMenuNode)
+            {
+                // Get the root parent for access check
+                $sParentId = $aMenu['parent'];
+                $aParentMenu = $aParentMenus[$sParentId];
+                while (isset($aParentMenus[$aParentMenu['parent']]))
+                {
+                    // grand parent exists
+                    $sParentId = $aParentMenu['parent'];
+                    $aParentMenu = $aParentMenus[$sParentId];
+                }
+                $oParentMenu = $aParentMenu['node'];
+                if ($oMenu->IsEnabled() && $oParentMenu->IsEnabled())
+                {
+                    $sMenuLabel = $oMenu->GetTitle();
+                    $sParentLabel = Dict::S('Menu:'.$sParentId);
+                    if ($sParentLabel != $sMenuLabel)
+                    {
+                        $aAllowedDashboards[$oMenu->GetMenuId()] = $sParentLabel.' - '.$sMenuLabel;
+                    }
+                    else
+                    {
+                        $aAllowedDashboards[$oMenu->GetMenuId()] = $sMenuLabel;
+                    }
+                    if (empty($sDefaultDashboard) && ($sRootMenuId == ApplicationMenu::GetRootMenuId($oMenu->GetMenuId())))
+                    {
+                        $sDefaultDashboard = $oMenu->GetMenuId();
+                    }
+                }
+            }
 		}
 		asort($aAllowedDashboards);
 		
-		$aKeys = array_keys($aAllowedDashboards); // Select the first one by default
-		$sDefaultDashboard = $aKeys[0];
 		$oField = new DesignerComboField('menu_id', Dict::S('UI:DashletCreation:Dashboard'), $sDefaultDashboard);
 		$oField->SetAllowedValues($aAllowedDashboards);
 		$oField->SetMandatory(true);
@@ -842,7 +917,7 @@ EOF
 		$oPage->add_ready_script(
 <<<EOF
 $('#dashlet_creation_dlg').dialog({
-	width: 400,
+	width: 600,
 	modal: true,
 	title: '$sDialogTitle',
 	buttons: [

application/datamodel.application.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
   <portals>
     <portal id="legacy_portal" _delta="define">
       <url>portal/index.php</url>
@@ -19,4 +19,9 @@
       </deny>
     </portal>
   </portals>
+  <menus>
+    <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
+      <rank>80</rank>
+    </menu>
+  </menus>
 </itop_design>

application/datatable.class.inc.php

@@ -174,6 +174,7 @@ class DataTable
 		}
 		$sJSOptions = json_encode($aOptions);
 		$oPage->add_ready_script("$('#datatable_{$this->iListId}').datatable($sJSOptions);");
+
 		return $sHtml;
 	}
 	
@@ -297,7 +298,7 @@ EOF;
 		if (!$oPage->IsPrintableVersion())
 		{
 			$sMenuTitle = Dict::S('UI:ConfigureThisList');
-			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><img src="../images/toolkit_menu.png?itopversion='.ITOP_VERSION.'"><ul>';
+			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><img src="../images/toolkit_menu.png?t='.utils::GetCacheBusterTimestamp().'"><ul>';
 	
 			$oMenuItem1 = new JSPopupMenuItem('iTop::ConfigureList', $sMenuTitle, "$('#datatable_dlg_".$this->iListId."').dialog('open');");
 			$aActions = array(
@@ -571,33 +572,6 @@ EOF
 		{
 			$oPage->add_ready_script("oTable.trigger(\"fakesorton\", [$sFakeSortList]);");
 		}
-		//if ($iNbPages == 1)
-		if (false)
-		{
-			if (isset($aExtraParams['cssCount']))
-			{
-				$sCssCount = $aExtraParams['cssCount'];
-				if ($sSelectMode == 'single')
-				{
-					$sSelectSelector = ":radio[name^=selectObj]";
-				}
-				else if ($sSelectMode == 'multiple')
-				{
-					$sSelectSelector = ":checkbox[name^=selectObj]";
-				}
-				$oPage->add_ready_script(
-<<<EOF
-	$('#{$this->iListId} table.listResults $sSelectSelector').change(function() {
-		var c = $('{$sCssCount}');							
-		var v = $('#{$this->iListId} table.listResults $sSelectSelector:checked').length;
-		c.val(v);
-		$('#{$this->iListId} .selectedCount').text(v);
-		c.trigger('change');	
-	});
-EOF
-				);
-			}
-		}
 		return $sHtml;
 	}
 	
@@ -606,7 +580,7 @@ EOF
 		$iPageSize = ($iDefaultPageSize < 1) ? 1 : $iDefaultPageSize;
 		$iPageIndex = 1 + floor($iStart / $iPageSize);
 		$sHtml = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
-		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".str_replace("\n", ' ', addslashes($sHtml))."');");
+		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".json_encode($sHtml)."');");
 		if ($iDefaultPageSize < 1)
 		{
 			$oPage->add_ready_script("$('#pager{$this->iListId}').parent().hide()");

application/displayblock.class.inc.php

@@ -43,6 +43,7 @@ require_once(APPROOT.'/application/utils.inc.php');
 class DisplayBlock
 {
 	const TAG_BLOCK = 'itopblock';
+	/** @var \DBSearch */
 	protected $m_oFilter;
 	protected $m_aConditions; // Conditions added to the filter -> avoid duplicate conditions
 	protected $m_sStyle;
@@ -74,10 +75,17 @@ class DisplayBlock
 	{
 		return $this->m_oFilter;
 	}
+
 	/**
 	 * Constructs a DisplayBlock object from a DBObjectSet already in memory
-	 * @param $oSet DBObjectSet
+	 *
+	 * @param DBObjectSet $oSet
+	 * @param string $sStyle
+	 * @param array $aParams
+	 *
 	 * @return DisplayBlock The DisplayBlock object, or null if the creation failed
+	 * @throws \CoreException
+	 * @throws \Exception
 	 */
 	public static function FromObjectSet(DBObjectSet $oSet, $sStyle, $aParams = array())
 	{
@@ -100,11 +108,15 @@ class DisplayBlock
 		$oBlock = new DisplayBlock($oDummyFilter, $sStyle, false, $aParams); // DisplayBlocks built this way are synchronous
 		return $oBlock;
 	}
-	
+
 	/**
 	 * Constructs a DisplayBlock object from an XML template
+	 *
 	 * @param $sTemplate string The XML template
+	 *
 	 * @return DisplayBlock The DisplayBlock object, or null if the template is invalid
+	 * @throws \ApplicationException
+	 * @throws \OQLException
 	 */
 	public static function FromTemplate($sTemplate)
 	{
@@ -114,7 +126,6 @@ class DisplayBlock
 		$aParams = array();
 		
 		if (($iStartPos === false) || ($iEndPos === false)) return null; // invalid template		
-		$sITopBlock = substr($sTemplate,$iStartPos, $iEndPos-$iStartPos+strlen('</'.self::TAG_BLOCK.'>'));
 		$sITopData = substr($sTemplate, 1+$iEndTag, $iEndPos - $iEndTag - 1);
 		$sITopTag = substr($sTemplate, $iStartPos + strlen('<'.self::TAG_BLOCK), $iEndTag - $iStartPos - strlen('<'.self::TAG_BLOCK));
 
@@ -135,10 +146,6 @@ class DisplayBlock
 		{
 			$sBlockClass = $aMatches[1];
 		}
-		if (preg_match('/ objectclass="(.*)"/U',$sITopTag, $aMatches))
-		{
-			$sObjectClass = $aMatches[1];
-		}
 		if (preg_match('/ encoding="(.*)"/U',$sITopTag, $aMatches))
 		{
 			$sEncoding = strtolower($aMatches[1]);
@@ -187,6 +194,7 @@ class DisplayBlock
 			}
 
 		}
+		$oFilter = null;
 		switch($sEncoding)
 		{
 			case 'text/serialize':
@@ -212,47 +220,20 @@ class DisplayBlock
 		$aExtraParams['currentId'] = $sId;
 		$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
 		
-		$bAutoReload = false;
-		if (isset($aExtraParams['auto_reload']))
-		{
-			if ($aExtraParams['auto_reload'] === true)
-			{
-				// Note: does not work in the switch (case true) because a positive number evaluates to true!!!
-				$aExtraParams['auto_reload'] = 'standard';
-			}
-			switch($aExtraParams['auto_reload'])
-			{
-				case 'fast':
-				$bAutoReload = true;
-				$iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval()*1000;
-				break;
-				
-				case 'standard':
-				case 'true':
-				$bAutoReload = true;
-				$iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval()*1000;
-				break;
-				
-				default:
-				if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0))
-				{
-					$bAutoReload = true;
-					$iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload'])*1000;
-				}
-				else
-				{
-					// incorrect config, ignore it
-					$bAutoReload = false;
-				}
-			}
-		}
+
 
 		$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
 		if (!$this->m_bAsynchronous)
 		{
 			// render now
-			$sHtml .= "<div id=\"$sId\" class=\"display_block\">\n";
-			$sHtml .= $this->GetRenderContent($oPage, $aExtraParams, $sId);
+			$sHtml .= "<div id=\"$sId\" class=\"display_block\" >\n";
+			try
+			{
+				$sHtml .= $this->GetRenderContent($oPage, $aExtraParams, $sId);
+			} catch (Exception $e)
+			{
+
+			}
 			$sHtml .= "</div>\n";
 		}
 		else
@@ -265,20 +246,49 @@ class DisplayBlock
 			$.post("ajax.render.php?style='.$this->m_sStyle.'",
 			   { operation: "ajax", filter: "'.$sFilter.'", extra_params: "'.$sExtraParams.'" },
 			   function(data){
-				 $("#'.$sId.'").empty();
-				 $("#'.$sId.'").append(data);
-				 $("#'.$sId.'").removeClass("loading");
+				 $("#'.$sId.'")
+				    .empty()
+				    .append(data)
+				    .removeClass("loading")
+                 ;
 				}
 			 );
 			 ');
 		}
-		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
-		{
-			$oPage->add_script('setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
-		}
+
+
+        if ($this->m_sStyle == 'list') // Search form need to extract result list extra data, the simplest way is to expose this configuration
+        {
+
+            $listJsonExtraParams = json_encode(json_encode($aExtraParams));
+            $oPage->add_ready_script("
+            $('#$sId').data('sExtraParams', ".$listJsonExtraParams.");
+//            console.debug($('#$sId').data());
+//            console.debug($('#$sId'));
+//            console.debug('#$sId'); 
+            ");
+
+
+
+
+//            $oPage->add_ready_script("console.debug($('#Menu_UserRequest_OpenRequests').data());");
+
+        }
+
+
 		return $sHtml;
 	}
-	
+
+	/**
+	 * @param \WebPage $oPage
+	 * @param array $aExtraParams
+	 *
+	 * @throws \ApplicationException
+	 * @throws \CoreException
+	 * @throws \CoreWarning
+	 * @throws \DictExceptionMissingString
+	 * @throws \MySQLException
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
 		if (!isset($aExtraParams['currentId']))
@@ -291,7 +301,19 @@ class DisplayBlock
 		}
 		$oPage->add($this->GetRenderContent($oPage, $aExtraParams, $sId));
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @param $sId
+	 * @return string
+	 * @throws ApplicationException
+	 * @throws CoreException
+	 * @throws CoreWarning
+	 * @throws DictExceptionMissingString
+	 * @throws MySQLException
+	 * @throws Exception
+	 */
 	public function GetRenderContent(WebPage $oPage, $aExtraParams = array(), $sId)
 	{
 		$sHtml = '';
@@ -406,37 +428,8 @@ class DisplayBlock
 			case 'count':
 			if (isset($aExtraParams['group_by']))
 			{
-				if (isset($aExtraParams['group_by_label']))
-				{
-					$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);					
-					$sGroupByLabel = $aExtraParams['group_by_label'];
-				}
-				else
-				{
-					// Backward compatibility: group_by is simply a field id
-					$sAlias = $this->m_oFilter->GetClassAlias();
-					$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
-					$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
-				}
+				$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
 
-				// Security filtering
-				$aFields = $oGroupByExp->ListRequiredFields();
-				foreach($aFields as $sFieldAlias)
-				{
-					if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
-					{
-						$sFieldClass = $this->m_oFilter->GetClassName($aMatches[1]);
-						$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
-						if ($oAttDef instanceof AttributeOneWayPassword)
-						{
-							throw new Exception('Grouping on password fields is not supported.');
-						}
-					}
-				}
-				
-				$aGroupBy = array();
-				$aGroupBy['grouped_by_1'] = $oGroupByExp;
-				$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy, true);
 				$aRes = CMDBSource::QueryToArray($sSql);
 
 				$aGroupBy = array();
@@ -449,7 +442,7 @@ class DisplayBlock
 					$aValues[$iRow] = $sValue;
 					$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
 					$aLabels[$iRow] = $sHtmlValue;
-					$aGroupBy[$iRow] = (int) $aRow['_itop_count_'];
+					$aGroupBy[$iRow] = (int) $aRow[$sFctVar];
 					$iTotalCount += $aRow['_itop_count_'];
 				}
 
@@ -465,12 +458,12 @@ class DisplayBlock
 					$oSubsetSearch->AddConditionExpression($oCondition);
 					$sFilter = urlencode($oSubsetSearch->serialize());
 
-					$aData[] = array ( 'group' => $aLabels[$iRow],
+					$aData[] = array ('group' => $aLabels[$iRow],
 									  'value' => "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=search&dosearch=1&$sParams&filter=$sFilter\">$iCount</a>"); // TO DO: add the context information
 				}
 				$aAttribs =array(
 					'group' => array('label' => $sGroupByLabel, 'description' => ''),
-					'value' => array('label'=> Dict::S('UI:GroupBy:Count'), 'description' => Dict::S('UI:GroupBy:Count+'))
+					'value' => array('label'=> Dict::S('UI:GroupBy:'.$sAggregationFunction), 'description' => Dict::Format('UI:GroupBy:'.$sAggregationFunction.'+', $sAggregationAttr))
 				);
 				$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
 				$sHtml .= $oPage->GetP(Dict::Format($sFormat, $iTotalCount));
@@ -594,14 +587,14 @@ class DisplayBlock
 				// Check the classes that can be read (i.e authorized) by this user...
 				foreach($aClasses as $sAlias => $sClassName)
 				{
-					if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ,  $this->m_oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
+					if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ,  $this->m_oSet) != UR_ALLOWED_NO)
 					{
 						$aAuthorizedClasses[$sAlias] = $sClassName;
 					}
 				}
 				if (count($aAuthorizedClasses) > 0)
 				{
-					if($this->m_oSet->Count() > 0)
+					if($this->m_oSet->CountWithLimit(1) > 0)
 					{
 						$sHtml .= cmdbAbstractObject::GetDisplayExtendedSet($oPage, $this->m_oSet, $aExtraParams);
 					}
@@ -620,7 +613,7 @@ class DisplayBlock
 			else
 			{
 				// The list is made of only 1 class of objects, actions on the list are possible
-				if ( ($this->m_oSet->Count()> 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
+				if ( ($this->m_oSet->CountWithLimit(1)> 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
 				{
 					$sHtml .= cmdbAbstractObject::GetDisplaySet($oPage, $this->m_oSet, $aExtraParams);
 				}
@@ -655,13 +648,27 @@ class DisplayBlock
 						}
 					}
 				}
+
+				if (isset($aExtraParams['update_history']) && true == $aExtraParams['update_history'])
+				{
+
+					$seventAttachedData = json_encode(array(
+						'filter'                => $this->m_oSet->GetFilter()->serialize(),
+						'breadcrumb_id'         => "ui-search-".$this->m_oSet->GetClass(),
+						'breadcrumb_label'      => MetaModel::GetName($this->m_oSet->GetClass()),
+						'breadcrumb_max_count'  => utils::GetConfig()->Get('breadcrumb.max_count'),
+						'breadcrumb_instance_id'=> MetaModel::GetConfig()->GetItopInstanceid(),
+						'breadcrumb_icon'       => utils::GetAbsoluteUrlAppRoot().'images/breadcrumb-search.png'
+					));
+					$oPage->add_ready_script("$('body').trigger('update_history.itop', [$seventAttachedData])");
+				}
 			}
 			break;
 			
 			case 'links':
 			//$bDashboardMode = isset($aExtraParams['dashboard']) ? ($aExtraParams['dashboard'] == 'true') : false;
 			//$bSelectMode = isset($aExtraParams['select']) ? ($aExtraParams['select'] == 'true') : false;
-			if ( ($this->m_oSet->Count()> 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
+			if ( ($this->m_oSet->CountWithLimit(1) > 0) && (UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) )
 			{
 				//$sLinkage = isset($aExtraParams['linkage']) ? $aExtraParams['linkage'] : '';
 				$sHtml .= cmdbAbstractObject::GetDisplaySet($oPage, $this->m_oSet, $aExtraParams);
@@ -677,8 +684,6 @@ class DisplayBlock
 				{
 					if ((UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
 					{
-						$oAppContext = new ApplicationContext();
-						$sParams = $oAppContext->GetForLink();
 						$sDefaults = '';
 						if (isset($this->m_aParams['default']))
 						{
@@ -706,7 +711,6 @@ class DisplayBlock
 			$bContextFilter = isset($aExtraParams['context_filter']) ? isset($aExtraParams['context_filter']) != 0 : false;
 			if ($bContextFilter)
 			{
-				$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($this->m_oFilter->GetClass()));
 				foreach($oAppContext->GetNames() as $sFilterCode)
 				{
 					$sContextParamValue = $oAppContext->GetCurrentValue($sFilterCode, null);
@@ -750,7 +754,6 @@ class DisplayBlock
 			$bContextFilter = isset($aExtraParams['context_filter']) ? isset($aExtraParams['context_filter']) != 0 : false;
 			if ($bContextFilter)
 			{
-				$aFilterCodes = array_keys(MetaModel::GetClassFilterDefs($this->m_oFilter->GetClass()));
 				foreach($oAppContext->GetNames() as $sFilterCode)
 				{
 					$sContextParamValue = $oAppContext->GetCurrentValue($sFilterCode, null);
@@ -774,21 +777,47 @@ class DisplayBlock
 			{
 				$aStates = explode(',', $sStatesList);
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sStateAttrCode);
+
+				// Generate one count + group by query [#1330]
+				$sClassAlias = $this->m_oFilter->GetClassAlias();
+				$oGroupByExpr = Expression::FromOQL($sClassAlias.'.'.$sStateAttrCode);
+				$aGroupBy = array('group1' => $oGroupByExpr);
+				$oGroupBySearch = $this->m_oFilter->DeepClone();
+				if (isset($this->m_bShowObsoleteData))
+				{
+					$oGroupBySearch->SetShowObsoleteData($this->m_bShowObsoleteData);
+				}
+				$sCountGroupByQuery = $oGroupBySearch->MakeGroupByQuery(array(), $aGroupBy, false);
+				$aCountGroupByResults = CMDBSource::QueryToArray($sCountGroupByQuery);
+				$aCountsQueryResults = array();
+				foreach ($aCountGroupByResults as $aCountGroupBySingleResult)
+				{
+					$aCountsQueryResults[$aCountGroupBySingleResult[0]] = $aCountGroupBySingleResult[1];
+				}
+
 				foreach($aStates as $sStateValue)
 				{
-					$oFilter = $this->m_oFilter->DeepClone();
-					$oFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
-					$oSet = new DBObjectSet($oFilter);
-					$oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
-					$aCounts[$sStateValue] = $oSet->Count();
 					$aStateLabels[$sStateValue] = htmlentities($oAttDef->GetValueLabel($sStateValue), ENT_QUOTES, 'UTF-8');
+
+					$aCounts[$sStateValue] = (array_key_exists($sStateValue, $aCountsQueryResults))
+						? $aCountsQueryResults[$sStateValue]
+						: 0;
+
 					if ($aCounts[$sStateValue] == 0)
 					{
 						$aCounts[$sStateValue] = '-';
 					}
 					else
 					{
-						$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search&'.$oAppContext->GetForLink().'&filter='.urlencode($oFilter->serialize());
+						$oSingleGroupByValueFilter = $this->m_oFilter->DeepClone();
+						$oSingleGroupByValueFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
+						if (isset($this->m_bShowObsoleteData))
+						{
+							$oSingleGroupByValueFilter->SetShowObsoleteData($this->m_bShowObsoleteData);
+						}
+						$sHyperlink = utils::GetAbsoluteUrlAppRoot()
+							.'pages/UI.php?operation=search&'.$oAppContext->GetForLink()
+							.'&filter='.urlencode($oSingleGroupByValueFilter->serialize());
 						$aCounts[$sStateValue] = "<a href=\"$sHyperlink\">{$aCounts[$sStateValue]}</a>";
 					}
 				}
@@ -829,36 +858,6 @@ class DisplayBlock
 			}
 			$sAjaxLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php';
 				
-/*
-			$sCSVData = cmdbAbstractObject::GetSetAsCSV($this->m_oSet, array('fields_advanced' => $bAdvancedMode));
-			$sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset');
-			if ($sCharset == 'UTF-8')
-			{
-				$bLostChars = false;
-			}
-			else
-			{
-				$sConverted = @iconv('UTF-8', $sCharset, $sCSVData);
-				$sRestored = @iconv($sCharset, 'UTF-8', $sConverted);
-				$bLostChars = ($sRestored != $sCSVData);
-			}
-
-			if ($bLostChars)
-			{
-				$sCharsetNotice = "&nbsp;&nbsp;<span id=\"csv_charset_issue\">";
-				$sCharsetNotice .= '<img src="../images/error.png"  style="vertical-align:middle"/>';
-				$sCharsetNotice .= "</span>";
-
-				$sTip = "<p>".htmlentities(Dict::S('UI:CSVExport:LostChars'), ENT_QUOTES, 'UTF-8')."</p>";
-				$sTip .= "<p>".htmlentities(Dict::Format('UI:CSVExport:LostChars+', $sCharset), ENT_QUOTES, 'UTF-8')."</p>";
-				$oPage->add_ready_script("$('#csv_charset_issue').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
-			}
-			else
-			{
-				$sCharsetNotice = '';
-			}
-
-*/
 			$sCharsetNotice = false;
 			$sHtml .= "<div>";
 			$sHtml .= '<table style="width:100%" class="transparent">';
@@ -895,21 +894,10 @@ class DisplayBlock
 			case 'search':
 			if (!$oPage->IsPrintableVersion())
 			{
-				$sStyle = (isset($aExtraParams['open']) && ($aExtraParams['open'] == 'true')) ? 'SearchDrawer' : 'SearchDrawer DrawerClosed';
-				$sHtml .= "<div id=\"ds_$sId\" class=\"$sStyle\">\n";
-				$oPage->add_ready_script(
-<<<EOF
-		$("#dh_$sId").click( function() {
-			$("#ds_$sId").slideToggle('normal', function() { $("#ds_$sId").parent().resize(); FixSearchFormsDisposition();  $("#dh_$sId").trigger('toggle_complete'); } );
-			$("#dh_$sId").toggleClass('open');
-		});
-EOF
-				);
+				$sHtml .= "<div id=\"ds_$sId\" class=\"search_box\">\n";
 				$aExtraParams['currentId'] = $sId;
 				$sHtml .= cmdbAbstractObject::GetSearchForm($oPage, $this->m_oSet, $aExtraParams);
 		 		$sHtml .= "</div>\n";
-		 		$sHtml .= "<div class=\"HRDrawer\"></div>\n";
-		 		$sHtml .= "<div id=\"dh_$sId\" class=\"DrawerHandle\">".Dict::S('UI:SearchToggle')."</div>\n";
 		 	}
 			break;
 			
@@ -925,18 +913,21 @@ EOF
 			$sFilter = $this->m_oFilter->serialize();
 			$oContext = new ApplicationContext();
 			$sContextParam = $oContext->GetForLink();
+			$sAggregationFunction = isset($aExtraParams['aggregation_function']) ? $aExtraParams['aggregation_function'] : '';
+			$sAggregationAttr = isset($aExtraParams['aggregation_attribute']) ? $aExtraParams['aggregation_attribute'] : '';
+			$sLimit = isset($aExtraParams['limit']) ? $aExtraParams['limit'] : '';
+			$sOrderBy = isset($aExtraParams['order_by']) ? $aExtraParams['order_by'] : '';
+			$sOrderDirection = isset($aExtraParams['order_direction']) ? $aExtraParams['order_direction'] : '';
 
 			if (isset($aExtraParams['group_by_label']))
 			{
-				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
+				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[group_by_label]={$aExtraParams['group_by_label']}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
 			}
 			else
 			{
-				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
+				$sUrl = json_encode(utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=chart&params[group_by]=$sGroupBy{$sGroupByExpr}&params[chart_type]=$sChartType&params[currentId]=$sId{$iChartCounter}&params[order_direction]=$sOrderDirection&params[order_by]=$sOrderBy&params[limit]=$sLimit&params[aggregation_function]=$sAggregationFunction&params[aggregation_attribute]=$sAggregationAttr&id=$sId{$iChartCounter}&filter=".urlencode($sFilter).'&'.$sContextParam);
 			}
-			
-			$sType = ($sChartType == 'pie') ? 'pie' : 'bar';
-			
+
 			$oPage->add_ready_script(
 <<<EOF
 $.post($sUrl, {}, function(data) {
@@ -953,22 +944,7 @@ EOF
 
 			if (isset($aExtraParams['group_by']))
 			{
-				if (isset($aExtraParams['group_by_label']))
-				{
-					$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);
-					$sGroupByLabel = $aExtraParams['group_by_label'];
-				}
-				else
-				{
-					// Backward compatibility: group_by is simply a field id
-					$sAlias = $this->m_oFilter->GetClassAlias();
-					$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
-					$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
-				}
-
-				$aGroupBy = array();
-				$aGroupBy['grouped_by_1'] = $oGroupByExp;
-				$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy, true);
+				$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
 				$aRes = CMDBSource::QueryToArray($sSql);
 				$oContext = new ApplicationContext();
 				$sContextParam = $oContext->GetForLink();
@@ -981,9 +957,9 @@ EOF
 				{
 					$sValue = $aRow['grouped_by_1'];
 					$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
-					$aGroupBy[(int)$iRow] = (int) $aRow['_itop_count_'];
+					$aGroupBy[(int)$iRow] = (int) $aRow[$sFctVar];
 					$iTotalCount += $aRow['_itop_count_'];
-					$aValues[] = array('label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'), 'label_html' => $sHtmlValue, 'value' => (int) $aRow['_itop_count_']);
+					$aValues[] = array('label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'), 'label_html' => $sHtmlValue, 'value' => (int) $aRow[$sFctVar]);
 					
 					// Build the search for this subset
 					$oSubsetSearch = $this->m_oFilter->DeepClone();
@@ -1005,7 +981,6 @@ EOF
 				$sJSNames = json_encode($aNames);
 				
 				$sJson = json_encode($aValues);
-				$sJSCount = json_encode(Dict::S('UI:GroupBy:Count'));
 				$oPage->add_ready_script(
 <<<EOF
 var chart = c3.generate({
@@ -1081,6 +1056,7 @@ var chart = c3.generate({
 			var aURLs = $sJSURLs;
 		    window.location.href= aURLs[d.index];
 		},
+		order: null,
     },
     legend: {
       show: true,
@@ -1102,12 +1078,71 @@ EOF
 			// Unsupported style, do nothing.
 			$sHtml .= Dict::format('UI:Error:UnsupportedStyleOfBlock', $this->m_sStyle);
 		}
+
+
+		$bAutoReload = false;
+		if (isset($aExtraParams['auto_reload']))
+		{
+			if ($aExtraParams['auto_reload'] === true)
+			{
+				// Note: does not work in the switch (case true) because a positive number evaluates to true!!!
+				$aExtraParams['auto_reload'] = 'standard';
+			}
+			switch($aExtraParams['auto_reload'])
+			{
+				case 'fast':
+					$bAutoReload = true;
+					$iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval()*1000;
+					break;
+
+				case 'standard':
+				case 'true':
+					$bAutoReload = true;
+					$iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval()*1000;
+					break;
+
+				default:
+					if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0))
+					{
+						$bAutoReload = true;
+						$iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload'])*1000;
+					}
+					else
+					{
+						// incorrect config, ignore it
+						$bAutoReload = false;
+					}
+			}
+		}
+		if (($bAutoReload) && ($this->m_sStyle != 'search')) // Search form do NOT auto-reload
+		{
+			$sFilter = $this->m_oFilter->serialize(); // Used either for asynchronous or auto_reload
+			$sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
+
+			$oPage->add_script('if (typeof window.oAutoReloadBlock == "undefined") {
+				    window.oAutoReloadBlock = {};
+				}
+				if (typeof window.oAutoReloadBlock[\''.$sId.'\'] != "undefined") {
+				    clearInterval(window.oAutoReloadBlock[\''.$sId.'\']);
+				}
+				window.oAutoReloadBlock[\''.$sId.'\'] = setInterval("ReloadBlock(\''.$sId.'\', \''.$this->m_sStyle.'\', \''.$sFilter.'\', \"'.$sExtraParams.'\")", '.$iReloadInterval.');');
+		}
+
 		return $sHtml;
 	}
-	
+
 	/**
 	 * Add a condition (restriction) to the current DBSearch on which the display block is based
 	 * taking into account the hierarchical keys for which the condition is based on the 'below' operator
+	 *
+	 * @param string $sFilterCode
+	 * @param array $condition
+	 * @param string $sOpCode
+	 * @param bool $bParseSearchString
+	 *
+	 * @throws \CoreException
+	 * @throws \CoreWarning
+	 * @throws \Exception
 	 */
 	protected function AddCondition($sFilterCode, $condition, $sOpCode = null, $bParseSearchString = false)
 	{
@@ -1164,7 +1199,7 @@ EOF
 		// In all other cases, just add the condition directly
 		if (!$bConditionAdded)
 		{
-			$this->m_oFilter->AddCondition($sFilterCode, $condition, null, $bParseSearchString); // Use the default 'loose' operator
+			$this->m_oFilter->AddCondition($sFilterCode, $condition, null); // Use the default 'loose' operator
 		}
 	}
 	
@@ -1185,6 +1220,97 @@ EOF
 	{
 		return $this->m_oSet->Count();
 	}
+
+	/**
+	 * @param $aExtraParams
+	 * @param $oGroupByExp
+	 * @param $sGroupByLabel
+	 * @param $aGroupBy
+	 * @param $sAggregationFunction
+	 * @param $sFctVar
+	 * @param $sAggregationAttr
+	 * @param $sSql
+	 *
+	 * @throws \Exception
+	 */
+	protected function MakeGroupByQuery(&$aExtraParams, &$oGroupByExp, &$sGroupByLabel, &$aGroupBy, &$sAggregationFunction, &$sFctVar, &$sAggregationAttr, &$sSql)
+	{
+		$sAlias = $this->m_oFilter->GetClassAlias();
+		if (isset($aExtraParams['group_by_label']))
+		{
+			$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);
+			$sGroupByLabel = $aExtraParams['group_by_label'];
+		}
+		else
+		{
+			// Backward compatibility: group_by is simply a field id
+			$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
+			$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
+		}
+
+		// Security filtering
+		$aFields = $oGroupByExp->ListRequiredFields();
+		foreach($aFields as $sFieldAlias)
+		{
+			$aMatches = array();
+			if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
+			{
+				$sFieldClass = $this->m_oFilter->GetClassName($aMatches[1]);
+				$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
+				if ($oAttDef instanceof AttributeOneWayPassword)
+				{
+					throw new Exception('Grouping on password fields is not supported.');
+				}
+			}
+		}
+
+		$aGroupBy = array();
+		$aGroupBy['grouped_by_1'] = $oGroupByExp;
+		$aQueryParams = array();
+		if (isset($aExtraParams['query_params']))
+		{
+			$aQueryParams = $aExtraParams['query_params'];
+		}
+		$aFunctions = array();
+		$sAggregationFunction = 'count';
+		$sFctVar = '_itop_count_';
+		$sAggregationAttr = '';
+		if (isset($aExtraParams['aggregation_function']) && !empty($aExtraParams['aggregation_attribute']))
+		{
+			$sAggregationFunction = $aExtraParams['aggregation_function'];
+			$sAggregationAttr = $aExtraParams['aggregation_attribute'];
+			$oAttrExpr = Expression::FromOQL('`'.$sAlias.'`.`'.$sAggregationAttr.'`');
+			$oFctExpr = new FunctionExpression(strtoupper($sAggregationFunction), array($oAttrExpr));
+			$sFctVar = '_itop_'.$sAggregationFunction.'_';
+			$aFunctions = array($sFctVar => $oFctExpr);
+		}
+
+		if (!empty($sAggregationAttr))
+		{
+			$sClass = $this->m_oFilter->GetClass();
+			$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
+		}
+		$iLimit = 0;
+		if (isset($aExtraParams['limit']))
+		{
+			$iLimit = intval($aExtraParams['limit']);
+		}
+		$aOrderBy = array();
+		if (isset($aExtraParams['order_direction']) && isset($aExtraParams['order_by']))
+		{
+			switch ($aExtraParams['order_by'])
+			{
+				case 'attribute':
+					$aOrderBy = array('grouped_by_1' => ($aExtraParams['order_direction'] === 'asc'));
+					break;
+				case 'function':
+					$aOrderBy = array($sFctVar => ($aExtraParams['order_direction'] === 'asc'));
+					break;
+			}
+		}
+
+		$sSql = $this->m_oFilter->MakeGroupByQuery($aQueryParams, $aGroupBy, true, $aFunctions, $aOrderBy, $iLimit);
+	}
 }
 
 /**
@@ -1336,15 +1462,25 @@ EOF
  * For backward compatibility 'popup' is equivalent to 'list'...
  */
 class MenuBlock extends DisplayBlock
-{	
+{
 	/**
 	 * Renders the "Actions" popup menu for the given set of objects
-	 * 
+	 *
 	 * Note that the menu links containing (or ending) with a hash (#) will have their fragment
 	 * part (whatever is after the hash) dynamically replaced (by javascript) when the menu is
 	 * displayed, to correspond to the current hash/fragment in the page. This allows modifying
 	 * an object in with the same tab active by default as the tab that was active when selecting
 	 * the "Modify..." action.
+	 *
+	 * @param \WebPage $oPage
+	 * @param array $aExtraParams
+	 * @param string $sId
+	 *
+	 * @return string
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
 	 */
 	public function GetRenderContent(WebPage $oPage, $aExtraParams = array(), $sId)
 	{
@@ -1363,7 +1499,6 @@ class MenuBlock extends DisplayBlock
 		$oReflectionClass = new ReflectionClass($sClass);
 		$oSet = new CMDBObjectSet($this->m_oFilter);
 		$sFilter = $this->m_oFilter->serialize();
-		$sFilterDesc = $this->m_oFilter->ToOql(true);
 		$aActions = array();
 		$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
 		$sRootUrl = utils::GetAbsoluteUrlAppRoot();
@@ -1482,6 +1617,7 @@ class MenuBlock extends DisplayBlock
 					if ($bLocked && $bRawModifiedAllowed)
 					{
 						// Add a special menu to kill the lock, but only to allowed users who can also modify this object
+						/** @var array $aAllowedProfiles */
 						$aAllowedProfiles = MetaModel::GetConfig()->Get('concurrent_lock_override_profiles');
 						$bCanKill = false;
 					
@@ -1550,7 +1686,6 @@ class MenuBlock extends DisplayBlock
 				$sTargetAttr = $aExtraParams['target_attr'];
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sTargetAttr);
 				$sTargetClass = $oAttDef->GetTargetClass();
-				$bIsDeleteAllowed = UserRights::IsActionAllowed($sClass, UR_ACTION_DELETE, $oSet);
 				if ($bIsModifyAllowed) { $aActions['UI:Menu:Add'] = array ('label' => Dict::S('UI:Menu:Add'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id&addObjects=true{$sContext}") + $aActionParams; }
 				if ($bIsBulkModifyAllowed) { $aActions['UI:Menu:Manage'] = array ('label' => Dict::S('UI:Menu:Manage'), 'url' => "{$sRootUrl}pages/$sUIPage?operation=modify_links&class=$sClass&link_attr=".$aExtraParams['link_attr']."&target_class=$sTargetClass&id=$id{$sContext}") + $aActionParams; }
 				//if ($bIsBulkDeleteAllowed) { $aActions[] = array ('label' => 'Remove All...', 'url' => "#") + $aActionParams; }
@@ -1567,7 +1702,7 @@ class MenuBlock extends DisplayBlock
 				// 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) && (($iLimit == 0) || ($oSet->CountWithLimit($iLimit + 1) < $iLimit)))
 				{
 					// Life cycle actions may be available... if all objects are in the same state
 					//
@@ -1641,7 +1776,8 @@ class MenuBlock extends DisplayBlock
 				}
 			}
 		}
-					
+		$param  =  null;
+		$iMenuId = null;
 		// New extensions based on iPopupMenuItem interface 
 		switch($this->m_sStyle)
 		{
@@ -1674,11 +1810,7 @@ class MenuBlock extends DisplayBlock
 				}
 			}
 		}
-		else
-		{
-			$aShortcutActions = array();
-		}
-		
+
 		if (!$oPage->IsPrintableVersion())
 		{
 			if (count($aFavoriteActions) > 0)
@@ -1689,12 +1821,27 @@ class MenuBlock extends DisplayBlock
 			{
 				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
 			}
-				
+
 			$sHtml .= $oPage->RenderPopupMenuItems($aActions, $aFavoriteActions);
+
+			if ($this->m_sStyle == 'details')
+			{
+				$sSearchAction = "window.location=\"{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}\"";
+				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::Format('UI:SearchFor_Class', MetaModel::GetName($sClass)), ENT_QUOTES, 'UTF-8')."\"><span class=\"search-button fa fa-search\" onclick='$sSearchAction'></span></div>";
+			}
+
+
+            if (empty($sRefreshAction) && $this->m_sStyle == 'list')
+            {
+                //for the detail page this var is defined way beyond this line
+                $sRefreshAction = "window.location.reload();";
+            }
 			if (!$oPage->IsPrintableVersion() && ($sRefreshAction!=''))
 			{
-				$sHtml .= "<div class=\"actions_button\" title=\"".htmlentities(Dict::S('UI:Button:Refresh'), ENT_QUOTES, 'UTF-8')."\"><span class=\"refresh-button\" onclick=\"$sRefreshAction\"></span></div>";
+				$sHtml .= "<div class=\"actions_button icon_actions_button\" title=\"".htmlentities(Dict::S('UI:Button:Refresh'), ENT_QUOTES, 'UTF-8')."\"><span class=\"refresh-button fa fa-refresh\" onclick=\"$sRefreshAction\"></span></div>";
 			}
+
+
 		}
 
 		static $bPopupScript = false;
@@ -1709,7 +1856,7 @@ class MenuBlock extends DisplayBlock
 	
 	/**
 	 * Appends a menu separator to the current list of actions
-	 * @param Hash $aActions The current actions list
+	 * @param array $aActions The current actions list
 	 * @return void
 	 */
 	protected function AddMenuSeparator(&$aActions)

application/excelexporter.class.inc.php

@@ -462,7 +462,7 @@ class ExcelExporter
 		$this->aAuthorizedClasses = array();
 		foreach($aClasses as $sAlias => $sClassName)
 		{
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO)
 			{
 				$this->aAuthorizedClasses[$sAlias] = $sClassName;
 			}

application/forms.class.inc.php

@@ -203,7 +203,7 @@ class DesignerForm
 	
 	public function RenderAsPropertySheet($oP, $bReturnHTML = false, $sNotifyParentSelector = null)
 	{
-		$sReturn = '';		
+		$sReturn = '';
 		$sActionUrl = addslashes($this->sSubmitTo);
 		$sJSSubmitParams = json_encode($this->aSubmitParams);
 		$sFormId = $this->GetFormId();
@@ -360,6 +360,7 @@ EOF
 <<<EOF
 $('#$sDialogId').dialog({
 		height: 'auto',
+		maxHeight: $(window).height() - 8,
 		width: $iDialogWidth,
 		modal: true,
 		autoOpen: $sAutoOpen,
@@ -1524,7 +1525,6 @@ class DesignerFormSelectorField extends DesignerFormField
 	
 	public function AddSubForm($oSubForm, $sLabel, $sValue)
 	{
-		$idx = count($this->aSubForms);
 		$this->aSubForms[] = array('form' => $oSubForm, 'label' => $sLabel, 'value' => $sValue);
 		if ($sValue == $this->defaultRealValue)
 		{
@@ -1538,7 +1538,7 @@ class DesignerFormSelectorField extends DesignerFormField
 		$sId = $this->oForm->GetFieldId($this->sCode);
 		$sName = $this->oForm->GetFieldName($this->sCode);
 		$sReadOnly = $this->IsReadOnly() ? 'disabled="disabled"' :  '';
-		
+
 		$this->aCSSClasses[] = 'formSelector';
 		
 		$sCSSClasses = '';
@@ -1554,8 +1554,6 @@ class DesignerFormSelectorField extends DesignerFormField
 		
 		if ($this->IsReadOnly())
 		{
-			$aSelected = array();
-			$aHiddenValues = array();
 			$sDisplayValue = '';
 			$sHiddenValue = '';
 			foreach($this->aSubForms as $iKey => $aFormData)
@@ -1571,8 +1569,6 @@ class DesignerFormSelectorField extends DesignerFormField
 		}
 		else
 		{
-			
-			
 			$sHtml = "<select $sCSSClasses id=\"$sId\" name=\"$sName\" $sReadOnly>";
 			foreach($this->aSubForms as $iKey => $aFormData)
 			{
@@ -1588,7 +1584,6 @@ class DesignerFormSelectorField extends DesignerFormField
 		{
 			$sHtml .= '</td><td class="prop_icon prop_apply"><span title="Apply" class="ui-icon ui-icon-circle-check"/></td><td  class="prop_icon prop_cancel"><span title="Revert" class="ui-icon ui-icon-circle-close"/></td></tr>';
 		}
-				
 		foreach($this->aSubForms as $sKey => $aFormData)
 		{
 			$sId = $this->oForm->GetFieldId($this->sCode);
@@ -1614,25 +1609,7 @@ class DesignerFormSelectorField extends DesignerFormField
 				$oSubForm->SetHierarchyPath($sPath);
 
 				$oSubForm->SetDisplayed($sKey == $this->defaultValue);
-				$sState = ($sKey == $this->defaultValue) ? 'visible' : 'hidden';
-				//$sHtml .= "</tbody><tbody data-selector=\"$sSelector\" data-path=\"$sPath\" data-state=\"$sState\" $sStyle>";
 				$sHtml .= $oSubForm->RenderAsPropertySheet($oP, true);
-
-				$sState = $this->oForm->IsDisplayed() ? 'visible' : 'hidden';
-				$sParentStyle = '';
-				if ($oParent = $this->oForm->GetParentForm())
-				{
-					$sParentStyle = ($oParent->IsDisplayed()) ? '' : 'style="display:none"';
-					$sParentSelector = $oParent->GetHierarchyParent();
-					$sParentPath = $oParent->GetHierarchyPath();
-				}
-				else
-				{
-					$sParentSelector = '';
-					$sParentPath = '';
-				}
-				
-				//$sHtml .= "</tbody><tbody data-selector=\"$sParentSelector\" data-path=\"$sParentPath\" data-state=\"$sState\" $sParentStyle>";
 			}
 			else
 			{
@@ -1680,7 +1657,6 @@ EOF
 				if ($selectedValue == $aFormData['value'])
 				{
 					$this->defaultValue =$iKey;
-					$aDefaultValues = $this->oForm->GetDefaultValues();
 					$oSubForm = $aFormData['form'];
 					$oSubForm->SetDefaultValues($aAllDefaultValues);
 				}

application/loginwebpage.class.inc.php

@@ -42,6 +42,7 @@ class LoginWebPage extends NiceWebPage
 	const EXIT_CODE_WRONGCREDENTIALS = 3;
 	const EXIT_CODE_MUSTBEADMIN = 4;
 	const EXIT_CODE_PORTALUSERNOTAUTHORIZED = 5;
+	const EXIT_CODE_NOTAUTHORIZED = 6;
 	
 	protected static $sHandlerClass = __class__;
 	public static function RegisterHandler($sClass)
@@ -97,10 +98,10 @@ class LoginWebPage extends NiceWebPage
 		}
 		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
 		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
-		$sDisplayIcon = utils::GetAbsoluteUrlAppRoot().'images/'.$sLogo.'?itopversion='.ITOP_VERSION;
+		$sDisplayIcon = utils::GetAbsoluteUrlAppRoot().'images/'.$sLogo.'?t='.utils::GetCacheBusterTimestamp();
 		if (file_exists(MODULESROOT.'branding/'.$sBrandingLogo))
 		{
-			$sDisplayIcon = utils::GetAbsoluteUrlModulesRoot().'branding/'.$sBrandingLogo.'?itopversion='.ITOP_VERSION;
+			$sDisplayIcon = utils::GetAbsoluteUrlModulesRoot().'branding/'.$sBrandingLogo.'?t='.utils::GetCacheBusterTimestamp();
 		}
 		$this->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8')."\"><img title=\"$sVersionShort\" src=\"$sDisplayIcon\"></a></div>\n");
 	}
@@ -194,7 +195,7 @@ class LoginWebPage extends NiceWebPage
 	 */	
 	public function ForgotPwdLink()
 	{
-		$sUrl = '?loginop=forgot_pwd';
+		$sUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
 		$sHtml = "<a href=\"$sUrl\" target=\"_blank\">".Dict::S('UI:Login:ForgotPwd')."</a>";
 		return $sHtml;
 	}
@@ -258,10 +259,6 @@ class LoginWebPage extends NiceWebPage
 			$oEmail = new Email();
 			$oEmail->SetRecipientTO($sTo);
 			$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
-			if ($sFrom == '')
-			{
-				$sFrom = $sTo;
-			}
 			$oEmail->SetRecipientFrom($sFrom);
 			$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject'));
 			$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
@@ -703,26 +700,36 @@ EOF
 			}
 		}
 	}
-	
+
 	/**
 	 * Check if the user is already authentified, if yes, then performs some additional validations:
 	 * - if $bMustBeAdmin is true, then the user must be an administrator, otherwise an error is displayed
-	 * - if $bIsAllowedToPortalUsers is false and the user has only access to the portal, then the user is redirected to the portal
+	 * - if $bIsAllowedToPortalUsers is false and the user has only access to the portal, then the user is redirected
+	 * to the portal
+	 *
 	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
 	 * @param bool $bIsAllowedToPortalUsers Whether or not the current page is considered as part of the portal
 	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
+	 *
+	 * @return int|mixed|string
+	 * @throws \Exception
 	 */
 	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false, $iOnExit = self::EXIT_PROMPT)
 	{
 		$sRequestedPortalId = $bIsAllowedToPortalUsers ? 'legacy_portal' : 'backoffice';
 		return self::DoLoginEx($sRequestedPortalId, $bMustBeAdmin, $iOnExit);
 	}
-	
+
 	/**
-	 * Check if the user is already authentified, if yes, then performs some additional validations to redirect towards the desired "portal"
+	 * Check if the user is already authentified, if yes, then performs some additional validations to redirect towards
+	 * the desired "portal"
+	 *
 	 * @param string|null $sRequestedPortalId The requested "portal" interface, null for any
 	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
 	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
+	 *
+	 * @return int|mixed|string
+	 * @throws \Exception
 	 */
 	static function DoLoginEx($sRequestedPortalId = null, $bMustBeAdmin = false, $iOnExit = self::EXIT_PROMPT)
 	{

application/menunode.class.inc.php

@@ -61,11 +61,23 @@ require_once(APPROOT."/application/user.dashboard.class.inc.php");
  
 class ApplicationMenu
 {
+	/**
+	 * @var bool
+	 */
 	static $bAdditionalMenusLoaded = false;
+	/**
+	 * @var array
+	 */
 	static $aRootMenus = array();
+	/**
+	 * @var array
+	 */
 	static $aMenusIndex = array();
+	/**
+	 * @var string
+	 */
 	static $sFavoriteSiloQuery = 'SELECT Organization';
-	
+
 	static public function LoadAdditionalMenus()
 	{
 		if (!self::$bAdditionalMenusLoaded)
@@ -96,7 +108,7 @@ class ApplicationMenu
 	/**
 	 * Set the query used to limit the list of displayed organizations in the drop-down menu
 	 * @param $sOQL string The OQL query returning a list of Organization objects
-	 * @return none
+	 * @return void
 	 */
 	static public function SetFavoriteSiloQuery($sOQL)
 	{
@@ -111,11 +123,34 @@ class ApplicationMenu
 	{
 		return self::$sFavoriteSiloQuery;
 	}
-	
-	
+
+	/**
+	 * Check wether a menu Id is enabled or not
+	 * @param $sMenuId
+	 * @throws DictExceptionMissingString
+	 */
+	static public function CheckMenuIdEnabled($sMenuId)
+	{
+		self::LoadAdditionalMenus();
+		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
+		if (is_null($oMenuNode) || !$oMenuNode->IsEnabled())
+		{
+			require_once(APPROOT.'/setup/setuppage.class.inc.php');
+			$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessRestricted')."</h1>\n");
+			$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
+			$oP->output();
+			exit;
+		}
+	}
+
 	/**
 	 * Main function to add a menu entry into the application, can be called during the definition
 	 * of the data model objects
+	 * @param MenuNode $oMenuNode
+	 * @param $iParentIndex
+	 * @param $fRank
+	 * @return int
 	 */
 	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
 	{
@@ -148,6 +183,7 @@ class ApplicationMenu
 			// the menu already exists, let's combine the conditions that make it visible
 			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
 		}
+
 		return $index;
 	}
 
@@ -159,9 +195,12 @@ class ApplicationMenu
 		self::LoadAdditionalMenus();
 		return self::$aMenusIndex;
 	}
-	
+
 	/**
 	 * Entry point to display the whole menu into the web page, used by iTopWebPage
+	 * @param $oPage
+	 * @param $aExtraParams
+	 * @throws DictExceptionMissingString
 	 */
 	static public function DisplayMenu($oPage, $aExtraParams)
 	{
@@ -172,34 +211,65 @@ class ApplicationMenu
 		$iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
 		foreach(self::$aRootMenus as $aMenu)
 		{
+			if (!self::CanDisplayMenu($aMenu)) { continue; }
 			$oMenuNode = self::GetMenuNode($aMenu['index']);
-			if (!$oMenuNode->IsEnabled()) continue; // Don't display a non-enabled menu
-			$oPage->AddToMenu('<h3 id="Menu_'.$oMenuNode->GetMenuID().'">'.$oMenuNode->GetTitle().'</h3>');
+			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'">'.$oMenuNode->GetTitle().'</h3>');
 			$oPage->AddToMenu('<div>');
+			$oPage->AddToMenu('<ul>');
 			$aChildren = self::GetChildren($aMenu['index']);
-			if (count($aChildren) > 0)
+			$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+			$oPage->AddToMenu('</ul>');
+			if ($bActive)
 			{
-				$oPage->AddToMenu('<ul>');
-				$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
-				$oPage->AddToMenu('</ul>');
-				if ($bActive)
-				{
 $oPage->add_ready_script(
 <<<EOF
-		// Accordion Menu
-		$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
+	// Accordion Menu
+	$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
 EOF
-					);
-				}
+				);
 			}
 			$oPage->AddToMenu('</div>');
 			$iAccordion++;
 		}
 	}
-	
+
+	/**
+	 * Recursively check if the menu and at least one of his sub-menu is enabled
+	 * @param array $aMenu menu entry
+	 * @return bool true if at least one menu is enabled
+	 */
+	static private function CanDisplayMenu($aMenu)
+	{
+		$oMenuNode = self::GetMenuNode($aMenu['index']);
+		if ($oMenuNode->IsEnabled())
+		{
+			$aChildren = self::GetChildren($aMenu['index']);
+			if (count($aChildren) > 0)
+			{
+				foreach($aChildren as $aSubMenu)
+				{
+					if (self::CanDisplayMenu($aSubMenu))
+					{
+						return true;
+					}
+				}
+			}
+			else
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Handles the display of the sub-menus (called recursively if necessary)
+	 * @param WebPage $oPage
+	 * @param array $aMenus
+	 * @param array $aExtraParams
+	 * @param int $iActiveMenu
 	 * @return true if the currently selected menu is one of the submenus
+	 * @throws DictExceptionMissingString
 	 */
 	static protected function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
 	{
@@ -217,13 +287,12 @@ EOF
 				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
 				if ($sHyperlink != '')
 				{
-					$oPage->AddToMenu('<li id="Menu_'.$oMenu->GetMenuID().'"'.$sCSSClass.'><a href="'.$oMenu->GetHyperlink($aExtraParams).'">'.$oMenu->GetTitle().'</a></li>');
+					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'><a href="'.$oMenu->GetHyperlink($aExtraParams).'">'.$oMenu->GetTitle().'</a></li>');
 				}
 				else
 				{
-					$oPage->AddToMenu('<li id="Menu_'.$oMenu->GetMenuID().'"'.$sCSSClass.'>'.$oMenu->GetTitle().'</li>');
+					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'>'.$oMenu->GetTitle().'</li>');
 				}
-				$aCurrentMenu = self::$aMenusIndex[$index];
 				if ($iActiveMenu == $index)
 				{
 					$bActive = true;
@@ -238,8 +307,12 @@ EOF
 		}
 		return $bActive;
 	}
+
 	/**
 	 * Helper function to sort the menus based on their rank
+	 * @param $a
+	 * @param $b
+	 * @return int
 	 */
 	static public function CompareOnRank($a, $b)
 	{
@@ -254,17 +327,21 @@ EOF
 		}
 		return $result;
 	}
-	
+
 	/**
-	 * Helper function to retrieve the MenuNodeObject based on its ID
+	 * Helper function to retrieve the MenuNode Object based on its ID
+	 * @param int $index
+	 * @return MenuNode|null
 	 */
 	static public function GetMenuNode($index)
 	{
 		return isset(self::$aMenusIndex[$index]) ? self::$aMenusIndex[$index]['node'] : null;
 	}
-	
+
 	/**
 	 * Helper function to get the list of child(ren) of a menu
+	 * @param int $index
+	 * @return array
 	 */
 	static public function GetChildren($index)
 	{
@@ -303,8 +380,11 @@ EOF
 			$sMenuId = self::GetDefaultMenuId();
 		}
 		return $sMenuId;
-	}	
+	}
 
+	/**
+	 * @return null|string
+	 */
 	static public function GetDefaultMenuId()
 	{
 		static $sDefaultMenuId = null;
@@ -320,6 +400,25 @@ EOF
 		}
 		return $sDefaultMenuId;
 	}
+
+	/**
+	 * @param $sMenuId
+	 * @return string
+	 */
+	static public function GetRootMenuId($sMenuId)
+	{
+		$iMenuIndex = self::GetMenuIndexById($sMenuId);
+		if ($iMenuIndex == -1)
+		{
+			return '';
+		}
+		$oMenu = ApplicationMenu::GetMenuNode($iMenuIndex);
+		while ($oMenu->GetParentIndex() != -1)
+		{
+			$oMenu = ApplicationMenu::GetMenuNode($oMenu->GetParentIndex());
+		}
+		return $oMenu->GetMenuId();
+	}
 }
 
 /**
@@ -350,8 +449,17 @@ EOF
  */
 abstract class MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sMenuId;
+	/**
+	 * @var int
+	 */
 	protected $index;
+	/**
+	 * @var int
+	 */
 	protected $iParentIndex;
 
 	/**
@@ -378,7 +486,7 @@ abstract class MenuNode
 	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
 	 */	
 	protected $m_aEnableStimuli;
-	
+
 	/**
 	 * Create a menu item, sets the condition to have it displayed and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -388,9 +496,8 @@ abstract class MenuNode
 	 * @param mixed $iActionCode UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
 	 * @param string $sEnableStimulus The user can see this menu if she/he has enough rights to apply this stimulus
-	 * @return MenuNode
 	 */
-	public function __construct($sMenuId, $iParentIndex = -1, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $iParentIndex = -1, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		$this->sMenuId = $sMenuId;
 		$this->iParentIndex = $iParentIndex;
@@ -409,21 +516,43 @@ abstract class MenuNode
 		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
 	}
 
+	/**
+	 * @return array
+	 */
 	public function ReflectionProperties()
 	{
 		return $this->aReflectionProperties;
 	}
-	
+
+	/**
+	 * @return string
+	 */
 	public function GetMenuId()
 	{
 		return $this->sMenuId;
 	}
-	
+
+	/**
+	 * @return int
+	 */
+	public function GetParentIndex()
+	{
+		return $this->iParentIndex;
+	}
+
+	/**
+	 * @return string
+	 * @throws DictExceptionMissingString
+	 */
 	public function GetTitle()
 	{
 		return Dict::S("Menu:$this->sMenuId", str_replace('_', ' ', $this->sMenuId));
 	}
-	
+
+	/**
+	 * @return string
+	 * @throws DictExceptionMissingString
+	 */
 	public function GetLabel()
 	{
 		$sRet = Dict::S("Menu:$this->sMenuId+", "");
@@ -442,7 +571,10 @@ abstract class MenuNode
 		}
 		return $sRet;
 	}
-	
+
+	/**
+	 * @return int
+	 */
 	public function GetIndex()
 	{
 		return $this->index;
@@ -458,6 +590,10 @@ abstract class MenuNode
 		}
 	}
 
+	/**
+	 * @param $aExtraParams
+	 * @return string
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		$aExtraParams['c[menu]'] = $this->GetMenuId();
@@ -500,7 +636,10 @@ abstract class MenuNode
 					}
 					if ($this->m_aEnableActions[$index] != null)
 					{
+						// Menus access rights ignore the archive mode
+						utils::PushArchiveMode(false);
 						$iResult = UserRights::IsActionAllowed($sClass, $this->m_aEnableActions[$index]);
+						utils::PopArchiveMode();
 						if (!($iResult & $this->m_aEnableActionResults[$index]))
 						{
 							return false;
@@ -515,9 +654,19 @@ abstract class MenuNode
 		}
 		return true;
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed
+	 */
 	public abstract function RenderContent(WebPage $oPage, $aExtraParams = array());
-	
+
+	/**
+	 * @param $sHyperlink
+	 * @param $aExtraParams
+	 * @return string
+	 */
 	protected function AddParams($sHyperlink, $aExtraParams)
 	{
 		if (count($aExtraParams) > 0)
@@ -551,13 +700,17 @@ class MenuGroup extends MenuNode
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuGroup
+	 * @param string $sEnableStimulus
 	 */
 	public function __construct($sMenuId, $fRank, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, -1 /* no parent, groups are at root level */, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
 		assert(false); // Shall never be called, groups do not display any content
@@ -570,6 +723,9 @@ class MenuGroup extends MenuNode
  */
 class TemplateMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sTemplateFile;
 	
 	/**
@@ -581,23 +737,34 @@ class TemplateMenuNode extends MenuNode
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuNode
+	 * @param string $sEnableStimulus
 	 */
-	public function __construct($sMenuId, $sTemplateFile, $iParentIndex, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $sTemplateFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sTemplateFile = $sTemplateFile;
 		$this->aReflectionProperties['template_file'] = $sTemplateFile;
 	}
-	
+
+	/**
+	 * @param $aExtraParams
+	 * @return string
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		if ($this->sTemplateFile == '') return '';
 		return parent::GetHyperlink($aExtraParams);
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed|void
+	 * @throws DictExceptionMissingString
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$sTemplate = @file_get_contents($this->sTemplateFile);
 		if ($sTemplate !== false)
 		{
@@ -618,17 +785,29 @@ class TemplateMenuNode extends MenuNode
  */
 class OQLMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sPageTitle;
+	/**
+	 * @var string
+	 */
 	protected $sOQL;
+	/**
+	 * @var bool
+	 */
 	protected $bSearch;
+	/**
+	 * @var bool|null
+	 */
 	protected $bSearchFormOpen;
 	
 	/**
 	 * Extra parameters to be passed to the display block to fine tune its appearence
 	 */
 	protected $m_aParams;
-	
-	
+
+
 	/**
 	 * Create a menu item based on an OQL query and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -639,22 +818,16 @@ class OQLMenuNode extends MenuNode
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuNode
+	 * @param string $sEnableStimulus
+	 * @param bool $bSearchFormOpen
 	 */
-	public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bSearchFormOpen = null)
+	public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0.0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bSearchFormOpen = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sPageTitle = "Menu:$sMenuId+";
 		$this->sOQL = $sOQL;
 		$this->bSearch = $bSearch;
-		if ($bSearchFormOpen == null)
-		{
-			$this->bSearchFormOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
-		}
-		else
-		{
-			$this->bSearchFormOpen = $bSearchFormOpen;
-		}
+		$this->bSearchFormOpen = $bSearchFormOpen;
 		$this->m_aParams = array();
 		$this->aReflectionProperties['oql'] = $sOQL;
 		$this->aReflectionProperties['do_search'] = $bSearch;
@@ -674,9 +847,18 @@ class OQLMenuNode extends MenuNode
 			$this->aReflectionProperties[$sKey] = $value;
 		}
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed|void
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 * @throws OQLException
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		OQLMenuNode::RenderOQLSearch
 		(
 			$this->sOQL,
@@ -690,6 +872,19 @@ class OQLMenuNode extends MenuNode
 		);
 	}
 
+	/**
+	 * @param $sOql
+	 * @param $sTitle
+	 * @param $sUsageId
+	 * @param $bSearchPane
+	 * @param $bSearchOpen
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @param bool $bEnableBreadcrumb
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 * @throws OQLException
+	 */
 	public static function RenderOQLSearch($sOql, $sTitle, $sUsageId, $bSearchPane, $bSearchOpen, WebPage $oPage, $aExtraParams = array(), $bEnableBreadcrumb = false)
 	{
 		$sUsageId = utils::GetSafeId($sUsageId);
@@ -725,22 +920,28 @@ class OQLMenuNode extends MenuNode
  */
 class SearchMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sPageTitle;
+	/**
+	 * @var string
+	 */
 	protected $sClass;
-	
+
 	/**
 	 * Create a menu item based on an OQL query and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
 	 * @param string $sClass The class of objects to search for
-	 * @param string $sPageTitle Title displayed into the page's content (will be looked-up in the dictionnary for translation)
 	 * @param integer $iParentIndex ID of the parent menu
 	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param bool $bSearch (not used)
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuNode
+	 * @param string $sEnableStimulus
 	 */
-	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0.0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sPageTitle = "Menu:$sMenuId+";
@@ -748,12 +949,20 @@ class SearchMenuNode extends MenuNode
 		$this->aReflectionProperties['class'] = $sClass;
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed|void
+	 * @throws DictExceptionMissingString
+	 * @throws Exception
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/search.png');
 
 		$oSearch = new DBObjectSearch($this->sClass);
-		$aParams = array_merge(array('open' => true, 'table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
+		$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
 		$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
 		$oBlock->Display($oPage, 0);
 	}
@@ -768,8 +977,11 @@ class SearchMenuNode extends MenuNode
  */
 class WebPageMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sHyperlink;
-	
+
 	/**
 	 * Create a menu item that points to any web page (not only UI.php)
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -779,21 +991,29 @@ class WebPageMenuNode extends MenuNode
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuNode
+	 * @param string $sEnableStimulus
 	 */
-	public function __construct($sMenuId, $sHyperlink, $iParentIndex, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $sHyperlink, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sHyperlink = $sHyperlink;
 		$this->aReflectionProperties['url'] = $sHyperlink;
 	}
 
+	/**
+	 * @param array $aExtraParams
+	 * @return string
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		$aExtraParams['c[menu]'] = $this->GetMenuId();
 		return $this->AddParams( $this->sHyperlink, $aExtraParams);
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
 		assert(false); // Shall never be called, the external web page will handle the display by itself
@@ -808,8 +1028,11 @@ class WebPageMenuNode extends MenuNode
  */
 class NewObjectMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sClass;
-	
+
 	/**
 	 * Create a menu item that points to the URL for creating a new object, the menu will be added only if the current user has enough
 	 * rights to create such an object (or an object of a child class)
@@ -817,15 +1040,22 @@ class NewObjectMenuNode extends MenuNode
 	 * @param string $sClass URL to the page to load. Use relative URL if you want to keep the application portable !
 	 * @param integer $iParentIndex ID of the parent menu
 	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @return MenuNode
+	 * @param string $sEnableClass
+	 * @param int|null $iActionCode
+	 * @param int $iAllowedResults
+	 * @param string $sEnableStimulus
 	 */
-	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0)
+	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank);
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sClass = $sClass;
 		$this->aReflectionProperties['class'] = $sClass;
 	}
 
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$this->sClass;
@@ -836,6 +1066,7 @@ class NewObjectMenuNode extends MenuNode
 	/**
 	 * Overload the check of the "enable" state of this menu to take into account
 	 * derived classes of objects
+	 * @throws CoreException
 	 */
 	public function IsEnabled()
 	{
@@ -854,7 +1085,12 @@ class NewObjectMenuNode extends MenuNode
 			}
 		}
 		return $bActionIsAllowed;		
-	}	
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
 		assert(false); // Shall never be called, the external web page will handle the display by itself
@@ -867,32 +1103,44 @@ require_once(APPROOT.'application/dashboard.class.inc.php');
  */
 class DashboardMenuNode extends MenuNode
 {
+	/**
+	 * @var string
+	 */
 	protected $sDashboardFile;
-	
+
 	/**
 	 * Create a menu item based on a custom template and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sTemplateFile Path (or URL) to the file that will be used as a template for displaying the page's content
+	 * @param string $sDashboardFile
 	 * @param integer $iParentIndex ID of the parent menu
 	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuNode
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS
+	 * @param string $sEnableStimulus
 	 */
-	public function __construct($sMenuId, $sDashboardFile, $iParentIndex, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $sDashboardFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->sDashboardFile = $sDashboardFile;
 		$this->aReflectionProperties['definition_file'] = $sDashboardFile;
 	}
-	
+
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		if ($this->sDashboardFile == '') return '';
 		return parent::GetHyperlink($aExtraParams);
 	}
 
+	/**
+	 * @return null|RuntimeDashboard
+	 * @throws CoreException
+	 * @throws Exception
+	 */
 	public function GetDashboard()
 	{
 		$sDashboardDefinition = @file_get_contents($this->sDashboardFile);		
@@ -924,8 +1172,15 @@ class DashboardMenuNode extends MenuNode
 		return $oDashboard;
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 * @throws CoreException
+	 * @throws Exception
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$oDashboard = $this->GetDashboard();
 		if ($oDashboard != null)
 		{
@@ -999,7 +1254,12 @@ EOF
 			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @throws CoreException
+	 * @throws Exception
+	 */
 	public function RenderEditor(WebPage $oPage)
 	{
 		$oDashboard = $this->GetDashboard();
@@ -1012,7 +1272,11 @@ EOF
 			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
 		}
 	}
-	
+
+	/**
+	 * @param $oDashlet
+	 * @throws Exception
+	 */
 	public function AddDashlet($oDashlet)
 	{
 		$oDashboard = $this->GetDashboard();
@@ -1034,15 +1298,28 @@ EOF
  */
 class ShortcutContainerMenuNode extends MenuNode
 {
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		return '';
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 * @return mixed|void
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
 	}
 
+	/**
+	 * @throws CoreException
+	 * @throws Exception
+	 */
 	public function PopulateChildMenus()
 	{
 		// Load user shortcuts in DB
@@ -1054,7 +1331,7 @@ class ShortcutContainerMenuNode extends MenuNode
 		while ($oShortcut = $oBMSet->Fetch())
 		{
 			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
-			$oShortcutMenu = new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
+			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
 		}
 	
 		// Complete the tree
@@ -1070,8 +1347,11 @@ require_once(APPROOT.'application/shortcut.class.inc.php');
  */
 class ShortcutMenuNode extends MenuNode
 {
+	/**
+	 * @var Shortcut
+	 */
 	protected $oShortcut;
-	
+
 	/**
 	 * Create a menu item based on a custom template and inserts it into the application's main menu
 	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
@@ -1081,15 +1361,20 @@ class ShortcutMenuNode extends MenuNode
 	 * @param string $sEnableClass Name of class of object
 	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
 	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @return MenuNode
+	 * @param string $sEnableStimulus
 	 */
-	public function __construct($sMenuId, $oShortcut, $iParentIndex, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	public function __construct($sMenuId, $oShortcut, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 		$this->oShortcut = $oShortcut;
 		$this->aReflectionProperties['shortcut'] = $oShortcut->GetKey();
 	}
-	
+
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 * @throws CoreException
+	 */
 	public function GetHyperlink($aExtraParams)
 	{
 		$sContext = $this->oShortcut->Get('context');
@@ -1105,16 +1390,31 @@ class ShortcutMenuNode extends MenuNode
 		return parent::GetHyperlink($aExtraParams);
 	}
 
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 * @return mixed|void
+	 * @throws DictExceptionMissingString
+	 */
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
 		$this->oShortcut->RenderContent($oPage, $aExtraParams);
 	}
 
+	/**
+	 * @return string
+	 * @throws CoreException
+	 */
 	public function GetTitle()
 	{
 		return $this->oShortcut->Get('name');
 	}
-	
+
+	/**
+	 * @return string
+	 * @throws CoreException
+	 */
 	public function GetLabel()
 	{
 		return $this->oShortcut->Get('name');

application/nicewebpage.class.inc.php

@@ -37,10 +37,11 @@ class NiceWebPage extends WebPage
     {
         parent::__construct($s_title, $bPrintable);
 		$this->m_aReadyScripts = array();
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.10.0.min.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.2.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.10.3.custom.min.css');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.10.3.custom.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.12.4.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
 		// table sorting
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
@@ -50,7 +51,25 @@ class NiceWebPage extends WebPage
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
 		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
-		$this->add_ready_script(
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/latinise/latinise.min.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
+
+	    $this->add_dict_entries('UI:Combo');
+
+	    $this->add_ready_script(
 <<< EOF
 	//add new widget called TruncatedList to properly display truncated lists when they are sorted
 	$.tablesorter.addWidget({ 

application/portalwebpage.class.inc.php

@@ -952,7 +952,7 @@ EOF
 		$sTransactionId = utils::GetNewTransactionId();
 		$this->SetTransactionId($sTransactionId);
 		$this->add("<input type=\"hidden\" id=\"transaction_id\" name=\"transaction_id\" value=\"$sTransactionId\">\n");
-		$this->add_ready_script("$(window).unload(function() { OnUnload('$sTransactionId') } );\n");
+		$this->add_ready_script("$(window).on('unload', function() { OnUnload('$sTransactionId') } );\n");
 	}
 
 	public function WizardFormButtons($iButtonFlags)

application/query.class.inc.php

@@ -32,7 +32,7 @@ abstract class Query extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui,application",
+			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -54,7 +54,8 @@ abstract class Query extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 }
 
@@ -64,7 +65,7 @@ class QueryOQL extends Query
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui,application",
+			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -83,7 +84,6 @@ class QueryOQL extends Query
 		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())

application/shortcut.class.inc.php

@@ -197,7 +197,7 @@ class ShortcutOQL extends Shortcut
 		}
 
 		$bSearchPane = true;
-		$bSearchOpen = false;
+		$bSearchOpen = true;
 		try
 		{
 			OQLMenuNode::RenderOQLSearch($this->Get('oql'), $this->Get('name'), 'shortcut_'.$this->GetKey(), $bSearchPane, $bSearchOpen, $oPage, $aExtraParams, true);

application/ui.extkeywidget.class.inc.php

@@ -19,15 +19,15 @@
  * Class UIExtKeyWidget
  * UI wdiget for displaying and editing external keys when
  * A simple drop-down list is not enough...
- * 
+ *
  * The layout is the following
- * 
+ *
  * +-- #label_<id> (input)-------+  +-----------+
  * |                             |  | Browse... |
  * +-----------------------------+  +-----------+
- * 
+ *
  * And the popup dialog has the following layout:
- * 
+ *
  * +------------------- ac_dlg_<id> (div)-----------+
  * + +--- ds_<id> (div)---------------------------+ |
  * | | +------------- fs_<id> (form)------------+ | |
@@ -61,13 +61,16 @@
 require_once(APPROOT.'/application/webpage.class.inc.php');
 require_once(APPROOT.'/application/displayblock.class.inc.php');
 
-class UIExtKeyWidget 
+class UIExtKeyWidget
 {
+	const ENUM_OUTPUT_FORMAT_CSV = 'csv';
+	const ENUM_OUTPUT_FORMAT_JSON = 'json';
+
 	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)
 	{
@@ -94,11 +97,11 @@ class UIExtKeyWidget
 		$this->sAttCode = $sAttCode;
 		$this->bSearchMode = $bSearchMode;
 	}
-	
+
 	/**
 	 * Get the HTML fragment corresponding to the ext key editing widget
 	 * @param WebPage $oP The web page used for all the output
-	 * @param Hash $aArgs Extra context arguments
+	 * @param array $aArgs Extra context arguments
 	 * @return string The HTML fragment to be inserted into the page
 	 */
 	public function Display(WebPage $oPage, $iMaxComboLength, $bAllowTargetCreation, $sTitle, DBObjectset $oAllowedValues, $value, $iInputId, $bMandatory, $sFieldName, $sFormPrefix = '', $aArgs = array(), $bSearchMode = null, $sDisplayStyle = 'select', $bSearchMultiple = true)
@@ -107,10 +110,10 @@ class UIExtKeyWidget
 		{
 			$this->bSearchMode = $bSearchMode;
 		}
-		$sTitle = addslashes($sTitle);	
+		$sTitle = addslashes($sTitle);
 		$oPage->add_linked_script('../js/extkeywidget.js');
 		$oPage->add_linked_script('../js/forms-json-utils.js');
-		
+
 		$bCreate = (!$this->bSearchMode) && (UserRights::IsActionAllowed($this->sTargetClass, UR_ACTION_BULK_MODIFY) && $bAllowTargetCreation);
 		$bExtensions = true;
 		$sMessage = Dict::S('UI:Message:EmptyList:UseSearchForm');
@@ -123,7 +126,7 @@ class UIExtKeyWidget
 			$sWizHelper = 'null';
 			$sWizHelperJSON = "''";
 			$sJSSearchMode = 'true';
-		} 
+		}
 		else
 		{
 			if (isset($aArgs['wizHelper']))
@@ -142,7 +145,12 @@ class UIExtKeyWidget
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
 		$oAllowedValues->SetShowObsoleteData(utils::ShowObsoleteData());
-		if ($oAllowedValues->Count() < $iMaxComboLength)
+		// Don't automatically launch the search if the table is huge
+		$bDoSearch = !utils::IsHighCardinality($this->sTargetClass);
+		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
+
+		// We just need to compare the number of entries with MaxComboLength, so no need to get the real count.
+		if (!$oAllowedValues->CountExceeds($iMaxComboLength))
 		{
             // Discrete list of values, use a SELECT or RADIO buttons depending on the config
 			switch($sDisplayStyle)
@@ -159,7 +167,7 @@ class UIExtKeyWidget
 				while($oObj = $oAllowedValues->Fetch())
 				{
 					$aAllowedValues[$oObj->GetKey()] = $oObj->GetName();
-				}				
+				}
 				$sHTMLValue .= $oPage->GetRadioButtons($aAllowedValues, $value, $this->iId, "{$sAttrFieldPrefix}{$sFieldName}", false /*  $bMandatory will be placed manually */, $bVertical, $sValidationField);
 				$aEventsList[] ='change';
 				break;
@@ -167,8 +175,7 @@ class UIExtKeyWidget
 				case 'select':
 				case 'list':
 				default:
-				$sSelectMode = 'true';
-				
+
 				$sHelpText = ''; //$this->oAttDef->GetHelpOnEdition();
 				$sHTMLValue .= "<div class=\"field_select_wrapper\">\n";
 
@@ -196,17 +203,17 @@ class UIExtKeyWidget
 				{
 					$key = $oObj->GetKey();
 					$display_value = $oObj->GetName();
-	
+
 					if (($oAllowedValues->Count() == 1) && ($bMandatory == 'true') )
 					{
 						// When there is only once choice, select it by default
-						$sSelected = ' selected';
+						$sSelected = 'selected';
 					}
 					else
 					{
-						$sSelected = (is_array($value) && in_array($key, $value)) || ($value == $key) ? ' selected' : '';
+						$sSelected = (is_array($value) && in_array($key, $value)) || ($value == $key) ? 'selected' : '';
 					}
-					$sHTMLValue .= "<option value=\"$key\"$sSelected>$display_value</option>\n";
+					$sHTMLValue .= "<option value=\"$key\" $sSelected>$display_value</option>\n";
 				}
 				$sHTMLValue .= "</select>\n";
 				$sHTMLValue .= "</div>\n";
@@ -226,7 +233,7 @@ class UIExtKeyWidget
 				}
 				$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, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
 		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') } );
@@ -238,8 +245,6 @@ EOF
 		else
 		{
 			// Too many choices, use an autocomplete
-			$sSelectMode = 'false';
-		
 			// Check that the given value is allowed
 			$oSearch = $oAllowedValues->GetFilter();
 			$oSearch->AddCondition('id', $value);
@@ -258,20 +263,19 @@ EOF
 				$sDisplayValue = $this->GetObjectName($value);
 			}
 			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 3; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
-			$iFieldSize = isset($aArgs['iFieldSize']) ? $aArgs['iFieldSize'] : 20; //@@@ $this->oAttDef->GetMaxSize();
-	
+
 			// the input for the auto-complete
-			$sHTMLValue .= "<input class=\"field_autocomplete\" count=\"".$oAllowedValues->Count()."\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
-			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_search_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_search.gif?itopversion=".ITOP_VERSION."\" onClick=\"oACWidget_{$this->iId}.Search();\"/></span>";
-	
+			$sHTMLValue .= "<input class=\"field_autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
+			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_search_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_search.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.Search();\"/></span>";
+
 			// another hidden input to store & pass the object's Id
 			$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";
 
-			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';	
+			$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, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
 		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').keyup(function() { if ($(this).val() == '') { $('#$this->iId').val(''); } } ); // Useful for search forms: empty value in the "label", means no value, immediatly !
@@ -286,7 +290,7 @@ EOF
 		}
 		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
 		{
-			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_tree_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_tree.gif?itopversion=".ITOP_VERSION."\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"/></span>";
+			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_tree_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_tree.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.HKDisplay();\"/></span>";
 			$oPage->add_ready_script(
 <<<EOF
 			if ($('#ac_tree_{$this->iId}').length == 0)
@@ -300,7 +304,7 @@ EOF
 		{
 			$sCallbackName = (MetaModel::IsAbstract($this->sTargetClass)) ? 'SelectObjectClass' : 'CreateObject';
 
-			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_add_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_add.gif?itopversion=".ITOP_VERSION."\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"/></span>";
+			$sHTMLValue .= "<span class=\"field_input_btn\"><img id=\"mini_add_{$this->iId}\" style=\"border:0;vertical-align:middle;cursor:pointer;\" src=\"../images/mini_add.gif?t=".utils::GetCacheBusterTimestamp()."\" onClick=\"oACWidget_{$this->iId}.{$sCallbackName}();\"/></span>";
 			$oPage->add_ready_script(
 <<<EOF
 		if ($('#ajax_{$this->iId}').length == 0)
@@ -320,7 +324,7 @@ EOF
 
 		return $sHTMLValue;
 	}
-	
+
 	public function GetSearchDialog(WebPage $oPage, $sTitle, $oCurrObject = null)
 	{
 		$sHTML = '<div class="wizContainer" style="vertical-align:top;"><div id="dc_'.$this->iId.'">';
@@ -338,10 +342,18 @@ EOF
 			$aParams = array();
 			$oFilter = new DBObjectSearch($this->sTargetClass);
 		}
-		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oBlock = new DisplayBlock($oFilter, 'search', false, $aParams);
-		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId, array('open' => $bOpen, 'currentId' => $this->iId));
+		$sHTML .= $oBlock->GetDisplay($oPage, $this->iId,
+            array(
+                'menu' => false,
+                'currentId' => $this->iId,
+                'table_id' => "dr_{$this->iId}",
+                'table_inner_id' => "{$this->iId}_results",
+                'selection_mode' => true,
+                'selection_type' => 'single',
+                'cssCount' => '#count_'.$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";
 		$sHTML .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
@@ -365,9 +377,13 @@ EOF
 
 	/**
 	 * Search for objects to be selected
+	 *
 	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param $sFilter
 	 * @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
+	 * @param null $oObj
+	 *
+	 * @throws \OQLException
 	 */
 	public function SearchObjectsToSelect(WebPage $oP, $sFilter, $sRemoteClass = '', $oObj = null)
 	{
@@ -375,7 +391,7 @@ EOF
 		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
-		
+
 		$oFilter = DBObjectSearch::FromOQL($sFilter);
 		if (strlen($sRemoteClass) > 0)
 		{
@@ -389,15 +405,21 @@ EOF
 		$oBlock = new DisplayBlock($oFilter, 'list', false, array('query_params' => array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId)));
 		$oBlock->Display($oP, $this->iId.'_results', array('this' => $oObj, 'cssCount'=> '#count_'.$this->iId, 'menu' => false, 'selection_mode' => true, 'selection_type' => 'single', 'table_id' => 'select_'.$this->sAttCode)); // Don't display the 'Actions' menu on the results
 	}
-	
-	/**
-	 * Search for objects to be selected
-	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
-	 * @param string $sFilter The OQL expression used to define/limit limit the scope of possible values
-	 * @param DBObject $oObj The current object for the OQL context
-	 * @param string $sContains The text of the autocomplete to filter the results
-	 */
-	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains)
+
+    /**
+     * Search for objects to be selected
+     *
+     * @param WebPage  $oP        The page used for the output (usually an AjaxWebPage)
+     * @param string   $sFilter   The OQL expression used to define/limit limit the scope of possible values
+     * @param DBObject $oObj      The current object for the OQL context
+     * @param string   $sContains The text of the autocomplete to filter the results
+     * @param string   $sOutputFormat
+     * @param null     $sOperation for the values @see ValueSetObjects->LoadValues()
+     *
+     * @throws CoreException
+     * @throws OQLException
+     */
+	public function AutoComplete(WebPage $oP, $sFilter, $oObj = null, $sContains, $sOutputFormat = self::ENUM_OUTPUT_FORMAT_CSV, $sOperation = null)
 	{
 		if (is_null($sFilter))
 		{
@@ -408,14 +430,74 @@ EOF
         $iCurrentExtKeyId = (is_null($oObj) || $this->sAttCode === '') ? 0 : $oObj->Get($this->sAttCode);
 
 		$oValuesSet = new ValueSetObjects($sFilter, 'friendlyname'); // Bypass GetName() to avoid the encoding by htmlentities
+		$iMax = 150;
+		$oValuesSet->SetLimit($iMax);
+		$oValuesSet->SetSort(false);
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-		$aValues = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains);
-		foreach($aValues as $sKey => $sFriendlyName)
+
+		if (empty($sOperation) || 'equals_start_with' == $sOperation)
+        {
+            $aValues = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'equals');
+            asort($aValues);
+
+            $iMax -= count($aValues);
+            if ($iMax > 0 ) {
+                $oValuesSet->SetLimit($iMax);
+                $aValuesStartWith = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with');
+                asort($aValuesStartWith);
+                foreach ($aValuesStartWith as $sKey => $sFriendlyName) {
+                    if (!isset($aValues[$sKey])) {
+                        $aValues[$sKey] = $sFriendlyName;
+                    }
+                }
+            }
+        }
+        else
+        {
+            $aValues = array();
+        }
+
+		$iMax -= count($aValues);
+		if ($iMax > 0 && (empty($sOperation) || 'contains' == $sOperation))
 		{
-			$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
+			$oValuesSet->SetLimit($iMax);
+			$aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains');
+			asort($aValuesContains);
+			foreach($aValuesContains as $sKey => $sFriendlyName)
+			{
+				if (!isset($aValues[$sKey]))
+				{
+					$aValues[$sKey] = $sFriendlyName;
+				}
+			}
+		}
+
+		switch($sOutputFormat)
+		{
+			case static::ENUM_OUTPUT_FORMAT_JSON:
+
+			    $aJsonMap = array();
+			    foreach ($aValues as $sKey => $sLabel)
+                {
+                    $aJsonMap[] = array('value' => $sKey, 'label' => $sLabel);
+                }
+
+			    $oP->SetContentType('application/json');
+                $oP->add(json_encode($aJsonMap));
+				break;
+
+			case static::ENUM_OUTPUT_FORMAT_CSV:
+				foreach($aValues as $sKey => $sFriendlyName)
+				{
+					$oP->add(trim($sFriendlyName)."\t".$sKey."\n");
+				}
+				break;
+			default:
+				throw new Exception('Invalid output format, "'.$sOutputFormat.'" given.');
+				break;
 		}
 	}
-	
+
 	/**
 	 * Get the display name of the selected object, to fill back the autocomplete
 	 */
@@ -435,12 +517,15 @@ EOF
 		}
 	}
 
-    /**
+	/**
 	 * Get the form to select a leaf class from the $this->sTargetClass (that should be abstract)
 	 * Note: Inspired from UILinksWidgetDirect::GetObjectCreationDialog()
 	 *
-     * @param WebPage $oPage
-     */
+	 * @param WebPage $oPage
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
 	public function GetClassSelectionForm(WebPage $oPage)
 	{
         // For security reasons: check that the "proposed" class is actually a subclass of the linked class
@@ -480,7 +565,7 @@ EOF
 	/**
 	 * Get the form to create a new object of the 'target' class
 	 */
-	public function GetObjectCreationForm(WebPage $oPage, $oCurrObject)
+	public function GetObjectCreationForm(WebPage $oPage, $oCurrObject, $aPrefillFormParam)
 	{
 		// Set all the default values in an object and clone this "default" object
 		$oNewObj = MetaModel::NewObject($this->sTargetClass);
@@ -488,7 +573,7 @@ EOF
 		// 1st - set context values
 		$oAppContext = new ApplicationContext();
 		$oAppContext->InitObjectFromContext($oNewObj);
-
+		$oNewObj->PrefillForm('creation_from_extkey', $aPrefillFormParam);
 		// 2nd set the default values from the constraint on the external key... if any
 		if ( ($oCurrObject != null) && ($this->sAttCode != ''))
 		{
@@ -505,7 +590,7 @@ EOF
 				}
 			}
 		}
-		
+
 		// 3rd - set values from the page argument 'default'
 		$oNewObj->UpdateObjectFromArg('default');
 
@@ -522,7 +607,7 @@ EOF
 				$aFieldsComments[$sAttCode] = '&nbsp;<img src="../images/transp-lock.png" style="vertical-align:middle" title="'.htmlentities(Dict::S('UI:UploadNotSupportedInThisMode')).'"/>';
 			}
 		}
-	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments));	
+	 	cmdbAbstractObject::DisplayCreationForm($oPage, $this->sTargetClass, $oNewObj, array(), array('formPrefix' => $this->iId, 'noRelations' => true, 'fieldsFlags' => $aFieldsFlags, 'fieldsComments' => $aFieldsComments));
 		$oPage->add('</div></div></div>');
 //		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: $(window).width()*0.8, height: 'auto', autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
 		$oPage->add_ready_script("\$('#ac_create_$this->iId').dialog({ width: 'auto', height: 'auto', maxHeight: $(window).height() - 50, autoOpen: false, modal: true, title: '$sDialogTitle'});\n");
@@ -542,21 +627,11 @@ EOF
 		{
 			throw new Exception('Implementation: null value for allowed values definition');
 		}
-		try
-		{
-		    $oFilter = DBObjectSearch::FromOQL($sFilter);
-			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-			$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj, 'current_extkey_id' => $currValue));
-		}
-		catch(MissingQueryArgument $e)
-		{
-			// When used in a search form the $this parameter may be missing, in this case return all possible values...
-			// TODO check if we can improve this behavior...
-			$sOQL = 'SELECT '.$this->m_sTargetClass;
-			$oFilter = DBObjectSearch::FromOQL($sOQL);
-			$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
-			$oSet = new DBObjectSet($oFilter);
-		}
+
+	    $oFilter = DBObjectSearch::FromOQL($sFilter);
+		$oFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
+		$oSet = new DBObjectSet($oFilter, array(), array('this' => $oObj, 'current_extkey_id' => $currValue));
+
 		$oSet->SetShowObsoleteData(utils::ShowObsoleteData());
 
 		$sHKAttCode = MetaModel::IsHierarchicalClass($this->sTargetClass);
@@ -566,7 +641,7 @@ EOF
 		$oPage->add('</div>');
 		$oPage->add("<input type=\"button\" id=\"btn_cancel_{$this->iId}\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_tree_{$this->iId}').dialog('close');\">&nbsp;&nbsp;");
 		$oPage->add("<input type=\"button\" id=\"btn_ok_{$this->iId}\" value=\"".Dict::S('UI:Button:Ok')."\"  onClick=\"oACWidget_{$this->iId}.DoHKOk();\">");
-		
+
 		$oPage->add('</div></div>');
 		$oPage->add_ready_script("\$('#tree_$this->iId ul').treeview();\n");
 		$oPage->add_ready_script("\$('#dlg_tree_$this->iId').dialog({ width: 'auto', height: 'auto', autoOpen: true, modal: true, title: '$sDialogTitle', resizeStop: oACWidget_{$this->iId}.OnHKResize, close: oACWidget_{$this->iId}.OnHKClose });\n");
@@ -588,7 +663,7 @@ EOF
 			}
 			else
 			{
-				return array('error' => implode(' ', $aErrors), 'id' => 0);		
+				return array('error' => implode(' ', $aErrors), 'id' => 0);
 			}
 		}
 		catch(Exception $e)
@@ -611,7 +686,7 @@ EOF
 			$aTree[$iParentId][$oObj->GetKey()] = $oObj->GetName();
 			$aNodes[$oObj->GetKey()] = $oObj;
 		}
-		
+
 		$aParents = array_keys($aTree);
 		$aRoots = array();
 		foreach($aParents as $id)
@@ -626,7 +701,7 @@ EOF
 			$this->DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue);
 		}
 	}
-	
+
 	function DumpNodes($oP, $iRootId, $aTree, $aNodes, $currValue)
 	{
 		$bSelect = true;

application/ui.linksdirectwidget.class.inc.php

@@ -30,7 +30,14 @@ class UILinksWidgetDirect
 	protected $sInputid;
 	protected $sNameSuffix;
 	protected $sLinkedClass;
-	
+
+	/**
+	 * UILinksWidgetDirect constructor.
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 * @param string $sInputId
+	 * @param string $sNameSuffix
+	 */
 	public function __construct($sClass, $sAttCode, $sInputId, $sNameSuffix = '')
 	{
 		$this->sClass = $sClass;
@@ -74,12 +81,12 @@ class UILinksWidgetDirect
 
 	/**
 	 * @param WebPage $oPage
-	 * @param DBObjectSet $oValue
+	 * @param DBObjectSet|ormLinkSet $oValue
 	 * @param array $aArgs
-	 * @param $sFormPrefix
-	 * @param $oCurrentObj
+	 * @param string $sFormPrefix
+	 * @param DBObject $oCurrentObj
 	 */
-	public function Display(WebPage $oPage, DBObjectSet $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
+	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
 	{
 		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		switch($oLinksetDef->GetEditMode())
@@ -127,11 +134,11 @@ class UILinksWidgetDirect
 	 * @param WebPage $oPage
 	 * @param DBObjectSet $oValue
 	 * @param array $aArgs
-	 * @param $sFormPrefix
-	 * @param $oCurrentObj
-	 * @param $bDisplayMenu
+	 * @param string $sFormPrefix
+	 * @param DBObject $oCurrentObj
+	 * @param bool $bDisplayMenu
 	 */
-	protected function DisplayAsBlock(WebPage $oPage, DBObjectSet $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $bDisplayMenu)
+	protected function DisplayAsBlock(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $bDisplayMenu)
 	{
 		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 		$sTargetClass = $oLinksetDef->GetLinkedClass();
@@ -170,51 +177,9 @@ class UILinksWidgetDirect
 
 	/**
 	 * @param WebPage $oPage
-	 * @param DBObjectSet $oValue
-	 * @param array $aArgs
-	 * @param $sFormPrefix
-	 * @param $oCurrentObj
-	 * @param array $aButtons
+	 * @param string $sProposedRealClass
 	 */
-	protected function DisplayEditInPlace(WebPage $oPage, DBObjectSet $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
-	{
-		$aAttribs = $this->GetTableConfig();
-		
-		$oValue->Rewind();
-		$oPage->add('<table class="listContainer" id="'.$this->sInputid.'"><tr><td>');
-
-		$aData = array();
-		while($oLinkObj = $oValue->Fetch())
-		{
-			$aRow = array();
-			$aRow['form::select'] = '<input type="checkbox" class="selectList'.$this->sInputid.'" value="'.$oLinkObj->GetKey().'"/>';
-			foreach($this->aZlist as $sLinkedAttCode)
-			{
-				$aRow[$sLinkedAttCode] = $oLinkObj->GetAsHTML($sLinkedAttCode);
-			}
-			$aData[] = $aRow;
-		}
-		$oPage->table($aAttribs, $aData);
-		$oPage->add('</td></tr></table>'); //listcontainer
-		$sInputName = $sFormPrefix.'attr_'.$this->sAttCode;
-		$aLabels = array(
-			'delete' => Dict::S('UI:Button:Delete'),
-			// 'modify' => 'Modify...' , 
-			'creation_title' => Dict::Format('UI:CreationTitle_Class', MetaModel::GetName($this->sLinkedClass)),
-			'create' => Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($this->sLinkedClass)),
-			'remove' => Dict::S('UI:Button:Remove'),
-			'add' => Dict::Format('UI:AddAnExisting_Class', MetaModel::GetName($this->sLinkedClass)),
-			'selection_title' => Dict::Format('UI:SelectionOf_Class', MetaModel::GetName($this->sLinkedClass)),
-		);
-		$oContext = new ApplicationContext();
-		$sSubmitUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?'.$oContext->GetForLink();
-		$sJSONLabels = json_encode($aLabels);
-		$sJSONButtons = json_encode($aButtons);
-		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
-		$oPage->add_ready_script("$('#{$this->sInputid}').directlinks({class_name: '$this->sClass', att_code: '$this->sAttCode', input_name:'$sInputName', labels: $sJSONLabels, submit_to: '$sSubmitUrl', buttons: $sJSONButtons, oWizardHelper: $sWizHelper });");
-	}
-	
-	public function GetObjectCreationDlg(WebPage $oPage, $sProposedRealClass = '')
+	public function GetObjectCreationDlg(WebPage $oPage, $sProposedRealClass = '', $oSourceObj = null)
 	{
 		// For security reasons: check that the "proposed" class is actually a subclass of the linked class
 		// and that the current user is allowed to create objects of this class
@@ -239,14 +204,17 @@ class UILinksWidgetDirect
 			$aKeys = array_keys($aPossibleClasses);
 			$sRealClass = $aKeys[0];
 		}
-		
+
 		if ($sRealClass != '')
 		{
 			$oPage->add("<h1>".MetaModel::GetClassIcon($sRealClass)."&nbsp;".Dict::Format('UI:CreationTitle_Class', MetaModel::GetName($sRealClass))."</h1>\n");
 			$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
 			$sExtKeyToMe = $oLinksetDef->GetExtKeyToMe();
 			$aFieldFlags = array( $sExtKeyToMe => OPT_ATT_HIDDEN);
-		 	cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, null, array(), array('formPrefix' => $this->sInputid, 'noRelations' => true, 'fieldsFlags' => $aFieldFlags));	
+			$oObj = DBObject::MakeDefaultInstance($sRealClass);
+			$aPrefillParam = array('source_obj' => $oSourceObj);
+			$oObj->PrefillForm('creation_from_editinplace', $aPrefillParam);
+		 	cmdbAbstractObject::DisplayCreationForm($oPage, $sRealClass, $oObj, array(), array('formPrefix' => $this->sInputid, 'noRelations' => true, 'fieldsFlags' => $aFieldFlags));
 		}
 		else
 		{
@@ -263,13 +231,89 @@ class UILinksWidgetDirect
 		}
 		$oPage->add('</div></div>');
 	}
-	
-	public function GetObjectsSelectionDlg($oPage, $oCurrentObj)
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DBObjectSet $oValue
+	 * @param array $aArgs
+	 * @param string $sFormPrefix
+	 * @param DBObject $oCurrentObj
+	 * @param array $aButtons
+	 */
+	protected function DisplayEditInPlace(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj, $aButtons = array('create', 'delete'))
+	{
+		$aAttribs = $this->GetTableConfig();
+
+		$oValue->Rewind();
+		$oPage->add('<table class="listContainer" id="'.$this->sInputid.'"><tr><td>');
+
+		$aData = array();
+		while($oLinkObj = $oValue->Fetch())
+		{
+			$aRow = array();
+			$aRow['form::select'] = '<input type="checkbox" class="selectList'.$this->sInputid.'" value="'.$oLinkObj->GetKey().'"/>';
+			foreach($this->aZlist as $sLinkedAttCode)
+			{
+				$aRow[$sLinkedAttCode] = $oLinkObj->GetAsHTML($sLinkedAttCode);
+			}
+			$aData[] = $aRow;
+		}
+		$oPage->table($aAttribs, $aData);
+		$oPage->add('</td></tr></table>'); //listcontainer
+		$sInputName = $sFormPrefix.'attr_'.$this->sAttCode;
+		$aLabels = array(
+			'delete' => Dict::S('UI:Button:Delete'),
+			// 'modify' => 'Modify...' ,
+			'creation_title' => Dict::Format('UI:CreationTitle_Class', MetaModel::GetName($this->sLinkedClass)),
+			'create' => Dict::Format('UI:ClickToCreateNew', MetaModel::GetName($this->sLinkedClass)),
+			'remove' => Dict::S('UI:Button:Remove'),
+			'add' => Dict::Format('UI:AddAnExisting_Class', MetaModel::GetName($this->sLinkedClass)),
+			'selection_title' => Dict::Format('UI:SelectionOf_Class', MetaModel::GetName($this->sLinkedClass)),
+		);
+		$oContext = new ApplicationContext();
+		$sSubmitUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?'.$oContext->GetForLink();
+		$sJSONLabels = json_encode($aLabels);
+		$sJSONButtons = json_encode($aButtons);
+		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
+		// Don't automatically launch the search if the table is huge
+		$bDoSearch = !utils::IsHighCardinality($this->sLinkedClass);
+		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
+		$oPage->add_ready_script("$('#{$this->sInputid}').directlinks({class_name: '$this->sClass', att_code: '$this->sAttCode', input_name:'$sInputName', labels: $sJSONLabels, submit_to: '$sSubmitUrl', buttons: $sJSONButtons, oWizardHelper: $sWizHelper, do_search: $sJSDoSearch});");
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DBObject $oCurrentObj
+	 * @param $aAlreadyLinked
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
+	 * @throws \OQLException
+	 */
+	public function GetObjectsSelectionDlg($oPage, $oCurrentObj, $aAlreadyLinked)
 	{
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
-		
-		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
-		$valuesDef = $oLinksetDef->GetValuesDef();				
+
+		$oHiddenFilter = new DBObjectSearch($this->sLinkedClass);
+		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($this->sLinkedClass, $this->sClass))
+		{
+			// Prevent linking to self if the linked object is of the same family
+			// and already present in the database
+			if (!$oCurrentObj->IsNew())
+			{
+				$oHiddenFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
+			}
+		}
+		if (count($aAlreadyLinked) > 0)
+		{
+			$oHiddenFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
+		}
+		$oHiddenCriteria = $oHiddenFilter->GetCriteria();
+		$aArgs = $oHiddenFilter->GetInternalParams();
+		$sHiddenCriteria = $oHiddenCriteria->Render($aArgs);
+
+		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
+		$valuesDef = $oLinkSetDef->GetValuesDef();
 		if ($valuesDef === null)
 		{
 			$oFilter = new DBObjectSearch($this->sLinkedClass);
@@ -282,13 +326,26 @@ class UILinksWidgetDirect
 			}
 			$oFilter = DBObjectSearch::FromOQL($valuesDef->GetFilterExpression());
 		}
+
 		if ($oCurrentObj != null)
 		{
 			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+
+			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
+			$oFilter->SetInternalParams($aArgs);
 		}
-		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}", array('open' => $bOpen));
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->sInputid}",
+			array(
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->sInputid}",
+				'table_id' => "add_{$this->sInputid}",
+				'table_inner_id' => "ResultsToAdd_{$this->sInputid}",
+				'selection_mode' => true,
+				'cssCount' => "#count_{$this->sInputid}",
+				'query_params' => $oFilter->GetInternalParams(),
+				'hidden_criteria' => $sHiddenCriteria,
+			)
+        );
 		$sHtml .= "<form id=\"ObjectsAddForm_{$this->sInputid}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->sInputid}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
@@ -299,13 +356,14 @@ class UILinksWidgetDirect
 		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
 	}
-	
+
 	/**
 	 * Search for objects to be linked to the current object (i.e "remote" objects)
 	 * @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 $this->sLinkedClass
 	 * @param array $aAlreadyLinked Array of indentifiers of objects which are already linke to the current object (or about to be linked)
 	 * @param DBObject $oCurrentObj The object currently being edited... if known...
+	 * @throws Exception
 	 */
 	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinked = array(), $oCurrentObj = null)
 	{
@@ -313,8 +371,8 @@ class UILinksWidgetDirect
 		{
 			$sRemoteClass = $this->sLinkedClass;
 		}
-		$oLinksetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
-		$valuesDef = $oLinksetDef->GetValuesDef();				
+		$oLinkSetDef = MetaModel::GetAttributeDef($this->sClass, $this->sAttCode);
+		$valuesDef = $oLinkSetDef->GetValuesDef();
 		if ($valuesDef === null)
 		{
 			$oFilter = new DBObjectSearch($sRemoteClass);
@@ -331,7 +389,7 @@ class UILinksWidgetDirect
 		if (($oCurrentObj != null) && MetaModel::IsSameFamilyBranch($sRemoteClass, $this->sClass))
 		{
 			// Prevent linking to self if the linked object is of the same family
-			// and laready present in the database
+			// and already present in the database
 			if (!$oCurrentObj->IsNew())
 			{
 				$oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!=');
@@ -343,6 +401,8 @@ class UILinksWidgetDirect
 		}
 		if ($oCurrentObj != null)
 		{
+			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+
 			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
 			$oFilter->SetInternalParams($aArgs);
 		}
@@ -350,6 +410,10 @@ class UILinksWidgetDirect
 		$oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", array('menu' => false, 'cssCount'=> '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid)); // Don't display the 'Actions' menu on the results
 	}
 
+	/**
+	 * @param WebPage $oP
+	 * @param $oFullSetFilter
+	 */
 	public function DoAddObjects(WebPage $oP, $oFullSetFilter)
 	{
 		$aLinkedObjectIds = utils::ReadMultipleSelection($oFullSetFilter);
@@ -377,7 +441,14 @@ class UILinksWidgetDirect
 		}
 		return $aAttribs;	
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param string $sRealClass
+	 * @param array $aValues
+	 * @param int $iTempId
+	 * @return mixed
+	 */
 	public function GetRow($oPage, $sRealClass, $aValues, $iTempId)
 	{
 		if ($sRealClass == '')
@@ -389,7 +460,13 @@ class UILinksWidgetDirect
 		
 		return $this->GetObjectRow($oPage, $oLinkObj, $iTempId);
 	}
-	
+
+	/**
+	 * @param WebPage $oPage
+	 * @param $oLinkObj
+	 * @param int $iTempId
+	 * @return mixed
+	 */
 	protected function GetObjectRow($oPage, $oLinkObj, $iTempId)
 	{
 		$aAttribs = $this->GetTableConfig();
@@ -405,7 +482,7 @@ class UILinksWidgetDirect
 	/**
 	 * Initializes the default search parameters based on 1) a 'current' object and 2) the silos defined by the context
 	 * @param DBObject $oSourceObj
-	 * @param DBSearch $oSearch
+	 * @param DBSearch|DBObjectSearch $oSearch
 	 */
 	protected function SetSearchDefaultFromContext($oSourceObj, &$oSearch)
 	{
@@ -424,7 +501,6 @@ class UILinksWidgetDirect
 
 			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

application/ui.linkswidget.class.inc.php

@@ -24,8 +24,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-require_once(APPROOT.'/application/webpage.class.inc.php');
-require_once(APPROOT.'/application/displayblock.class.inc.php');
+require_once(APPROOT.'application/webpage.class.inc.php');
+require_once(APPROOT.'application/displayblock.class.inc.php');
 
 class UILinksWidget 
 {
@@ -39,7 +39,22 @@ class UILinksWidget
 	protected $m_sLinkedClass;
 	protected $m_sRemoteClass;
 	protected $m_bDuplicatesAllowed;
-	
+	protected $m_aEditableFields;
+	protected $m_aTableConfig;
+
+	/**
+	 * UILinksWidget constructor.
+	 *
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 * @param int $iInputId
+	 * @param string $sNameSuffix
+	 * @param bool $bDuplicatesAllowed
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
 	public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '', $bDuplicatesAllowed = false)
 	{
 		$this->m_sClass = $sClass;
@@ -48,12 +63,15 @@ class UILinksWidget
 		$this->m_iInputId = $iInputId;
 		$this->m_bDuplicatesAllowed = $bDuplicatesAllowed;
 		$this->m_aEditableFields = array();
-			
+
+		/** @var AttributeLinkedSetIndirect $oAttDef */
 		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
 		$this->m_sLinkedClass = $oAttDef->GetLinkedClass();
 		$this->m_sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
 		$this->m_sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-		$oLinkingAttDef = 	MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
+
+		/** @var AttributeExternalKey $oLinkingAttDef */
+		$oLinkingAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
 		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
 		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
 		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
@@ -95,14 +113,20 @@ class UILinksWidget
 
 	/**
 	 * A one-row form for editing a link record
+	 *
 	 * @param WebPage $oP Web page used for the ouput
 	 * @param DBObject $oLinkedObj Remote object
 	 * @param mixed $linkObjOrId Either the object linked or a unique number for new link records to add
-	 * @param array|Hash $aArgs Extra context arguments
-	 * @param $oCurrentObj The object to which all the elements of the linked set refer to
-	 * @param $iUniqueId A unique identifier of new links
-     * @param boolean $bReadOnly Display link as editable or read-only. Default is false (editable)
-	 * @return string The HTML fragment of the one-row form
+	 * @param array $aArgs Extra context arguments
+	 * @param DBObject $oCurrentObj The object to which all the elements of the linked set refer to
+	 * @param int $iUniqueId A unique identifier of new links
+	 * @param boolean $bReadOnly Display link as editable or read-only. Default is false (editable)
+	 *
+	 * @return array The HTML fragment of the one-row form
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \Exception
 	 */
 	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId, $aArgs, $oCurrentObj, $iUniqueId, $bReadOnly = false)
 	{
@@ -138,7 +162,9 @@ class UILinksWidget
                     $sValue = $linkObjOrId->Get($sFieldCode);
                     $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
                     $oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-                    $aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId, $sNameSuffix, 0, $aArgs);
+                    $aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
+                        cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId, $sNameSuffix, 0, $aArgs).
+	                    '</div></div></div>';
                     $aFieldsMap[$sFieldCode] = $sSafeId;
                 }
             }
@@ -166,7 +192,7 @@ class UILinksWidget
 			$sPrefix .= "[-$iUniqueId][";
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
-			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".$iUniqueId;
+			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".($iUniqueId < 0 ? -$iUniqueId : $iUniqueId);
 			$aArgs['this'] = $oNewLinkObj;
 			$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"-$iUniqueId\">";
 			foreach($this->m_aEditableFields as $sFieldCode)
@@ -176,17 +202,24 @@ class UILinksWidget
 				$sValue = $oNewLinkObj->Get($sFieldCode);
 				$sDisplayValue = $oNewLinkObj->GetEditValue($sFieldCode);
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId /* id */, $sNameSuffix, 0, $aArgs);
+				$aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
+					cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId /* id */, $sNameSuffix, 0, $aArgs).
+					'</div></div></div>';
 				$aFieldsMap[$sFieldCode] = $sSafeId;
 			}
 			$sState = '';
 
-			$oP->add_script(
-<<<EOF
+			// Rows created with ajax call need OnLinkAdded call.
+			// Rows added before loading the form cannot call OnLinkAdded.
+			if ($iUniqueId > 0)
+			{
+				$oP->add_script(
+					<<<EOF
 PrepareWidgets();
 oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
 EOF
-			);
+				);
+			}
 		}
 
 		if(!$bReadOnly)
@@ -220,7 +253,11 @@ EOF
 
 	/**
 	 * Display one row of the whole form
-	 * @return none
+	 * @param WebPage $oP
+	 * @param array $aConfig
+	 * @param array $aRow
+	 * @param int $iRowId
+	 * @return string
 	 */
 	protected function DisplayFormRow(WebPage $oP, $aConfig, $aRow, $iRowId)
 	{
@@ -238,8 +275,8 @@ EOF
 	/**
 	 * Display the table with the form for editing all the links at once
 	 * @param WebPage $oP The web page used for the output
-	 * @param Hash $aConfig The table's header configuration
-	 * @param Hash $aData The tabular data to be displayed
+	 * @param array $aConfig The table's header configuration
+	 * @param array $aData The tabular data to be displayed
 	 * @return string Html fragment representing the form table
 	 */
 	protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
@@ -276,21 +313,25 @@ EOF
 		
 		return $sHtml;
 	}
-	
+
 
 	/**
 	 * Get the HTML fragment corresponding to the linkset editing widget
-	 * @param WebPage $oP The web page used for all the output
-	 * @param DBObjectSet The initial value of the linked set
-	 * @param Hash $aArgs Extra context arguments
+	 *
+	 * @param WebPage $oPage
+	 * @param DBObject|ormLinkSet $oValue
+	 * @param array $aArgs Extra context arguments
 	 * @param string $sFormPrefix prefix of the fields in the current form
 	 * @param DBObject $oCurrentObj the current object to which the linkset is related
+	 *
 	 * @return string The HTML fragment to be inserted into the page
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
 	 */
-	public function Display(WebPage $oPage, DBObjectSet $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
+	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
 	{
 		$sHtmlValue = '';
-		$sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
 		$sHtmlValue .= "<div id=\"linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtmlValue .= "<input type=\"hidden\" id=\"{$sFormPrefix}{$this->m_iInputId}\">\n";
 		$oValue->Rewind();
@@ -324,9 +365,12 @@ EOF
 		}
 		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
 		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
+		// Don't automatically launch the search if the table is huge
+		$bDoSearch = !utils::IsHighCardinality($this->m_sRemoteClass);
+		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
 		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
 		$oPage->add_ready_script(<<<EOF
-		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}');
+		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}', $sJSDoSearch);
 		oWidget{$this->m_iInputId}.Init();
 EOF
 );
@@ -337,14 +381,25 @@ EOF
 		$oPage->add_at_the_end("<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\"></div>"); // To prevent adding forms inside the main form
         return $sHtmlValue;
 	}
-	         
+
+	/**
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
 	protected static function GetTargetClass($sClass, $sAttCode)
 	{
+		/** @var AttributeLinkedSet $oAttDef */
 		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 		$sLinkedClass = $oAttDef->GetLinkedClass();
+		$sTargetClass = '';
 		switch(get_class($oAttDef))
 		{
 			case 'AttributeLinkedSetIndirect':
+			/** @var AttributeExternalKey $oLinkingAttDef */
+			/** @var AttributeLinkedSetIndirect $oAttDef */
 			$oLinkingAttDef = 	MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
 			$sTargetClass = $oLinkingAttDef->GetTargetClass();
 			break;
@@ -356,21 +411,60 @@ EOF
 		
 		return $sTargetClass;
 	}
-	
-	public function GetObjectPickerDialog($oPage, $oCurrentObj)
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DBObject $oCurrentObj
+	 * @param $sJson
+	 * @param array $aAlreadyLinkedIds
+	 *
+	 * @throws DictExceptionMissingString
+	 * @throws Exception
+	 */
+	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPrefillFormParam = array())
 	{
-		$bOpen = MetaModel::GetConfig()->Get('legacy_search_drawer_open');
 		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+
+		$oAlreadyLinkedFilter = new DBObjectSearch($this->m_sRemoteClass);
+		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
+		{
+			$oAlreadyLinkedFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
+			$oAlreadyLinkedExpression = $oAlreadyLinkedFilter->GetCriteria();
+			$sAlreadyLinkedExpression = $oAlreadyLinkedExpression->Render();
+		}
+		else
+		{
+			$sAlreadyLinkedExpression = '';
+		}
+
 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
-		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+
+		if(!empty($oCurrentObj))
+		{
+			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+			$aPrefillFormParam['filter'] = $oFilter;
+			$aPrefillFormParam['dest_class'] = $this->m_sRemoteClass;
+			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
+		}
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}", array('open' => $bOpen));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\">\n";
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+			array(
+				'menu' => false,
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_id' => 'add_'.$this->m_sAttCode,
+				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'selection_mode' => true,
+				'json' => $sJson,
+				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'query_params' => $oFilter->GetInternalParams(),
+				'hidden_criteria' => $sAlreadyLinkedExpression,
+			));
+		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
 		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
 		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
 		$sHtml .= "</div>\n";
 		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "<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=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
 		$sHtml .= "</div>\n";
 		$sHtml .= "</form>\n";
 		$oPage->add($sHtml);
@@ -382,11 +476,17 @@ EOF
 
 	/**
 	 * Search for objects to be linked to the current object (i.e "remote" objects)
+	 *
 	 * @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 m_sRemoteClass
-	 * @param Array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of the search
+	 * @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
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
 	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array())
+	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array(), $oCurrentObj = null)
 	{
 		if ($sRemoteClass != '')
 		{
@@ -402,10 +502,20 @@ EOF
 		{
 			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
 		}
+		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
 		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", array('menu' => false, 'cssCount'=> '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode)); // Don't display the 'Actions' menu on the results
 	}
-	
+
+	/**
+	 * @param WebPage $oP
+	 * @param int $iMaxAddedId
+	 * @param $oFullSetFilter
+	 * @param DBObject $oCurrentObj
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function DoAddObjects(WebPage $oP, $iMaxAddedId, $oFullSetFilter, $oCurrentObj)
 	{
 		$aLinkedObjectIds = utils::ReadMultipleSelection($oFullSetFilter);
@@ -426,11 +536,15 @@ EOF
 			}
 		}
 	}
-	
+
 	/**
 	 * Initializes the default search parameters based on 1) a 'current' object and 2) the silos defined by the context
+	 *
 	 * @param DBObject $oSourceObj
-	 * @param DBSearch $oSearch
+	 * @param DBSearch|DBObjectSearch $oSearch
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
 	 */
 	protected function SetSearchDefaultFromContext($oSourceObj, &$oSearch)
 	{
@@ -449,7 +563,6 @@ EOF
 
 			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
@@ -463,7 +576,31 @@ EOF
 	
 				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue))
 				{
-					$oSearch->AddCondition($sAttCode, $defaultValue);
+					// Add Hierarchical condition if hierarchical key
+					$oAttDef = MetaModel::GetAttributeDef($sDestClass, $sAttCode);
+					if (isset($oAttDef) && ($oAttDef->IsExternalKey()))
+					{
+						try
+						{
+							/** @var AttributeExternalKey $oAttDef */
+							$sTargetClass = $oAttDef->GetTargetClass();
+							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sTargetClass);
+							if ($sHierarchicalKeyCode !== false)
+							{
+								$oFilter = new DBObjectSearch($sTargetClass);
+								$oFilter->AddCondition('id', $defaultValue);
+								$oHKFilter = new DBObjectSearch($sTargetClass);
+								$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
+								$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
+							}
+						} catch (Exception $e)
+						{
+						}
+					}
+					else
+					{
+						$oSearch->AddCondition($sAttCode, $defaultValue);
+					}
 				}
 			}
 		}

application/ui.searchformforeignkeys.class.inc.php

@@ -0,0 +1,115 @@
+<?php
+/**
+ *
+ * Copyright (C) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ *  iTop is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  iTop is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+
+class UISearchFormForeignKeys
+{
+	public function __construct($sTargetClass, $iInputId = null)
+	{
+		$this->m_sRemoteClass = $sTargetClass;
+		$this->m_iInputId = $iInputId;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 *
+	 * @param $sTitle
+	 *
+	 * @throws \Exception
+	 */
+	public function ShowModalSearchForeignKeys($oPage, $sTitle)
+	{
+		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+
+		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+
+		$oBlock = new DisplayBlock($oFilter, 'search', false);
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_iInputId}",
+			array(
+				'menu' => false,
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_iInputId}",
+				'table_id' => "add_{$this->m_iInputId}",
+				'table_inner_id' => "ResultsToAdd_{$this->m_iInputId}",
+				'selection_mode' => true,
+				'cssCount' => "#count_{$this->m_iInputId}",
+				'query_params' => $oFilter->GetInternalParams(),
+			));
+		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_iInputId}\">\n";
+		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_iInputId}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
+		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
+		$sHtml .= "</div>\n";
+		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_iInputId}\" value=\"0\"/>";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_iInputId}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_iInputId}\" disabled=\"disabled\" type=\"button\" onclick=\"return oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "</div>\n";
+		$sHtml .= "</form>\n";
+		$oPage->add($sHtml);
+		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes });");
+		$oPage->add_ready_script("$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId} form').bind('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_iInputId}').resize(oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);");
+	}
+
+	public function GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter)
+	{
+		try
+		{
+			$aLinkedObjects = utils::ReadMultipleSelectionWithFriendlyname($oFullSetFilter);
+			$oPage->add(json_encode($aLinkedObjects));
+		}
+		catch (CoreException $e)
+		{
+			http_response_code(500);
+			$oPage->add(json_encode(array('error' => $e->GetMessage())));
+			IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
+		}
+	}
+
+	/**
+	 * Search for objects to be linked to the current object (i.e "remote" objects)
+	 *
+	 * @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 m_sRemoteClass
+	 *
+	 * @throws \Exception
+	 */
+	public function ListResultsSearchForeignKeys(WebPage $oP, $sRemoteClass = '')
+	{
+		if ($sRemoteClass != '')
+		{
+			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
+			$oFilter = new DBObjectSearch($sRemoteClass);
+		}
+		else
+		{
+			// No remote class specified use the one defined in the linkedset
+			$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+		}
+
+		$oBlock = new DisplayBlock($oFilter, 'list', false);
+		$oBlock->Display($oP, "ResultsToAdd_{$this->m_iInputId}",
+			array('menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"));
+	}
+
+}

application/utils.inc.php

@@ -141,6 +141,9 @@ class utils
 	}
 
 	protected static $bPageMode = null;
+	/**
+	 * @var boolean[]
+	 */
 	protected static $aModes = array();
 
 	public static function InitArchiveMode()
@@ -164,6 +167,10 @@ class utils
 		self::$bPageMode = ($iCurrent == 1);
 	}
 
+	/**
+	 * @param boolean $bMode if true then activate archive mode (archived objects are visible), otherwise archived objects are
+	 *     hidden (archive = "soft deletion")
+	 */
 	public static function PushArchiveMode($bMode)
 	{
 		array_push(self::$aModes, $bMode);
@@ -174,6 +181,9 @@ class utils
 		array_pop(self::$aModes);
 	}
 
+	/**
+	 * @return boolean true if archive mode is enabled
+	 */
 	public static function IsArchiveMode()
 	{
 		if (count(self::$aModes) > 0)
@@ -301,7 +311,7 @@ class utils
 				switch($sSanitizationFilter)
 				{
 					case 'parameter':
-					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=-]*$/'))); // the '=' equal character is used in serialized filters
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^([ A-Za-z0-9_=-]|%3D|%2B|%2F)*$/'))); // the '=', '%3D, '%2B', '%2F' characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
 					break;
 					
 					case 'field_name':
@@ -403,8 +413,10 @@ class utils
 	
 	/**
 	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 *
 	 * @param $oFullSetFilter DBSearch The criteria defining the whole sets of objects being selected
-	 * @return Array An arry of object IDs corresponding to the objects selected in the set
+	 *
+	 * @return Array An array of object IDs corresponding to the objects selected in the set
 	 */	
 	public static function ReadMultipleSelection($oFullSetFilter)
 	{
@@ -438,6 +450,51 @@ class utils
 		return $aSelectedObj;
 	}
 
+	/**
+	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 *
+	 * @param DBSearch $oFullSetFilter The criteria defining the whole sets of objects being selected
+	 *
+	 * @return Array An array of object IDs:friendlyname corresponding to the objects selected in the set
+	 * @throws \CoreException
+	 */
+	public static function ReadMultipleSelectionWithFriendlyname($oFullSetFilter)
+	{
+		$sSelectionMode = utils::ReadParam('selectionMode', '');
+
+		if ($sSelectionMode === '')
+		{
+			throw new CoreException('selectionMode is mandatory');
+		}
+
+		// Paginated selection
+		$aSelectedIds = utils::ReadParam('storedSelection', array());
+		if (count($aSelectedIds) > 0 )
+		{
+			if ($sSelectionMode == 'positive')
+			{
+				// Only the explicitly listed items are selected
+				$oFullSetFilter->AddCondition('id', $aSelectedIds, 'IN');
+			}
+			else
+			{
+				// All items of the set are selected, except the one explicitly listed
+				$oFullSetFilter->AddCondition('id', $aSelectedIds, 'NOTIN');
+			}
+		}
+
+		$aSelectedObj = array();
+		$oFullSet = new DBObjectSet($oFullSetFilter);
+		$sClassAlias = $oFullSetFilter->GetClassAlias();
+		$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
+		while ($oObj = $oFullSet->Fetch())
+		{
+			$aSelectedObj[$oObj->GetKey()] = $oObj->Get('friendlyname');
+		}
+
+		return $aSelectedObj;
+	}
+	
 	public static function GetNewTransactionId()
 	{
 		return privUITransaction::GetNewTransactionId();
@@ -601,23 +658,49 @@ class utils
 		return str_replace($aSearch, $aReplacement, $sOldDateTimeFormat);
 	}
 
+	/**
+	 * @return \Config from the current environement, or if not existing from the production env, else new Config made from scratch
+	 * @uses \MetaModel::GetConfig() don't forget to add the needed <code>require_once(APPROOT.'core/metamodel.class.php');</code>
+	 */
 	static public function GetConfig()
 	{
 		if (self::$oConfig == null)
 		{
-			$sConfigFile = self::GetConfigFilePath();
-			if (file_exists($sConfigFile))
-			{
-				self::$oConfig = new Config($sConfigFile);
-			}
-			else
-			{
-				// When executing the setup, the config file may be still missing
-				self::$oConfig = new Config();
-			}
+		    self::$oConfig = MetaModel::GetConfig();
+
+		    if (self::$oConfig == null)
+		    {
+    			$sConfigFile = self::GetConfigFilePath();
+    			if (!file_exists($sConfigFile))
+    			{
+				    $sConfigFile = self::GetConfigFilePath('production');
+				    if (!file_exists($sConfigFile))
+				    {
+				    	$sConfigFile = null;
+				    }
+    			}
+
+			    self::$oConfig = new Config($sConfigFile);
+		    }
 		}
 		return self::$oConfig;
 	}
+
+	public static function InitTimeZone() {
+		$oConfig = self::GetConfig();
+		$sItopTimeZone = $oConfig->Get('timezone');
+
+		if (!empty($sItopTimeZone))
+		{
+			date_default_timezone_set($sItopTimeZone);
+		}
+		else
+		{
+			// Leave as is... up to the admin to set a value somewhere...
+			// see http://php.net/manual/en/datetime.configuration.php#ini.date.timezone
+		}
+	}
+
     /**
      * Returns the absolute URL to the application root path
      * @return string The absolute URL to the application root, without the first slash
@@ -917,7 +1000,7 @@ class utils
 	 */
 	public static function GetCachePath()
 	{
-		return APPROOT.'data/cache-'.self::GetCurrentEnvironment().'/';
+		return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
 	}
 	/**
 	 * Merge standard menu items with plugin provided menus items
@@ -947,7 +1030,7 @@ class utils
 				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
 			);
 			
-			if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
+			if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) != UR_ALLOWED_NO)
 			{
 				// Bulk export actions
 				$aResult[] = new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '$sDataTableId', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")");
@@ -957,8 +1040,8 @@ class utils
 					// PDF export requires GD
 					$aResult[] = new JSPopupMenuItem('UI:Menu:ExportPDF', Dict::S('UI:Menu:ExportPDF'), "ExportListDlg('$sOQL', '$sDataTableId', 'pdf', ".json_encode(Dict::S('UI:Menu:ExportPDF')).")");
 				}
-			}	
-			$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL')");
+			}
+			$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
 			$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
 				
 			break;
@@ -1054,8 +1137,7 @@ class utils
 	}
 
     /**
-     * Returns the absolute URL to the modules root path
-     * @return string ...
+     * @return string the absolute URL to the modules root path
      */                   
 	static public function GetAbsoluteUrlModulesRoot()
 	{
@@ -1063,33 +1145,67 @@ class utils
 		return $sUrl;
 	}
 
-    /**
-     * Returns the URL to a page that will execute the requested module page
-     *      
-     * To be compatible with this mechanism, the called page must include approot
-     * with an absolute path OR not include it at all (losing the direct access to the page)
-     * if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-     * require_once(__DIR__.'/../../approot.inc.php');
-     *      
-     * @return string ...
-     */                   
+	/**
+	 * To be compatible with this mechanism, the called page must include approot with an absolute path OR not include
+	 * it at all (losing the direct access to the page) :
+	 *
+	 * ```php
+	 * if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+	 * require_once(__DIR__.'/../../approot.inc.php');
+	 * ```
+	 *
+	 * @param string $sModule
+	 * @param string $sPage
+	 * @param string[] $aArguments
+	 * @param string $sEnvironment
+	 *
+	 * @return string the URL to a page that will execute the requested module page, with query string values url encoded
+	 *
+	 * @see GetExecPageArguments can be used to submit using the GET method (see bug in N.1108)
+	 * @see GetAbsoluteUrlExecPage
+	 */
 	static public function GetAbsoluteUrlModulePage($sModule, $sPage, $aArguments = array(), $sEnvironment = null)
+	{
+		$aArgs = self::GetExecPageArguments($sModule, $sPage, $aArguments, $sEnvironment);
+		$sArgs = http_build_query($aArgs);
+
+		return self::GetAbsoluteUrlExecPage()."?".$sArgs;
+	}
+
+	/**
+	 * @param string $sModule
+	 * @param string $sPage
+	 * @param string[] $aArguments
+	 * @param string $sEnvironment
+	 *
+	 * @return string[] key/value pair for the exec page query string. <b>Warning</b> : values are not url encoded !
+	 * @throws \Exception if one of the argument has a reserved name
+	 */
+	static public function GetExecPageArguments($sModule, $sPage, $aArguments = array(), $sEnvironment = null)
 	{
 		$sEnvironment = is_null($sEnvironment) ? self::GetCurrentEnvironment() : $sEnvironment;
 		$aArgs = array();
-		$aArgs[] = 'exec_module='.$sModule;
-		$aArgs[] = 'exec_page='.$sPage;
-		$aArgs[] = 'exec_env='.$sEnvironment;
+		$aArgs['exec_module'] = $sModule;
+		$aArgs['exec_page'] = $sPage;
+		$aArgs['exec_env'] = $sEnvironment;
 		foreach($aArguments as $sName => $sValue)
 		{
-			if (($sName == 'exec_module')||($sName == 'exec_page')||($sName == 'exec_env'))
+			if (($sName == 'exec_module') || ($sName == 'exec_page') || ($sName == 'exec_env'))
 			{
 				throw new Exception("Module page: $sName is a reserved page argument name");
 			}
-			$aArgs[] = $sName.'='.urlencode($sValue);
+			$aArgs[$sName] = $sValue;
 		}
-		$sArgs = implode('&', $aArgs);
-		return self::GetAbsoluteUrlAppRoot().'pages/exec.php?'.$sArgs;
+
+		return $aArgs;
+	}
+
+	/**
+	 * @return string
+	 */
+	static public function GetAbsoluteUrlExecPage()
+	{
+		return self::GetAbsoluteUrlAppRoot().'pages/exec.php';
 	}
 
 	/**
@@ -1590,4 +1706,239 @@ class utils
 		}
 		return null;
 	}
+	
+	/**
+	 * Check if the given path/url is an http(s) URL
+	 * @param string $sPath
+	 * @return boolean
+	 */
+	public static function IsURL($sPath)
+	{
+		$bRet = false;
+		if ((substr($sPath, 0, 7) == 'http://') || (substr($sPath, 0, 8) == 'https://') || (substr($sPath, 0, 8) == 'ftp://'))
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+	
+	/**
+	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
+	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
+	 * @param string $sPath
+	 * @return false|ormDocument
+	 * @throws Exception
+	 */
+	public static function IsSelfURL($sPath)
+	{
+		$result = false;
+		$sPageUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php';
+		if (substr($sPath, 0, strlen($sPageUrl)) == $sPageUrl)
+		{
+			// If the URL is an URL pointing to this instance of iTop, then
+			// extract the "query" part of the URL and analyze it
+			$sQuery = parse_url($sPath, PHP_URL_QUERY);
+			if ($sQuery !== null)
+			{
+				$aParams = array();
+				foreach(explode('&', $sQuery) as $sChunk)
+				{
+					$aParts = explode('=', $sChunk);
+					if (count($aParts) != 2) continue;
+					$aParams[$aParts[0]] = urldecode($aParts[1]);
+				}
+				$result = array_key_exists('operation', $aParams) && array_key_exists('class', $aParams) && array_key_exists('id', $aParams) && array_key_exists('field', $aParams) && ($aParams['operation'] == 'download_document');
+				if ($result)
+				{
+					// This is a 'download_document' operation, let's retrieve the document directly from the database
+					$sClass = $aParams['class'];
+					$iKey = $aParams['id'];
+					$sAttCode = $aParams['field'];
+
+					$oObj = MetaModel::GetObject($sClass, $iKey, false /* must exist */); // Users rights apply here !!
+					if ($oObj)
+					{
+						/**
+						 * @var ormDocument $result
+						 */
+						$result = clone $oObj->Get($sAttCode);
+						return $result;
+					}
+				}
+			}
+			throw new Exception('Invalid URL. This iTop URL is not pointing to a valid Document/Image.');
+		}
+		return $result;
+	}
+	
+	/**
+	 * Read the content of a file (and retrieve its MIME type) from either:
+	 * - an URL pointing to a blob (image/document) on the current iTop server
+	 * - an http(s) URL
+	 * - the local file system (but only if you are an administrator)
+	 * @param string $sPath
+	 * @return ormDocument|null
+	 * @throws Exception
+	 */
+	public static function FileGetContentsAndMIMEType($sPath)
+	{
+		$oUploadedDoc = null;
+		$aKnownExtensions = array(
+				'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+				'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+				'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+				'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+				'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+				'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+				'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+				'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+				'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+				'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+				'jpg' => 'image/jpeg',
+				'jpeg' => 'image/jpeg',
+				'gif' => 'image/gif',
+				'png' => 'image/png',
+				'pdf' => 'application/pdf',
+				'doc' => 'application/msword',
+				'dot' => 'application/msword',
+				'xls' => 'application/vnd.ms-excel',
+				'ppt' => 'application/vnd.ms-powerpoint',
+				'vsd' => 'application/x-visio',
+				'vdx' => 'application/visio.drawing',
+				'odt' => 'application/vnd.oasis.opendocument.text',
+				'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+				'odp' => 'application/vnd.oasis.opendocument.presentation',
+				'zip' => 'application/zip',
+				'txt' => 'text/plain',
+				'htm' => 'text/html',
+				'html' => 'text/html',
+				'exe' => 'application/octet-stream'
+		);
+	
+		$sData = null;
+		$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
+		$sFileName = 'uploaded-file'; // Default name for downloaded-files
+		$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
+
+		if(empty($sPath))
+		{
+			// Empty path (NULL or '') means that there is no input, making an empty document.
+			$oUploadedDoc = new ormDocument('', '', '');
+		}
+		elseif (static::IsURL($sPath))
+		{
+			if ($oUploadedDoc = static::IsSelfURL($sPath))
+			{
+				// Nothing more to do, we've got it !!
+			}
+			else
+			{
+				// Remote file, let's use the HTTP headers to find the MIME Type
+				$sData = @file_get_contents($sPath);
+				if ($sData === false)
+				{
+					throw new Exception("Failed to load the file from the URL '$sPath'.");
+				}
+				else
+				{
+					if (isset($http_response_header))
+					{
+						$aHeaders = static::ParseHeaders($http_response_header);
+						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
+						// Compute the file extension from the MIME Type
+						foreach($aKnownExtensions as $sExtValue => $sMime)
+						{
+							if ($sMime === $sMimeType)
+							{
+								$sExtension = '.'.$sExtValue;
+								break;
+							}
+						}
+					}
+					$sFileName .= $sExtension;
+				}
+				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
+			}
+		}
+		else if (UserRights::IsAdministrator())
+		{
+			// Only administrators are allowed to read local files
+			$sData = @file_get_contents($sPath);
+			if ($sData === false)
+			{
+				throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
+			}
+			$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
+			$sFileName = basename($sPath);
+				
+			if (array_key_exists($sExtension, $aKnownExtensions))
+			{
+				$sMimeType = $aKnownExtensions[$sExtension];
+			}
+			else if (extension_loaded('fileinfo'))
+			{
+				$finfo = new finfo(FILEINFO_MIME);
+				$sMimeType = $finfo->file($sPath);
+			}
+			$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
+		}
+		return $oUploadedDoc;
+	}
+	
+	protected static function ParseHeaders($aHeaders)
+	{
+		$aCleanHeaders = array();
+		foreach( $aHeaders as $sKey => $sValue )
+		{
+			$aTokens = explode(':', $sValue, 2);
+			if(isset($aTokens[1]))
+			{
+				$aCleanHeaders[trim($aTokens[0])] = trim($aTokens[1]);
+			}
+			else
+			{
+				// The header is not in the form Header-Code: Value
+				$aCleanHeaders[] = $sValue; // Store the value as-is
+				$aMatches = array();
+				// Check if it's not the HTTP response code
+				if( preg_match("|HTTP/[0-9\.]+\s+([0-9]+)|", $sValue, $aMatches) )
+				{
+					$aCleanHeaders['reponse_code'] = intval($aMatches[1]);
+				}
+			}
+		}
+		return $aCleanHeaders;
+	}
+	
+	/**
+	 * Return a string based on compilation time or (if not available because the datamodel has not been loaded)
+	 * the version of iTop. This string is useful to prevent browser side caching of content that may vary at each
+	 * (re)installation of iTop (especially during development). 
+	 * @return string
+	 */
+	public static function GetCacheBusterTimestamp()
+	{
+		if(!defined('COMPILATION_TIMESTAMP'))
+		{
+			return ITOP_VERSION;
+		}
+		return COMPILATION_TIMESTAMP;
+	}
+
+	/**
+	 * Check if the given class if configured as a high cardinality class.
+	 *
+	 * @param $sClass
+	 *
+	 * @return bool
+	 */
+	public static function IsHighCardinality($sClass)
+	{
+		if (utils::GetConfig()->Get('search_manual_submit'))
+		{
+			return true;
+		}
+		$aHugeClasses = MetaModel::GetConfig()->Get('high_cardinality_classes');
+		return in_array($sClass, $aHugeClasses);
+	}
 }

application/wizardhelper.class.inc.php

@@ -86,12 +86,20 @@ class WizardHelper
 								}
 								elseif($sLinkedAttDef instanceof AttributeDateTime)
                                 {
+                                    $sDateClass = get_class($sLinkedAttDef);
                                     $sDate = $aLinkedObject[$sLinkedAttCode];
                                     if($sDate !== null && $sDate !== '')
                                     {
-                                        $oDateTimeFormat = AttributeDateTime::GetFormat();
+                                        $oDateTimeFormat = $sDateClass::GetFormat();
                                         $oDate = $oDateTimeFormat->Parse($sDate);
-                                        $sDate = $oDate->format('Y-m-d H:i:s');
+                                        if ($sDateClass == "AttributeDate")
+                                        {
+                                            $sDate = $oDate->format('Y-m-d');
+                                        }
+                                        else
+                                        {
+                                            $sDate = $oDate->format('Y-m-d H:i:s');
+                                        }
                                     }
 
                                     $oLinkedObj->Set($sLinkedAttCode, $sDate);

core/action.class.inc.php

@@ -39,7 +39,7 @@ abstract class Action extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -60,7 +60,7 @@ abstract class Action extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // 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('default_search', array('name', 'description', 'status')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
 
@@ -103,7 +103,7 @@ abstract class ActionNotification extends Action
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -136,7 +136,7 @@ class ActionEmail extends ActionNotification
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
@@ -262,22 +262,34 @@ class ActionEmail extends ActionNotification
 			{
 				$sPrefix = '';
 			}
+
 			if ($oLog)
 			{
 				$oLog->Set('message', $sPrefix . $sRes);
-			}
+                $oLog->DBUpdate();
+            }
+
 		}
 		catch (Exception $e)
 		{
 			if ($oLog)
 			{
 				$oLog->Set('message', 'Error: '.$e->getMessage());
+
+				try
+				{
+                    $oLog->DBUpdate();
+				}
+				catch (Exception $eSecondTryUpdate)
+				{
+                    IssueLog::Error("Failed to process email ".$oLog->GetKey()." - reason: ".$e->getMessage()."\nTrace:\n".$e->getTraceAsString());
+
+                    $oLog->Set('message', 'Error: more details in the log for email "'.$oLog->GetKey().'"');
+                    $oLog->DBUpdate();
+                }
 			}
 		}
-		if ($oLog)
-		{
-			$oLog->DBUpdate();
-		}
+
 	}
 
 	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
@@ -348,7 +360,6 @@ class ActionEmail extends ActionNotification
 			$sTestBody .= "</div>\n";
 			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
 			$oEmail->SetRecipientTO($this->Get('test_recipient'));
-			$oEmail->SetRecipientFrom($this->Get('test_recipient'));
 			$oEmail->SetReferences($sReference);
 			$oEmail->SetMessageId($sMessageId);
 		}

core/apc-compat.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2016 Combodo SARL
+// Copyright (C) 2016-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -67,3 +67,32 @@ if (!function_exists('apc_store') && function_exists('apcu_store'))
 		return apcu_store($key, $var, $ttl);
 	}
 }
+
+/**
+ * Returns user cache info... beware of the format of the returned structure that may vary (See usages)
+ * @return array
+ */
+function apc_cache_info_compat()
+{
+	if (!function_exists('apc_cache_info')) return array();
+
+	$oFunction = new ReflectionFunction('apc_cache_info');
+	if ($oFunction->getNumberOfParameters() != 2)
+	{
+		// Beware: APCu behaves slightly differently from APC !!
+		// Worse: the compatibility layer integrated into APC differs from apcu-bc (testing the number of parameters is a must)
+		// In CLI mode (PHP > 7) apc_cache_info returns null and outputs an error message.
+		$aCacheUserData = @apc_cache_info();
+	}
+	else
+	{
+		$aCacheUserData = @apc_cache_info('user');
+	}
+	return $aCacheUserData;
+}
+
+// Cache emulation
+if (!function_exists('apc_store'))
+{
+	require_once(APPROOT.'core/apc-emulation.php');
+}

core/apc-emulation.php

@@ -0,0 +1,333 @@
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Date: 27/09/2017
+ */
+
+/**
+ * @param string $cache_type
+ * @param bool $limited
+ * @return array|bool
+ */
+function apc_cache_info($cache_type = '', $limited = false)
+{
+	$aInfo = array();
+	$sRootCacheDir = apcFile::GetCacheFileName();
+	$aInfo['cache_list'] = apcFile::GetCacheEntries($sRootCacheDir);
+	return $aInfo;
+}
+
+/**
+ * @param array|string $key
+ * @param $var
+ * @param int $ttl
+ * @return array|bool
+ */
+function apc_store($key, $var = NULL, $ttl = 0)
+{
+	if (is_array($key))
+	{
+		$aResult = array();
+		foreach($key as $sKey => $value)
+		{
+			$aResult[] = apcFile::StoreOneFile($sKey, $value, $ttl);
+		}
+		return $aResult;
+	}
+	return apcFile::StoreOneFile($key, $var, $ttl);
+}
+
+/**
+ * @param $key string|array
+ * @return mixed
+ */
+function apc_fetch($key)
+{
+	if (is_array($key))
+	{
+		$aResult = array();
+		foreach($key as $sKey)
+		{
+			$aResult[$sKey] = apcFile::FetchOneFile($sKey);
+		}
+		return $aResult;
+	}
+	return apcFile::FetchOneFile($key);
+}
+
+/**
+ * @param string $cache_type
+ * @return bool
+ */
+function apc_clear_cache($cache_type = '')
+{
+	apcFile::DeleteEntry(utils::GetCachePath());
+	return true;
+}
+
+/**
+ * @param $key
+ * @return bool|string[]
+ */
+function apc_delete($key)
+{
+	if (empty($key))
+	{
+		return false;
+	}
+	$bRet1 = apcFile::DeleteEntry(apcFile::GetCacheFileName($key));
+	$bRet2 = apcFile::DeleteEntry(apcFile::GetCacheFileName('-'.$key));
+	return $bRet1 || $bRet2;
+}
+
+class apcFile
+{
+	// Check only once per request
+	static public $aFilesByTime = null;
+	static public $iFileCount = 0;
+
+	/** Get the file name corresponding to the cache entry.
+	 * If an empty key is provided, the root of the cache is returned.
+	 * @param $sKey
+	 * @return string
+	 */
+	static public function GetCacheFileName($sKey = '')
+	{
+		$sPath = str_replace(array(' ', '/', '\\', '.'), '-', $sKey);
+		return utils::GetCachePath().'apc-emul/'.$sPath;
+	}
+
+	/** Get the list of entries from a starting folder.
+	 * @param $sEntry string starting folder.
+	 * @return array list of entries stored into array of key 'info'
+	 */
+	static public function GetCacheEntries($sEntry)
+	{
+		$aResult = array();
+		if (is_dir($sEntry))
+		{
+			$aFiles = array_diff(scandir($sEntry), array('.', '..'));
+			foreach($aFiles as $sFile)
+			{
+				$sSubFile = $sEntry.'/'.$sFile;
+				$aResult = array_merge($aResult, self::GetCacheEntries($sSubFile));
+			}
+		}
+		else
+		{
+			$sKey = basename($sEntry);
+			if (strpos($sKey, '-') === 0)
+			{
+				$sKey = substr($sKey, 1);
+			}
+			$aResult[] = array('info' => $sKey);
+		}
+		return $aResult;
+	}
+
+	/** Delete one cache entry.
+	 * @param $sCache
+	 * @return bool true if the entry was deleted false if error occurs (like entry did not exist).
+	 */
+	static public function DeleteEntry($sCache)
+	{
+		if (is_dir($sCache))
+		{
+			$aFiles = array_diff(scandir($sCache), array('.', '..'));
+			foreach($aFiles as $sFile)
+			{
+				$sSubFile = $sCache.'/'.$sFile;
+				if (!self::DeleteEntry($sSubFile))
+				{
+					return false;
+				}
+			}
+			if (!@rmdir($sCache))
+			{
+				return false;
+			}
+		}
+		else
+		{
+			if (!@unlink($sCache))
+			{
+				return false;
+			}
+		}
+
+		self::ResetFileCount();
+		return true;
+	}
+
+	/** Get one cache entry content.
+	 * @param $sKey
+	 * @return bool|mixed
+	 */
+	static public function FetchOneFile($sKey)
+	{
+		// Try the 'TTLed' version
+		$sValue = self::ReadCacheLocked(self::GetCacheFileName('-'.$sKey));
+		if ($sValue === false)
+		{
+			$sValue = self::ReadCacheLocked(self::GetCacheFileName($sKey));
+			if ($sValue === false)
+			{
+				return false;
+			}
+		}
+		$oRes = @unserialize($sValue);
+		return $oRes;
+	}
+
+	/** Add one cache entry.
+	 * @param string $sKey
+	 * @param $value
+	 * @param int $iTTL time to live
+	 * @return bool
+	 */
+	static public function StoreOneFile($sKey, $value, $iTTL)
+	{
+		if (empty($sKey))
+		{
+			return false;
+		}
+
+		@unlink(self::GetCacheFileName($sKey));
+		@unlink(self::GetCacheFileName('-'.$sKey));
+		if ($iTTL > 0)
+		{
+			// hint for ttl management
+			$sKey = '-'.$sKey;
+		}
+
+		$sFilename = self::GetCacheFileName($sKey);
+		// try to create the folder
+		$sDirname = dirname($sFilename);
+		if (!file_exists($sDirname))
+		{
+			if (!@mkdir($sDirname, 0755, true))
+			{
+				return false;
+			}
+		}
+		$bRes = !(@file_put_contents($sFilename, serialize($value), LOCK_EX) === false);
+		self::AddFile($sFilename);
+		return $bRes;
+	}
+
+	/** Manage the cache files when adding a new cache entry:
+	 * remove older files if the mamximum is reached.
+	 * @param $sNewFilename
+	 */
+	static protected function AddFile($sNewFilename)
+	{
+		if (strpos(basename($sNewFilename), '-') !== 0)
+		{
+			return;
+		}
+
+		$iMaxFiles = MetaModel::GetConfig()->Get('apc_cache_emulation.max_entries');
+		if ($iMaxFiles == 0)
+		{
+			return;
+		}
+		if (!self::$aFilesByTime)
+		{
+			self::ListFilesByTime();
+			self::$iFileCount = count(self::$aFilesByTime);
+			if ($iMaxFiles !== 0)
+			{
+				asort(self::$aFilesByTime);
+			}
+		}
+		else
+		{
+			self::$aFilesByTime[$sNewFilename] = time();
+			self::$iFileCount++;
+		}
+		if (self::$iFileCount > $iMaxFiles)
+		{
+			$iFileNbToRemove = self::$iFileCount - $iMaxFiles;
+			foreach(self::$aFilesByTime as $sFileToRemove => $iTime)
+			{
+				@unlink($sFileToRemove);
+				if (--$iFileNbToRemove === 0)
+				{
+					break;
+				}
+			}
+			self::$aFilesByTime = array_slice(self::$aFilesByTime, self::$iFileCount - $iMaxFiles, null, true);
+			self::$iFileCount = $iMaxFiles;
+		}
+	}
+
+	/** Get the list of files with their associated access time
+	 * @param string $sCheck Directory to scan
+	 */
+	static protected function ListFilesByTime($sCheck = null)
+	{
+		if (empty($sCheck))
+		{
+			$sCheck = self::GetCacheFileName();
+		}
+		// Garbage collection
+		$aFiles = array_diff(@scandir($sCheck), array('.', '..'));
+		foreach($aFiles as $sFile)
+		{
+			$sSubFile = $sCheck.'/'.$sFile;
+			if (is_dir($sSubFile))
+			{
+				self::ListFilesByTime($sSubFile);
+			}
+			else
+			{
+				if (strpos(basename($sSubFile), '-') === 0)
+				{
+					self::$aFilesByTime[$sSubFile] = @fileatime($sSubFile);
+				}
+			}
+		}
+	}
+
+	/** Read the content of one cache file under lock protection
+	 * @param $sFilename
+	 * @return bool|string the content of the cache entry or false if error
+	 */
+	static protected function ReadCacheLocked($sFilename)
+	{
+		$file = @fopen($sFilename, 'r');
+		if ($file === false)
+		{
+			return false;
+		}
+		flock($file, LOCK_SH);
+		$sContent = @fread($file, @filesize($sFilename));
+		flock($file, LOCK_UN);
+		fclose($file);
+		return $sContent;
+	}
+
+	static protected function ResetFileCount()
+	{
+		self::$aFilesByTime = null;
+		self::$iFileCount = 0;
+	}
+
+}

core/asynctask.class.inc.php

@@ -186,7 +186,7 @@ abstract class AsyncTask extends DBObject
     * @return boolean True if the task record can be deleted
     */
 	public function Process()
-   {
+	{
 		// By default: consider that the task is not completed
 		$bRet = false;
 
@@ -196,16 +196,15 @@ abstract class AsyncTask extends DBObject
 		{
 			try
 			{
-		   	$sStatus = $this->DoProcess();
-		   	if ($this->Get('event_id') != 0)
-		   	{
-		   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-		   		$oEventLog->Set('message', $sStatus);
-		   		$oEventLog->DBUpdate();
+				$sStatus = $this->DoProcess();
+				if ($this->Get('event_id') != 0)
+				{
+					$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+					$oEventLog->Set('message', $sStatus);
+					$oEventLog->DBUpdate();
 				}
 				$bRet = true;
-			}
-			catch(Exception $e)
+			} catch (Exception $e)
 			{
 				$this->HandleError($e->getMessage(), $e->getCode());
 			}
@@ -215,6 +214,7 @@ abstract class AsyncTask extends DBObject
 			// Already done or being handled by another process... skip...
 			$bRet = false;
 		}
+
 		return $bRet;
 	}
 
@@ -238,7 +238,20 @@ abstract class AsyncTask extends DBObject
 		{
 			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
 			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
-
+			if ($this->Get('event_id') != 0)
+			{
+				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s'");
+                try
+                {
+                    $oEventLog->DBUpdate();
+                }
+                catch (Exception $e)
+                {
+                    $oEventLog->Set('message', "Failed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s', more details in the log");
+                    $oEventLog->DBUpdate();
+                }
+			}
 			$this->Set('remaining_retries', $iRemaining - 1);
 			$this->Set('status', 'planned');
 			$this->Set('started', null);
@@ -247,7 +260,20 @@ abstract class AsyncTask extends DBObject
 		else
 		{
 			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
-
+			if ($this->Get('event_id') != 0)
+			{
+				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task.");
+				try
+				{
+                    $oEventLog->DBUpdate();
+				}
+				catch (Exception $e)
+				{
+                    $oEventLog->Set('message', 'Failed to process async task, more details in the log');
+                    $oEventLog->DBUpdate();
+				}
+			}
 			$this->Set('status', 'error');
 			$this->Set('started', null);
 			$this->Set('planned', null);

core/background.inc.php

@@ -50,6 +50,6 @@ class ObsolescenceDateUpdater implements iBackgroundProcess
 			$oObsoletedToday->AddCondition('obsolescence_date', null, '!=');
 			$iCountReset += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => null));
 		}
-		echo "Obsolescence date updated (classes: $iClasses ; set: $iCountSet ; reset: $iCountReset)\n";
+		return "Obsolescence date updated (classes: $iClasses ; set: $iCountSet ; reset: $iCountReset)\n";
 	}
 }

core/backgroundprocess.inc.php

@@ -24,9 +24,16 @@
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 interface iProcess
 {
+	/**
+	 * @param int $iUnixTimeLimit
+	 *
+	 * @return string status message
+	 * @throws \ProcessException
+	 * @throws \ProcessFatalException
+	 * @throws MySQLHasGoneAwayException
+	 */
 	public function Process($iUnixTimeLimit);
 }
 
@@ -37,13 +44,11 @@ interface iProcess
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 interface iBackgroundProcess extends iProcess
 {
-	/*
-		Gives the repetition rate in seconds
-		@returns integer
-	*/
+	/**
+	 * @return int repetition rate in seconds
+	 */
 	public function GetPeriodicity();
 }
 
@@ -54,14 +59,30 @@ interface iBackgroundProcess extends iProcess
  * @copyright   Copyright (C) 2013 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 interface iScheduledProcess extends iProcess
 {
-	/*
-		Gives the exact time at which the process must be run next time
-		@returns DateTime
-	*/
+	/**
+	 * @return DateTime exact time at which the process must be run next time
+	 */
 	public function GetNextOccurrence();
 }
 
-?>
+/**
+ * Class ProcessException
+ * Exception for iProcess implementations.<br>
+ * An error happened during the processing but we can go on with the next implementations.
+ */
+class ProcessException extends CoreException
+{
+
+}
+
+/**
+ * Class ProcessFatalException
+ * Exception for iProcess implementations.<br>
+ * A big error occurred, we have to stop the iProcess processing.
+ */
+class ProcessFatalException extends CoreException
+{
+
+}

core/bulkchange.class.inc.php

@@ -320,7 +320,7 @@ class BulkChange
 	// Returns true if the CSV data specifies that the external key must be left undefined
 	protected function IsNullExternalKeySpec($aRowData, $sAttCode)
 	{
-		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+		//$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
 		{
 			// The foreign attribute is one of our reconciliation key
@@ -367,6 +367,7 @@ class BulkChange
 			else
 			{
 				$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
+
 				$aCacheKeys = array();
 				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 				{
@@ -385,7 +386,6 @@ class BulkChange
 					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
 				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
-				$iCount = 0;
 				$iForeignKey = null;
 				$sOQL = '';
 				// TODO: check if *too long* keys can lead to collisions... and skip the cache in such a case...
@@ -468,14 +468,14 @@ class BulkChange
 		//
 		foreach ($this->m_aAttList as $sAttCode => $iCol)
 		{
-            $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-
 			// skip the private key, if any
 			if ($sAttCode == 'id') continue;
+
+			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+
 			// skip reconciliation keys
 			if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ 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]) )
@@ -532,13 +532,11 @@ class BulkChange
 				{
 					$sCurValue = $oTargetObj->GetAsHTML($sAttCode, $this->m_bLocalizedValues);
 					$sOrigValue = $oTargetObj->GetOriginalAsHTML($sAttCode, $this->m_bLocalizedValues);
-					$sInput = htmlentities($aRowData[$iCol], ENT_QUOTES, 'UTF-8');
 				}
 				else
 				{
 					$sCurValue = $oTargetObj->GetAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
 					$sOrigValue = $oTargetObj->GetOriginalAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
-					$sInput = $aRowData[$iCol];
 				}
 				if (isset($aErrors[$sAttCode]))
 				{
@@ -609,10 +607,6 @@ class BulkChange
 				throw new BulkChangeException('Invalid attribute code', array('class' => get_class($oTargetObj), 'attcode' => $sAttCode));
 			}
 			$oTargetObj->Set($sAttCode, $value);
-			if (!array_key_exists($sAttCode, $this->m_aAttList))
-			{
-				// #@# will be out of the reporting... (counted anyway)
-			}
 		}
 	
 		// Reporting on fields
@@ -650,6 +644,47 @@ class BulkChange
 	protected function CreateObject(&$aResult, $iRow, $aRowData, CMDBChange $oChange = null)
 	{
 		$oTargetObj = MetaModel::NewObject($this->m_sClass);
+
+		// Populate the cache for hierarchical keys (only if in verify mode)
+		if (is_null($oChange))
+		{
+			// 1. determine if a hierarchical key exists
+			foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
+			{
+				$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
+				if (!$this->IsNullExternalKeySpec($aRowData, $sAttCode) && MetaModel::IsParentClass(get_class($oTargetObj), $this->m_sClass))
+				{
+					// 2. Populate the cache for further checks
+					$aCacheKeys = array();
+					foreach ($aKeyConfig as $sForeignAttCode => $iCol)
+					{
+						// The foreign attribute is one of our reconciliation key
+						if ($sForeignAttCode == 'id')
+						{
+							$value = $aRowData[$iCol];
+						}
+						else
+						{
+							if (!isset($this->m_aAttList[$sForeignAttCode]) || !isset($aRowData[$this->m_aAttList[$sForeignAttCode]]))
+							{
+								// the key is not in the import
+								break 2;
+							}
+							$value = $aRowData[$this->m_aAttList[$sForeignAttCode]];
+						}
+						$aCacheKeys[] = $value;
+					}
+					$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
+					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
+						'c' => 1,
+						'k' => -1,
+						'oql' => '',
+						'h' => 0, // number of hits on this cache entry
+					);
+				}
+			}
+		}
+
 		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
 	
 		if (count($aErrors) > 0)
@@ -683,7 +718,7 @@ class BulkChange
 		if ($oChange)
 		{
 			$newID = $oTargetObj->DBInsertTrackedNoReload($oChange);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj($this->m_sClass, $newID);
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
 			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
 			$aResult[$iRow]["id"] = new CellStatus_Void($newID);
 		}
@@ -1175,6 +1210,9 @@ EOF
 
 	/**
 	 * Display the details of an import
+	 * @param iTopWebPage $oPage
+	 * @param $iChange
+	 * @throws Exception
 	 */
 	static function DisplayImportHistoryDetails(iTopWebPage $oPage, $iChange)
 	{

core/bulkexport.class.inc.php

@@ -73,8 +73,14 @@ class BulkExportResult extends DBObject
 		MetaModel::Init_AddAttribute(new AttributeString("temp_file_path", array("allowed_values"=>null, "sql"=>"temp_file_path", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLongText("search", array("allowed_values"=>null, "sql"=>"search", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLongText("status_info", array("allowed_values"=>null, "sql"=>"status_info", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+        MetaModel::Init_AddAttribute(new AttributeBoolean("localize_output", array("allowed_values"=>null, "sql"=>"localize_output", "default_value"=>true, "is_null_allowed"=>true, "depends_on"=>array())));
+
 	}
-	
+
+	/**
+	 * @throws CoreUnexpectedValue
+	 * @throws Exception
+	 */
 	public function ComputeValues()
 	{
 		$this->Set('user_id', UserRights::GetUserId());
@@ -147,13 +153,16 @@ abstract class BulkExport
 		$this->sTmpFile = '';
 		$this->bLocalizeOutput = false;
 	}
-		
-	/**
-	 * Find the first class capable of exporting the data in the given format
-	 * @param string $sFormat The lowercase format (e.g. html, csv, spreadsheet, xlsx, xml, json, pdf...)
-	 * @param DBSearch $oSearch The search/filter defining the set of objects to export or null when listing the supported formats
-	 * @return iBulkExport|NULL
-	 */
+
+    /**
+     * Find the first class capable of exporting the data in the given format
+     *
+     * @param string   $sFormatCode The lowercase format (e.g. html, csv, spreadsheet, xlsx, xml, json, pdf...)
+     * @param DBSearch $oSearch     The search/filter defining the set of objects to export or null when listing the supported formats
+     *
+     * @return BulkExport|null
+     * @throws ReflectionException
+     */
 	static public function FindExporter($sFormatCode, $oSearch = null)
 	{
 		foreach(get_declared_classes() as $sPHPClass)
@@ -174,12 +183,17 @@ abstract class BulkExport
 		}
 		return null;
 	}
-	
-	/**
-	 * Find the exporter corresponding to the given persistent token
-	 * @param int $iPersistentToken The identifier of the BulkExportResult object storing the information
-	 * @return iBulkExport|NULL
-	 */
+
+    /**
+     * Find the exporter corresponding to the given persistent token
+     *
+     * @param int $iPersistentToken The identifier of the BulkExportResult object storing the information
+     *
+     * @return iBulkExport|null
+     * @throws ArchivedObjectException
+     * @throws CoreException
+     * @throws ReflectionException
+     */
 	static public function FindExporterFromToken($iPersistentToken = null)
 	{
 		$oBulkExporter = null;
@@ -188,7 +202,7 @@ abstract class BulkExport
 		{
 			$sFormatCode = $oInfo->Get('format');
 			$oSearch = DBObjectSearch::unserialize($oInfo->Get('search'));
-			
+
 			$oBulkExporter = self::FindExporter($sFormatCode, $oSearch);
 			if ($oBulkExporter)
 			{
@@ -196,13 +210,21 @@ abstract class BulkExport
 				$oBulkExporter->SetObjectList($oSearch);
 				$oBulkExporter->SetChunkSize($oInfo->Get('chunk_size'));
 				$oBulkExporter->SetStatusInfo(json_decode($oInfo->Get('status_info'), true));
+
+                $oBulkExporter->SetLocalizeOutput($oInfo->Get('localize_output'));
+
+
 				$oBulkExporter->sTmpFile = $oInfo->Get('temp_file_path');
 				$oBulkExporter->oBulkExportResult = $oInfo;
 			}
 		}
 		return $oBulkExporter;
 	}
-	
+
+	/**
+	 * @param $data
+	 * @throws Exception
+	 */
 	public function AppendToTmpFile($data)
 	{
 		if ($this->sTmpFile == '')
@@ -221,10 +243,10 @@ abstract class BulkExport
 	{
 		return $this->sTmpFile;
 	}
-	
+
 	/**
 	 * Lists all possible export formats. The output is a hash array in the form: 'format_code' => 'localized format label'
-	 * @return multitype:string
+	 * @return array :string
 	 */
 	static public function FindSupportedFormats()
 	{
@@ -250,6 +272,14 @@ abstract class BulkExport
 	{
 		$this->iChunkSize = $iChunkSize;
 	}
+
+    /**
+     * @param $bLocalizeOutput
+     */
+    public function SetLocalizeOutput($bLocalizeOutput)
+    {
+        $this->bLocalizeOutput = $bLocalizeOutput;
+    }
 	
 	/**
 	 * (non-PHPdoc)
@@ -288,13 +318,21 @@ abstract class BulkExport
 	{
 	}
 
+	/**
+	 * @return string
+	 */
 	public function GetHeader()
 	{
+		return '';
 	}
 	abstract public function GetNextChunk(&$aStatus);
+
+	/**
+	 * @return string
+	 */
 	public function GetFooter()
 	{
-		
+		return '';
 	}
 	
 	public function SaveState()
@@ -304,9 +342,10 @@ abstract class BulkExport
 			$this->oBulkExportResult = new BulkExportResult();
 			$this->oBulkExportResult->Set('format', $this->sFormatCode);
 			$this->oBulkExportResult->Set('search', $this->oSearch->serialize());
-			$this->oBulkExportResult->Set('chunk_size', $this->iChunkSize);	
-			$this->oBulkExportResult->Set('temp_file_path', $this->sTmpFile);	
-		}
+			$this->oBulkExportResult->Set('chunk_size', $this->iChunkSize);
+            $this->oBulkExportResult->Set('temp_file_path', $this->sTmpFile);
+            $this->oBulkExportResult->Set('localize_output', $this->bLocalizeOutput);
+        }
 		$this->oBulkExportResult->Set('status_info', json_encode($this->GetStatusInfo()));
 		utils::PushArchiveMode(false);
 		$ret = $this->oBulkExportResult->DBWrite();
@@ -355,13 +394,21 @@ abstract class BulkExport
 	{
 		
 	}
+
+	/**
+	 * @return string
+	 */
 	public function GetMimeType()
 	{
-		
+		return '';
 	}
+
+	/**
+	 * @return string
+	 */
 	public function GetFileExtension()
 	{
-		
+		return '';
 	}
 	public function GetCharacterSet()
 	{
@@ -388,6 +435,11 @@ abstract class BulkExport
 		return $this->aStatusInfo;
 	}
 
+	/**
+	 * @param $sExtension
+	 * @return string
+	 * @throws Exception
+	 */
 	protected function MakeTmpFile($sExtension)
 	{
 		if(!is_dir(APPROOT."data/bulk_export"))
@@ -401,7 +453,6 @@ abstract class BulkExport
 		}
 
 		$iNum = rand();
-		$sFileName = '';
 		do
 		{
 			$iNum++;

core/cmdbsource.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2015 Combodo SARL
+// Copyright (C) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -20,7 +20,7 @@
 /**
  * DB Server abstraction
  *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -29,22 +29,76 @@ require_once(APPROOT.'core/kpi.class.inc.php');
 
 class MySQLException extends CoreException
 {
-	public function __construct($sIssue, $aContext, $oException = null)
+	/**
+	 * MySQLException constructor.
+	 *
+	 * @param string $sIssue
+	 * @param array $aContext
+	 * @param \Exception $oException
+	 * @param \mysqli $oMysqli to use when working with a custom mysqli instance
+	 */
+	public function __construct($sIssue, $aContext, $oException = null, $oMysqli = null)
 	{
 		if ($oException != null)
 		{
-			$aContext['mysql_error'] = $oException->getCode();
-			$aContext['mysql_errno'] = $oException->getMessage();
+			$aContext['mysql_errno'] = $oException->getCode();
+			$this->code = $oException->getCode();
+			$aContext['mysql_error'] = $oException->getMessage();
+		}
+		else if ($oMysqli != null)
+		{
+			$aContext['mysql_errno'] = $oMysqli->errno;
+			$this->code = $oMysqli->errno;
+			$aContext['mysql_error'] = $oMysqli->error;
 		}
 		else
 		{
-			$aContext['mysql_error'] = CMDBSource::GetError();
 			$aContext['mysql_errno'] = CMDBSource::GetErrNo();
+			$this->code = CMDBSource::GetErrNo();
+			$aContext['mysql_error'] = CMDBSource::GetError();
 		}
 		parent::__construct($sIssue, $aContext);
 	}
 }
 
+/**
+ * Class MySQLQueryHasNoResultException
+ *
+ * @since 2.5
+ */
+class MySQLQueryHasNoResultException extends MySQLException
+{
+
+}
+
+/**
+ * Class MySQLHasGoneAwayException
+ *
+ * @since 2.5
+ * @see itop bug 1195
+ * @see https://dev.mysql.com/doc/refman/5.7/en/gone-away.html
+ */
+class MySQLHasGoneAwayException extends MySQLException
+{
+	/**
+	 * can not be a constant before PHP 5.6 (http://php.net/manual/fr/language.oop5.constants.php)
+	 *
+	 * @return int[]
+	 */
+	public static function getErrorCodes()
+	{
+		return array(
+			2006,
+			2013
+		);
+	}
+
+	public function __construct($sIssue, $aContext)
+	{
+		parent::__construct($sIssue, $aContext, null);
+	}
+}
+
 
 /**
  * CMDBSource
@@ -54,41 +108,136 @@ class MySQLException extends CoreException
  */
 class CMDBSource
 {
+	/**
+	 * SQL charset & collation declaration for text columns
+	 *
+	 * Using an attribute instead of a constant to avoid crash in the setup for older PHP versions
+	 *
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html
+	 * @since 2.5 #1001 switch to utf8mb4
+	 */
+	public static $SQL_STRING_COLUMNS_CHARSET_DEFINITION = ' CHARACTER SET '.DEFAULT_CHARACTER_SET.' COLLATE '.DEFAULT_COLLATION;
+
 	protected static $m_sDBHost;
 	protected static $m_sDBUser;
 	protected static $m_sDBPwd;
 	protected static $m_sDBName;
+	/**
+	 * @var boolean
+	 * @since 2.5 #1260 MySQL TLS first implementation
+	 */
+	protected static $m_bDBTlsEnabled;
+	/**
+	 * @var string
+	 * @since 2.5 #1260 MySQL TLS first implementation
+	 */
+	protected static $m_sDBTlsCA;
+
+	/** @var mysqli $m_oMysqli */
 	protected static $m_oMysqli;
 
-	public static function Init($sServer, $sUser, $sPwd, $sSource = '')
+	/**
+	 * @param Config $oConfig
+	 *
+	 * @throws \MySQLException
+	 * @uses \CMDBSource::Init()
+	 * @uses \CMDBSource::SetCharacterSet()
+	 */
+	public static function InitFromConfig($oConfig)
+	{
+		$sServer = $oConfig->Get('db_host');
+		$sUser = $oConfig->Get('db_user');
+		$sPwd = $oConfig->Get('db_pwd');
+		$sSource = $oConfig->Get('db_name');
+		$bTlsEnabled = $oConfig->Get('db_tls.enabled');
+		$sTlsCA = $oConfig->Get('db_tls.ca');
+
+		self::Init($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA);
+
+		$sCharacterSet = DEFAULT_CHARACTER_SET;
+		$sCollation = DEFAULT_COLLATION;
+		self::SetCharacterSet($sCharacterSet, $sCollation);
+	}
+
+	/**
+	 * @param string $sServer
+	 * @param string $sUser
+	 * @param string $sPwd
+	 * @param string $sSource database to use
+	 * @param bool $bTlsEnabled
+	 * @param string $sTlsCA
+	 *
+	 * @throws \MySQLException
+	 */
+	public static function Init(
+		$sServer, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCA = null
+	)
 	{
 		self::$m_sDBHost = $sServer;
 		self::$m_sDBUser = $sUser;
 		self::$m_sDBPwd = $sPwd;
 		self::$m_sDBName = $sSource;
-		self::$m_oMysqli = null;
+		self::$m_bDBTlsEnabled = empty($bTlsEnabled) ? false : $bTlsEnabled;
+		self::$m_sDBTlsCA = empty($sTlsCA) ? null : $sTlsCA;
+
+		self::$m_oMysqli = self::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA, true);
+	}
+
+	/**
+	 * @param string $sDbHost
+	 * @param string $sUser
+	 * @param string $sPwd
+	 * @param string $sSource database to use
+	 * @param bool $bTlsEnabled
+	 * @param string $sTlsCa
+	 * @param bool $bCheckTlsAfterConnection If true then verify after connection if it is encrypted
+	 *
+	 * @return \mysqli
+	 * @throws \MySQLException
+	 */
+	public static function GetMysqliInstance(
+		$sDbHost, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCa = null, $bCheckTlsAfterConnection = false
+	) {
+		$oMysqli = null;
+
+		$sServer = null;
+		$iPort = null;
+		self::InitServerAndPort($sDbHost, $sServer, $iPort);
+
+		$iFlags = null;
+
+		// *some* errors (like connection errors) will throw mysqli_sql_exception instead of generating warnings printed to the output
+		// but some other errors will still cause the query() method to return false !!!
+		mysqli_report(MYSQLI_REPORT_STRICT);
 
-		mysqli_report(MYSQLI_REPORT_STRICT); // *some* errors (like connection errors) will throw mysqli_sql_exception instead
-											 // of generating warnings printed to the output but some other errors will still
-											 // cause the query() method to return false !!!
 		try
 		{
-			$aConnectInfo = explode(':', self::$m_sDBHost);
-			if (count($aConnectInfo) > 1)
+			$oMysqli = new mysqli();
+			$oMysqli->init();
+
+			if ($bTlsEnabled)
 			{
-				// Override the default port
-				$sServer = $aConnectInfo[0];
-				$iPort = (int)$aConnectInfo[1];
-				self::$m_oMysqli = new mysqli($sServer, self::$m_sDBUser, self::$m_sDBPwd, '', $iPort);
-			}
-			else
-			{
-				self::$m_oMysqli = new mysqli(self::$m_sDBHost, self::$m_sDBUser, self::$m_sDBPwd);
+				$iFlags = (empty($sTlsCa))
+					? MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
+					: MYSQLI_CLIENT_SSL;
+				$sTlsCert = null; // not implemented
+				$sTlsCaPath = null; // not implemented
+				$sTlsCipher = null; // not implemented
+				$oMysqli->ssl_set($bTlsEnabled, $sTlsCert, $sTlsCa, $sTlsCaPath, $sTlsCipher);
 			}
+			$oMysqli->real_connect($sServer, $sUser, $sPwd, '', $iPort, ini_get("mysqli.default_socket"), $iFlags);
 		}
 		catch(mysqli_sql_exception $e)
 		{
-			throw new MySQLException('Could not connect to the DB server', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser), $e);	
+			throw new MySQLException('Could not connect to the DB server', array('host' => $sServer, 'user' => $sUser), $e);
+		}
+
+		if ($bTlsEnabled
+			&& $bCheckTlsAfterConnection
+			&& !self::IsOpenedDbConnectionUsingTls($oMysqli))
+		{
+			throw new MySQLException("Connection to the database is not encrypted whereas it was opened using TLS parameters",
+				null, null, $oMysqli);
 		}
 
 		if (!empty($sSource))
@@ -96,16 +245,104 @@ class CMDBSource
 			try
 			{
 				mysqli_report(MYSQLI_REPORT_STRICT); // Errors, in the next query, will throw mysqli_sql_exception
-				self::$m_oMysqli->query("USE `$sSource`");
+				$oMysqli->query("USE `$sSource`");
 			}
 			catch(mysqli_sql_exception $e)
 			{
-				throw new MySQLException('Could not select DB', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser, 'db_name'=>self::$m_sDBName), $e);
+				throw new MySQLException('Could not select DB',
+					array('host' => $sServer, 'user' => $sUser, 'db_name' => $sSource), $e);
 			}
 		}
+
+		return $oMysqli;
+	}
+
+	/**
+	 * @param string $sDbHost initial value ("p:domain:port" syntax)
+	 * @param string $sServer server variable to update
+	 * @param int $iPort port variable to update
+	 */
+	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
+	{
+		$aConnectInfo = explode(':', $sDbHost);
+
+		$bUsePersistentConnection = false;
+		if (strcasecmp($aConnectInfo[0], 'p') == 0)
+		{
+			// we might have "p:" prefix to use persistent connections (see http://php.net/manual/en/mysqli.persistconns.php)
+			$bUsePersistentConnection = true;
+			$sServer = $aConnectInfo[0].':'.$aConnectInfo[1];
+		}
+		else
+		{
+			$sServer = $aConnectInfo[0];
+		}
+
+		$iConnectInfoCount = count($aConnectInfo);
+		if ($bUsePersistentConnection && ($iConnectInfoCount == 3))
+		{
+			$iPort = $aConnectInfo[2];
+		}
+		else if (!$bUsePersistentConnection && ($iConnectInfoCount == 2))
+		{
+			$iPort = $aConnectInfo[1];
+		}
+		else
+		{
+			$iPort = 3306;
+		}
 	}
 
-	public static function SetCharacterSet($sCharset = 'utf8', $sCollation = 'utf8_general_ci')
+	/**
+	 * <p>A DB connection can be opened transparently (no errors thrown) without being encrypted, whereas the TLS
+	 * parameters were used.<br>
+	 * This method can be called to ensure that the DB connection really uses TLS.
+	 *
+	 * <p>We're using this object connection : {@link self::$m_oMysqli}
+	 *
+	 * @param \mysqli $oMysqli
+	 *
+	 * @return boolean true if the connection was really established using TLS
+	 * @throws \MySQLException
+	 *
+	 * @uses IsMySqlVarNonEmpty
+	 */
+	private static function IsOpenedDbConnectionUsingTls($oMysqli)
+	{
+		if (self::$m_oMysqli == null)
+		{
+			self::$m_oMysqli = $oMysqli;
+		}
+
+		$bNonEmptySslVersionVar = self::IsMySqlVarNonEmpty('ssl_version');
+		$bNonEmptySslCipherVar = self::IsMySqlVarNonEmpty('ssl_cipher');
+
+		return ($bNonEmptySslVersionVar && $bNonEmptySslCipherVar);
+	}
+
+	/**
+	 * @param string $sVarName
+	 *
+	 * @return bool
+	 * @throws \MySQLException
+	 *
+	 * @uses SHOW STATUS queries
+	 */
+	private static function IsMySqlVarNonEmpty($sVarName)
+	{
+		try
+		{
+			$sResult = self::QueryToScalar("SHOW SESSION STATUS LIKE '$sVarName'", 1);
+		}
+		catch (MySQLQueryHasNoResultException $e)
+		{
+			$sResult = null;
+		}
+
+		return (!empty($sResult));
+	}
+
+	public static function SetCharacterSet($sCharset = DEFAULT_CHARACTER_SET, $sCollation = DEFAULT_COLLATION)
 	{
 		if (strlen($sCharset) > 0)
 		{
@@ -164,7 +401,12 @@ class CMDBSource
 		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
 		return $aVersions[0];
 	}
-	
+
+	/**
+	 * @param string $sSource
+	 *
+	 * @throws \MySQLException
+	 */
 	public static function SelectDB($sSource)
 	{
 		if (!((bool)self::$m_oMysqli->query("USE `$sSource`")))
@@ -174,9 +416,15 @@ class CMDBSource
 		self::$m_sDBName = $sSource;
 	}
 
+	/**
+	 * @param string $sSource
+	 *
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function CreateDB($sSource)
 	{
-		self::Query("CREATE DATABASE `$sSource` CHARACTER SET utf8 COLLATE utf8_unicode_ci");
+		self::Query("CREATE DATABASE `$sSource` CHARACTER SET ".DEFAULT_CHARACTER_SET." COLLATE ".DEFAULT_COLLATION);
 		self::SelectDB($sSource);
 	}
 
@@ -207,6 +455,14 @@ class CMDBSource
 		return $res;
 	}
 
+	/**
+	 * @return \mysqli
+	 */
+	public static function GetMysqli()
+	{
+		return self::$m_oMysqli;
+	}
+
 	public static function GetErrNo()
 	{
 		if (self::$m_oMysqli->errno != 0)
@@ -236,15 +492,19 @@ class CMDBSource
 	public static function DBPwd() {return self::$m_sDBPwd;}
 	public static function DBName() {return self::$m_sDBName;}
 
+	/**
+	 * Quote variable and protect against SQL injection attacks
+	 * Code found in the PHP documentation: quote_smart($value)
+	 *
+	 * @param mixed $value
+	 * @param bool $bAlways should be set to true when the purpose is to create a IN clause,
+	 *                      otherwise and if there is a mix of strings and numbers, the clause would always be false
+	 * @param string $cQuoteStyle
+	 *
+	 * @return array|string
+	 */
 	public static function Quote($value, $bAlways = false, $cQuoteStyle = "'")
 	{
-		// Quote variable and protect against SQL injection attacks
-		// Code found in the PHP documentation: quote_smart($value)
-
-		// bAlways should be set to true when the purpose is to create a IN clause,
-		// otherwise and if there is a mix of strings and numbers, the clause
-		// would always be false
-
 		if (is_null($value))
 		{
 			return 'NULL';
@@ -273,6 +533,13 @@ class CMDBSource
 		return $value;
 	}
 
+	/**
+	 * @param string $sSQLQuery
+	 *
+	 * @return \mysqli_result
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function Query($sSQLQuery)
 	{
 		$oKPI = new ExecutionKPI();
@@ -287,19 +554,35 @@ class CMDBSource
 		$oKPI->ComputeStats('Query exec (mySQL)', $sSQLQuery);
 		if ($oResult === false)
 		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSQLQuery));
+			$aContext = array('query' => $sSQLQuery);
+
+			$iMySqlErrorNo = self::$m_oMysqli->errno;
+			$aMySqlHasGoneAwayErrorCodes = MySQLHasGoneAwayException::getErrorCodes();
+			if (in_array($iMySqlErrorNo, $aMySqlHasGoneAwayErrorCodes))
+			{
+				throw new MySQLHasGoneAwayException(self::GetError(), $aContext);
+			}
+
+			throw new MySQLException('Failed to issue SQL query', $aContext);
 		}
 	
 		return $oResult;
 	}
 
+	/**
+	 * @param string $sTable
+	 *
+	 * @return int
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
 	public static function GetNextInsertId($sTable)
 	{
 		$sSQL = "SHOW TABLE STATUS LIKE '$sTable'";
 		$oResult = self::Query($sSQL);
 		$aRow = $oResult->fetch_assoc();
-		$iNextInsertId = $aRow['Auto_increment'];
-		return $iNextInsertId;
+
+		return $aRow['Auto_increment'];
 	}
 
 	public static function GetInsertId()
@@ -326,7 +609,15 @@ class CMDBSource
 		self::Query($sSQLQuery);
 	}
 
-	public static function QueryToScalar($sSql)
+	/**
+	 * @param string $sSql
+	 * @param int $iCol beginning at 0
+	 *
+	 * @return string corresponding cell content on the first line
+	 * @throws \MySQLException
+	 * @throws \MySQLQueryHasNoResultException
+	 */
+	public static function QueryToScalar($sSql, $iCol = 0)
 	{
 		$oKPI = new ExecutionKPI();
 		try
@@ -343,20 +634,28 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-		
+
 		if ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
 		{
-			$res = $aRow[0];
+			$res = $aRow[$iCol];
 		}
 		else
 		{
 			$oResult->free();
-			throw new MySQLException('Found no result for query', array('query' => $sSql));
+			throw new MySQLQueryHasNoResultException('Found no result for query', array('query' => $sSql));
 		}
 		$oResult->free();
+
 		return $res;
 	}
 
+
+	/**
+	 * @param string $sSql
+	 *
+	 * @return array
+	 * @throws \MySQLException if query cannot be processed
+	 */
 	public static function QueryToArray($sSql)
 	{
 		$aData = array();
@@ -384,6 +683,13 @@ class CMDBSource
 		return $aData;
 	}
 
+	/**
+	 * @param string $sSql
+	 * @param int $col
+	 *
+	 * @return array
+	 * @throws \MySQLException
+	 */
 	public static function QueryToCol($sSql, $col)
 	{
 		$aColumn = array();
@@ -395,6 +701,12 @@ class CMDBSource
 		return $aColumn;
 	}
 
+	/**
+	 * @param string $sSql
+	 *
+	 * @return array
+	 * @throws \MySQLException if query cannot be processed
+	 */
 	public static function ExplainQuery($sSql)
 	{
 		$aData = array();
@@ -410,8 +722,8 @@ class CMDBSource
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
-		
-		$aNames = self::GetColumns($oResult);
+
+		$aNames = self::GetColumns($oResult, $sSql);
 
 		$aData[] = $aNames;
 		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
@@ -422,6 +734,12 @@ class CMDBSource
 		return $aData;
 	}
 
+	/**
+	 * @param string $sSql
+	 *
+	 * @return string
+	 * @throws \MySQLException if query cannot be processed
+	 */
 	public static function TestQuery($sSql)
 	{
 		try
@@ -459,7 +777,14 @@ class CMDBSource
 		return $oResult->fetch_array(MYSQLI_ASSOC);
 	}
 
-	public static function GetColumns($oResult)
+	/**
+	 * @param mysqli_result $oResult
+	 * @param string $sSql
+	 *
+	 * @return string[]
+	 * @throws \MySQLException
+	 */
+	public static function GetColumns($oResult, $sSql)
 	{
 		$aNames = array();
 		for ($i = 0; $i < (($___mysqli_tmp = $oResult->field_count) ? $___mysqli_tmp : 0) ; $i++)
@@ -541,17 +866,35 @@ class CMDBSource
 		return ($aFieldData["Type"]);
 	}
 
+	/**
+	 * @param string $sTable
+	 * @param string $sField
+	 *
+	 * @return bool|string
+	 * @see \AttributeDefinition::GetSQLColumns()
+	 */
 	public static function GetFieldSpec($sTable, $sField)
 	{
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return false;
 		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
 		$aFieldData = $aTableInfo["Fields"][$sField];
+
 		$sRet = $aFieldData["Type"];
+
+		$sColumnCharset = $aFieldData["Charset"];
+		$sColumnCollation = $aFieldData["Collation"];
+		if (!empty($sColumnCharset))
+		{
+			$sRet .= ' CHARACTER SET '.$sColumnCharset;
+			$sRet .= ' COLLATE '.$sColumnCollation;
+		}
+
 		if ($aFieldData["Null"] == 'NO')
 		{
 			$sRet .= ' NOT NULL';
 		}
+
 		if (is_numeric($aFieldData["Default"]))
 		{
 			if (strtolower(substr($aFieldData["Type"], 0, 5)) == 'enum(')
@@ -569,10 +912,11 @@ class CMDBSource
 		{
 			$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"]);
 		}
+
 		return $sRet;
 	}
 
-	public static function HasIndex($sTable, $sIndexId, $aFields = null)
+	public static function HasIndex($sTable, $sIndexId, $aFields = null, $aLength = null)
 	{
 		$aTableInfo = self::GetTableInfo($sTable);
 		if (empty($aTableInfo)) return false;
@@ -586,9 +930,24 @@ class CMDBSource
 
 		// Compare the columns
 		$sSearchedIndex = implode(',', $aFields);
-		$sExistingIndex = implode(',', $aTableInfo['Indexes'][$sIndexId]);
+		$aColumnNames = array();
+		$aSubParts = array();
+		foreach($aTableInfo['Indexes'][$sIndexId] as $aIndexDef)
+		{
+			$aColumnNames[] = $aIndexDef['Column_name'];
+			$aSubParts[] = $aIndexDef['Sub_part'];
+		}
+		$sExistingIndex = implode(',', $aColumnNames);
 
-		return ($sSearchedIndex == $sExistingIndex);
+		if (is_null($aLength))
+		{
+			return ($sSearchedIndex == $sExistingIndex);
+		}
+
+		$sSearchedLength = implode(',', $aLength);
+		$sExistingLength = implode(',', $aSubParts);
+
+		return ($sSearchedIndex == $sExistingIndex) && ($sSearchedLength == $sExistingLength);
 	}
 
 	// Returns an array of (fieldname => array of field info)
@@ -608,35 +967,49 @@ class CMDBSource
 	{
 		self::$m_aTablesInfo = array();
 	}
+
+	/**
+	 * @param $sTableName
+	 *
+	 * @throws \MySQLException
+	 */
 	private static function _TableInfoCacheInit($sTableName)
 	{
 		if (isset(self::$m_aTablesInfo[strtolower($sTableName)])
-			&& (self::$m_aTablesInfo[strtolower($sTableName)] != null)) return;
-
-		try
+			&& (self::$m_aTablesInfo[strtolower($sTableName)] != null))
 		{
-			// Check if the table exists
-			$aFields = self::QueryToArray("SHOW COLUMNS FROM `$sTableName`");
-			// Note: without backticks, you get an error with some table names (e.g. "group")
-			foreach ($aFields as $aFieldData)
-			{
-				$sFieldName = $aFieldData["Field"];
-				self::$m_aTablesInfo[strtolower($sTableName)]["Fields"][$sFieldName] =
-					array
-					(
-						"Name"=>$aFieldData["Field"],
-						"Type"=>$aFieldData["Type"],
-						"Null"=>$aFieldData["Null"],
-						"Key"=>$aFieldData["Key"],
-						"Default"=>$aFieldData["Default"],
-						"Extra"=>$aFieldData["Extra"]
-					);
-			}
+			return;
 		}
-		catch(MySQLException $e)
+
+		// Create array entry, if table does not exist / has no columns
+		self::$m_aTablesInfo[strtolower($sTableName)] = null;
+
+		// Get table informations
+		//   We were using SHOW COLUMNS FROM... but this don't return charset and collation info !
+		//   so since 2.5 and #1001 (switch to utf8mb4) we're using INFORMATION_SCHEMA !
+		$aMapping = array(
+			"Name" => "COLUMN_NAME",
+			"Type" => "COLUMN_TYPE",
+			"Null" => "IS_NULLABLE",
+			"Key" => "COLUMN_KEY",
+			"Default" => "COLUMN_DEFAULT",
+			"Extra" => "EXTRA",
+			"Charset" => "CHARACTER_SET_NAME",
+			"Collation" => "COLLATION_NAME",
+			"CharMaxLength" => "CHARACTER_MAXIMUM_LENGTH",
+		);
+		$sColumns = implode(', ', $aMapping);
+		$sDBName = self::$m_sDBName;
+		$aFields = self::QueryToArray("SELECT $sColumns FROM information_schema.`COLUMNS` WHERE table_schema = '$sDBName' AND table_name = '$sTableName';");
+		foreach ($aFields as $aFieldData)
 		{
-			// Table does not exist
-			self::$m_aTablesInfo[strtolower($sTableName)] = null;
+			$aFields = array();
+			foreach($aMapping as $sKey => $sColumn)
+			{
+				$aFields[$sKey] = $aFieldData[$sColumn];
+			}
+			$sFieldName = $aFieldData["COLUMN_NAME"];
+			self::$m_aTablesInfo[strtolower($sTableName)]["Fields"][$sFieldName] = $aFields;
 		}
 
 		if (!is_null(self::$m_aTablesInfo[strtolower($sTableName)]))
@@ -645,32 +1018,57 @@ class CMDBSource
 			$aMyIndexes = array();
 			foreach ($aIndexes as $aIndexColumn)
 			{
-				$aMyIndexes[$aIndexColumn['Key_name']][$aIndexColumn['Seq_in_index']-1] = $aIndexColumn['Column_name'];
+				$aMyIndexes[$aIndexColumn['Key_name']][$aIndexColumn['Seq_in_index']-1] = $aIndexColumn;
 			}
 			self::$m_aTablesInfo[strtolower($sTableName)]["Indexes"] = $aMyIndexes;
 		}
 	}
-	//public static function EnumTables()
-	//{
-	//	self::_TablesInfoCacheInit();
-	//	return array_keys(self::$m_aTablesInfo);
-	//}
+
 	public static function GetTableInfo($sTable)
 	{
 		self::_TableInfoCacheInit($sTable);
 
 		// perform a case insensitive match because on Windows the table names become lowercase :-(
-		//foreach(self::$m_aTablesInfo as $sTableName => $aInfo)
-		//{
-		//	if (strtolower($sTableName) == strtolower($sTable))
-		//	{
-		//		return $aInfo;
-		//	}
-		//}
 		return self::$m_aTablesInfo[strtolower($sTable)];
-		//return null;
 	}
 
+	/**
+	 * @param string $sTableName
+	 *
+	 * @return string query to upgrade table charset and collation if needed, null if not
+	 * @throws \MySQLException
+	 *
+	 * @since 2.5 #1001 switch to utf8mb4
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-table.html
+	 */
+	public static function DBCheckTableCharsetAndCollation($sTableName)
+	{
+		$sDBName = self::DBName();
+		$sTableInfoQuery = "SELECT C.character_set_name, T.table_collation
+			FROM information_schema.`TABLES` T inner join information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` C
+				ON T.table_collation = C.collation_name
+			WHERE T.table_schema = '$sDBName'
+  			AND T.table_name = '$sTableName';";
+		$aTableInfo = self::QueryToArray($sTableInfoQuery);
+		$sTableCharset = $aTableInfo[0]['character_set_name'];
+		$sTableCollation = $aTableInfo[0]['table_collation'];
+
+		if ((DEFAULT_CHARACTER_SET == $sTableCharset) && (DEFAULT_COLLATION == $sTableCollation))
+		{
+			return null;
+		}
+
+
+		return 'ALTER TABLE `'.$sTableName.'` '.self::$SQL_STRING_COLUMNS_CHARSET_DEFINITION.';';
+
+	}
+
+	/**
+	 * @param string $sTable
+	 *
+	 * @return array
+	 * @throws \MySQLException if query cannot be processed
+	 */
 	public static function DumpTable($sTable)
 	{
 		$sSql = "SELECT * FROM `$sTable`";
@@ -726,6 +1124,7 @@ class CMDBSource
 		}
 		catch(MySQLException $e)
 		{
+			$iCode = self::GetErrNo();
 			return "Current user not allowed to see his own privileges (could not access to the database 'mysql' - $iCode)";
 		}
 
@@ -784,4 +1183,28 @@ class CMDBSource
 		}
 		return false;
 	}
-}
+
+	/**
+	 * @return string query to upgrade database charset and collation if needed, null if not
+	 * @throws \MySQLException
+	 *
+	 * @since 2.5 #1001 switch to utf8mb4
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html
+	 */
+	public static function DBCheckCharsetAndCollation()
+	{
+		$sDBName = CMDBSource::DBName();
+		$sDBInfoQuery = "SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
+			FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$sDBName';";
+		$aDBInfo = CMDBSource::QueryToArray($sDBInfoQuery);
+		$sDBCharset = $aDBInfo[0]['DEFAULT_CHARACTER_SET_NAME'];
+		$sDBCollation = $aDBInfo[0]['DEFAULT_COLLATION_NAME'];
+
+		if ((DEFAULT_CHARACTER_SET == $sDBCharset) && (DEFAULT_COLLATION == $sDBCollation))
+		{
+			return null;
+		}
+
+		return 'ALTER DATABASE'.CMDBSource::$SQL_STRING_COLUMNS_CHARSET_DEFINITION.';';
+	}
+}

core/coreexception.class.inc.php

@@ -69,6 +69,13 @@ class CoreException extends Exception
 		parent::__construct($sMessage, 0);
 	}
 
+	/**
+	 * @return string code and message for log purposes
+	 */
+	public function getInfoLog()
+	{
+		return 'error_code='.$this->getCode().', message="'.$this->getMessage().'"';
+	}
 	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
 	{
 		return $this->getMessage();
@@ -112,4 +119,13 @@ class SecurityException extends CoreException
 {
 }
 
+/**
+ * Throwned when querying on an object that exists in the database but is archived
+ *
+ * @see N.1108
+ */
+class ArchivedObjectException extends CoreException
+{
+}
+
 ?>

core/datamodel.core.xml

@@ -1,3 +1,258 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
+  <user_rights>
+    <profiles>
+      <profile id="1024" _delta="define">
+        <name>REST Services User</name>
+        <description>Only users having this profile are allowed to use the REST Web Services (unless 'secure_rest_services' is set to false in the configuration file).</description>
+        <groups />
+      </profile>
+    </profiles>
+  </user_rights>
+  <meta>
+    <classes>
+      <class id="User" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>core,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="contactid" xsi:type="AttributeExternalKey">
+            <target_class>Person</target_class>
+          </field>
+          <field id="last_name" xsi:type="AttributeExternalField"/>
+          <field id="first_name" xsi:type="AttributeExternalField"/>
+          <field id="email" xsi:type="AttributeExternalField"/>
+          <field id="org_id" xsi:type="AttributeExternalField"/>
+          <field id="login" xsi:type="AttributeString"/>
+          <field id="language" xsi:type="AttributeApplicationLanguage"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="profile_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="allowed_org_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="finalclass" xsi:type="AttributeFinalClass"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="contactid_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="contactid_obsolescence_flag" xsi:type="AttributeExternalField"/>
+          <field id="org_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="org_id_obsolescence_flag" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+      <class id="URP_Profiles" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>addon/userrights,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="user_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+        </fields>
+      </class>
+      <class id="URP_UserProfile" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>addon/userrights,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="userid" xsi:type="AttributeExternalKey">
+            <target_class>User</target_class>
+          </field>
+          <field id="userlogin" xsi:type="AttributeExternalField"/>
+          <field id="profileid" xsi:type="AttributeExternalKey">
+            <target_class>URP_Profiles</target_class>
+          </field>
+          <field id="profile" xsi:type="AttributeExternalField"/>
+          <field id="reason" xsi:type="AttributeString"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="userid_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="userid_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="profileid_friendlyname" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+      <class id="URP_UserOrg" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>addon/userrights,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="userid" xsi:type="AttributeExternalKey">
+            <target_class>User</target_class>
+          </field>
+          <field id="userlogin" xsi:type="AttributeExternalField"/>
+          <field id="allowed_org_id" xsi:type="AttributeExternalKey">
+            <target_class>Organization</target_class>
+          </field>
+          <field id="allowed_org_name" xsi:type="AttributeExternalField"/>
+          <field id="reason" xsi:type="AttributeString"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="userid_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="userid_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="allowed_org_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="allowed_org_id_obsolescence_flag" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+      <class id="Action" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>grant_by_profile,core/cmdb</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="trigger_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="finalclass" xsi:type="AttributeFinalClass"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+        </fields>
+      </class>
+      <class id="Trigger" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>grant_by_profile,core/cmdb</category>
+        </properties>
+        <fields>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="action_list" xsi:type="AttributeLinkedSetIndirect"/>
+          <field id="finalclass" xsi:type="AttributeFinalClass"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+        </fields>
+      </class>
+      <class id="SynchroDataSource" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>core/cmdb,view_in_gui,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeText"/>
+          <field id="status" xsi:type="AttributeEnum"/>
+          <field id="user_id" xsi:type="AttributeExternalKey">
+            <target_class>User</target_class>
+          </field>
+          <field id="notify_contact_id" xsi:type="AttributeExternalKey">
+            <target_class>Contact</target_class>
+          </field>
+          <field id="scope_class" xsi:type="AttributeClass"/>
+          <field id="database_table_name" xsi:type="AttributeString"/>
+          <field id="scope_restriction" xsi:type="AttributeString"/>
+          <field id="full_load_periodicity" xsi:type="AttributeDuration"/>
+          <field id="reconciliation_policy" xsi:type="AttributeEnum"/>
+          <field id="action_on_zero" xsi:type="AttributeEnum"/>
+          <field id="action_on_one" xsi:type="AttributeEnum"/>
+          <field id="action_on_multiple" xsi:type="AttributeEnum"/>
+          <field id="delete_policy" xsi:type="AttributeEnum"/>
+          <field id="delete_policy_update" xsi:type="AttributeString"/>
+          <field id="delete_policy_retention" xsi:type="AttributeDuration"/>
+          <field id="attribute_list" xsi:type="AttributeLinkedSet"/>
+          <field id="user_delete_policy" xsi:type="AttributeEnum"/>
+          <field id="url_icon" xsi:type="AttributeURL"/>
+          <field id="url_application" xsi:type="AttributeString"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="user_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="user_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="notify_contact_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="notify_contact_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="notify_contact_id_obsolescence_flag" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+      <class id="SynchroAttribute" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>core/cmdb,view_in_gui,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="sync_source_id" xsi:type="AttributeExternalKey">
+            <target_class>SynchroDataSource</target_class>
+          </field>
+          <field id="sync_source_name" xsi:type="AttributeExternalField"/>
+          <field id="attcode" xsi:type="AttributeString"/>
+          <field id="update" xsi:type="AttributeBoolean"/>
+          <field id="reconcile" xsi:type="AttributeBoolean"/>
+          <field id="update_policy" xsi:type="AttributeEnum"/>
+          <field id="finalclass" xsi:type="AttributeFinalClass"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="sync_source_id_friendlyname" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+      <class id="AuditRule" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>application, grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="query" xsi:type="AttributeOQL"/>
+          <field id="valid_flag" xsi:type="AttributeEnum"/>
+          <field id="category_id" xsi:type="AttributeExternalKey">
+            <target_class>AuditCategory</target_class>
+          </field>
+          <field id="category_name" xsi:type="AttributeExternalField"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="category_id_friendlyname" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+      <class id="AuditCategory" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>application, grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeString"/>
+          <field id="definition_set" xsi:type="AttributeOQL"/>
+          <field id="rules_list" xsi:type="AttributeLinkedSet"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+        </fields>
+      </class>
+      <class id="Query" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>core/cmdb,view_in_gui,application,grant_by_profile</category>
+        </properties>
+        <fields>
+          <field id="name" xsi:type="AttributeString"/>
+          <field id="description" xsi:type="AttributeText"/>
+          <field id="fields" xsi:type="AttributeText"/>
+          <field id="finalclass" xsi:type="AttributeFinalClass"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+        </fields>
+      </class>
+      <class id="lnkTriggerAction" _delta="define">
+        <!-- Generated by toolkit/export-class-to-meta.php -->
+        <parent>cmdbAbstractObject</parent>
+        <properties>
+          <category>grant_by_profile,core/cmdb,application</category>
+        </properties>
+        <fields>
+          <field id="action_id" xsi:type="AttributeExternalKey">
+            <target_class>Action</target_class>
+          </field>
+          <field id="action_name" xsi:type="AttributeExternalField"/>
+          <field id="trigger_id" xsi:type="AttributeExternalKey">
+            <target_class>Trigger</target_class>
+          </field>
+          <field id="trigger_name" xsi:type="AttributeExternalField"/>
+          <field id="order" xsi:type="AttributeInteger"/>
+          <field id="friendlyname" xsi:type="AttributeFriendlyName"/>
+          <field id="action_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="action_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+          <field id="trigger_id_friendlyname" xsi:type="AttributeExternalField"/>
+          <field id="trigger_id_finalclass_recall" xsi:type="AttributeExternalField"/>
+        </fields>
+      </class>
+    </classes>
+  </meta>
 </itop_design>

core/dbobject.class.php

@@ -74,8 +74,8 @@ abstract class DBObject implements iDisplay
   	private static $m_aBulkInsertCols = array(); // class => array of ('table' => array of <sql_column>)
   	private static $m_bBulkInsert = false;
 
-	private $m_bIsInDB = false; // true IIF the object is mapped to a DB record
-	private $m_iKey = null;
+	protected $m_bIsInDB = false; // true IIF the object is mapped to a DB record
+	protected $m_iKey = null;
 	private $m_aCurrValues = array();
 	protected $m_aOrigValues = array();
 
@@ -159,18 +159,13 @@ abstract class DBObject implements iDisplay
 
 	public function __toString()
 	{
-		$sRet = '';
-		$sClass = get_class($this);
-		$sRootClass = MetaModel::GetRootClass($sClass);
-		$iPKey = $this->GetKey();
-		$sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey<br/>\n";
-		$sRet .= "<ul class=\"treeview\">\n";
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
-		{
-			$sRet .= "<li>".$oAttDef->GetLabel()." = ".$this->GetAsHtml($sAttCode)."</li>\n";
-		}
-		$sRet .= "</ul>";
-		return $sRet;
+        $sRet = '';
+        $sClass = get_class($this);
+        $sRootClass = MetaModel::GetRootClass($sClass);
+        $iPKey = $this->GetKey();
+        $sFriendlyname = $this->Get('friendlyname');
+        $sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey ($sFriendlyname)<br/>\n";
+        return $sRet;
 	}
 	
 	// Restore initial values... mmmm, to be discussed
@@ -1053,24 +1048,24 @@ abstract class DBObject implements iDisplay
 	}
 
 	/**
-	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
-	 * for the given attribute in the current state of the object
-	 * @param $sAttCode string $sAttCode The code of the attribute
-	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
-	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
-	 * @return integer Flags: the binary combination of the flags applicable to this attribute
-	 */	 	  	 	
+	 *
+	 * @param string $sAttCode $sAttCode The code of the attribute
+	 * @param array $aReasons To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 * @param string $sTargetState The target state in which to evalutate the flags, if empty the current state will be
+	 *     used
+	 *
+	 * @return integer the binary combination of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...) for the
+	 *     given attribute in the given state of the object
+	 * @throws \CoreException
+	 */
 	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
 	{
 		$iFlags = 0; // By default (if no life cycle) no flag at all
 
 		$aReadOnlyAtts = $this->GetReadOnlyAttributes();
-		if ($aReadOnlyAtts != null)
+		if (($aReadOnlyAtts != null) && (in_array($sAttCode, $aReadOnlyAtts)))
 		{
-			if (in_array($sAttCode, $aReadOnlyAtts))
-			{
-				return OPT_ATT_READONLY;
-			}
+			return OPT_ATT_READONLY;
 		}
 
 		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
@@ -1094,6 +1089,19 @@ abstract class DBObject implements iDisplay
 		return $iFlags | $iSynchroFlags; // Combine both sets of flags
 	}
 
+	/**
+	 * @param string $sAttCode
+	 * @param array $aReasons To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 *
+	 * @throws \CoreException
+	 */
+	public function IsAttributeReadOnlyForCurrentState($sAttCode, &$aReasons = array())
+	{
+		$iAttFlags = $this->GetAttributeFlags($sAttCode, $aReasons);
+
+		return ($iAttFlags & OPT_ATT_READONLY);
+	}
+
     /**
      * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
      * for the given attribute in a transition
@@ -1216,16 +1224,17 @@ abstract class DBObject implements iDisplay
 			if ($oAtt->IsHierarchicalKey())
 			{
 				// This check cannot be deactivated since otherwise the user may break things by a CSV import of a bulk modify
-				if ($toCheck == $this->GetKey())
+				$aValues = $oAtt->GetAllowedValues(array('this' => $this));
+				if (!array_key_exists($toCheck, $aValues))
 				{
-					return "An object can not be its own parent in a hierarchy (".$oAtt->Getlabel()." = $toCheck)";
+					return "Value not allowed [$toCheck]";
 				}
 			}
 		}
 		elseif ($oAtt->IsScalar())
 		{
 			$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
-			if (count($aValues) > 0)
+			if (is_array($aValues) && (count($aValues) > 0))
 			{
 				if (!array_key_exists($toCheck, $aValues))
 				{
@@ -1731,6 +1740,14 @@ abstract class DBObject implements iDisplay
 
 		$this->m_bIsInDB = true;
 		$this->m_bDirty = false;
+		foreach ($this->m_aCurrValues as $sAttCode => $value)
+		{
+			if (is_object($value))
+			{
+				$value = clone $value;
+			}
+			$this->m_aOrigValues[$sAttCode] = $value;
+		}
 
 		$this->AfterInsert();
 
@@ -2922,7 +2939,7 @@ abstract class DBObject implements iDisplay
 					$oSearch->AllowAllData();
 				}
 				$oSet = new CMDBObjectSet($oSearch);
-				if ($oSet->Count() > 0)
+				if ($oSet->CountExceeds(0))
 				{
 					$aDependentObjects[$sRemoteClass][$sExtKeyAttCode] = array(
 						'attribute' => $oExtKeyAttDef,
@@ -3640,5 +3657,76 @@ abstract class DBObject implements iDisplay
 		$this->m_aCurrValues['archive_date'] = null;
 		$this->m_aOrigValues['archive_date'] = null;
 	}
+
+
+
+	/**
+	 * @param string $sClass Needs to be an instanciable class
+	 * @returns $oObj
+	 **/
+	public static function MakeDefaultInstance($sClass)
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
+		$oObj = MetaModel::NewObject($sClass);
+		if (!empty($sStateAttCode))
+		{
+			$sTargetState = MetaModel::GetDefaultState($sClass);
+			$oObj->Set($sStateAttCode, $sTargetState);
+		}
+		return $oObj;
+	}
+
+	/**
+	 * Complete a new object with data from context
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillCreationForm(&$aContextParam)
+	{
+	}
+
+	/**
+	 * Complete an object after a state transition with data from context
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillTransitionForm(&$aContextParam)
+	{
+	}
+
+	/**
+	 * Complete a filter ($aContextParam['filter']) data from context
+	 * (Called on source object)
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillSearchForm(&$aContextParam)
+	{
+	}
+
+	/**
+	 * Prefill a creation / stimulus change / search form according to context, current state of an object, stimulus.. $sOperation
+	 * @param string $sOperation Operation identifier
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillForm($sOperation, &$aContextParam)
+	{
+		switch($sOperation){
+			case 'creation_from_0':
+			case 'creation_from_extkey':
+			case 'creation_from_editinplace':
+				$this->PrefillCreationForm($aContextParam);
+				break;
+			case 'state_change':
+				$this->PrefillTransitionForm($aContextParam);
+				break;
+			case 'search':
+				$this->PrefillSearchForm($aContextParam);
+				break;
+			default:
+				break;
+		}
+	}
 }
 

core/dbobjectsearch.class.php

@@ -1,9 +1,9 @@
 <?php
-// Copyright (C) 2010-2017 Combodo SARL
+// Copyright (c) 2010-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
-//   iTop is free software; you can redistribute it and/or modify	
+//   iTop is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU Affero General Public License as published by
 //   the Free Software Foundation, either version 3 of the License, or
 //   (at your option) any later version.
@@ -15,14 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Define filters for a given class of objects (formerly named "filter") 
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
+//
 
 // Dev hack for disabling the some query build optimizations (Folding/Merging)
 define('ENABLE_OPT', true);
@@ -33,7 +26,6 @@ class DBObjectSearch extends DBSearch
 	private $m_aSelectedClasses; // selected for the output (alias => class name)
 	private $m_oSearchCondition;
 	private $m_aParams;
-	private $m_aFullText;
 	private $m_aPointingTo;
 	private $m_aReferencedBy;
 
@@ -54,7 +46,6 @@ class DBObjectSearch extends DBSearch
 		$this->m_aClasses = array($sClassAlias => $sClass);
 		$this->m_oSearchCondition = new TrueExpression;
 		$this->m_aParams = array();
-		$this->m_aFullText = array();
 		$this->m_aPointingTo = array();
 		$this->m_aReferencedBy = array();
 	}
@@ -109,8 +100,13 @@ class DBObjectSearch extends DBSearch
 
 	/**
 	 * Change the class (only subclasses are supported as of now, because the conditions must fit the new class)
-	 * Defaults to the first selected class (most of the time it is also the first joined class	 
-	 */	 	
+	 * Defaults to the first selected class (most of the time it is also the first joined class
+	 *
+	 * @param $sNewClass
+	 * @param null $sAlias
+	 *
+	 * @throws \CoreException
+	 */
 	public function ChangeClass($sNewClass, $sAlias = null)
 	{
 		if (is_null($sAlias))
@@ -195,7 +191,9 @@ class DBObjectSearch extends DBSearch
 	 *
 	 * @param $sOldName
 	 * @param $sNewName
+	 *
 	 * @return bool True if the alias has been found and changed
+	 * @throws \Exception
 	 */
 	public function RenameAlias($sOldName, $sNewName)
 	{
@@ -285,7 +283,6 @@ class DBObjectSearch extends DBSearch
 	public function IsAny()
 	{
 		if (!$this->m_oSearchCondition->IsTrue()) return false;
-		if (count($this->m_aFullText) > 0) return false;
 		if (count($this->m_aPointingTo) > 0) return false;
 		if (count($this->m_aReferencedBy) > 0) return false;
 		return true;
@@ -367,10 +364,19 @@ class DBObjectSearch extends DBSearch
 		$this->AddConditionExpression($oNewCondition);
 	}
 
-	public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSeachString = false)
+	/**
+	 * @param string $sFilterCode
+	 * @param mixed $value
+	 * @param string $sOpCode operator to use : 'IN', 'NOT IN', 'Contains',' Begins with', 'Finishes with', ...
+	 * @param bool $bParseSearchString
+	 *
+	 * @throws \CoreException
+	 *
+	 * @see AddConditionForInOperatorUsingParam for IN/NOT IN queries with lots of params
+	 */
+	public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSearchString = false)
 	{
 		MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
-		$oFilterDef = MetaModel::GetClassFilterDef($this->GetClass(), $sFilterCode);
 
 		$oField = new FieldExpression($sFilterCode, $this->GetClassAlias());
 		if (empty($sOpCode))
@@ -382,15 +388,15 @@ class DBObjectSearch extends DBSearch
 			else
 			{
 				$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
-				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams, $bParseSeachString);
+				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
 				$this->AddConditionExpression($oNewCondition);
 				return;
 			}
 		}
 		// Parse search strings if needed and if the filter code corresponds to a valid attcode
-		if($bParseSeachString && MetaModel::IsValidAttCode($this->GetClass(), $sFilterCode))
+		if($bParseSearchString && MetaModel::IsValidAttCode($this->GetClass(), $sFilterCode))
 		{
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sFilterCode);
+			$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
 			$value = $oAttDef->ParseSearchString($value);
 		}
 
@@ -408,14 +414,14 @@ class DBObjectSearch extends DBSearch
 			throw new CoreException('Deprecated operator, please consider using OQL (SQL) expressions like "(TO_DAYS(NOW()) - TO_DAYS(x)) AS AgeDays"', array('operator' => $sOpCode));
 			break;
 
-		case "IN":
+		case 'IN':
 			if (!is_array($value)) $value = array($value);
 			if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
 			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
 			$sOQLCondition = $oField->Render()." IN $sListExpr";
 			break;
 
-		case "NOTIN":
+		case 'NOTIN':
 			if (!is_array($value)) $value = array($value);
             if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
 			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
@@ -469,6 +475,8 @@ class DBObjectSearch extends DBSearch
 				break;
 			case "IN":
 			case "NOTIN":
+				// this will parse all of the values... Can take forever if there are lots of them !
+				// In this case using a parameter is far better : WHERE ... IN (:my_param)
 				$oNewCondition = Expression::FromOQL($sOQLCondition);
 				break;
 
@@ -483,12 +491,52 @@ class DBObjectSearch extends DBSearch
 		$this->AddConditionExpression($oNewCondition);
 	}
 
+	/**
+	 * @param string $sFilterCode attribute code to use
+	 * @param array $aValues
+	 * @param bool $bPositiveMatch if true will add a IN filter, else a NOT IN
+	 *
+	 * @throws \CoreException
+	 */
+	public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true)
+	{
+		$oFieldExpression = new FieldExpression($sFilterCode, $this->GetClassAlias());
+
+		$sOperator = $bPositiveMatch ? 'IN' : 'NOT IN';
+
+		$sInParamName = $this->GenerateUniqueParamName();
+		$oParamExpression = new VariableExpression($sInParamName);
+		$this->SetInternalParams(array($sInParamName => $aValues));
+
+		$oListExpression = new ListExpression(array($oParamExpression));
+
+		$oInCondition = new BinaryExpression($oFieldExpression, $sOperator, $oListExpression);
+		$this->AddConditionExpression($oInCondition);
+	}
+
+	/**
+	 * @return string a unique param name
+	 */
+	private function GenerateUniqueParamName() {
+		$iExistingParamsNb = count($this->m_aParams);
+		$iCurrentArrayParamNb = $iExistingParamsNb + 1;
+		$sParamName = 'param'.$iCurrentArrayParamNb;
+
+		if (isset($this->m_aParams[$sParamName])) {
+			$sParamName .= '_'.microtime(true) . '_' .rand(0,100);
+		}
+
+		return $sParamName;
+	}
+
 	/**
 	 * Specify a condition on external keys or link sets
-	 * @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
-	 *                 Example: infra_list->ci_id->location_id->country	 
-	 * @param value The value to match (can be an array => IN(val1, val2...)
+	 * @param string $sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
+	 *                 Example: infra_list->ci_id->location_id->country
+	 * @param $value
 	 * @return void
+	 * @throws \CoreException
+	 * @throws \CoreWarning
 	 */
 	public function AddConditionAdvanced($sAttSpec, $value)
 	{
@@ -549,9 +597,24 @@ class DBObjectSearch extends DBSearch
 		}
 	}
 
-	public function AddCondition_FullText($sFullText)
+	public function AddCondition_FullText($sNeedle)
 	{
-		$this->m_aFullText[] = $sFullText;
+		// Transform the full text condition into additional condition expression
+		$aFullTextFields = array();
+		foreach (MetaModel::ListAttributeDefs($this->GetClass()) as $sAttCode => $oAttDef)
+		{
+			if (!$oAttDef->IsScalar()) continue;
+			if ($oAttDef->IsExternalKey()) continue;
+			$aFullTextFields[] = new FieldExpression($sAttCode, $this->GetClassAlias());
+		}
+		$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
+
+		$sQueryParam = 'needle';
+		$oFlexNeedle = new CharConcatExpression(array(new ScalarExpression('%'), new VariableExpression($sQueryParam), new ScalarExpression('%')));
+
+		$oNewCond = new BinaryExpression($oTextFields, 'LIKE', $oFlexNeedle);
+		$this->AddConditionExpression($oNewCond);
+		$this->m_aParams[$sQueryParam] = $sNeedle;
 	}
 
 	protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation, $bTranslateMainAlias = true)
@@ -670,9 +733,9 @@ class DBObjectSearch extends DBSearch
 	 * - convert a translation table (format optimized for the translation in an expression tree) into simple hash
 	 * - compile over an eventually existing map
 	 *
-	 * @param $aRealiasingMap  Map to update
-	 * @param $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
-	 * @return array of <old-alias> => <new-alias>
+	 * @param array $aRealiasingMap Map to update
+	 * @param array $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
+	 * @return void of <old-alias> => <new-alias>
 	 */
 	protected function UpdateRealiasingMap(&$aRealiasingMap, $aAliasTranslation)
 	{
@@ -702,7 +765,7 @@ class DBObjectSearch extends DBSearch
 	 * This a workaround to handle some cases in which the list of classes is not correctly updated.
 	 * This code should disappear as soon as DBObjectSearch get split between a container search class and a Node class
 	 *
-	 * @param $aClasses List to be completed
+	 * @param array $aClasses List to be completed
 	 */
 	protected function RecomputeClassList(&$aClasses)
 	{
@@ -822,6 +885,8 @@ class DBObjectSearch extends DBSearch
 	 * @param $sForeignExtKeyAttCode
 	 * @param int $iOperatorCode
 	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 * @return void
+	 * @throws \CoreException
 	 */
 	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
 	{
@@ -844,7 +909,7 @@ class DBObjectSearch extends DBSearch
 		// NO: $oFilter = $oFilter->DeepClone();
 		// See also: Trac #639, and self::AddCondition_PointingTo()
 		$aAliasTranslation = array();
-		$res = $this->AddCondition_ReferencedBy_InNameSpace($oFilter, $sForeignExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
+		$this->AddCondition_ReferencedBy_InNameSpace($oFilter, $sForeignExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
 		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
 		$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
 
@@ -868,7 +933,6 @@ class DBObjectSearch extends DBSearch
 			}
 		}
 		$this->RecomputeClassList($this->m_aClasses);
-		return $res;
 	}
 
 	protected function AddCondition_ReferencedBy_InNameSpace(DBSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
@@ -927,7 +991,10 @@ class DBObjectSearch extends DBSearch
 			$oRightFilter = $oRightFilter->DeepClone();
 
 			$bAllowAllData = ($oLeftFilter->IsAllDataAllowed() && $oRightFilter->IsAllDataAllowed());
-			$oLeftFilter->AllowAllData($bAllowAllData);
+			if ($bAllowAllData)
+			{
+				$oLeftFilter->AllowAllData();
+			}
 
 			if ($oLeftFilter->GetClass() != $oRightFilter->GetClass())
 			{
@@ -973,8 +1040,6 @@ class DBObjectSearch extends DBSearch
 		// Translate search condition into our aliasing scheme
 		$aAliasTranslation[$oFilter->GetClassAlias()]['*'] = $this->GetClassAlias(); 
 
-		$this->m_aFullText = array_merge($this->m_aFullText, $oFilter->m_aFullText);
-
 		foreach($oFilter->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
 		{
 			foreach($aPointingTo as $iOperatorCode => $aFilter)
@@ -1001,8 +1066,8 @@ class DBObjectSearch extends DBSearch
 	}
 
 	public function GetCriteria() {return $this->m_oSearchCondition;}
-	public function GetCriteria_FullText() {return $this->m_aFullText;}
-	protected function GetCriteria_PointingTo($sKeyAttCode = "")
+	public function GetCriteria_FullText() {throw new Exception("Removed GetCriteria_FullText");}
+	public function GetCriteria_PointingTo($sKeyAttCode = "")
 	{
 		if (empty($sKeyAttCode))
 		{
@@ -1074,14 +1139,15 @@ class DBObjectSearch extends DBSearch
 	{
 		return $this->m_oSearchCondition->ListConstantFields();
 	}
-	
+
 	/**
 	 * Turn the parameters (:xxx) into scalar values in order to easily
 	 * serialize a search
-	 */
+	 * @param $aArgs
+*/
 	public function ApplyParameters($aArgs)
 	{
-		return $this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
+		$this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
 	}
 	
 	public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false)
@@ -1119,11 +1185,6 @@ class DBObjectSearch extends DBSearch
 		$sRes .= $this->ToOQL_Joins();
 		$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
 
-		// Temporary: add more info about other conditions, necessary to avoid strange behaviors with the cache
-		foreach($this->m_aFullText as $sFullText)
-		{
-			$sRes .= " AND MATCHES '$sFullText'";
-		}
 		if ($bWithAllowAllFlag && $this->m_bAllowAllData)
 		{
 			$sRes .= " ALLOW ALL DATA";
@@ -1436,7 +1497,7 @@ class DBObjectSearch extends DBSearch
 		return $sRet;
 	}
 
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		// Hide objects that are not visible to the current user
 		//
@@ -1455,11 +1516,6 @@ class DBObjectSearch extends DBSearch
 				$oSearch = $this->Intersect($oVisibleObjects);
 				$oSearch->SetDataFiltered();
 			}
-			else
-			{
-				// should be true at this point, meaning that no additional filtering
-				// is required
-			}
 		}
 
 		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
@@ -1468,10 +1524,32 @@ class DBObjectSearch extends DBSearch
 
 		// Create a unique cache id
 		//
+		$aContextData = array();
+		$bCanCache = true;
 		if (self::$m_bQueryCacheEnabled || self::$m_bTraceQueries)
 		{
+			if (isset($_SERVER['REQUEST_URI']))
+			{
+				$aContextData['sRequestUri'] = $_SERVER['REQUEST_URI'];
+			}
+			else if (isset($_SERVER['SCRIPT_NAME']))
+			{
+				$aContextData['sRequestUri'] = $_SERVER['SCRIPT_NAME'];
+			}
+			else
+			{
+				$aContextData['sRequestUri'] = '';
+			}
+
 			// Need to identify the query
 			$sOqlQuery = $oSearch->ToOql(false, null, true);
+			if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false))
+			{
+				// Requests containing "id IN" are not worth caching
+				$bCanCache = false;
+			}
+
+			$aContextData['sOqlQuery'] = $sOqlQuery;
 
 			if (count($aModifierProperties))
 			{
@@ -1482,12 +1560,14 @@ class DBObjectSearch extends DBSearch
 			{
 				$sModifierProperties = '';
 			}
+			$aContextData['sModifierProperties'] = $sModifierProperties;
 
 			$sRawId = $sOqlQuery.$sModifierProperties;
 			if (!is_null($aAttToLoad))
 			{
 				$sRawId .= json_encode($aAttToLoad);
 			}
+			$aContextData['aAttToLoad'] = $aAttToLoad;
 			if (!is_null($aGroupByExpr))
 			{
 				foreach($aGroupByExpr as $sAlias => $oExpr)
@@ -1495,13 +1575,28 @@ class DBObjectSearch extends DBSearch
 					$sRawId .= 'g:'.$sAlias.'!'.$oExpr->Render();
 				}
 			}
+			if (!is_null($aSelectExpr))
+			{
+				foreach($aSelectExpr as $sAlias => $oExpr)
+				{
+					$sRawId .= 'se:'.$sAlias.'!'.$oExpr->Render();
+				}
+			}
+			$aContextData['aGroupByExpr'] = $aGroupByExpr;
+			$aContextData['aSelectExpr'] = $aSelectExpr;
 			$sRawId .= $bGetCount;
+			$aContextData['bGetCount'] = $bGetCount;
 			if (is_array($aSelectedClasses))
 			{
 				$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
 			}
-			$sRawId .= $oSearch->GetArchiveMode() ? '--arch' : '';
-			$sRawId .= $oSearch->GetShowObsoleteData() ? '--obso' : '';
+			$aContextData['aSelectedClasses'] = $aSelectedClasses;
+			$bIsArchiveMode = $oSearch->GetArchiveMode();
+			$sRawId .= $bIsArchiveMode ? '--arch' : '';
+			$bShowObsoleteData = $oSearch->GetShowObsoleteData();
+			$sRawId .= $bShowObsoleteData ? '--obso' : '';
+			$aContextData['bIsArchiveMode'] = $bIsArchiveMode;
+			$aContextData['bShowObsoleteData'] = $bShowObsoleteData;
 			$sOqlId = md5($sRawId);
 		}
 		else
@@ -1513,6 +1608,7 @@ class DBObjectSearch extends DBSearch
 
 		// Query caching
 		//
+		$sOqlAPCCacheId = null;
 		if (self::$m_bQueryCacheEnabled)
 		{
 			// Warning: using directly the query string as the key to the hash array can FAIL if the string
@@ -1552,13 +1648,14 @@ class DBObjectSearch extends DBSearch
 		if (!isset($oSQLQuery))
 		{
 			$oKPI = new ExecutionKPI();
-			$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses);
+			$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
 
 			if (self::$m_bQueryCacheEnabled)
 			{
-				if (self::$m_bUseAPCCache)
+				if ($bCanCache && self::$m_bUseAPCCache)
 				{
+					$oSQLQuery->m_aContextData = $aContextData;
 					$oKPI = new ExecutionKPI();
 					apc_store($sOqlAPCCacheId, $oSQLQuery, self::$m_iQueryCacheTTL);
 					$oKPI->ComputeStats('Query APC (store)', $sOqlQuery);
@@ -1570,13 +1667,24 @@ class DBObjectSearch extends DBSearch
 		return $oSQLQuery;
 	}
 
-	protected function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null)
+	/**
+	 * @param array $aAttToLoad
+	 * @param bool $bGetCount
+	 * @param array $aModifierProperties
+	 * @param array $aGroupByExpr
+	 * @param array $aSelectedClasses
+	 * @param array $aSelectExpr
+	 *
+	 * @return null|SQLObjectQuery
+	 * @throws \CoreException
+	 */
+	protected function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
-		$oBuild = new QueryBuilderContext($this, $aModifierProperties, $aGroupByExpr, $aSelectedClasses);
+		$oBuild = new QueryBuilderContext($this, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
 
 		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, $aAttToLoad, array());
 		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
-		if ($aGroupByExpr)
+		if (is_array($aGroupByExpr))
 		{
 			$aCols = $oBuild->m_oQBExpressions->GetGroupBy();
 			$oSQLQuery->SetGroupBy($aCols);
@@ -1586,6 +1694,17 @@ class DBObjectSearch extends DBSearch
 		{
 			$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
 		}
+		if ($aSelectExpr)
+		{
+			// Get the fields corresponding to the select expressions
+			foreach($oBuild->m_oQBExpressions->GetSelect() as $sAlias => $oExpr)
+			{
+				if (key_exists($sAlias, $aSelectExpr))
+				{
+					$oSQLQuery->AddSelect($sAlias, $oExpr);
+				}
+			}
+		}
 
 		$aMandatoryTables = null;
 		if (self::$m_bOptimizeQueries)
@@ -1614,6 +1733,13 @@ class DBObjectSearch extends DBSearch
 	}
 
 
+	/**
+	 * @param $oBuild
+	 * @param null $aAttToLoad
+	 * @param array $aValues
+	 * @return null|SQLObjectQuery
+	 * @throws \CoreException
+	 */
 	protected function MakeSQLObjectQuery(&$oBuild, $aAttToLoad = null, $aValues = array())
 	{
 		// Note: query class might be different than the class of the filter
@@ -1623,9 +1749,9 @@ class DBObjectSearch extends DBSearch
 
 		$bIsOnQueriedClass = array_key_exists($sClassAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
 
-		self::DbgTrace("Entering: ".$this->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
+		//self::DbgTrace("Entering: ".$this->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
 
-		$sRootClass = MetaModel::GetRootClass($sClass);
+		//$sRootClass = MetaModel::GetRootClass($sClass);
 		$sKeyField = MetaModel::DBGetKey($sClass);
 
 		if ($bIsOnQueriedClass)
@@ -1658,30 +1784,10 @@ class DBObjectSearch extends DBSearch
 					}
 				}
 			}
-
-			// Transform the full text condition into additional condition expression
-			$aFullText = $this->GetCriteria_FullText();
-			if (count($aFullText) > 0)
-			{
-				$aFullTextFields = array();
-				foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-				{
-					if (!$oAttDef->IsScalar()) continue;
-					if ($oAttDef->IsExternalKey()) continue;
-					$aFullTextFields[] = new FieldExpression($sAttCode, $sClassAlias);
-				}
-				$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
-				
-				foreach($aFullText as $sFTNeedle)
-				{
-					$oNewCond = new BinaryExpression($oTextFields, 'LIKE', new ScalarExpression("%$sFTNeedle%"));
-					$oBuild->m_oQBExpressions->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($oBuild->m_oQBExpressions, true)."</pre></p>\n";
 		$aExpectedAtts = array(); // array of (attcode => fieldexpression)
-//echo "<p>".__LINE__.": GetUnresolvedFields($sClassAlias, ...)</p>\n";
+		//echo "<p>".__LINE__.": GetUnresolvedFields($sClassAlias, ...)</p>\n";
 		$oBuild->m_oQBExpressions->GetUnresolvedFields($sClassAlias, $aExpectedAtts);
 
 		// Compute a clear view of required joins (from the current class)
@@ -1798,37 +1904,46 @@ class DBObjectSearch extends DBSearch
 			}
 		}
 
-		// First query built upon on the leaf (ie current) class
+		// First query built from the root, adding all tables including the leaf
+		//   Before N.1065 we were joining from the leaf first, but this wasn't a good choice :
+		//   most of the time (obsolescence, friendlyname, ...) we want to get a root attribute !
 		//
-		self::DbgTrace("Main (=leaf) class, call MakeSQLObjectQuerySingleTable()");
-		if (MetaModel::HasTable($sClass))
+		$oSelectBase = null;
+		$aClassHierarchy = MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, true);
+		$bIsClassStandaloneClass = (count($aClassHierarchy) == 1);
+		foreach($aClassHierarchy as $sSomeClass)
 		{
-			$oSelectBase = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sClass, $aExtKeys, $aValues);
-		}
-		else
-		{
-			$oSelectBase = null;
+			if (!MetaModel::HasTable($sSomeClass))
+			{
+				continue;
+			}
 
-			// As the join will not filter on the expected classes, we have to specify it explicitely
-			$sExpectedClasses = implode("', '", MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
-			$oFinalClassRestriction = Expression::FromOQL("`$sClassAlias`.finalclass IN ('$sExpectedClasses')");
-			$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
-		}
-
-		// Then we join the queries of the eventual parent classes (compound model)
-		foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
-		{
-			if (!MetaModel::HasTable($sParentClass)) continue;
-
-			self::DbgTrace("Parent class: $sParentClass... let's call MakeSQLObjectQuerySingleTable()");
-			$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sParentClass, $aExtKeys, $aValues);
+			self::DbgTrace("Adding join from root to leaf: $sSomeClass... let's call MakeSQLObjectQuerySingleTable()");
+			$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSomeClass, $aExtKeys, $aValues);
 			if (is_null($oSelectBase))
 			{
 				$oSelectBase = $oSelectParentTable;
+				if (!$bIsClassStandaloneClass && (MetaModel::IsRootClass($sSomeClass)))
+				{
+					// As we're linking to root class first, we're adding a where clause on the finalClass attribute :
+					//      COALESCE($sRootClassFinalClass IN ('$sExpectedClasses'), 1)
+					// If we don't, the child classes can be removed in the query optimisation phase, including the leaf that was queried
+					// So we still need to filter records to only those corresponding to the child classes !
+					// The coalesce is mandatory if we have a polymorphic query (left join)
+					$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
+					$sFinalClassSqlColumnName = MetaModel::DBGetClassField($sSomeClass);
+					$oClassExpr = new FieldExpression($sFinalClassSqlColumnName, $oSelectBase->GetTableAlias());
+					$oInExpression = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
+					$oTrueExpression = new TrueExpression();
+					$aCoalesceAttr = array($oInExpression, $oTrueExpression);
+					$oFinalClassRestriction = new FunctionExpression("COALESCE", $aCoalesceAttr);
+
+					$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
+				}
 			}
 			else
 			{
-				$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sParentClass));
+				$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sSomeClass));
 			}
 		}
 
@@ -2104,7 +2219,7 @@ class DBObjectSearch extends DBSearch
 							self::DbgTrace("External key $sKeyAttCode, Join on $sLocalKeyField = $sExternalKeyField");
 							if ($oKeyAttDef->IsNullAllowed())
 							{
-								$oSelectBase->AddLeftJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField, $sExternalKeyTable);
+								$oSelectBase->AddLeftJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField);
 							}
 							else
 							{
@@ -2156,11 +2271,21 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 *	Get the expression for the class and its subclasses (if finalclass = 'subclass' ...)
-	 *	Simplifies the final expression by grouping classes having the same expression
-	 */
-	static protected function GetPolymorphicExpression($sClass, $sAttCode)
+	 *    Get the expression for the class and its subclasses (if finalclass = 'subclass' ...)
+	 *    Simplifies the final expression by grouping classes having the same expression
+	 * @param $sClass
+	 * @param $sAttCode
+	 * @return \FunctionExpression|mixed|null
+	 * @throws \CoreException
+*/
+	static public function GetPolymorphicExpression($sClass, $sAttCode)
 	{
+		$oExpression = ExpressionCache::GetCachedExpression($sClass, $sAttCode);
+		if (!empty($oExpression))
+		{
+			return $oExpression;
+		}
+
 		// 1st step - get all of the required expressions (instantiable classes)
 		//            and group them using their OQL representation
 		//

core/dbobjectset.class.php

@@ -69,7 +69,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * @var int
 	 */
 	protected $m_iCurrRow;
-	/*
+	/**
 	 * @var DBSearch
 	 */
 	protected $m_oFilter;
@@ -77,18 +77,20 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * @var mysqli_result
 	 */
 	protected $m_oSQLResult;
+	protected $m_bSort;
 
 	/**
 	 * Create a new set based on a Search definition.
 	 * 
 	 * @param DBSearch $oFilter The search filter defining the objects which are part of the set (multiple columns/objects per row are supported)
-	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
-	 * @param hash $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
-	 * @param hash $aExtendedDataSpec
+	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 * @param array $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
+	 * @param array $aExtendedDataSpec
 	 * @param int $iLimitCount Maximum number of rows to load (i.e. equivalent to MySQL's LIMIT start, count)
 	 * @param int $iLimitStart Index of the first row to load (i.e. equivalent to MySQL's LIMIT start, count)
+	 * @param bool $bSort if false no order by is done
 	 */
-	public function __construct(DBSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0)
+	public function __construct(DBSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bSort = true)
 	{
 		$this->m_oFilter = $oFilter->DeepClone();
 		$this->m_aAddedIds = array();
@@ -98,6 +100,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		$this->m_aExtendedDataSpec = $aExtendedDataSpec;
 		$this->m_iLimitCount = $iLimitCount;
 		$this->m_iLimitStart = $iLimitStart;
+		$this->m_bSort = $bSort;
 
 		$this->m_iNumTotalDBRows = null;
 		$this->m_iNumLoadedDBRows = 0;
@@ -170,8 +173,8 @@ class DBObjectSet implements iDBObjectSetIterator
 
 	/**
 	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
-	 * 
-	 * @param hash $aAttToLoad Format: alias => array of attribute_codes
+	 *
+	 * @param array $aAttToLoad Format: alias => array of attribute_codes
 	 * 
 	 * @return void
 	 */
@@ -195,11 +198,25 @@ class DBObjectSet implements iDBObjectSetIterator
 					{
 						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad);
 						$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad] = $oAttDef;
-						if ($oAttDef->IsExternalKey())
+						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
 						{
 							// Add the external key friendly name anytime
 							$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_friendlyname');
 							$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_friendlyname'] = $oFriendlyNameAttDef;
+
+							if (MetaModel::IsArchivable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
+							{
+								// Add the archive flag if necessary
+								$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_archive_flag');
+								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_archive_flag'] = $oArchiveFlagAttDef;
+							}
+
+							if (MetaModel::IsObsoletable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
+							{
+								// Add the obsolescence flag if necessary
+								$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_obsolescence_flag');
+								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_obsolescence_flag'] = $oObsoleteFlagAttDef;
+							}
 						}
 					}
 				}
@@ -207,6 +224,20 @@ class DBObjectSet implements iDBObjectSetIterator
 				$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
 				$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
 
+				if (MetaModel::IsArchivable($sClass))
+				{
+					// Add the archive flag if necessary
+					$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, 'archive_flag');
+					$aAttToLoadWithAttDef[$sClassAlias]['archive_flag'] = $oArchiveFlagAttDef;
+				}
+
+				if (MetaModel::IsObsoletable($sClass))
+				{
+					// Add the obsolescence flag if necessary
+					$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, 'obsolescence_flag');
+					$aAttToLoadWithAttDef[$sClassAlias]['obsolescence_flag'] = $oObsoleteFlagAttDef;
+				}
+
 				// Make sure that the final class is requested anytime, whatever the specification (needed for object construction!)
 				if (!MetaModel::IsStandaloneClass($sClass) && !array_key_exists('finalclass', $aAttToLoadWithAttDef[$sClassAlias]))
 				{
@@ -312,7 +343,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	}
 
     /**
-     * Note: After calling this method, the set cursor will be at the end of the set. You might to rewind it.
+     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
      *
      * @param bool $bWithId
      * @return array
@@ -386,7 +417,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	}
 
     /**
-     * Note: After calling this method, the set cursor will be at the end of the set. You might to rewind it.
+     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
      *
      * @param string $sAttCode
      * @param bool $bWithId
@@ -539,7 +570,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		$aAttributes = array();
 		foreach ($aAliases as $sAlias => $bClassDirection)
 		{
-			foreach (MetaModel::GetOrderByDefault($this->m_oFilter->GetClass($sAlias)) as $sAttCode => $bAttributeDirection)
+			foreach (MetaModel::GetOrderByDefault($this->m_oFilter->GetClassName($sAlias)) as $sAttCode => $bAttributeDirection)
 			{
 				$bDirection = $bClassDirection ? $bAttributeDirection : !$bAttributeDirection;
 				$aAttributes[$sAlias.'.'.$sAttCode] = $bDirection;
@@ -573,10 +604,15 @@ class DBObjectSet implements iDBObjectSetIterator
 	 * 
 	 * Limitation: the sort order has no effect on objects added in-memory
 	 * 
-	 * @return hash Format: field_code => boolean (true = ascending, false = descending)
+	 * @return array Format: field_code => boolean (true = ascending, false = descending)
 	 */
 	public function GetRealSortOrder()
 	{
+		if (!$this->m_bSort)
+		{
+			// No order by
+			return array();
+		}
 		// Get the class default sort order if not specified with the API
 		//
 		if (empty($this->m_aOrderBy))
@@ -598,14 +634,7 @@ class DBObjectSet implements iDBObjectSetIterator
 		// Note: it is mandatory to set this value now, to protect against reentrance
 		$this->m_bLoaded = true;
 
-		if ($this->m_iLimitCount > 0)
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $this->m_aAttToLoad, $this->m_aExtendedDataSpec, $this->m_iLimitCount, $this->m_iLimitStart);
-		}
-		else
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
-		}
+		$sSQL = $this->_makeSelectQuery($this->m_aAttToLoad);
 		
 		if (is_object($this->m_oSQLResult))
 		{
@@ -613,23 +642,74 @@ class DBObjectSet implements iDBObjectSetIterator
 			$this->m_oSQLResult->free();
 			$this->m_oSQLResult = null;
 		}
-		$this->m_iNumTotalDBRows = null;
-		
-		$this->m_oSQLResult = CMDBSource::Query($sSQL);
+
+		try
+		{
+			$this->m_oSQLResult = CMDBSource::Query($sSQL);
+		} catch (MySQLException $e)
+		{
+			// 1116 = ER_TOO_MANY_TABLES
+			// https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_too_many_tables
+			if ($e->getCode() != 1116)
+			{
+				throw $e;
+			}
+
+			// N.689 Workaround for the 61 max joins in MySQL : full lazy load !
+			$aAttToLoad = array();
+			foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				$aAttToLoad[$sClassAlias] = array();
+				$bIsAbstractClass = MetaModel::IsAbstract($sClass);
+				$bIsClassWithChildren = MetaModel::HasChildrenClasses($sClass);
+				if ($bIsAbstractClass || $bIsClassWithChildren)
+				{
+					// we need finalClass field at least to be able to instantiate the real corresponding object !
+					$aAttToLoad[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
+				}
+			}
+			$sSQL = $this->_makeSelectQuery($aAttToLoad);
+			$this->m_oSQLResult = CMDBSource::Query($sSQL); // may fail again
+		}
+
 		if ($this->m_oSQLResult === false) return;
-		
-		if (($this->m_iLimitCount == 0) && ($this->m_iLimitStart == 0))
+
+		if ((($this->m_iLimitCount == 0) || ($this->m_iLimitCount > $this->m_oSQLResult->num_rows)) && ($this->m_iLimitStart == 0))
 		{
 			$this->m_iNumTotalDBRows = $this->m_oSQLResult->num_rows;
 		}
+
 		$this->m_iNumLoadedDBRows = $this->m_oSQLResult->num_rows;
 	}
 
 	/**
-	 * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into account the rows added in-memory.
-	 * 
-	 * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a SetLimit
-	 * 
+	 * @param string[] $aAttToLoad
+	 *
+	 * @return string SQL query
+	 */
+	private function _makeSelectQuery($aAttToLoad)
+	{
+		if ($this->m_iLimitCount > 0)
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $aAttToLoad,
+				$this->m_aExtendedDataSpec, $this->m_iLimitCount, $this->m_iLimitStart);
+		}
+		else
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $aAttToLoad,
+				$this->m_aExtendedDataSpec);
+		}
+
+		return $sSQL;
+	}
+
+	/**
+	 * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into
+	 * account the rows added in-memory.
+	 *
+	 * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a
+	 * SetLimit
+	 *
 	 * @return int The total number of rows for this set.
 	 */
 	public function Count()
@@ -639,14 +719,83 @@ class DBObjectSet implements iDBObjectSetIterator
 			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, 0, 0, true);
 			$resQuery = CMDBSource::Query($sSQL);
 			if (!$resQuery) return 0;
-	
+
 			$aRow = CMDBSource::FetchArray($resQuery);
 			CMDBSource::FreeResult($resQuery);
-			$this->m_iNumTotalDBRows = $aRow['COUNT'];
+			$this->m_iNumTotalDBRows = intval($aRow['COUNT']);
 		}
+
 		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
 	}
-	
+
+	/** Check if the count exceeds a given limit
+	 * @param $iLimit
+	 *
+	 * @return bool
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function CountExceeds($iLimit)
+	{
+		if (is_null($this->m_iNumTotalDBRows))
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
+			$resQuery = CMDBSource::Query($sSQL);
+			if ($resQuery)
+			{
+				$aRow = CMDBSource::FetchArray($resQuery);
+				CMDBSource::FreeResult($resQuery);
+				$iCount = intval($aRow['COUNT']);
+			}
+			else
+			{
+				$iCount = 0;
+			}
+		}
+		else
+		{
+			$iCount = $this->m_iNumTotalDBRows;
+		}
+
+		return ($iCount > $iLimit);
+	}
+
+	/** Count only up to the given limit
+	 * @param $iLimit
+	 *
+	 * @return int
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function CountWithLimit($iLimit)
+	{
+		if (is_null($this->m_iNumTotalDBRows))
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
+			$resQuery = CMDBSource::Query($sSQL);
+			if ($resQuery)
+			{
+				$aRow = CMDBSource::FetchArray($resQuery);
+				CMDBSource::FreeResult($resQuery);
+				$iCount = intval($aRow['COUNT']);
+			}
+			else
+			{
+				$iCount = 0;
+			}
+		}
+		else
+		{
+			$iCount = $this->m_iNumTotalDBRows;
+		}
+
+		return $iCount;
+	}
+
 	/**
 	 * Number of rows available in memory (loaded from DB + added in memory)
 	 * 

core/dbunionsearch.class.php

@@ -143,7 +143,7 @@ class DBUnionSearch extends DBSearch
 
 	/**
 	 * Limited to the selected classes
-	 */	 	
+	 */
 	public function GetClassName($sAlias)
 	{
 		if (array_key_exists($sAlias, $this->aSelectedClasses))
@@ -474,15 +474,17 @@ class DBUnionSearch extends DBSearch
 		throw new Exception('MakeUpdateQuery is not implemented for the unions!');
 	}
 
-	protected function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null)
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		if (count($this->aSearches) == 1)
 		{
-			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr);
+			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectExpr);
 		}
 
 		$aSQLQueries = array();
 		$aAliases = array_keys($this->aSelectedClasses);
+		$aQueryAttToLoad = null;
+		$aUnionQuerySelectExpr = array();
 		foreach ($this->aSearches as $iSearch => $oSearch)
 		{
 			$aSearchAliases = array_keys($oSearch->GetSelectedClasses());
@@ -496,19 +498,30 @@ class DBUnionSearch extends DBSearch
 				$aSearchSelectedClasses[$sSearchAlias] = $this->aSelectedClasses[$sAlias];
 			}
 
-			if (is_null($aAttToLoad))
+			if ($bGetCount)
 			{
-				$aQueryAttToLoad = null;
+				// Select only ids for the count to allow optimization of joins
+				foreach($aSearchAliases as $sSearchAlias)
+				{
+					$aQueryAttToLoad[$sSearchAlias] = array();
+				}
 			}
 			else
 			{
-					// (Eventually) Transform the aliases
-				$aQueryAttToLoad = array();
-				foreach ($aAttToLoad as $sAlias => $aAttributes)
+				if (is_null($aAttToLoad))
 				{
-					$iColumn = array_search($sAlias, $aAliases);
-					$sQueryAlias = ($iColumn === false) ? $sAlias : $aSearchAliases[$iColumn];
-					$aQueryAttToLoad[$sQueryAlias] = $aAttributes;
+					$aQueryAttToLoad = null;
+				}
+				else
+				{
+					// (Eventually) Transform the aliases
+					$aQueryAttToLoad = array();
+					foreach($aAttToLoad as $sAlias => $aAttributes)
+					{
+						$iColumn = array_search($sAlias, $aAliases);
+						$sQueryAlias = ($iColumn === false) ? $sAlias : $aSearchAliases[$iColumn];
+						$aQueryAttToLoad[$sQueryAlias] = $aAttributes;
+					}
 				}
 			}
 
@@ -533,7 +546,43 @@ class DBUnionSearch extends DBSearch
 					$aQueryGroupByExpr[$sExpressionAlias] = $oExpression->Translate($aTranslationData, false, false);
 				}
 			}
-			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses);
+
+			if (is_null($aSelectExpr))
+			{
+				$aQuerySelectExpr = null;
+			}
+			else
+			{
+				$aQuerySelectExpr = array();
+				$aTranslationData = array();
+				$aQueryColumns = array_keys($oSearch->GetSelectedClasses());
+				foreach($aAliases as $iColumn => $sAlias)
+				{
+					$sQueryAlias = $aQueryColumns[$iColumn];
+					$aTranslationData[$sAlias]['*'] = $sQueryAlias;
+				}
+				foreach($aSelectExpr as $sExpressionAlias => $oExpression)
+				{
+					$oExpression->Browse(function ($oNode) use (&$aQuerySelectExpr, &$aTranslationData)
+					{
+						if ($oNode instanceof FieldExpression)
+						{
+							$sAlias = $oNode->GetParent()."__".$oNode->GetName();
+							if (!key_exists($sAlias, $aQuerySelectExpr))
+							{
+								$aQuerySelectExpr[$sAlias] = $oNode->Translate($aTranslationData, false, false);
+							}
+							$aTranslationData[$oNode->GetParent()][$oNode->GetName()] = new FieldExpression($sAlias);
+						}
+					});
+					// Only done for the first select as aliases are named after the first query
+					if (!array_key_exists($sExpressionAlias, $aUnionQuerySelectExpr))
+					{
+						$aUnionQuerySelectExpr[$sExpressionAlias] = $oExpression->Translate($aTranslationData, false, false);
+					}
+				}
+			}
+			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr);
 			if (count($aSearchAliases) > 1)
 			{
 				// Necessary to make sure that selected columns will match throughout all the queries
@@ -543,7 +592,7 @@ class DBUnionSearch extends DBSearch
 			$aSQLQueries[] = $oSubQuery;
 		}
 
-		$oSQLQuery = new SQLUnionQuery($aSQLQueries, $aGroupByExpr);
+		$oSQLQuery = new SQLUnionQuery($aSQLQueries, $aGroupByExpr, $aUnionQuerySelectExpr);
 		//MyHelpers::var_dump_html($oSQLQuery, true);
 		//MyHelpers::var_dump_html($oSQLQuery->RenderSelect(), true);
 		if (self::$m_bDebugQuery) $oSQLQuery->DisplayHtml();

core/designdocument.class.inc.php

@@ -1,20 +1,23 @@
 <?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+/**
+ * Copyright (c) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
 
 /**
  * Design document and associated nodes
@@ -57,6 +60,9 @@ class DesignDocument extends DOMDocument
 
 	/**
 	 * Overload of the standard API
+	 *
+	 * @param $filename
+	 * @param int $options
 	 */
 	public function load($filename, $options = 0)
 	{
@@ -65,6 +71,11 @@ class DesignDocument extends DOMDocument
 
 	/**
 	 * Overload of the standard API
+	 *
+	 * @param $filename
+	 * @param int $options
+	 *
+	 * @return int
 	 */
 	public function save($filename, $options = 0)
 	{
@@ -84,18 +95,18 @@ class DesignDocument extends DOMDocument
 		{
 			return $sXml;
 		}
-		else
-		{
-			echo "<pre>\n";
-			echo htmlentities($sXml);
-			echo "</pre>\n";
-		}
+
+		echo "<pre>\n";
+		echo htmlentities($sXml);
+		echo "</pre>\n";
+
+		return '';
 	}
 
 	/**
 	 * Quote and escape strings for use within an XPath expression
 	 * Usage: DesignDocument::GetNodes('class[@id='.DesignDocument::XPathQuote($sId).']');
-	 * @param $sValue The value to be quoted
+	 * @param string $sValue The value to be quoted
 	 * @return string to be used within an XPath
 	 */
 	public static function XPathQuote($sValue)
@@ -115,7 +126,7 @@ class DesignDocument extends DOMDocument
 	/**
 	 * Extracts some nodes from the DOM
 	 * @param string $sXPath A XPath expression
-	 * @param DesignNode|null $oContextNode The node to start the search from
+	 * @param DesignElement $oContextNode The node to start the search from
 	 * @return \DOMNodeList
 	 */
 	public function GetNodes($sXPath, $oContextNode = null)
@@ -134,7 +145,7 @@ class DesignDocument extends DOMDocument
 
 	/**
 	 * An alternative to getNodePath, that gives the id of nodes instead of the position within the children
-	 * @param $oNode The node to describe
+	 * @param DesignElement $oNode The node to describe
 	 * @return string
 	 */
 	public static function GetItopNodePath($oNode)
@@ -166,8 +177,11 @@ class DesignElement extends \DOMElement
 
 	/**
 	 * Create an HTML representation of the DOM, for debugging purposes
+	 *
 	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
+	 *
 	 * @return mixed void or the HTML representation of the DOM
+	 * @throws \Exception
 	 */
 	public function Dump($bReturnRes = false)
 	{
@@ -180,19 +194,16 @@ class DesignElement extends \DOMElement
 		{
 			return $sXml;
 		}
-		else
-		{
-			echo "<pre>\n";
-			echo htmlentities($sXml);
-			echo "</pre>\n";
-		}
+		echo "<pre>\n";
+		echo htmlentities($sXml);
+		echo "</pre>\n";
+		return '';
 	}
-
 	/**
 	 * Returns the node directly under the given node
 	 * @param $sTagName
 	 * @param bool|true $bMustExist
-	 * @return MFElement
+	 * @return \MFElement
 	 * @throws DOMFormatException
 	 */
 	public function GetUniqueElement($sTagName, $bMustExist = true)
@@ -216,7 +227,7 @@ class DesignElement extends \DOMElement
 	/**
 	 * Returns the node directly under the current node, or null if missing
 	 * @param $sTagName
-	 * @return MFElement
+	 * @return \MFElement
 	 * @throws DOMFormatException
 	 */
 	public function GetOptionalElement($sTagName)
@@ -252,9 +263,12 @@ class DesignElement extends \DOMElement
 
 	/**
 	 * Get the TEXT value from a child node
+	 *
 	 * @param string $sTagName
 	 * @param string|null $sDefault
+	 *
 	 * @return string
+	 * @throws \DOMFormatException
 	 */
 	public function GetChildText($sTagName, $sDefault = null)
 	{

core/dict.class.inc.php

@@ -20,7 +20,7 @@
  * Class Dict
  * Management of localizable strings 
  *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
@@ -65,6 +65,11 @@ class Dict
 	protected static $m_aData = array();
 	protected static $m_sApplicationPrefix = null;
 
+	/**
+	 * @param $sLanguageCode
+	 *
+	 * @throws \DictExceptionUnknownLanguage
+	 */
 	public static function SetDefaultLanguage($sLanguageCode)
 	{
 		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
@@ -74,6 +79,11 @@ class Dict
 		self::$m_sDefaultLanguage = $sLanguageCode;
 	}
 
+	/**
+	 * @param $sLanguageCode
+	 *
+	 * @throws \DictExceptionUnknownLanguage
+	 */
 	public static function SetUserLanguage($sLanguageCode)
 	{
 		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
@@ -108,11 +118,12 @@ class Dict
 
 	/**
 	 * Returns a localised string from the dictonary
+	 *
 	 * @param string $sStringCode The code identifying the dictionary entry
 	 * @param string $sDefault Default value if there is no match in the dictionary
 	 * @param bool $bUserLanguageOnly True to allow the use of the default language as a fallback, false otherwise
-	 * @throws DictExceptionMissingString
-	 * @return unknown|Ambigous <>|string
+	 *
+	 * @return string
 	 */
 	public static function S($sStringCode, $sDefault = null, $bUserLanguageOnly = false)
 	{
@@ -122,7 +133,7 @@ class Dict
 
 		if (!array_key_exists(self::GetUserLanguage(), self::$m_aData))
 		{
-			// It may happen, when something happens before the dictionnaries get loaded
+			// It may happen, when something happens before the dictionaries get loaded
 			return $sStringCode;
 		}
 		$aCurrentDictionary = self::$m_aData[self::GetUserLanguage()];
@@ -153,25 +164,12 @@ class Dict
 		}
 		// Could not find the string...
 		//
-		switch (self::$m_iErrorMode)
+		if (is_null($sDefault))
 		{
-			case DICT_ERR_STRING:
-				if (is_null($sDefault))
-				{
-					return $sStringCode;
-				}
-				else
-				{
-					return $sDefault;
-				}
-				break;
-
-			case DICT_ERR_EXCEPTION:
-			default:
-				throw new DictExceptionMissingString(self::$m_sCurrentLanguage, $sStringCode);
-				break;
+			return $sStringCode;
 		}
-		return 'bug!';
+
+		return $sDefault;
 	}
 
 
@@ -283,6 +281,9 @@ class Dict
 
 	/**
 	 * Clone a string in every language (if it exists in that language)
+	 *
+	 * @param $sSourceCode
+	 * @param $sDestCode
 	 */
 	public static function CloneString($sSourceCode, $sDestCode)
 	{
@@ -355,5 +356,38 @@ class Dict
 		// No need to actually load the strings since it's only used to know the list of languages
 		// at setup time !!
 	}
+	
+	/**
+	 * Export all the dictionary entries - of the given language - whose code matches the given prefix
+	 * missing entries in the current language will be replaced by entries in the default language
+	 * @param string $sStartingWith
+	 * @return string[]
+	 */
+	public static function ExportEntries($sStartingWith)
+	{
+		self::InitLangIfNeeded(self::GetUserLanguage());
+		self::InitLangIfNeeded(self::$m_sDefaultLanguage);
+		$aEntries = array();
+		$iLength = strlen($sStartingWith);
+		
+		// First prefill the array with entries from the default language
+		foreach(self::$m_aData[self::$m_sDefaultLanguage] as $sCode => $sEntry)
+		{
+			if (substr($sCode, 0, $iLength) == $sStartingWith)
+			{
+				$aEntries[$sCode] = $sEntry;
+			}
+		}
+		
+		// Now put (overwrite) the entries for the user language
+		foreach(self::$m_aData[self::GetUserLanguage()] as $sCode => $sEntry)
+		{
+			if (substr($sCode, 0, $iLength) == $sStartingWith)
+			{
+				$aEntries[$sCode] = $sEntry;
+			}
+		}
+		return $aEntries;
+	}
 }
 ?>

core/displayablegraph.class.inc.php

@@ -1438,22 +1438,22 @@ class DisplayableGraph extends SimpleGraph
 			}
 			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
 		}
+		$sSftShort = Dict::S('UI:ElementsDisplayed');
+		$sSearchToggle = Dict::S('UI:Search:Toggle');
 		$oP->add("<div class=\"not-printable\">\n");
-		$oP->add("<div id=\"ds_flash\" class=\"SearchDrawer\" style=\"display:none;\">\n");
-		if (!$oP->IsPrintableVersion())
-		{
-			$oP->add_ready_script(
+		$oP->add(
 <<<EOF
-	$( "#tabbedContent_0" ).tabs({ heightStyle: "fill" });
+ <div id="ds_flash" class="search_box">
+	<form id="dh_flash" class="search_form_handler closed">
+	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fa fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
+	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
 EOF
-			);
-		}
+		);
 		
 		$oP->add_ready_script(
 <<<EOF
-	$("#dh_flash").click( function() {
-		$("#ds_flash").slideToggle('normal', function() { $("#ds_flash").parent().resize(); $("#dh_flash").trigger('toggle_complete'); } );
-		$("#dh_flash").toggleClass('open');
+	$("#dh_flash > .sf_title").click( function() {
+		$("#dh_flash").toggleClass('closed');
 	});
     $('#ReloadMovieBtn').button().button('disable');
 EOF
@@ -1476,9 +1476,8 @@ EOF
 			$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></div></form>");
 		$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");
 	 	$oP->add("</div>\n"); // class="not-printable"
 
 		$aAdditionalContexts = array();

core/email.class.inc.php

@@ -57,6 +57,7 @@ class EMail
 	{
 		$this->m_aData = array();
 		$this->m_oMessage = Swift_Message::newInstance();
+		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
 	}
 
 	/**
@@ -195,18 +196,29 @@ class EMail
 
 		$aFailedRecipients = array();
 		$this->m_oMessage->setMaxLineLength(0);
-		$iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients);
-		if ($iSent === 0)
+		$oKPI = new ExecutionKPI();
+		try
 		{
-			// Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!!
-			IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients));
-			$aIssues = array('Some recipients were invalid.');
-			return EMAIL_SEND_ERROR;
+			$iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients);
+			if ($iSent === 0)
+			{
+				// Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!!
+				IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients));
+				$aIssues = array('Some recipients were invalid.');
+				$oKPI->ComputeStats('Email Sent', 'Error received');
+				return EMAIL_SEND_ERROR;
+			}
+			else
+			{
+				$aIssues = array();
+				$oKPI->ComputeStats('Email Sent', 'Succeded');
+				return EMAIL_SEND_OK;
+			}
 		}
-		else
+		catch (Exception $e)
 		{
-			$aIssues = array();
-			return EMAIL_SEND_OK;
+			$oKPI->ComputeStats('Email Sent', 'Error received');
+			throw $e;
 		}
 	}
 	
@@ -249,6 +261,11 @@ class EMail
 
 	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
 	{
+		//select a default sender if none is provided.
+		if(empty($this->m_aData['from']['address']) && !empty($this->m_aData['to'])){
+			$this->SetRecipientFrom($this->m_aData['to']);
+		}
+
 		if ($bForceSynchronous)
 		{
 			return $this->SendSynchronous($aIssues, $oLog);

core/event.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2013 Combodo SARL
+// Copyright (C) 2010-2017 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -408,4 +408,30 @@ class EventLoginUsage extends Event
 	}
 }
 
-?>
+class EventOnObject extends Event
+{
+    public static function Init()
+    {
+        $aParams = array
+        (
+            "category" => "core/cmdb,view_in_gui",
+            "key_type" => "autoincrement",
+            "name_attcode" => "",
+            "state_attcode" => "",
+            "reconc_keys" => array(),
+            "db_table" => "priv_event_onobject",
+            "db_key_field" => "id",
+            "db_finalclass_field" => "",
+            "display_template" => "",
+            "order_by_default" => array('date' => false)
+        );
+        MetaModel::Init_Params($aParams);
+        MetaModel::Init_InheritAttributes();
+        MetaModel::Init_AddAttribute(new AttributeString("obj_class", array("allowed_values"=>null, "sql"=>"obj_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+        MetaModel::Init_AddAttribute(new AttributeInteger("obj_key", array("allowed_values"=>null, "sql"=>"obj_key", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+        // Display lists
+        MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for the complete details
+        MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for a list
+    }
+}

core/excelbulkexport.class.inc.php

@@ -188,10 +188,10 @@ EOF
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
 				$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
 			}
-			else if ($value instanceOf ormCustomFieldsValue)
+			else if ($value instanceOf ormDocument)
 			{
 				$oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
-				$sRet = $oAttDef->GetAsCSV($value, "\n", '', $oObj);
+				$sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
 			}
 			else
 			{

core/expressioncache.class.inc.php

@@ -0,0 +1,110 @@
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+class ExpressionCache
+{
+	static private $aCache = array();
+
+	static public function GetCachedExpression($sClass, $sAttCode)
+	{
+		// read current cache
+		@include_once (static::GetCacheFileName());
+
+		$oExpr = null;
+		$sKey = static::GetKey($sClass, $sAttCode);
+		if (array_key_exists($sKey, static::$aCache))
+		{
+			$oExpr =  static::$aCache[$sKey];
+		}
+		else
+		{
+			if (class_exists('ExpressionCacheData'))
+			{
+				if (array_key_exists($sKey, ExpressionCacheData::$aCache))
+				{
+					$sVal = ExpressionCacheData::$aCache[$sKey];
+					$oExpr = unserialize($sVal);
+					static::$aCache[$sKey] = $oExpr;
+				}
+			}
+		}
+		return $oExpr;
+	}
+
+
+	static public function Warmup()
+	{
+		$sFilePath = static::GetCacheFileName();
+
+		if (!is_file($sFilePath))
+		{
+			$content = <<<EOF
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+// Generated Expression Cache file
+
+class ExpressionCacheData
+{
+	static \$aCache =  array(
+EOF;
+
+			foreach(MetaModel::GetClasses() as $sClass)
+			{
+				$content .= static::GetSerializedExpression($sClass, 'friendlyname');
+				if (MetaModel::IsObsoletable($sClass))
+				{
+					$content .= static::GetSerializedExpression($sClass, 'obsolescence_flag');
+				}
+			}
+
+			$content .= <<<EOF
+	);
+}
+EOF;
+
+			file_put_contents($sFilePath, $content);
+		}
+	}
+
+	static private function GetSerializedExpression($sClass, $sAttCode)
+	{
+		$sKey = static::GetKey($sClass, $sAttCode);
+		$oExpr = DBObjectSearch::GetPolymorphicExpression($sClass, $sAttCode);
+		return "'".$sKey."' => '".serialize($oExpr)."',\n";
+	}
+
+	/**
+	 * @param $sClass
+	 * @param $sAttCode
+	 * @return string
+	 */
+	static private function GetKey($sClass, $sAttCode)
+	{
+		return $sClass.'::'.$sAttCode;
+	}
+
+	public static function GetCacheFileName()
+	{
+		return utils::GetCachePath().'expressioncache.php';
+	}
+
+}
+
+
+

core/htmlsanitizer.class.inc.php

@@ -151,11 +151,17 @@ class HTMLPurifierSanitizer extends HTMLSanitizer
 class HTMLDOMSanitizer extends HTMLSanitizer
 {
 	protected $oDoc;
+
+	/**
+	 * @var array
+	 * @see https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Arich_text_limitations
+	 */
 	protected static $aTagsWhiteList = array(
 		'html' => array(),
 		'body' => array(),
 		'a' => array('href', 'name', 'style', 'target', 'title'),
 		'p' => array('style'),
+		'blockquote' => array('style'),
 		'br' => array(),
 		'span' => array('style'),
 		'div' => array('style'),
@@ -178,16 +184,15 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'table' => array('style', 'width', 'summary', 'align', 'border', 'cellpadding', 'cellspacing'),
 		'thead' => array('style'),
 		'tbody' => array('style'),
-		'tr' => array('style'),
-		'td' => array('style', 'colspan'),
-		'th' => array('style'),
+		'tr' => array('style', 'colspan', 'rowspan'),
+		'td' => array('style', 'colspan', 'rowspan'),
+		'th' => array('style', 'colspan', 'rowspan'),
 		'fieldset' => array('style'),
 		'legend' => array('style'),
 		'font' => array('face', 'color', 'style', 'size'),
 		'big' => array(),
 		'small' => array(),
 		'tt' => array(),
-		'code' => array(),
 		'kbd' => array(),
 		'samp' => array(),
 		'var' => array(),
@@ -198,23 +203,49 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'q' => array(),
 		'hr' => array('style'),
 		'pre' => array(),
-		'center' => array(),
-		'caption' => array(),
 	);
-	
+
 	protected static $aAttrsWhiteList = array(
 		'src' => '/^(http:|https:|data:)/i',
 	);
-	
+
+	/**
+	 * @var array
+	 * @see https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Arich_text_limitations
+	 */
 	protected static $aStylesWhiteList = array(
-		'background-color', 'color', 'float', 'font', 'font-style', 'font-size', 'font-family', 'padding', 'margin', 'border', 'cellpadding', 'cellspacing', 'bordercolor', 'border-collapse', 'width', 'height', 'text-align',
+		'background-color',
+		'border',
+		'border-collapse',
+		'bordercolor',
+		'cellpadding',
+		'cellspacing',
+		'color',
+		'float',
+		'font',
+		'font-family',
+		'font-size',
+		'font-style',
+		'height',
+		'margin',
+		'padding',
+		'text-align',
+		'width',
 	);
 
 	public function __construct()
 	{
+		// Building href validation pattern from url and email validation patterns as the patterns are not used the same way in HTML content than in standard attributes value.
+		// eg. "foo@bar.com" vs "mailto:foo@bar.com?subject=Title&body=Hello%20world"
 		if (!array_key_exists('href', self::$aAttrsWhiteList))
 		{
-			$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
+			// Regular urls
+			$sUrlPattern = utils::GetConfig()->Get('url_validation_pattern');
+			// Mailto urls
+			$sMailtoPattern = '(mailto:(' . utils::GetConfig()->Get('email_validation_pattern') . ')(?:\?(?:subject|body)=([a-zA-Z0-9+\$_.-]*)(?:&(?:subject|body)=([a-zA-Z0-9+\$_.-]*))?)?)';
+
+			$sPattern = $sUrlPattern . '|' . $sMailtoPattern;
+			$sPattern = '/'.str_replace('/', '\/', $sPattern).'/i';
 			self::$aAttrsWhiteList['href'] = $sPattern;
 		}
 	}

core/inlineimage.class.inc.php

@@ -497,10 +497,10 @@ EOF
  */
 class InlineImageGC implements iBackgroundProcess
 {
-	public function GetPeriodicity()
-	{
-		return 3600; // Runs every 3600 seconds
-	}
+    public function GetPeriodicity()
+    {
+        return 3600; // Runs every hour
+    }
 
 	public function Process($iTimeLimit)
 	{

core/mutex.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2013-2017 Combodo SARL
+// Copyright (C) 2013-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -24,17 +24,29 @@
  * Relies on MySQL locks because the API sem_get is not always present in the
  * installed PHP.    
  *
- * @copyright   Copyright (C) 2013-2017 Combodo SARL
+ * @copyright   Copyright (C) 2013-2018 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 class iTopMutex
 {
 	protected $sName;
-	protected $hDBLink;
+	/** @var bool */
 	protected $bLocked; // Whether or not this instance of the Mutex is locked
+
+	/** @var \mysqli */
+	protected $hDBLink;
+	protected $sDBHost;
+	protected $sDBUser;
+	protected $sDBPwd;
+	protected $sDBName;
+	protected $sDBSubname;
+	protected $bDBTlsEnabled;
+	protected $sDBTlsCA;
 	static protected $aAcquiredLocks = array(); // Number of instances of the Mutex, having the lock, in this page
 
-	public function __construct($sName, $sDBHost = null, $sDBUser = null, $sDBPwd = null)
+	public function __construct(
+		$sName, $sDBHost = null, $sDBUser = null, $sDBPwd = null, $bDBTlsEnabled = false, $sDBTlsCA = null
+	)
 	{
 		// Compute the name of a lock for mysql
 		// Note: names are server-wide!!! So let's make the name specific to this iTop instance
@@ -43,17 +55,27 @@ class iTopMutex
 		{
 			$oConfig = utils::GetConfig(); // Will return an empty config when called during the setup
 		}
-		$sDBName = $oConfig->GetDBName();
-		$sDBSubname = $oConfig->GetDBSubname();
-		$this->sName = 'itop.'.$sName;
-		if (substr($sName, -strlen($sDBName.$sDBSubname)) != $sDBName.$sDBSubname)
+		$this->sDBHost = is_null($sDBHost) ? $oConfig->Get('db_host') : $sDBHost;
+		$this->sDBUser = is_null($sDBUser) ? $oConfig->Get('db_user') : $sDBUser;
+		$this->sDBPwd = is_null($sDBPwd) ? $oConfig->Get('db_pwd') : $sDBPwd;
+		$this->sDBName = $oConfig->Get('db_name');
+		$sDBSubname = $oConfig->Get('db_subname');
+
+		$this->bDBTlsEnabled = is_null($bDBTlsEnabled) ? $oConfig->Get('db_tls.enabled') : $bDBTlsEnabled;
+		$this->sDBTlsCA = is_null($sDBTlsCA) ? $oConfig->Get('db_tls.ca') : $sDBTlsCA;
+
+		$this->sName = $sName;
+		if (substr($sName, -strlen($this->sDBName.$sDBSubname)) != $this->sDBName.$sDBSubname)
 		{
 			// If the name supplied already ends with the expected suffix
 			// don't add it twice, since the setup may try to detect an already
 			// running cron job by its mutex, without knowing if the config already exists or not
-			$this->sName .= $sDBName.$sDBSubname;
+			$this->sName .= $this->sDBName.$sDBSubname;
 		}
 
+		// Limit the length of the name for MySQL > 5.7.5
+		$this->sName = 'itop.'.md5($this->sName);
+
 		$this->bLocked = false; // Not yet locked
 
 		if (!array_key_exists($this->sName, self::$aAcquiredLocks))
@@ -61,12 +83,9 @@ class iTopMutex
 			self::$aAcquiredLocks[$this->sName] = 0;
 		}
 
-		// It is a MUST to create a dedicated session each time a lock is required, because
+		// It is MANDATORY to create a dedicated session each time a lock is required, because
 		// using GET_LOCK anytime on the same session will RELEASE the current and unique session lock (known issue)
-		$sDBHost = is_null($sDBHost) ? $oConfig->GetDBHost() : $sDBHost;
-		$sDBUser = is_null($sDBUser) ? $oConfig->GetDBUser() : $sDBUser;
-		$sDBPwd = is_null($sDBPwd) ? $oConfig->GetDBPwd() : $sDBPwd;
-		$this->InitMySQLSession($sDBHost, $sDBUser, $sDBPwd);
+		$this->InitMySQLSession();
 	}
 
 	public function __destruct()
@@ -79,7 +98,9 @@ class iTopMutex
 	}
 
 	/**
-	 *	Acquire the mutex
+	 * Acquire the mutex. Uses a MySQL lock. <b>Warn</b> : can have an abnormal behavior on MySQL clusters (see R-016204)
+	 *
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock
 	 */	
 	public function Lock()
 	{
@@ -197,26 +218,26 @@ class iTopMutex
 		self::$aAcquiredLocks[$this->sName]--;
 	}
 
-
-
-	public function InitMySQLSession($sHost, $sUser, $sPwd)
+	/**
+	 * Initialize database connection. Mandatory attributes must be already set !
+	 *
+	 * @throws \Exception
+	 * @throws \MySQLException
+	 */
+	public function InitMySQLSession()
 	{
-		$aConnectInfo = explode(':', $sHost);
-		if (count($aConnectInfo) > 1)
-		{
-			// Override the default port
-			$sServer = $aConnectInfo[0];
-			$iPort = $aConnectInfo[1];
-			$this->hDBLink = @mysqli_connect($sServer, $sUser, $sPwd, '', $iPort);
-		}
-		else
-		{
-			$this->hDBLink = @mysqli_connect($sHost, $sUser, $sPwd);
-		}
+		$sServer = $this->sDBHost;
+		$sUser = $this->sDBUser;
+		$sPwd = $this->sDBPwd;
+		$sSource = $this->sDBName;
+		$bTlsEnabled = $this->bDBTlsEnabled;
+		$sTlsCA = $this->sDBTlsCA;
+
+		$this->hDBLink = CMDBSource::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA, false);
 
 		if (!$this->hDBLink)
 		{
-			throw new Exception("Could not connect to the DB server (host=$sHost, user=$sUser): ".mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno().')');
+			throw new Exception("Could not connect to the DB server (host=$sServer, user=$sUser): ".mysqli_connect_error().' (mysql errno: '.mysqli_connect_errno().')');
 		}
 	}
 

core/oql/check_oql.php

@@ -20,13 +20,13 @@
  *     echo "Ok, '$sOQL' is a valid query";
  * }
  */
-if (!class_exists('CoreException', false))
-{
-	class CoreException extends Exception
-	{
-	
-	}
-}
+//if (!class_exists('CoreException', false))
+//{
+//	class CoreException extends Exception
+//	{
+//
+//	}
+//}
 
 require_once(__DIR__.'/expression.class.inc.php');
 require_once(__DIR__.'/oqlquery.class.inc.php');

core/oql/oqlinterpreter.class.inc.php

@@ -85,6 +85,7 @@ class OqlInterpreter
 
 	/**
 	 * @return OqlQuery
+	 * @throws \OQLException
 	 */
 	public function ParseQuery()
 	{

core/oql/oqlquery.class.inc.php

@@ -283,10 +283,10 @@ abstract class OqlQuery
 	/**
 	 * Check the validity of the expression with regard to the data model
 	 * and the query in which it is used
-	 * 	 	 
-	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
-	 * @throws OqlNormalizeException
-	 */	 	
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @param string $sSourceQuery
+	 */
 	abstract public function Check(ModelReflection $oModelReflection, $sSourceQuery);
 
 	/**

core/ormcaselog.class.inc.php

@@ -191,8 +191,15 @@ class ormCaseLog {
 
 	public function __toString()
 	{
-		return $this->m_sLog;
+        if($this->IsEmpty()) return '';
+
+        return $this->m_sLog;
 	}
+
+	public function IsEmpty()
+    {
+        return ($this->m_sLog === null);
+    }
 	
 	public function ClearModifiedFlag()
 	{

core/ormdocument.class.inc.php

@@ -51,6 +51,8 @@ class ormDocument
 
 	public function __toString()
 	{
+	    if($this->IsEmpty()) return '';
+
 		return MyHelpers::beautifulstr($this->m_data, 100, true);
 	}
 

core/ormlinkset.class.inc.php

@@ -52,7 +52,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 * Object from the original set, minus the removed objects
 	 * @var DBObject[] array of iObjectId => DBObject
 	 */
-	protected $aPreserved;
+	protected $aPreserved = array();
 
 	/**
 	 * @var DBObject[] New items
@@ -74,6 +74,14 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 */
 	protected $iCursor = 0;
 
+	/**
+	 * __toString magical function overload.
+	 */
+	public function __toString()
+	{
+		return '';
+	}
+
 	/**
 	 * ormLinkSet constructor.
 	 * @param $sHostClass
@@ -123,19 +131,18 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	{
 		assert($oLink instanceof $this->sClass);
 		// No impact on the iteration algorithm
-		$this->aAdded[] = $oLink;
+        $iObjectId = $oLink->GetKey();
+		$this->aAdded[$iObjectId] = $oLink;
 		$this->bHasDelta = true;
 	}
 
     /**
      * @param DBObject $oObject
      * @param string $sClassAlias
-     * @deprecated
+     * @deprecated Since iTop 2.4, use ormLinkset->AddItem() instead.
      */
 	public function AddObject(DBObject $oObject, $sClassAlias = '')
     {
-        trigger_error('iTop: ormLinkSet::AddObject() is deprecated use ormLinkSet::AddItem() instead.', E_USER_DEPRECATED);
-
         $this->AddItem($oObject);
     }
 
@@ -150,6 +157,13 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 			$this->aRemoved[$iObjectId] = $iObjectId;
 			$this->bHasDelta = true;
 		}
+		else
+        {
+            if (array_key_exists($iObjectId, $this->aAdded))
+            {
+                unset($this->aAdded[$iObjectId]);
+            }
+        }
 	}
 
 	/**
@@ -158,9 +172,14 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	public function ModifyItem(DBObject $oLink)
 	{
 		assert($oLink instanceof $this->sClass);
+
 		$iObjectId = $oLink->GetKey();
-		$this->aModified[$iObjectId] = $oLink;
-		$this->bHasDelta = true;
+        if (array_key_exists($iObjectId, $this->aPreserved))
+        {
+            unset($this->aPreserved[$iObjectId]);
+            $this->aModified[$iObjectId] = $oLink;
+            $this->bHasDelta = true;
+        }
 	}
 
 	protected function LoadOriginalIds()
@@ -169,15 +188,22 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		{
 			if ($this->oOriginalSet)
 			{
-				$this->aOriginalObjects = $this->oOriginalSet->ToArray();
+				$this->aOriginalObjects = $this->GetArrayOfIndex();
 				$this->aPreserved = $this->aOriginalObjects; // Copy (not effective until aPreserved gets modified)
-				foreach ($this->aRemoved as $iObjectId)
-				{
-					if (array_key_exists($iObjectId, $this->aPreserved))
-					{
-						unset($this->aPreserved[$iObjectId]);
-					}
-				}
+                foreach ($this->aRemoved as $iObjectId)
+                {
+                    if (array_key_exists($iObjectId, $this->aPreserved))
+                    {
+                        unset($this->aPreserved[$iObjectId]);
+                    }
+                }
+                foreach ($this->aModified as $iObjectId => $oLink)
+                {
+                    if (array_key_exists($iObjectId, $this->aPreserved))
+                    {
+                        unset($this->aPreserved[$iObjectId]);
+                    }
+                }
 			}
 			else
 			{
@@ -189,17 +215,29 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		}
 	}
 
+	/**
+	 * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
+	 * @return array
+	 */
+	protected function GetArrayOfIndex()
+	{
+		$aRet = array();
+		$this->oOriginalSet->Rewind();
+		$iRow = 0;
+		while ($oObject = $this->oOriginalSet->Fetch())
+		{
+			$aRet[$oObject->GetKey()] = $iRow++;
+		}
+		return $aRet;
+	}
+
     /**
-     * Note: After calling this method, the set cursor will be at the end of the set. You might to rewind it.
-     *
      * @param bool $bWithId
      * @return array
-     * @deprecated
+     * @deprecated Since iTop 2.4, use foreach($this as $oItem){} instead
      */
     public function ToArray($bWithId = true)
     {
-        trigger_error('iTop: ormLinkSet::ToArray() is deprecated use foreach instead.', E_USER_DEPRECATED);
-
         $aRet = array();
         foreach($this as $oItem)
         {
@@ -215,6 +253,28 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
         return $aRet;
     }
 
+    /**
+     * @param string $sAttCode
+     * @param bool $bWithId
+     * @return array
+     */
+    public function GetColumnAsArray($sAttCode, $bWithId = true)
+    {
+        $aRet = array();
+        foreach($this as $oItem)
+        {
+            if ($bWithId)
+            {
+                $aRet[$oItem->GetKey()] = $oItem->Get($sAttCode);
+            }
+            else
+            {
+                $aRet[] = $oItem->Get($sAttCode);
+            }
+        }
+        return $aRet;
+    }
+
     /**
 	 * The class of the objects of the collection (at least a common ancestor)
 	 *
@@ -233,7 +293,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	public function Count()
 	{
 		$this->LoadOriginalIds();
-		$iRet = count($this->aPreserved) + count($this->aAdded);
+		$iRet = count($this->aPreserved) + count($this->aAdded) + count($this->aModified);
 		return $iRet;
 	}
 
@@ -290,11 +350,21 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		$iPreservedCount = count($this->aPreserved);
 		if ($this->iCursor < $iPreservedCount)
 		{
-			$oRet = current($this->aPreserved);
+			$iRet = current($this->aPreserved);
+			$this->oOriginalSet->Seek($iRet);
+			$oRet = $this->oOriginalSet->Fetch();
 		}
 		else
 		{
-			$oRet = current($this->aAdded);
+		    $iModifiedCount = count($this->aModified);
+		    if($this->iCursor < $iPreservedCount + $iModifiedCount)
+            {
+                $oRet = current($this->aModified);
+            }
+            else
+            {
+                $oRet = current($this->aAdded);
+            }
 		}
 		return $oRet;
 	}
@@ -315,9 +385,17 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		}
 		else
 		{
-			next($this->aAdded);
+		    $iModifiedCount = count($this->aModified);
+		    if($this->iCursor < $iPreservedCount + $iModifiedCount)
+            {
+                next($this->aModified);
+            }
+            else
+            {
+                next($this->aAdded);
+            }
 		}
-		// Increment AFTER moving the internal cursors because when starting aAdded, we must leave it intact
+		// Increment AFTER moving the internal cursors because when starting aModified / aAdded, we must leave it intact
 		$this->iCursor++;
 	}
 
@@ -353,11 +431,12 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 	 */
 	public function rewind()
 	{
-		$this->LoadOriginalIds();
+	    $this->LoadOriginalIds();
 
-		$this->iCursor = 0;
+	    $this->iCursor = 0;
 		reset($this->aPreserved);
-		reset($this->aAdded);
+        reset($this->aAdded);
+        reset($this->aModified);
 	}
 
 	public function HasDelta()
@@ -429,7 +508,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 			$this->aAdded = array();
 			$this->aRemoved = array();
 			$this->aModified = array();
-			$this->aPreserved = $this->aOriginalObjects;
+			$this->aPreserved = ($this->aOriginalObjects === null) ? array() : $this->aOriginalObjects;
 			$this->bHasDelta = false;
 
 			/** @var AttributeLinkedSet $oAttDef */
@@ -460,6 +539,27 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		}
 	}
 
+	/**
+	 * Get the list of all modified (added, modified and removed) links
+	 *
+	 * @return array of link objects
+	 * @throws \Exception
+	 */
+	public function ListModifiedLinks()
+	{
+		$aAdded = $this->aAdded;
+		$aModified = $this->aModified;
+		$aRemoved = array();
+		if (count($this->aRemoved) > 0)
+		{
+			$oSearch = new DBObjectSearch($this->sClass);
+			$oSearch->AddCondition('id', $this->aRemoved, 'IN');
+			$oSet = new DBObjectSet($oSearch);
+			$aRemoved = $oSet->ToArray();
+		}
+		return array_merge($aAdded, $aModified, $aRemoved);
+	}
+
 	/**
 	 * @param DBObject $oHostObject
 	 */
@@ -504,12 +604,15 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 
 		// Check for the existing links
 		//
+		/** @var DBObject[] $aExistingLinks */
+		$aExistingLinks = array();
+		/** @var Int[] $aExistingRemote */
+		$aExistingRemote = array();
 		if (count($aCheckLinks) > 0)
 		{
 			$oSearch = new DBObjectSearch($this->sClass);
 			$oSearch->AddCondition('id', $aCheckLinks, 'IN');
 			$oSet = new DBObjectSet($oSearch);
-			/** @var DBObject[] $aExistingLinks */
 			$aExistingLinks = $oSet->ToArray();
 		}
 
@@ -521,8 +624,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 			$oSearch->AddCondition($sExtKeyToMe, $oHostObject->GetKey(), '=');
 			$oSearch->AddCondition($sExtKeyToRemote, $aCheckRemote, 'IN');
 			$oSet = new DBObjectSet($oSearch);
-			/** @var Int[] $aExistingRemote */
-			$aExistingRemote = $oSet->GetColumnAsArray($sExtKeyToRemote);
+			$aExistingRemote = $oSet->GetColumnAsArray($sExtKeyToRemote, true);
 		}
 
 		// Write the links according to the existing links
@@ -536,11 +638,28 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 			{
 				if (count($aCheckRemote) > 0)
 				{
-					if (in_array($oLink->Get($sExtKeyToRemote), $aExistingRemote))
-					{
-						// Do not create a duplicate
-						continue;
-					}
+				    $bIsDuplicate = false;
+				    foreach($aExistingRemote as $sLinkKey => $sExtKey)
+                    {
+                        if ($sExtKey == $oLink->Get($sExtKeyToRemote))
+                        {
+                            // Do not create a duplicate
+                            // + In the case of a remove action followed by an add action
+                            // of an existing link,
+                            // the final state to consider is add action,
+                            // so suppress the entry in the removed list.
+                            if (array_key_exists($sLinkKey, $this->aRemoved))
+                            {
+                                unset($this->aRemoved[$sLinkKey]);
+                            }
+                            $bIsDuplicate = true;
+                            break;
+                        }
+                    }
+                    if ($bIsDuplicate)
+                    {
+                        continue;
+                    }
 				}
 
 			}
@@ -598,4 +717,34 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		//
 		$oMtx->Unlock();
 	}
+
+	public function ToDBObjectSet($bShowObsolete = true)
+	{
+		$oAttDef = MetaModel::GetAttributeDef($this->sHostClass, $this->sAttCode);
+		$oLinkSearch = $this->GetFilter();
+		if ($oAttDef->IsIndirect())
+		{
+			$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+			$oLinkingAttDef = MetaModel::GetAttributeDef($this->sClass, $sExtKeyToRemote);
+			$sTargetClass = $oLinkingAttDef->GetTargetClass();
+			if (!$bShowObsolete && MetaModel::IsObsoletable($sTargetClass))
+			{
+				$oNotObsolete = new BinaryExpression(
+					new FieldExpression('obsolescence_flag', $sTargetClass),
+					'=',
+					new ScalarExpression(0)
+				);
+				$oNotObsoleteRemote = new DBObjectSearch($sTargetClass);
+				$oNotObsoleteRemote->AddConditionExpression($oNotObsolete);
+				$oLinkSearch->AddCondition_PointingTo($oNotObsoleteRemote, $sExtKeyToRemote);
+			}
+		}
+		$oLinkSet = new DBObjectSet($oLinkSearch);
+		$oLinkSet->SetShowObsoleteData($bShowObsolete);
+		if ($this->HasDelta())
+		{
+			$oLinkSet->AddObjectArray($this->aAdded);
+		}
+		return $oLinkSet;
+	}
 }

core/pdfbulkexport.class.inc.php

@@ -226,9 +226,9 @@ EOF
 							$iNewWidth = $iWidth * $fScale;
 							$iNewHeight = $iHeight * $fScale;
 
-							$sUrl = 'data:' . $value->GetMimeType() . ';base64,' . base64_encode($value->GetData());
+							$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
 						}
-						$sRet = '<img src="' . $sUrl . '" style="width: ' . $iNewWidth . 'px; height: ' . $iNewHeight . 'px">';
+						$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="width: '.$iNewWidth.'px; height: '.$iNewHeight.'px">' : '';
 						$sRet = '<div class="view-image">'.$sRet.'</div>';
 					}
 					else

core/querybuildercontext.class.inc.php

@@ -34,10 +34,10 @@ class QueryBuilderContext
 
 	public $m_oQBExpressions;
 
-	public function __construct($oFilter, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null)
+	public function __construct($oFilter, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
 	{
 		$this->m_oRootFilter = $oFilter;
-		$this->m_oQBExpressions = new QueryBuilderExpressions($oFilter, $aGroupByExpr);
+		$this->m_oQBExpressions = new QueryBuilderExpressions($oFilter, $aGroupByExpr, $aSelectExpr);
 
 		$this->m_aClassAliases = $oFilter->GetJoinedClasses();
 		$this->m_aTableAliases = array();

core/relationgraph.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2015-2017 Combodo SARL
+// Copyright (C) 2015-2018 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -15,10 +15,12 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
 /**
  * Data structures (i.e. PHP classes) to build and use relation graphs
  *
- * @copyright   Copyright (C) 2015-2017 Combodo SARL
+ * @copyright   Copyright (C) 2015-2018 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  * 
  */
@@ -38,8 +40,12 @@ class RelationObjectNode extends GraphNode
 	}
 
 	/**
-	 * Make a normalized ID to ensure the uniqueness of such a node	
-	 */	
+	 * Make a normalized ID to ensure the uniqueness of such a node
+	 *
+	 * @param string $oObject
+	 *
+	 * @return string
+	 */
 	public static function MakeId($oObject)
 	{
 		return get_class($oObject).'::'.$oObject->GetKey();
@@ -47,7 +53,11 @@ class RelationObjectNode extends GraphNode
 
 	/**
 	 * Formatting for GraphViz
-	 */	 	
+	 *
+	 * @param bool $bNoLabel
+	 *
+	 * @return string
+	 */
 	public function GetDotAttributes($bNoLabel = false)
 	{
 		$sDot = parent::GetDotAttributes();
@@ -76,7 +86,10 @@ class RelationObjectNode extends GraphNode
 
 	/**
 	 * Recursively mark the objects nodes as reached, unless we get stopped by a redundancy node or a 'not allowed' node
-	 */	 	
+	 *
+	 * @param string $sProperty
+	 * @param $value
+	 */
 	public function ReachDown($sProperty, $value)
 	{
 		if (is_null($this->GetProperty($sProperty)) && ($this->GetProperty($sProperty.'_allowed') !== false))
@@ -104,8 +117,15 @@ class RelationRedundancyNode extends GraphNode
 	}
 
 	/**
-	 * Make a normalized ID to ensure the uniqueness of such a node	
-	 */	
+	 * Make a normalized ID to ensure the uniqueness of such a node
+	 *
+	 * @param string $sRelCode
+	 * @param string $sNeighbourId
+	 * @param $oSourceObject
+	 * @param \DBObject $oSinkObject
+	 *
+	 * @return string
+	 */
 	public static function MakeId($sRelCode, $sNeighbourId, $oSourceObject, $oSinkObject)
 	{
 		return 'redundancy-'.$sRelCode.'-'.$sNeighbourId.'-'.get_class($oSinkObject).'::'.$oSinkObject->GetKey();
@@ -113,7 +133,11 @@ class RelationRedundancyNode extends GraphNode
 
 	/**
 	 * Formatting for GraphViz
-	 */	 	
+	 *
+	 * @param bool $bNoLabel
+	 *
+	 * @return string
+	 */
 	public function GetDotAttributes($bNoLabel = false)
 	{
 		$sDisplayThreshold = sprintf('%.1f', $this->GetProperty('threshold'));
@@ -123,7 +147,10 @@ class RelationRedundancyNode extends GraphNode
 
 	/**
 	 * Recursively mark the objects nodes as reached, unless we get stopped by a redundancy node
-	 */	 	
+	 *
+	 * @param string $sProperty
+	 * @param $value
+	 */
 	public function ReachDown($sProperty, $value)
 	{
 		$this->SetProperty($sProperty.'_count', $this->GetProperty($sProperty.'_count', 0) + 1);
@@ -145,6 +172,16 @@ class RelationRedundancyNode extends GraphNode
  */ 
 class RelationEdge extends GraphEdge
 {
+	/**
+	 * RelationEdge constructor.
+	 *
+	 * @param \SimpleGraph $oGraph
+	 * @param \GraphNode $oSourceNode
+	 * @param \GraphNode $oSinkNode
+	 * @param bool $bMustBeUnique
+	 *
+	 * @throws \SimpleGraphException
+	 */
 	public function __construct(SimpleGraph $oGraph, GraphNode $oSourceNode, GraphNode $oSinkNode, $bMustBeUnique = false)
 	{
 		$sId = $oSourceNode->GetId().'-to-'.$oSinkNode->GetId();
@@ -182,7 +219,9 @@ class RelationGraph extends SimpleGraph
 
 	/**
 	 * Add an object that will be the starting point for building the relations downstream
-	 */	 	
+	 *
+	 * @param \DBObject $oObject
+	 */
 	public function AddSourceObject(DBObject $oObject)
 	{
 		$oSourceNode = new RelationObjectNode($this, $oObject);
@@ -192,22 +231,28 @@ class RelationGraph extends SimpleGraph
 
 	/**
 	 * Add an object that will be the starting point for building the relations uptream
-	 */	 	
+	 *
+	 * @param \DBObject $oObject
+	 */
 	public function AddSinkObject(DBObject$oObject)
 	{
 		$oSinkNode = new RelationObjectNode($this, $oObject);
 		$oSinkNode->SetProperty('sink', true);
 		$this->aSinkNodes[$oSinkNode->GetId()] = $oSinkNode;
 	}
-	
+
 	/**
 	 * Add a 'context' OQL query, specifying extra objects to be marked as 'is_reached'
 	 * even though they are not part of the sources.
-	 * @param string $sOQL The OQL query defining the context objects 
+	 *
+	 * @param string $key
+	 * @param string $sOQL The OQL query defining the context objects
+	 *
+	 * @throws \Exception
 	 */
 	public function AddContextQuery($key, $sOQL)
 	{
-		if ($sOQL === '') return;
+		if ($sOQL === '') { return;}
 		
 		$oSearch = static::MakeSearch($sOQL);
 		$aAliases = $oSearch->GetSelectedClasses();
@@ -217,7 +262,6 @@ class RelationGraph extends SimpleGraph
 			throw new Exception("Invalid context query '$sOQL'. A context query must contain at least two columns. Columns: ".implode(', ', $aAliases).'. ');
 		}
 		$aAliasNames = array_keys($aAliases);
-		$sClassAlias = $oSearch->GetClassAlias();
 		$oCondition = new BinaryExpression(new FieldExpression('id', $aAliasNames[0]), '=', new VariableExpression('id'));
 		$oSearch->AddConditionExpression($oCondition);
 		
@@ -228,11 +272,14 @@ class RelationGraph extends SimpleGraph
 		}
 		$this->aContextSearches[$sClass][] = array('key' => $key, 'search' => $oSearch);
 	}
-	
+
 	/**
 	 * Determines if the given DBObject is part of a 'context'
+	 *
 	 * @param DBObject $oObj
+	 *
 	 * @return boolean
+	 * @throws \CoreException
 	 */
 	public function IsPartOfContext(DBObject $oObj, &$aRootCauses)
 	{
@@ -271,7 +318,15 @@ class RelationGraph extends SimpleGraph
 
 	/**
 	 * Build the graph downstream, and mark the nodes that can be reached from the source node
-	 */	 	
+	 *
+	 * @param string $sRelCode
+	 * @param int $iMaxDepth
+	 * @param bool $bEnableRedundancy
+	 * @param array $aUnreachableObjects
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public function ComputeRelatedObjectsDown($sRelCode, $iMaxDepth, $bEnableRedundancy, $aUnreachableObjects = array())
 	{
 		//echo "<h5>Sources only...</h5>\n".$this->DumpAsHtmlImage()."<br/>\n";
@@ -316,7 +371,14 @@ class RelationGraph extends SimpleGraph
 
 	/**
 	 * Build the graph upstream
-	 */	 	
+	 *
+	 * @param string $sRelCode
+	 * @param int $iMaxDepth
+	 * @param bool $bEnableRedundancy
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public function ComputeRelatedObjectsUp($sRelCode, $iMaxDepth, $bEnableRedundancy)
 	{
 		//echo "<h5>Sinks only...</h5>\n".$this->DumpAsHtmlImage()."<br/>\n";
@@ -344,14 +406,14 @@ class RelationGraph extends SimpleGraph
 
 	/**
 	 * Recursively find related objects, and add them into the graph
-	 * 
+	 *
 	 * @param string $sRelCode The code of the relation to use for the computation
 	 * @param boolean $bDown The direction: downstream or upstream
-	 * @param array $oObjectNode The node from which to compute the neighbours
+	 * @param \GraphElement $oObjectNode The node from which to compute the neighbours
 	 * @param int $iMaxDepth
-	 * @param boolean $bEnableReduncancy
-	 * 
-	 * @return void
+	 * @param boolean $bEnableRedundancy
+	 *
+	 * @throws \Exception
 	 */
 	protected function AddRelatedObjects($sRelCode, $bDown, $oObjectNode, $iMaxDepth, $bEnableRedundancy)
 	{
@@ -359,7 +421,7 @@ class RelationGraph extends SimpleGraph
 		{
 			if ($oObjectNode instanceof RelationRedundancyNode)
 			{
-				// Note: this happens when recursing on an existing part of the graph 
+				// Note: this happens when recursing on an existing part of the graph
 				// Skip that redundancy node
 				$aRelatedEdges = $bDown ? $oObjectNode->GetOutgoingEdges() : $oObjectNode->GetIncomingEdges();
 				foreach ($aRelatedEdges as $oRelatedEdge)
@@ -371,15 +433,19 @@ class RelationGraph extends SimpleGraph
 			}
 			elseif ($oObjectNode->GetProperty('developped', false))
 			{
-				// No need to execute the queries again... just dig into the nodes down/up to iMaxDepth
-				//
-				$aRelatedEdges = $bDown ? $oObjectNode->GetOutgoingEdges() : $oObjectNode->GetIncomingEdges();
-				foreach ($aRelatedEdges as $oRelatedEdge)
-				{
-					$oRelatedNode = $bDown ? $oRelatedEdge->GetSinkNode() : $oRelatedEdge->GetSourceNode();
-					// Recurse (decrement the depth)
-					$this->AddRelatedObjects($sRelCode, $bDown, $oRelatedNode, $iMaxDepth - 1, $bEnableRedundancy);
-				}
+				// No need to explore the underlying graph at all. We can stop here since the node has already been developped.
+				// Otherwise in case of "loops" in the graph we would recurse up to the max depth limit
+				// without producing any difference in the resulting graph... but potentially taking a LOOOONG time.
+				return;
+				
+				// Former code was
+				//$aRelatedEdges = $bDown ? $oObjectNode->GetOutgoingEdges() : $oObjectNode->GetIncomingEdges();
+				//foreach ($aRelatedEdges as $oRelatedEdge)
+				//{
+				//	$oRelatedNode = $bDown ? $oRelatedEdge->GetSinkNode() : $oRelatedEdge->GetSourceNode();
+				//	// Recurse (decrement the depth)
+				//	$this->AddRelatedObjects($sRelCode, $bDown, $oRelatedNode, $iMaxDepth - 1, $bEnableRedundancy);
+				//}
 			}
 			else
 			{
@@ -441,8 +507,16 @@ class RelationGraph extends SimpleGraph
 	}
 
 	/**
-	 * Determine if there is a redundancy (or use the existing one) and add the corresponding nodes/edges	
-	 */	
+	 * Determine if there is a redundancy (or use the existing one) and add the corresponding nodes/edges
+	 *
+	 * @param string $sRelCode
+	 * @param array $aQueryInfo
+	 * @param GraphElement $oFromNode
+	 * @param GraphElement $oToNode
+	 *
+	 * @return \GraphNode|NULL|\RelationRedundancyNode
+	 * @throws \Exception
+	 */
 	protected function ComputeRedundancy($sRelCode, $aQueryInfo, $oFromNode, $oToNode)
 	{
 		$oRedundancyNode = null;
@@ -493,8 +567,14 @@ class RelationGraph extends SimpleGraph
 	}
 
 	/**
-	 * Helper to determine the redundancy setting on a given relation	
-	 */	
+	 * Helper to determine the redundancy setting on a given relation
+	 *
+	 * @param string $sRelCode
+	 * @param array $aQueryInfo
+	 * @param GraphElement $oToNode
+	 *
+	 * @return bool
+	 */
 	protected function IsRedundancyEnabled($sRelCode, $aQueryInfo, $oToNode)
 	{
 		$bRet = false;
@@ -509,8 +589,15 @@ class RelationGraph extends SimpleGraph
 	}
 
 	/**
-	 * Helper to determine the redundancy threshold, given the count of objects upstream 	
-	 */	
+	 * Helper to determine the redundancy threshold, given the count of objects upstream
+	 *
+	 * @param string $sRelCode
+	 * @param array $aQueryInfo
+	 * @param GraphElement $oToNode
+	 * @param int $iUpstreamObjects
+	 *
+	 * @return int
+	 */
 	protected function GetRedundancyMinUp($sRelCode, $aQueryInfo, $oToNode, $iUpstreamObjects)
 	{
 		$iMinUp = 0;
@@ -533,8 +620,14 @@ class RelationGraph extends SimpleGraph
 	}
 
 	/**
-	 * Helper to search for the redundancy attribute	
-	 */	
+	 * Helper to search for the redundancy attribute
+	 *
+	 * @param string $sRelCode
+	 * @param array $aQueryInfo
+	 * @param string $sClass
+	 *
+	 * @return \AttributeDefinition|\AttributeRedundancySettings|null
+	 */
 	protected function FindRedundancyAttribute($sRelCode, $aQueryInfo, $sClass)
 	{
 		$oRet = null;
@@ -560,7 +653,7 @@ class RelationGraph extends SimpleGraph
 	
 	/**
 	 * Get the objects referenced by the graph as a hash array: 'class' => array of objects
-	 * @return Ambigous <multitype:multitype: , unknown>
+	 * @return array Ambigous <multitype:multitype: , unknown>
 	 */
 	public function GetObjectsByClass()
 	{
@@ -580,8 +673,15 @@ class RelationGraph extends SimpleGraph
 			}
 		}
 		return $aResults;		
-	}	
+	}
 
+	/**
+	 * @param string $sOQL
+	 *
+	 * @return \DBSearch
+	 * @throws \CoreException
+	 * @throws \OQLException
+	 */
 	protected static function MakeSearch($sOQL)
 	{
 		$oSearch = DBSearch::FromOQL($sOQL);

core/spreadsheetbulkexport.class.inc.php

@@ -175,7 +175,8 @@ EOF
 				}
 				elseif ($oAttDef instanceof AttributeCustomFields)
 				{
-					$sRet = $oObj->GetAsHTML($sAttCode);
+					// Stick to the weird implementation made in GetNextChunk
+					$sRet = utils::TextToHtml($oObj->GetEditValue($sAttCode));
 				}
 				else
 				{
@@ -326,6 +327,12 @@ EOF
 							}
 							$sData .= "<td x:str>$sField</td>";
 						}
+						elseif ($oAttDef instanceof AttributeCustomFields)
+						{
+							// GetAsHTML returns a table that would not fit
+							$sField = utils::TextToHtml($oObj->GetEditValue($sAttCode));
+							$sData .= "<td x:str>$sField</td>";
+						}
 						else if($oAttDef instanceof AttributeString)
 						{
 							$sField = $oObj->GetAsHTML($sAttCode, $this->bLocalizeOutput);

core/sqlobjectquery.class.inc.php

@@ -36,7 +36,8 @@
 
 class SQLObjectQuery extends SQLQuery
 {
-	private $m_SourceOQL = '';
+	public $m_aContextData = null;
+	public $m_iOriginalTableCount = 0;
 	private $m_sTable = '';
 	private $m_sTableAlias = '';
 	private $m_aFields = array();
@@ -46,7 +47,7 @@ class SQLObjectQuery extends SQLQuery
 	private $m_aValues = array(); // Values to set in case of an update query
 	private $m_oSelectedIdField = null;
 	private $m_aJoinSelects = array();
-	private $m_bBeautifulQuery = false;
+	protected $m_bBeautifulQuery = false;
 
 	// Data set by PrepareRendering()
 	private $__aFrom;
@@ -244,6 +245,12 @@ class SQLObjectQuery extends SQLQuery
 	}
 	
 	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @return string
+	 * @throws CoreException
+	 */
 	public function RenderDelete($aArgs = array())
 	{
 		$this->PrepareRendering();
@@ -269,6 +276,7 @@ class SQLObjectQuery extends SQLQuery
 			$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
 			return "DELETE $sDelete FROM $sFrom WHERE $sWhere";
 		}
+		return '';
 	}
 
 	/**
@@ -282,16 +290,25 @@ class SQLObjectQuery extends SQLQuery
 	}
 
 	/**
-	 *	Needed for the unions
+	 *    Needed for the unions
+	 * @param $aOrderBy
+	 * @return string
+	 * @throws CoreException
 	 */
 	public function RenderOrderByClause($aOrderBy)
 	{
 		$this->PrepareRendering();
-		$sOrderBy = self::ClauseOrderBy($aOrderBy);
+		$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
 		return $sOrderBy;
 	}
 
 	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @return string
+	 * @throws CoreException
+	 */
 	public function RenderUpdate($aArgs = array())
 	{
 		$this->PrepareRendering();
@@ -302,6 +319,17 @@ class SQLObjectQuery extends SQLQuery
 	}
 
 	// Interface, build the SQL query
+
+	/**
+	 * @param array $aOrderBy
+	 * @param array $aArgs
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @param bool $bGetCount
+	 * @param bool $bBeautifulQuery
+	 * @return string
+	 * @throws CoreException
+	 */
 	public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false)
 	{
 		$this->m_bBeautifulQuery = $bBeautifulQuery;
@@ -311,6 +339,14 @@ class SQLObjectQuery extends SQLQuery
 		$this->PrepareRendering();
 		$sFrom   = self::ClauseFrom($this->__aFrom, $sIndent);
 		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
 		if ($bGetCount)
 		{
 			if (count($this->__aSelectedIdFields) > 0)
@@ -321,47 +357,70 @@ class SQLObjectQuery extends SQLQuery
 					$aCountFields[] = "COALESCE($sFieldExpr, 0)"; // Null values are excluded from the count
 				}
 				$sCountFields = implode(', ', $aCountFields);
-				$sSQL = "SELECT$sLineSep COUNT(DISTINCT $sCountFields) AS COUNT$sLineSep FROM $sFrom$sLineSep WHERE $sWhere";
+				// Count can be limited for performance reason, in this case the total amount is not important,
+				// we only need to know if the number of entries is greater than a certain amount.
+				$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep DISTINCT $sCountFields $sLineSep FROM $sFrom$sLineSep WHERE $sWhere $sLimit) AS _tatooine_";
 			}
 			else
 			{
-				$sSQL = "SELECT$sLineSep COUNT(*) AS COUNT$sLineSep FROM $sFrom$sLineSep WHERE $sWhere";
+				$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep WHERE $sWhere $sLimit) AS _tatooine_";
 			}
 		}
 		else
 		{
-			$sSelect = self::ClauseSelect($this->__aFields);
-			$sOrderBy = self::ClauseOrderBy($aOrderBy);
+			$sSelect = self::ClauseSelect($this->__aFields, $sLineSep);
+			$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
 			if (!empty($sOrderBy))
 			{
 				$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
 			}
-			if ($iLimitCount > 0)
-			{
-				$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
-			}
-			else
-			{
-				$sLimit = '';
-			}
+
 			$sSQL = "SELECT$sLineSep DISTINCT $sSelect$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep $sOrderBy $sLimit";
 		}
 		return $sSQL;
 	}
 
 	// Interface, build the SQL query
-	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false)
+
+	/**
+	 * @param array $aArgs
+	 * @param bool $bBeautifulQuery
+	 * @param array $aOrderBy
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false, $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0)
 	{
 		$this->m_bBeautifulQuery = $bBeautifulQuery;
 		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
 		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
 
 		$this->PrepareRendering();
+
 		$sSelect = self::ClauseSelect($this->__aFields);
 		$sFrom   = self::ClauseFrom($this->__aFrom, $sIndent);
 		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
 		$sGroupBy = self::ClauseGroupBy($this->__aGroupBy);
-		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep GROUP BY $sGroupBy";
+		$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
+		if (!empty($sGroupBy))
+		{
+			$sGroupBy = "GROUP BY $sGroupBy$sLineSep";
+		}
+		if (!empty($sOrderBy))
+		{
+			$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
+		}
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep $sGroupBy $sOrderBy$sLineSep $sLimit";
 		return $sSQL;
 	}
 
@@ -384,6 +443,7 @@ class SQLObjectQuery extends SQLQuery
 	private function PrepareSingleTable(SQLObjectQuery $oRootQuery, &$aFrom, $sCallerAlias = '', $aJoinData)
 	{
 		$aTranslationTable[$this->m_sTable]['*'] = $this->m_sTableAlias;
+		$sJoinCond = '';
 
 		// Handle the various kinds of join (or first table in the list)
 		//
@@ -501,7 +561,7 @@ class SQLObjectQuery extends SQLQuery
 		{
 			$oRightSelect = $aJoinData["select"];
 
-			$sJoinTableAlias = $oRightSelect->PrepareSingleTable($oRootQuery, $aTempFrom, $this->m_sTableAlias, $aJoinData);
+			$oRightSelect->PrepareSingleTable($oRootQuery, $aTempFrom, $this->m_sTableAlias, $aJoinData);
 		}
 		$aFrom[$this->m_sTableAlias]['subfrom'] = $aTempFrom;
 
@@ -510,6 +570,7 @@ class SQLObjectQuery extends SQLQuery
 
 	public function OptimizeJoins($aUsedTables, $bTopCall = true)
 	{
+		$this->m_iOriginalTableCount = $this->CountTables();
 		if ($bTopCall)
 		{
 			// Top call: complete the list of tables absolutely required to perform the right query
@@ -545,7 +606,7 @@ class SQLObjectQuery extends SQLQuery
 		return $iRet;
 	}
 
-	protected function CollectUsedTables(&$aTables)
+	public function CollectUsedTables(&$aTables)
 	{
 		$this->m_oConditionExpr->CollectUsedParents($aTables);
 		foreach($this->m_aFields as $sFieldAlias => $oField)
@@ -576,7 +637,7 @@ class SQLObjectQuery extends SQLQuery
 				}
 				if (isset($aJoinInfo["on_expression"]))
 				{
-					$sJoinCond = $aJoinInfo["on_expression"]->CollectUsedParents($aTables);
+					$aJoinInfo["on_expression"]->CollectUsedParents($aTables);
 				}
 			}
 		}
@@ -604,7 +665,7 @@ class SQLObjectQuery extends SQLQuery
 				}
 				if (isset($aJoinInfo["on_expression"]))
 				{
-					$sJoinCond = $aJoinInfo["on_expression"]->CollectUsedParents($aTables);
+					$aJoinInfo["on_expression"]->CollectUsedParents($aTables);
 				}
 				$bResult = true;
 			}
@@ -612,4 +673,5 @@ class SQLObjectQuery extends SQLQuery
 		// None of the tables is in the list of required tables
 		return $bResult;
 	}
+
 }

core/sqlquery.class.inc.php

@@ -39,7 +39,7 @@ require_once('cmdbsource.class.inc.php');
 abstract class SQLQuery
 {
 	private $m_SourceOQL = '';
-	private $m_bBeautifulQuery = false;
+	protected $m_bBeautifulQuery = false;
 
 	public function __construct()
 	{
@@ -69,18 +69,18 @@ abstract class SQLQuery
 	abstract public function RenderDelete($aArgs = array());
 	abstract public function RenderUpdate($aArgs = array());
 	abstract public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false);
-	abstract public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false);
+	abstract public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false,  $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0);
 
 	abstract public function OptimizeJoins($aUsedTables, $bTopCall = true);
 
-	protected static function ClauseSelect($aFields)
+	protected static function ClauseSelect($aFields, $sLineSep = '')
 	{
 		$aSelect = array();
 		foreach ($aFields as $sFieldAlias => $sSQLExpr)
 		{
 			$aSelect[] = "$sSQLExpr AS $sFieldAlias";
 		}
-		$sSelect = implode(', ', $aSelect);
+		$sSelect = implode(",$sLineSep ", $aSelect);
 		return $sSelect;
 	}
 
@@ -101,6 +101,13 @@ abstract class SQLQuery
 		return $sDelTables;
 	}
 
+	/**
+	 * @param $aFrom
+	 * @param null $sIndent
+	 * @param int $iIndentLevel
+	 * @return string
+	 * @throws CoreException
+	 */
 	protected static function ClauseFrom($aFrom, $sIndent = null, $iIndentLevel = 0)
 	{
 		$sLineBreakLong = $sIndent ? "\n".str_repeat($sIndent, $iIndentLevel + 1) : '';
@@ -174,7 +181,13 @@ abstract class SQLQuery
 		}
 	}
 
-	protected static function ClauseOrderBy($aOrderBy)
+	/**
+	 * @param array $aOrderBy
+	 * @param array $aExistingFields
+	 * @return string
+	 * @throws CoreException
+	 */
+	protected static function ClauseOrderBy($aOrderBy, $aExistingFields)
 	{
 		$aOrderBySpec = array();
 		foreach($aOrderBy as $sFieldAlias => $bAscending)

core/sqlunionquery.class.inc.php

@@ -38,8 +38,9 @@ class SQLUnionQuery extends SQLQuery
 {
 	protected $aQueries;
 	protected $aGroupBy;
+	protected $aSelectExpr;
 
-	public function __construct($aQueries, $aGroupBy)
+	public function __construct($aQueries, $aGroupBy, $aSelectExpr = array())
 	{
 		parent::__construct();
 
@@ -49,6 +50,7 @@ class SQLUnionQuery extends SQLQuery
 			$this->aQueries[] = $oSQLQuery->DeepClone();
 		}
 		$this->aGroupBy = $aGroupBy;
+		$this->aSelectExpr = $aSelectExpr;
 	}
 
 	public function DisplayHtml()
@@ -58,7 +60,7 @@ class SQLUnionQuery extends SQLQuery
 		{
 			$aQueriesHtml[] = '<p>'.$oSQLQuery->DisplayHtml().'</p>';
 		}
-		echo implode('UNION', $aQueries);
+		echo implode('UNION', $aQueriesHtml);
 	}
 
 	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '')
@@ -69,12 +71,21 @@ class SQLUnionQuery extends SQLQuery
 		}
 	}
 
+	/**
+	 * @param array $aArgs
+	 * @throws Exception
+	 */
 	public function RenderDelete($aArgs = array())
 	{
 		throw new Exception(__class__.'::'.__function__.'Not implemented !');
 	}
 
 	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @throws Exception
+	 */
 	public function RenderUpdate($aArgs = array())
 	{
 		throw new Exception(__class__.'::'.__function__.'Not implemented !');
@@ -85,7 +96,6 @@ class SQLUnionQuery extends SQLQuery
 	{
 		$this->m_bBeautifulQuery = $bBeautifulQuery;
 		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
-		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
 
 		$aSelects = array();
 		foreach ($this->aQueries as $oSQLQuery)
@@ -93,46 +103,52 @@ class SQLUnionQuery extends SQLQuery
 			// Render SELECTS without orderby/limit/count
 			$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
 		}
-		$sSelects = '('.implode(")$sLineSep UNION$sLineSep(", $aSelects).')';
-
-		if ($bGetCount)
+		if ($iLimitCount > 0)
 		{
-			$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
-			$sSQL = "SELECT$sLineSep COUNT(*) AS COUNT$sLineSep FROM $sFrom$sLineSep";
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+
+		if ($bGetCount)
+		{
+			$sSelects = '('.implode(" $sLimit)$sLineSep UNION$sLineSep(", $aSelects)." $sLimit)";
+			$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
+			$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep) AS _union_tatooine_";
 		}
 		else
 		{
-			$aSelects = array();
-			foreach ($this->aQueries as $oSQLQuery)
-			{
-				// Render SELECT without orderby/limit/count
-				$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
-			}
-			$sSelect = $this->aQueries[0]->RenderSelectClause();
 			$sOrderBy = $this->aQueries[0]->RenderOrderByClause($aOrderBy);
 			if (!empty($sOrderBy))
 			{
-				$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
-			}
-			if ($iLimitCount > 0)
-			{
-				$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+				$sOrderBy = "ORDER BY $sOrderBy$sLineSep $sLimit";
+				$sSQL = '('.implode(")$sLineSep UNION$sLineSep (", $aSelects).')'.$sLineSep.$sOrderBy;
 			}
 			else
 			{
-				$sLimit = '';
+				$sSQL = '('.implode(" $sLimit)$sLineSep UNION$sLineSep (", $aSelects)." $sLimit)";
 			}
-			$sSQL = $sSelects.$sLineSep.$sOrderBy.' '.$sLimit;
 		}
 		return $sSQL;
 	}
 
 	// Interface, build the SQL query
-	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false)
+
+	/**
+	 * @param array $aArgs
+	 * @param bool $bBeautifulQuery
+	 * @param array $aOrderBy
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false, $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0)
 	{
 		$this->m_bBeautifulQuery = $bBeautifulQuery;
 		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
-		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
 
 		$aSelects = array();
 		foreach ($this->aQueries as $oSQLQuery)
@@ -143,15 +159,41 @@ class SQLUnionQuery extends SQLQuery
 		$sSelects = '('.implode(")$sLineSep UNION$sLineSep(", $aSelects).')';
 		$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
 
-		$aAliases = array();
+		$aSelectAliases = array();
+		$aGroupAliases = array();
 		foreach ($this->aGroupBy as $sGroupAlias => $trash)
 		{
-			$aAliases[] = "`$sGroupAlias`";
+			$aSelectAliases[$sGroupAlias] = "`$sGroupAlias`";
+			$aGroupAliases[] = "`$sGroupAlias`";
+		}
+		foreach($this->aSelectExpr as $sSelectAlias => $oExpr)
+		{
+			$aSelectAliases[$sSelectAlias] = $oExpr->Render()." AS `$sSelectAlias`";
 		}
-		$sSelect = implode(', ', $aAliases);
-		$sGroupBy = implode(', ', $aAliases);
 
-		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep GROUP BY $sGroupBy";
+		$sSelect = implode(",$sLineSep ", $aSelectAliases);
+		$sGroupBy = implode(', ', $aGroupAliases);
+
+		$sOrderBy = self::ClauseOrderBy($aOrderBy, $aSelectAliases);
+		if (!empty($sGroupBy))
+		{
+			$sGroupBy = "GROUP BY $sGroupBy$sLineSep";
+		}
+		if (!empty($sOrderBy))
+		{
+			$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
+		}
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+
+
+		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep $sGroupBy $sOrderBy$sLineSep $sLimit";
 		return $sSQL;
 	}
 

core/tabularbulkexport.class.inc.php

@@ -188,7 +188,7 @@ abstract class TabularBulkExport extends BulkExport
 		$aAuthorizedClasses = array();
 		foreach($aSelectedClasses as $sAlias => $sClassName)
 		{
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ, $oSet) != UR_ALLOWED_NO)
 			{
 				$aAuthorizedClasses[$sAlias] = $sClassName;
 			}

core/trigger.class.inc.php

@@ -38,7 +38,7 @@ abstract class Trigger extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -97,7 +97,7 @@ abstract class TriggerOnObject extends Trigger
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -116,8 +116,8 @@ abstract class TriggerOnObject extends Trigger
 		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('default_search', array('description', 'target_class'));  // Default criteria of the search banner
+//		MetaModel::Init_SetZListItems('standard_search', array('name', 'target_class', 'description')); // Criteria of the search form
 	}
 
 	public function DoCheckToWrite()
@@ -194,7 +194,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -220,7 +220,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb",
+			"category" => "grant_by_profile,core/cmdb",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -249,7 +249,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -277,7 +277,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -305,7 +305,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
@@ -333,7 +333,7 @@ class lnkTriggerAction extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -366,7 +366,7 @@ class TriggerOnThresholdReached extends TriggerOnObject
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,application",
+			"category" => "grant_by_profile,core/cmdb,application",
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",

core/userrights.class.inc.php

@@ -168,7 +168,7 @@ abstract class User extends cmdbAbstractObject
 	{
 		$aParams = array
 		(
-			"category" => "core",
+			"category" => "core,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "login",
 			"state_attcode" => "",
@@ -185,6 +185,7 @@ abstract class User extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeExternalField("last_name", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"name")));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("first_name", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"first_name")));
 		MetaModel::Init_AddAttribute(new AttributeExternalField("email", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"org_id")));
 
 		MetaModel::Init_AddAttribute(new AttributeString("login", array("allowed_values"=>null, "sql"=>"login", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
@@ -195,11 +196,11 @@ abstract class User extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class"=>"URP_UserOrg", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"allowed_org_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'first_name', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'login', 'status')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Unused as it's an abstract class !
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('login', 'contactid')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'email', 'language', 'status', 'org_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('login', 'contactid', 'org_id')); // Default criteria of the search banner
 	}
 
 	abstract public function CheckCredentials($sPassword);
@@ -240,7 +241,7 @@ abstract class User extends cmdbAbstractObject
 	protected $oContactObject;
 
 	/**
-	 * Fetch and memoize the associated contact (if any)
+	 * Fetch and memorize the associated contact (if any)
 	 */
 	public function GetContactObject()
 	{
@@ -254,9 +255,11 @@ abstract class User extends cmdbAbstractObject
 		return $this->oContactObject;
 	}
 
-	/*
-	* Overload the standard behavior
-	*/	
+	/**
+	 * Overload the standard behavior.
+	 *
+	 * @throws \CoreException
+	 */
 	public function DoCheckToWrite()
 	{
 		parent::DoCheckToWrite();
@@ -280,11 +283,57 @@ abstract class User extends cmdbAbstractObject
 				}
 			}
 		}
-		// Check that this user has at least one profile assigned
-		$oSet = $this->Get('profile_list');
-		if ($oSet->Count() == 0)
+		// Check that this user has at least one profile assigned when profiles have changed
+		if (array_key_exists('profile_list', $aChanges))
 		{
-			$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneProfileIsNeeded');
+			$oSet = $this->Get('profile_list');
+			if ($oSet->Count() == 0)
+			{
+				$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneProfileIsNeeded');
+			}
+		}
+		// Only administrators can manage administrators
+		if (UserRights::IsAdministrator($this) && !UserRights::IsAdministrator())
+		{
+			$this->m_aCheckIssues[] = Dict::Format('UI:Login:Error:AccessRestricted');
+		}
+
+		if (!UserRights::IsAdministrator())
+		{
+			$oUser = UserRights::GetUserObject();
+			$oAddon = UserRights::GetModuleInstance();
+			if (!is_null($oUser) && method_exists($oAddon, 'GetUserOrgs'))
+			{
+				$aOrgs = $oAddon->GetUserOrgs($oUser, '');
+				if (count($aOrgs) > 0)
+				{
+					// Check that the modified User belongs to one of our organization
+					if (!in_array($this->GetOriginal('org_id'), $aOrgs) || !in_array($this->Get('org_id'), $aOrgs))
+					{
+						$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:UserOrganizationNotAllowed');
+					}
+					// Check users with restricted organizations when allowed organizations have changed
+					if ($this->IsNew() || array_key_exists('allowed_org_list', $aChanges))
+					{
+						$oSet = $this->get('allowed_org_list');
+						if ($oSet->Count() == 0)
+						{
+							$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneOrganizationIsNeeded');
+						}
+						else
+						{
+							$aModifiedLinks = $oSet->ListModifiedLinks();
+							foreach($aModifiedLinks as $oLink)
+							{
+								if (!in_array($oLink->Get('allowed_org_id'), $aOrgs))
+								{
+									$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:OrganizationNotAllowed');
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 
@@ -338,6 +387,8 @@ abstract class User extends cmdbAbstractObject
 				'bulkread' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_READ),
 				'write' => $this->GetGrantAsHtml($sClass, UR_ACTION_MODIFY),
 				'bulkwrite' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_MODIFY),
+				'delete' => $this->GetGrantAsHtml($sClass, UR_ACTION_DELETE),
+				'bulkdelete' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_DELETE),
 				'stimuli' => $sStimuli,
 			);
 		}
@@ -350,6 +401,8 @@ abstract class User extends cmdbAbstractObject
 		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
 		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
 		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
+		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
+		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
 		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
 		$oPage->table($aDisplayConfig, $aDisplayData);
 	}
@@ -360,8 +413,8 @@ abstract class User extends cmdbAbstractObject
 		if (!$bEditMode)
 		{
 			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage, 'bizmodel');
-	
+			$this->DoShowGrantSumary($oPage, 'bizmodel,grant_by_profile');
+
 			// debug
 			if (false)
 			{
@@ -418,7 +471,7 @@ abstract class UserInternal extends User
 	{
 		$aParams = array
 		(
-			"category" => "core",
+			"category" => "core,grant_by_profile",
 			"key_type" => "autoincrement",
 			"name_attcode" => "login",
 			"state_attcode" => "",
@@ -434,11 +487,10 @@ abstract class UserInternal extends User
 		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("reset_pwd_token", array("allowed_values"=>null, "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'first_name', 'email', 'login', 'status', 'language', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'login', 'status')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'status', 'language', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('login', 'contactid')); // Criteria of the advanced search form
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
 	}
 
 	/**
@@ -519,6 +571,7 @@ interface iSelfRegister
  */
 class UserRights
 {
+	/** @var UserRightsAddOnAPI $m_oAddOn */
 	protected static $m_oAddOn;
 	protected static $m_oUser;
 	protected static $m_oRealUser;
@@ -564,7 +617,7 @@ class UserRights
 		return $bRes;
 	}
 	
-	protected static function IsLoggedIn()
+	public static function IsLoggedIn()
 	{
 		if (self::$m_oUser == null)
 		{
@@ -706,6 +759,7 @@ class UserRights
 		}
 		else
 		{
+			$oUser->AllowWrite(true);
 			return $oUser->ChangePassword($sOldPassword, $sNewPassword);
 		}
 	}
@@ -918,35 +972,57 @@ class UserRights
 		return true;
 	}
 
+	/**
+	 * Add additional filter for organization silos to all the requests.
+	 *
+	 * @param $sClass
+	 * @param array $aSettings
+	 *
+	 * @return bool|\Expression
+	 */
 	public static function GetSelectFilter($sClass, $aSettings = array())
 	{
 		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) return true;
+		if (!self::CheckLogin()) {return true;}
 
-		if (self::IsAdministrator()) return true;
+		if (self::IsAdministrator()) {return true;}
 
-		if (MetaModel::HasCategory($sClass, 'bizmodel'))
+		try
 		{
-			return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings);
-		}
-		else
+			// Check Bug 1436 for details
+			if (MetaModel::HasCategory($sClass, 'bizmodel'))
+			{
+				return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings);
+			}
+			else
+			{
+				return true;
+			}
+		} catch (Exception $e)
 		{
-			return true;
+			return false;
 		}
 	}
 
-	public static function IsActionAllowed($sClass, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null, $oUser = null)
+	/**
+	 * @param string $sClass
+	 * @param int $iActionCode
+	 * @param DBObjectSet $oInstanceSet
+	 * @param User $oUser
+	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO|UR_ALLOWED_DEPENDS)
+	 */
+	public static function IsActionAllowed($sClass, $iActionCode, /*dbObjectSet*/$oInstanceSet = null, $oUser = null)
 	{
 		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) return true;
+		if (!self::CheckLogin()) return UR_ALLOWED_YES;
 
 		if (MetaModel::DBIsReadOnly())
 		{
-			if ($iActionCode == UR_ACTION_CREATE) return false;
-			if ($iActionCode == UR_ACTION_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_DELETE) return false;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return false;
+			if ($iActionCode == UR_ACTION_CREATE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_MODIFY) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
 		}
 
 		$aPredefinedObjects = call_user_func(array($sClass, 'GetPredefinedObjects'));
@@ -955,14 +1031,14 @@ class UserRights
 			// As opposed to the read-only DB, modifying an object is allowed
 			// (the constant columns will be marked as read-only)
 			//
-			if ($iActionCode == UR_ACTION_CREATE) return false;
-			if ($iActionCode == UR_ACTION_DELETE) return false;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return false;
+			if ($iActionCode == UR_ACTION_CREATE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
 		}
 
-		if (self::IsAdministrator($oUser)) return true;
+		if (self::IsAdministrator($oUser)) return UR_ALLOWED_YES;
 
-		if (MetaModel::HasCategory($sClass, 'bizmodel'))
+		if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile'))
 		{
 			if (is_null($oUser))
 			{
@@ -978,12 +1054,12 @@ class UserRights
 		}
 		elseif(($iActionCode == UR_ACTION_READ) && MetaModel::HasCategory($sClass, 'view_in_gui'))
 		{
-			return true;
+			return UR_ALLOWED_YES;
 		}
 		else
 		{
 			// Other classes could be edited/listed by the administrators
-			return false;
+			return UR_ALLOWED_NO;
 		}
 	}
 
@@ -1014,32 +1090,45 @@ class UserRights
 		}
 	}
 
-	public static function IsActionAllowedOnAttribute($sClass, $sAttCode, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null, $oUser = null)
+	/**
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 * @param int $iActionCode
+	 * @param DBObjectSet $oInstanceSet
+	 * @param User $oUser
+	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO)
+	 */
+	public static function IsActionAllowedOnAttribute($sClass, $sAttCode, $iActionCode, /*dbObjectSet*/$oInstanceSet = null, $oUser = null)
 	{
 		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) return true;
+		if (!self::CheckLogin()) return UR_ALLOWED_YES;
 
 		if (MetaModel::DBIsReadOnly())
 		{
-			if ($iActionCode == UR_ACTION_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_DELETE) return false;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return false;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return false;
+			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_MODIFY) return falUR_ALLOWED_NOse;
+			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
 		}
 
-		if (self::IsAdministrator($oUser)) return true;
+		if (self::IsAdministrator($oUser)) return UR_ALLOWED_YES;
+
+		if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile'))
+		{
+			if (is_null($oUser))
+			{
+				$oUser = self::$m_oUser;
+			}
+			return self::$m_oAddOn->IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet);
+		}
 
 		// this module is forbidden for non admins
-		if (MetaModel::HasCategory($sClass, 'addon/userrights')) return false;
+		if (MetaModel::HasCategory($sClass, 'addon/userrights')) return UR_ALLOWED_NO;
+
+		// the rest is allowed
+		return UR_ALLOWED_YES;
 
-		// the rest is allowed (#@# to be improved)
-		if (!MetaModel::HasCategory($sClass, 'bizmodel')) return true;
 
-		if (is_null($oUser))
-		{
-			$oUser = self::$m_oUser;
-		}
-		return self::$m_oAddOn->IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet);
 	}
 
 	protected static $m_aAdmins = array();
@@ -1153,7 +1242,7 @@ class UserRights
 			self::$m_aAdmins = array();
 			self::$m_aPortalUsers = array();
 		}
-		if (!isset($_SESSION))
+		if (!isset($_SESSION) && !utils::IsModeCLI())
 		{
 			session_name('itop-'.md5(APPROOT));
 			session_start();

core/valuesetdef.class.inc.php

@@ -52,7 +52,7 @@ abstract class ValueSetDefinition
 	}
 
 
-	public function GetValues($aArgs, $sContains = '')
+	public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
 	{
 		if (!$this->m_bIsLoaded)
 		{
@@ -93,12 +93,16 @@ abstract class ValueSetDefinition
 class ValueSetObjects extends ValueSetDefinition
 {
 	protected $m_sContains;
+	protected $m_sOperation;
 	protected $m_sFilterExpr; // in OQL
 	protected $m_sValueAttCode;
 	protected $m_aOrderBy;
 	protected $m_aExtraConditions;
 	private $m_bAllowAllData;
 	private $m_aModifierProperties;
+	private $m_bSort;
+	private $m_iLimit;
+
 
 	/**
 	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
@@ -106,12 +110,15 @@ class ValueSetObjects extends ValueSetDefinition
 	public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false, $aModifierProperties = array())
 	{
 		$this->m_sContains = '';
+		$this->m_sOperation = '';
 		$this->m_sFilterExpr = $sFilterExp;
 		$this->m_sValueAttCode = $sValueAttCode;
 		$this->m_aOrderBy = $aOrderBy;
 		$this->m_bAllowAllData = $bAllowAllData;
 		$this->m_aModifierProperties = $aModifierProperties;
 		$this->m_aExtraConditions = array();
+		$this->m_bSort = true;
+		$this->m_iLimit = 0;
 	}
 
 	public function SetModifierProperty($sPluginClass, $sProperty, $value)
@@ -163,11 +170,20 @@ class ValueSetObjects extends ValueSetDefinition
 		return new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
 	}
 
-	public function GetValues($aArgs, $sContains = '')
+    /**
+     * @param        $aArgs
+     * @param string $sContains
+     * @param string $sOperation for the values @see self::LoadValues()
+     *
+     * @return array
+     * @throws CoreException
+     * @throws OQLException
+     */
+    public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
 	{
-		if (!$this->m_bIsLoaded || ($sContains != $this->m_sContains))
+		if (!$this->m_bIsLoaded || ($sContains != $this->m_sContains) || ($sOperation != $this->m_sOperation))
 		{
-			$this->LoadValues($aArgs, $sContains);
+			$this->LoadValues($aArgs, $sContains, $sOperation);
 			$this->m_bIsLoaded = true;
 		}
 		// The results are already filtered and sorted (on friendly name)
@@ -175,9 +191,19 @@ class ValueSetObjects extends ValueSetDefinition
 		return $aRet;
 	}
 
-	protected function LoadValues($aArgs, $sContains = '')
+	/**
+	 * @param $aArgs
+	 * @param string $sContains
+	 * @param string $sOperation 'contains' or 'equals_start_with'
+	 *
+	 * @return bool
+	 * @throws \CoreException
+	 * @throws \OQLException
+	 */
+	protected function LoadValues($aArgs, $sContains = '', $sOperation = 'contains')
 	{
 		$this->m_sContains = $sContains;
+		$this->m_sOperation = $sOperation;
 
 		$this->m_aValues = array();
 		
@@ -202,12 +228,59 @@ class ValueSetObjects extends ValueSetDefinition
 			}
 		}
 
-		$oValueExpr = new ScalarExpression('%'.$sContains.'%');
-		$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
-		$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
-		$oFilter->AddConditionExpression($oNewCondition);
+		switch ($sOperation)
+		{
+			case 'equals':
+				$aAttributes = MetaModel::GetFriendlyNameAttributeCodeList($oFilter->GetClass());
+				$sClassAlias = $oFilter->GetClassAlias();
+				$aFilters = array();
+				$oValueExpr = new ScalarExpression($sContains);
+				foreach($aAttributes as $sAttribute)
+				{
+					$oNewFilter = $oFilter->DeepClone();
+					$oNameExpr = new FieldExpression($sAttribute, $sClassAlias);
+					$oCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
+					$oNewFilter->AddConditionExpression($oCondition);
+					$aFilters[] = $oNewFilter;
+				}
+                // Unions are much faster than OR conditions
+				$oFilter = new DBUnionSearch($aFilters);
+				break;
+            case 'start_with':
+                $aAttributes = MetaModel::GetFriendlyNameAttributeCodeList($oFilter->GetClass());
+                $sClassAlias = $oFilter->GetClassAlias();
+                $aFilters = array();
+                $oValueExpr = new ScalarExpression($sContains.'%');
+                foreach($aAttributes as $sAttribute)
+                {
+                    $oNewFilter = $oFilter->DeepClone();
+                    $oNameExpr = new FieldExpression($sAttribute, $sClassAlias);
+                    $oCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+                    $oNewFilter->AddConditionExpression($oCondition);
+                    $aFilters[] = $oNewFilter;
+                }
+                // Unions are much faster than OR conditions
+                $oFilter = new DBUnionSearch($aFilters);
+                break;
 
-		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
+			default:
+				$oValueExpr = new ScalarExpression('%'.$sContains.'%');
+				$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
+				$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+				$oFilter->AddConditionExpression($oNewCondition);
+				break;
+		}
+
+		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs, null, $this->m_iLimit, 0, $this->m_bSort);
+		if (empty($this->m_sValueAttCode))
+		{
+			$aAttToLoad = array($oFilter->GetClassAlias() => array('friendlyname'));
+		}
+		else
+		{
+			$aAttToLoad = array($oFilter->GetClassAlias() => array($this->m_sValueAttCode));
+		}
+		$oObjects->OptimizeColumnLoad($aAttToLoad);
 		while ($oObject = $oObjects->Fetch())
 		{
 			if (empty($this->m_sValueAttCode))
@@ -231,6 +304,22 @@ class ValueSetObjects extends ValueSetDefinition
 	{
 		return $this->m_sFilterExpr;
 	}
+
+	/**
+	 * @param $iLimit
+	 */
+	public function SetLimit($iLimit)
+	{
+		$this->m_iLimit = $iLimit;
+	}
+
+	/**
+	 * @param $bSort
+	 */
+	public function SetSort($bSort)
+	{
+		$this->m_bSort = $bSort;
+	}
 }
 
 

core/xmlbulkexport.class.inc.php

@@ -108,7 +108,7 @@ class XMLBulkExport extends BulkExport
 		$aClass2Attributes = array();
 		foreach($aClasses as $sAlias => $sClassName)
 		{
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ, $oSet) && (UR_ALLOWED_YES || UR_ALLOWED_DEPENDS))
+			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_BULK_READ, $oSet) != UR_ALLOWED_NO)
 			{
 				$aAuthorizedClasses[$sAlias] = $sClassName;
 				$aAttributes = array();

css/css-variables.scss

@@ -1,8 +1,53 @@
-$highlight-color: #E87C1E;
+// Base colors
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              #444 !default;
+$gray:                   #777 !default;
+$gray-light:             #808080 !default;
+$gray-lighter:           #ddd !default;
+$gray-extra-light:       #F1F1F1 !default;
+
+$white:					#FFFFFF !default;
+
+$combodo-orange:		#EA7D1E !default;
+$combodo-dark-gray:		#585653 !default;
+
+$combodo-orange-dark:		darken($combodo-orange, 13.8%) !default;
+$combodo-orange-darker:		darken($combodo-orange, 18%) !default;
+$combodo-dark-gray-dark:	darken($combodo-dark-gray, 13.5%) !default;
+$combodo-dark-gray-darker:	darken($combodo-dark-gray, 18%) !default;
+
+// Vars
+$highlight-color: $combodo-orange;
 $grey-color: #555555;
 $complement-color: #1c94c4;
 $complement-light: #d6e8ef;
-$frame-background-color: #F1F1F1;
+$frame-background-color: $gray-extra-light;
 $text-color: #000;
+$box-radius: 0px;
+$box-shadow-regular: 0 1px 1px rgba(0, 0, 0, 0.15);
+// - Boxes
+//$search-criteria-box-color: #2D2D2D;
+//$search-criteria-box-bg-color: #f0f3f5;
+//$search-criteria-box-border-color: #3f7294;
+//$search-criteria-box-border: 1px solid $search-criteria-box-border-color;
+//$search-criteria-box-radius: 1px;
+//
+$search-criteria-box-color: #2D2D2D;
+$search-criteria-box-picto-color: #E87C1E;
+$search-criteria-box-bg-color: #EEEEEE;
+$search-criteria-box-hover-color: $white;
+$search-criteria-box-border-color: #CCCCCC;
+$search-criteria-box-border: 1px solid $search-criteria-box-border-color;
+$search-criteria-box-radius: 1px;
+//
+$search-add-criteria-box-color: $search-criteria-box-color;
+$search-add-criteria-box-bg-color: $white;
+$search-add-criteria-box-hover-color: $gray-extra-light;
+//
+$search-button-box-color: $combodo-orange;
+$search-button-box-bg-color: $white;
+$search-button-box-bg-hover-color: $gray-extra-light;
+
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.4.0-beta";
+$version: "v2.5.0-beta";

css/font-combodo/combodo.sfd

@@ -21,7 +21,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1463745065
-ModificationTime: 1464178421
+ModificationTime: 1522325525
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -47,7 +47,7 @@ FitToEm: 0
 WinInfo: 0 31 10
 BeginPrivate: 0
 EndPrivate
-BeginChars: 256 8
+BeginChars: 256 13
 
 StartChar: zero
 Encoding: 48 48 0
@@ -210,7 +210,7 @@ StartChar: three
 Encoding: 51 51 3
 Width: 1022
 VWidth: 0
-Flags: MO
+Flags: M
 LayerCount: 3
 Fore
 SplineSet
@@ -261,11 +261,13 @@ StartChar: C
 Encoding: 67 67 4
 Width: 1080
 VWidth: 0
-Flags: HW
+Flags: W
+HStem: -112 36<398.67 444.211> 97 36<463.993 575.071> 116 37<411.524 459.906> 250 37<334.123 402.464> 335 37<749.246 821.773> 387 37<836.543 929.295> 396 37<873.093 933.545> 442 37<475 482 739.647 795.664> 621 37<286.042 389.13> 650 37<510.192 579.789>
+VStem: 53 37<216.048 298> 218 37<457.867 579.651> 272 36<60.6299 128.446> 439 37<479.452 577.67> 451 37<-73.2171 5.85426> 472 37<568.829 649.107> 553 37<359.872 417.574> 651 38<-34.3438 62.6665> 718 38<8.82031 164.606> 934 38<341.569 396>
 LayerCount: 3
 Fore
 SplineSet
-641 -116 m 4x9b20
+641 -116 m 4x9b39f0
  637 -116 633 -115 630 -113 c 4
  624 -110 616 -102 616 -88 c 4
  616 -84 617 -80 618 -75 c 4
@@ -275,14 +277,14 @@ SplineSet
  651 31 641 52 624 75 c 4
  609 94 595 108 586 115 c 5
  562 107 523 97 500 97 c 6
- 499 97 l 6xdb20
+ 499 97 l 6xdb39f0
  479 97 468 105 460 111 c 4
  457 114 455 115 453 116 c 4
  450 116 438 112 423 104 c 4
  412 98 405 94 401 90 c 5
  411 80 436 61 448 52 c 4
  460 43 468 37 473 32 c 4
- 485 20 488 -4 488 -20 c 4
+ 485 20 488 -4 488 -20 c 4xb93af0
  488 -27 487 -33 487 -36 c 4
  485 -55 477 -90 452 -105 c 4
  444 -110 435 -112 426 -112 c 4
@@ -321,10 +323,10 @@ SplineSet
  219 484 218 493 218 504 c 4
  218 526 222 550 231 575 c 4
  237 593 255 636 284 651 c 4
- 293 656 305 658 320 658 c 4xb9a0
+ 293 656 305 658 320 658 c 4
  342 658 367 653 389 644 c 4
  416 633 437 617 452 597 c 4
- 472 571 476 537 476 508 c 4
+ 472 571 476 537 476 508 c 4xb9bcf0
  476 497 476 487 475 479 c 5
  482 479 l 5
  505 499 l 5
@@ -352,7 +354,7 @@ SplineSet
  766 473 767 473 768 473 c 4
  787 473 808 460 831 446 c 4
  845 437 865 424 873 424 c 4
- 874 424 l 6x9d60
+ 874 424 l 6x9d79f0
  875 424 880 425 884 426 c 4
  897 429 915 433 930 433 c 4
  956 433 965 421 969 412 c 4
@@ -362,7 +364,7 @@ SplineSet
  916 289 911 288 905 288 c 4
  888 288 863 299 835 311 c 4
  810 322 780 335 766 335 c 4
- 765 335 764 335 764 335 c 4
+ 764 335 l 4
  763 335 757 331 748 315 c 4
  741 301 734 283 727 264 c 4
  721 248 715 231 708 216 c 5
@@ -370,7 +372,7 @@ SplineSet
  756 69 755 58 753 47 c 4
  748 19 727 -22 708 -51 c 4
  697 -68 687 -82 677 -93 c 4
- 663 -109 652 -116 641 -116 c 4x9b20
+ 663 -109 652 -116 641 -116 c 4x9b39f0
 308 85 m 5
  308 83 312 72 340 46 c 4
  357 30 374 18 374 18 c 6
@@ -387,14 +389,14 @@ SplineSet
  383 55 362 72 362 90 c 4
  362 92 362 93 362 95 c 4
  363 100 366 113 402 134 c 4
- 410 138 435 153 453 153 c 4xb9a0
+ 410 138 435 153 453 153 c 4xb9baf0
  455 153 458 152 460 152 c 4
  470 150 476 145 482 141 c 4
  488 136 491 133 499 133 c 6
- 500 133 l 6xd920
+ 500 133 l 6xd93af0
  521 133 562 145 581 153 c 6
  589 156 l 5
- 596 153 l 6xb920
+ 596 153 l 6xb93af0
  612 146 637 119 654 97 c 4
  670 75 689 44 689 16 c 4
  689 13 689 10 688 7 c 4
@@ -413,7 +415,7 @@ SplineSet
  868 337 893 326 903 325 c 5
  907 329 916 340 924 359 c 4
  932 377 934 390 934 396 c 4
- 933 396 932 396 930 396 c 4xdb20
+ 933 396 932 396 930 396 c 4xdb3af0
  919 396 902 392 892 390 c 4
  886 389 881 388 878 388 c 4
  876 388 875 387 873 387 c 4
@@ -433,9 +435,9 @@ SplineSet
  629 559 619 566 619 566 c 6
  615 569 l 5
  580 633 l 5
- 566 639 539 650 520 650 c 4x9d60
+ 566 639 539 650 520 650 c 4
  514 650 512 650 511 649 c 4
- 510 648 509 644 509 637 c 4
+ 510 648 509 644 509 637 c 4x9d79f0
  509 629 510 618 514 602 c 4
  517 589 520 577 523 569 c 5
  562 561 l 5
@@ -446,7 +448,7 @@ SplineSet
  435 465 l 6
  437 474 439 491 439 510 c 4
  439 533 436 558 423 575 c 4
- 400 605 354 621 320 621 c 4x99a0
+ 400 605 354 621 320 621 c 4x99bcf0
  310 621 304 619 301 618 c 4
  281 608 255 548 255 504 c 4
  255 497 255 490 257 484 c 4
@@ -475,22 +477,25 @@ SplineSet
  424 204 390 196 377 186 c 4
  330 149 310 105 308 85 c 5
 EndSplineSet
+Validated: 1
 EndChar
 
 StartChar: I
 Encoding: 73 73 5
 Width: 1024
 VWidth: 0
-Flags: HW
+Flags: W
+HStem: -154 166<226 365 659 798> 126 26<498.267 525.733> 151 131<288 343 681 735> 313 132<288 343 681 735> 330 32<424.389 599.754> 443 26<498.267 525.733> 584 184<226 365 659 798>
+VStem: 51 175<12 151 445 584> 365 132<74 126 469 521> 366 31<282 313> 527 132<74 126 469 521> 627 31<282 313> 798 175<12 151 445 584>
 LayerCount: 3
 Fore
 SplineSet
-51 -154 m 1
+51 -154 m 1x8308
  51 768 l 1
  973 768 l 1
  973 -154 l 1
- 51 -154 l 1
-497 469 m 2
+ 51 -154 l 1x8308
+497 469 m 1x87a8
  502 469 507 470 512 470 c 0
  517 470 522 469 527 469 c 1
  527 521 l 1
@@ -498,35 +503,34 @@ SplineSet
  512 702 l 1
  414 604 l 1
  497 521 l 1
- 497 469 l 1
- 497 469 l 2
+ 497 469 l 1x87a8
 653 417 m 1
  681 445 l 1
- 798 445 l 1
+ 798 445 l 1x9328
  798 584 l 1
  659 584 l 1
  659 467 l 1
  633 440 l 1
  643 433 649 425 653 417 c 1
-366 282 m 1
+366 282 m 1xb348
  366 313 l 1
  288 313 l 1
  206 396 l 1
  108 298 l 1
  206 200 l 1
  288 282 l 1
- 366 282 l 1
+ 366 282 l 1xb348
 343 445 m 1
  371 417 l 1
  375 425 381 433 391 440 c 1
  365 467 l 1
- 365 584 l 1
+ 365 584 l 1x9388
  226 584 l 1
  226 445 l 1
  343 445 l 1
 371 178 m 1
  343 151 l 1
- 226 151 l 1
+ 226 151 l 1xa388
  226 12 l 1
  365 12 l 1
  365 129 l 1
@@ -535,7 +539,7 @@ SplineSet
 818 396 m 1
  735 313 l 1
  658 313 l 1
- 658 282 l 1
+ 658 282 l 1xb318
  735 282 l 1
  818 200 l 1
  916 298 l 1
@@ -543,12 +547,12 @@ SplineSet
 653 178 m 1
  649 170 643 162 633 155 c 1
  659 129 l 1
- 659 12 l 1
+ 659 12 l 1xa328
  798 12 l 1
  798 151 l 1
  681 151 l 1
  653 178 l 1
-527 126 m 1
+527 126 m 1xc3a8
  522 126 517 126 512 126 c 0
  507 126 502 126 497 126 c 1
  497 74 l 1
@@ -556,8 +560,7 @@ SplineSet
  512 -106 l 1
  610 -8 l 1
  527 74 l 1
- 527 126 l 1
- 527 126 l 1
+ 527 126 l 1xc3a8
 610 348 m 0
  584 337 549 330 512 330 c 0
  475 330 441 337 414 348 c 0
@@ -567,9 +570,9 @@ SplineSet
  449 157 479 152 512 152 c 0
  545 152 575 157 598 167 c 0
  616 174 627 184 627 192 c 2
- 627 356 l 1
+ 627 356 l 1xcb58
  622 353 616 351 610 348 c 0
-512 443 m 1
+512 443 m 1x8f58
  479 443 449 438 426 428 c 0
  408 421 397 410 397 402 c 0
  397 394 408 384 426 377 c 0
@@ -577,8 +580,7 @@ SplineSet
  545 362 575 367 598 377 c 0
  616 384 627 394 627 402 c 0
  627 410 616 421 598 428 c 0
- 575 438 545 443 512 443 c 1
- 512 443 l 1
+ 575 438 545 443 512 443 c 1x8f58
 EndSplineSet
 Validated: 5
 EndChar
@@ -587,7 +589,8 @@ StartChar: four
 Encoding: 52 52 6
 Width: 1024
 VWidth: 0
-Flags: H
+HStem: -2 41<389.544 635.489> 292 109<316 441 550 675> 639 41<389.544 636.396>
+VStem: 117 41<241.556 436.857> 441 109<167 292 401 525> 868 41<249.643 435.223>
 LayerCount: 3
 Fore
 SplineSet
@@ -607,7 +610,6 @@ SplineSet
  909 288 892 238 861 189 c 0
  835 149 801 111 757 77 c 1
  801 -67 l 1
- 801 -67 l 1
 649 63 m 1
  733 17 l 1
  710 93 l 1
@@ -618,7 +620,6 @@ SplineSet
  158 174 317 39 513 39 c 0
  552 39 592 49 634 59 c 2
  649 63 l 1
- 649 63 l 1
 675 306 m 1
  675 298 667 292 657 292 c 2
  550 292 l 1
@@ -640,7 +641,6 @@ SplineSet
  657 401 l 2
  667 401 675 394 675 386 c 2
  675 306 l 1
- 675 306 l 1
 EndSplineSet
 Validated: 5
 EndChar
@@ -649,15 +649,17 @@ StartChar: D
 Encoding: 68 68 7
 Width: 1080
 VWidth: 0
-Flags: HW
+Flags: W
+HStem: 198 131<79.9424 131.341> 306 98<835.102 921.871> 353 100<731.982 810.871>
+VStem: 238 219<460.138 583.719> 292 88<67.6511 114.863> 369 100<-72.2559 6.9753> 667 66<3.74069 76.8123>
 LayerCount: 3
 Fore
 SplineSet
-469 -14 m 4
+469 -14 m 4x26
  469 -45 459 -89 425 -89 c 4
- 397 -89 372 -53 369 -41 c 4
+ 397 -89 372 -53 369 -41 c 4x26
  365 -27 363 7 363 7 c 5
- 363 7 292 63 292 88 c 4
+ 363 7 292 63 292 88 c 4x2a
  292 113 317 164 366 202 c 4
  388 219 439 225 439 225 c 5
  439 225 414 269 373 269 c 4
@@ -669,7 +671,7 @@ SplineSet
  119 206 108 198 97 198 c 4
  78 198 76 234 76 261 c 4
  76 268 76 274 76 279 c 4
- 76 288 76 295 76 295 c 6
+ 76 295 l 6
  76 295 82 320 96 328 c 4
  97 328 98 329 99 329 c 4
  121 329 217 268 217 268 c 6
@@ -696,12 +698,12 @@ SplineSet
  570 401 569 394 569 388 c 4
  569 355 614 330 614 330 c 5
  614 330 646 364 662 384 c 4
- 678 404 734 453 763 453 c 4
+ 678 404 734 453 763 453 c 4xb2
  790 453 841 404 867 404 c 4
  878 404 902 413 924 413 c 4
  938 413 945 409 945 396 c 4
  945 371 922 318 905 307 c 4
- 903 306 902 306 899 306 c 4
+ 903 306 902 306 899 306 c 4x52
  872 306 795 353 761 353 c 4
  758 353 756 353 754 352 c 4
  723 342 708 263 682 213 c 5
@@ -714,11 +716,360 @@ SplineSet
  667 64 605 129 586 138 c 5
  565 130 522 118 499 118 c 4
  475 118 470 137 453 137 c 4
- 437 137 380 108 380 93 c 4
+ 437 137 380 108 380 93 c 4x2a
  380 77 446 36 460 23 c 4
- 465 18 469 3 469 -14 c 4
+ 465 18 469 3 469 -14 c 4x26
 EndSplineSet
 Validated: 1
 EndChar
+
+StartChar: E
+Encoding: 69 69 8
+Width: 1024
+VWidth: 0
+HStem: -65 248<767.992 903.557> 62.9598 56.9516<226.56 349.224 705.189 710> 143 26.9554<256.859 324.845> 192.776 27.2245<289.957 314.952> 295.071 27.9295<269.575 354.789> 344 66<376.038 439.962> 433 25<407.015 431.988> 469 248<767.951 904.873>
+VStem: 66.5097 115.469<193.203 298.14> 204 32.9583<187.285 267.499> 257.966 57.0345<194.835 224.243> 335.831 30.8205<177.895 239.59> 388.713 44.4108<157.773 270.37> 407 25<433.012 457.985> 442 55.4336<365.791 447.874> 711 249<-8.06335 62 583 662.557>
+LayerCount: 3
+Fore
+SplineSet
+279 573 m 0x7ffb
+ 292 573 313 570 343 563 c 0
+ 462 535 489 420 496 389 c 0
+ 496.963 384.737 497.434 380.795 497.434 377.167 c 0
+ 497.434 354.414 478.912 344 447 344 c 0
+ 422.333 344 394.111 344.889 359.074 344.889 c 0
+ 341.556 344.889 322.333 344.667 301 344 c 0
+ 237 342 192 300 183 241 c 0
+ 182.31 236.477 181.979 231.948 181.979 227.44 c 0
+ 181.979 173.142 230.063 121.847 279 120 c 0
+ 280.57 119.941 282.134 119.911 283.69 119.911 c 0
+ 334.636 119.911 377.296 151.452 387 199 c 0
+ 388.159 204.678 388.713 210.303 388.713 215.813 c 0
+ 388.713 257.852 356.437 293.232 314 295 c 0
+ 312.865 295.047 311.742 295.071 310.63 295.071 c 0
+ 264.267 295.071 236.958 255.02 236.958 229.128 c 0
+ 236.958 206.914 253.918 170.972 286 170 c 0
+ 287.107 169.97 288.186 169.955 289.238 169.955 c 0
+ 323.358 169.955 329.15 185.419 334 199 c 0
+ 335.206 202.378 335.831 206.221 335.831 210.207 c 0
+ 335.831 222.743 329.657 236.689 316 242 c 0
+ 298 249 291 238 290 234 c 0
+ 289 228 294 220 299 220 c 0
+ 306 220 316 220 315 206 c 0
+ 314.143 195.714 302.265 192.776 292.592 192.776 c 0
+ 290.98 192.776 289.429 192.857 288 193 c 0
+ 278.231 193.977 257.966 202.588 257.966 228.155 c 0
+ 257.966 248.46 275.443 271.256 306.289 271.256 c 0
+ 308.143 271.256 310.047 271.172 312 271 c 0
+ 351.28 267.429 366.651 246.325 366.651 219.783 c 0
+ 366.651 216.594 366.429 213.326 366 210 c 0
+ 362 179 343 143 284 143 c 0
+ 225 143 204 192 204 229 c 0
+ 204 266 232 322 318 323 c 0
+ 318.502 323.006 319.002 323.009 319.501 323.009 c 0
+ 394.354 323.009 433.124 257.543 433.124 205.254 c 0
+ 433.124 198.198 432.418 191.383 431 185 c 0
+ 420.148 134.686 398.59 62.9598 273.187 62.9598 c 0
+ 271.478 62.9598 269.749 62.9731 268 63 c 0
+ 134.539 65.8599 66.5097 196.855 66.5097 295.718 c 0
+ 66.5097 300.562 66.673 305.329 67 310 c 0
+ 74 410 112 447 146 480 c 0
+ 204.987 537.114 264.85 531.109 264.85 543.245 c 0
+ 264.85 544.071 264.573 544.981 264 546 c 0
+ 260.913 551.732 257.827 557.659 257.827 562.495 c 0
+ 257.827 568.625 262.788 573 279 573 c 0x7ffb
+408 478 m 0
+ 389 478 374 463 374 444 c 0
+ 374 425 389 410 408 410 c 0
+ 427 410 442 425 442 444 c 0
+ 442 463 427 478 408 478 c 0
+835 717 m 0
+ 904 717 960 662 960 593 c 0
+ 960 524 904 469 835 469 c 0
+ 798 469 751 495 731 526 c 1
+ 515 456 l 1
+ 503 483 491 498 481 511 c 1
+ 712 583 l 2
+ 712 586 711 590 711 593 c 0
+ 711 662 766 717 835 717 c 0
+462 207 m 1
+ 727 121 l 1
+ 747 155 795 183 834 183 c 0
+ 903 183 958 128 958 59 c 0
+ 958 -10 903 -65 834 -65 c 0x9ff3
+ 765 -65 710 -10 710 59 c 0
+ 710 60 710 61 710 62 c 2
+ 456 143 l 1
+ 458.679 159.077 462.157 171.165 462.157 197.076 c 0
+ 462.157 200.176 462.107 203.474 462 207 c 1
+407 445 m 0x1ff7
+ 407 453 412 458 420 458 c 0
+ 428 458 432 453 432 445 c 0
+ 432 437 428 433 420 433 c 0
+ 412 433 407 437 407 445 c 0x1ff7
+EndSplineSet
+Validated: 1
+EndChar
+
+StartChar: F
+Encoding: 70 70 9
+Width: 1024
+VWidth: 0
+HStem: -36 87<438.038 591.036> 87 39<470.027 570.5> 163 41<517.914 555.989> 241 41<519.089 577.135> 317 43<482.813 612.995> 394 100<654.807 741.193> 528 39<697.004 734.996>
+VStem: 177 177<195.689 296.938> 387 50<156.758 272.234> 469 87<171.273 203.985> 588 47<139.283 231.811> 669 67<122.953 266.087> 697 38<528.004 566.995> 750 85<426.5 559.5>
+LayerCount: 3
+Fore
+SplineSet
+502 742 m 0xfff4
+ 522 742 553 738 599 727 c 0
+ 780 684 822 509 833 462 c 0
+ 835 456 835 450 835 444 c 0
+ 835 409 806 392 758 392 c 0
+ 721 392 678 394 624 394 c 0
+ 597 394 568 393 535 392 c 0
+ 437 388 368 325 355 235 c 0
+ 354 228 354 222 354 215 c 0
+ 354 132 426 55 501 51 c 0
+ 504 51 507 51 510 51 c 0
+ 587 51 652 99 666 171 c 0
+ 668 180 669 188 669 196 c 0
+ 669 260 620 313 555 317 c 0
+ 553 317 550 317 548 317 c 0
+ 478 317 437 256 437 218 c 0
+ 437 184 463 127 512 126 c 0
+ 514 126 516 126 518 126 c 0
+ 569 126 578 150 586 171 c 0
+ 588 176 588 181 588 187 c 0
+ 588 207 579 228 557 237 c 0
+ 550 240 545 241 540 241 c 0
+ 525 241 520 230 518 225 c 0
+ 516 216 524 204 532 204 c 0
+ 543 204 556 202 556 183 c 0
+ 556 166 541 163 525 163 c 0
+ 522 163 518 163 515 163 c 0
+ 499 164 469 177 469 217 c 0
+ 469 247 497 282 543 282 c 0
+ 546 282 549 282 552 282 c 0
+ 611 277 635 243 635 202 c 0
+ 635 197 635 193 634 188 c 0
+ 628 141 598 87 508 87 c 0
+ 418 87 387 162 387 218 c 0
+ 387 274 430 358 561 360 c 0
+ 562 360 563 360 564 360 c 0
+ 677 360 736 262 736 182 c 0
+ 736 171 735 160 733 150 c 0
+ 716 74 683 -36 494 -36 c 0
+ 491 -36 487 -36 484 -36 c 0
+ 280 -32 177 170 177 321 c 0
+ 177 328 178 335 178 342 c 0
+ 188 495 246 549 298 600 c 0
+ 388 687 479 677 479 696 c 0
+ 479 697 479 698 478 700 c 0
+ 473 709 469 718 469 725 c 0
+ 469 735 477 742 502 742 c 0xfff4
+698 597 m 0
+ 669 597 646 574 646 545 c 0
+ 646 516 669 494 698 494 c 0
+ 727 494 750 516 750 545 c 0
+ 750 574 727 597 698 597 c 0
+697 547 m 0xffec
+ 697 560 703 567 716 567 c 0
+ 729 567 735 560 735 547 c 0
+ 735 534 729 528 716 528 c 0
+ 703 528 697 534 697 547 c 0xffec
+EndSplineSet
+Validated: 1
+EndChar
+
+StartChar: O
+Encoding: 79 79 10
+Width: 1024
+VWidth: 0
+HStem: 1.59961 8<801.97 829.007> 20 35.2002<801.975 810.774 823.574 824.837> 33.5996 5.60059<810.774 817.806> 48.7998 6.40039<810.774 818.736> 61.5996 8.7998<801.043 829.91> 434.399 245.601<441.712 567.228>
+VStem: 780.375 8.7998<21.8033 49.6942> 801.975 8.7998<20 33.5996 39.2002 48.7998> 819.574 8.80078<40.0451 47.9513> 841.175 8.7998<21.5374 50.3356>
+LayerCount: 3
+Fore
+SplineSet
+504.375 680 m 0x8fc0
+ 672.375 680 816.375 560 846.774 395.2 c 0
+ 877.175 230.399 785.975 67.2002 629.175 7.2002 c 0
+ 621.975 4.7998 613.975 8 611.574 15.2002 c 2
+ 533.175 218.399 l 2
+ 530.774 225.6 533.975 234.399 541.175 236.8 c 0
+ 587.574 254.399 613.975 301.6 605.175 350.399 c 0
+ 596.375 399.2 553.975 434.399 504.375 434.399 c 0
+ 454.774 434.399 413.175 399.2 404.375 350.399 c 0
+ 395.574 301.6 421.175 254.399 467.574 236.8 c 0
+ 474.774 234.399 477.975 225.6 475.574 218.399 c 2
+ 397.975 15.2002 l 2
+ 395.574 8 386.774 4.7998 379.574 7.2002 c 0
+ 222.774 67.2002 131.574 230.399 161.975 395.2 c 0
+ 192.375 560 336.375 680 504.375 680 c 0x8fc0
+815.574 70.3994 m 0
+ 834.774 70.3994 849.975 55.2002 849.975 36 c 0
+ 849.975 16.7998 834.774 1.59961 815.574 1.59961 c 0
+ 796.375 1.59961 780.375 16.7998 780.375 36 c 0
+ 780.375 55.2002 796.375 70.3994 815.574 70.3994 c 0
+815.574 61.5996 m 0
+ 801.175 61.5996 789.175 50.3994 789.175 36 c 0
+ 789.175 21.5996 801.175 9.59961 815.574 9.59961 c 0
+ 829.975 9.59961 841.175 21.5996 841.175 36 c 0
+ 841.175 50.3994 829.975 61.5996 815.574 61.5996 c 0
+814.774 39.2002 m 2xbfc0
+ 816.375 39.2002 817.975 40 818.774 40.7998 c 0
+ 819.574 41.5996 819.574 42.3994 819.574 44 c 0
+ 819.574 45.5996 819.574 46.3994 818.774 47.2002 c 0
+ 817.975 48 816.375 48.7998 814.774 48.7998 c 2
+ 810.774 48.7998 l 1
+ 810.774 39.2002 l 1
+ 814.774 39.2002 l 2xbfc0
+810.774 33.5996 m 1
+ 810.774 20 l 1
+ 801.975 20 l 1
+ 801.975 55.2002 l 1xcfc0
+ 815.574 55.2002 l 2x9fc0
+ 820.375 55.2002 822.774 54.3994 825.175 52.7998 c 0
+ 827.574 51.2002 828.375 48.7998 828.375 45.5996 c 0
+ 828.375 43.2002 827.574 41.5996 826.774 40 c 0
+ 825.975 38.3994 824.375 36.7998 821.975 36 c 1
+ 823.574 36 824.375 35.2002 825.175 34.3994 c 0
+ 825.975 33.5996 827.574 32 828.375 29.5996 c 2
+ 833.175 20 l 1
+ 823.574 20 l 1xcfc0
+ 819.574 28.7998 l 2
+ 818.774 30.3994 817.175 31.2002 816.375 32 c 0
+ 815.574 32.7998 814.774 33.5996 813.175 33.5996 c 2
+ 810.774 33.5996 l 1
+EndSplineSet
+Validated: 33
+EndChar
+
+StartChar: B
+Encoding: 66 66 11
+Width: 1024
+VWidth: 0
+HStem: 0 59<210.859 353.111 670.997 813.141> 103 28<483.475 540.525> 326 280<245 398 626 779>
+VStem: 87 62<121.402 265.716> 415 60<134.336 199.804> 549 60<134.336 199.804> 875 62<121.402 265.716>
+LayerCount: 3
+Fore
+SplineSet
+376 606 m 0
+ 420 606 456 571 456 527 c 0
+ 456 514 l 1
+ 458 444 l 1
+ 566 444 l 1
+ 568 514 l 1
+ 568 514 568 524 568 527 c 0
+ 568 571 604 606 648 606 c 0
+ 677 606 704 590 718 564 c 1
+ 719 564 l 1
+ 754 502 l 1
+ 781 491 803 472 817 446 c 1
+ 818 446 l 1
+ 914 283 l 1
+ 929 255 937 224 937 192 c 0
+ 937 87 852 0 747 0 c 0
+ 666 0 594 54 568 131 c 1
+ 555 114 534 103 512 103 c 0
+ 490 103 469 114 456 132 c 1
+ 431 55 358 0 277 0 c 0
+ 172 0 87 87 87 192 c 0
+ 87 224 95 255 110 283 c 1
+ 206 446 l 1
+ 207 446 l 1
+ 221 472 243 491 270 502 c 1
+ 306 564 l 1
+ 320 590 347 606 376 606 c 0
+282 326 m 0
+ 208 326 149 266 149 193 c 0
+ 149 119 208 59 282 59 c 0
+ 355 59 415 119 415 193 c 0
+ 415 266 355 326 282 326 c 0
+742 326 m 0
+ 669 326 609 266 609 193 c 0
+ 609 119 669 59 742 59 c 0
+ 816 59 875 119 875 193 c 0
+ 875 266 816 326 742 326 c 0
+512 204 m 0
+ 492 204 475 188 475 168 c 0
+ 475 148 492 131 512 131 c 0
+ 532 131 549 148 549 168 c 0
+ 549 188 532 204 512 204 c 0
+EndSplineSet
+EndChar
+
+StartChar: b
+Encoding: 98 98 12
+Width: 1024
+VWidth: 0
+Flags: H
+HStem: -1 35<183.649 347.721 676.937 838.822> 198 25<478.803 548.794> 294 234<470.756 555.897>
+VStem: 75 44<83.375 145> 414 42<83.6665 369.146> 432 24<255 473> 569 42<83.6665 369.146> 569 24<255 473> 906 43<84.3258 145>
+LayerCount: 3
+Fore
+SplineSet
+352 616 m 0xf080
+ 390 616 423 593 420 563 c 1
+ 422 488 l 1
+ 452 468 454 441 454 441 c 1
+ 455 305 456 159 456 12 c 1
+ 453 -62 369 -121 266 -121 c 0
+ 161 -121 74 -59 74 17 c 0
+ 74 20 76 22 76 25 c 1
+ 74 25 l 1
+ 106 196 l 1
+ 106 196 l 1
+ 113 235 143 270 188 292 c 1
+ 186 292 l 1
+ 206 408 l 1
+ 206 408 228 457 274 487 c 1
+ 282 570 l 1
+ 284 570 l 1
+ 287 596 316 616 352 616 c 0xf080
+266 114 m 0
+ 185 114 118 69 118 14 c 0
+ 118 -41 185 -86 266 -86 c 0
+ 347 -86 414 -41 414 14 c 0
+ 414 69 347 114 266 114 c 0
+514 408 m 0
+ 554 408 589 384 592 353 c 1
+ 592 353 l 1
+ 592 135 l 1
+ 592 135 l 1
+ 590 103 555 78 514 78 c 0
+ 473 78 436 103 434 135 c 1
+ 432 135 l 1
+ 432 353 l 1
+ 434 353 l 1
+ 437 384 474 408 514 408 c 0
+466 138 m 0
+ 466 118 489 103 514 103 c 2
+ 539 103 560 118 560 138 c 0
+ 560 158 539 174 514 174 c 0
+ 489 174 466 158 466 138 c 0
+672 616 m 0
+ 708 616 737 596 740 570 c 1
+ 742 570 l 1
+ 750 487 l 1
+ 796 457 818 408 818 408 c 1
+ 838 292 l 1
+ 836 292 l 1
+ 881 270 911 235 918 196 c 1
+ 950 25 l 1
+ 948 25 l 1
+ 948 22 948 20 948 17 c 0
+ 948 -59 863 -121 758 -121 c 0
+ 655 -121 571 -62 568 12 c 1
+ 568 159 569 305 570 441 c 1
+ 570 441 572 468 602 488 c 1
+ 604 563 l 1
+ 601 593 634 616 672 616 c 0
+758 114 m 0
+ 677 114 610 69 610 14 c 0
+ 610 -41 677 -86 758 -86 c 0
+ 839 -86 906 -41 906 14 c 0
+ 906 69 839 114 758 114 c 0
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont

css/font-combodo/font-combodo.css

@@ -1,8 +1,8 @@
 @font-face {
     font-family: 'CombodoRegular';
-    src: url('combodo-webfont.woff2?v=1.0') format('woff2'),
-         url('combodo-webfont.woff?v=1.0') format('woff'),
-         url('combodo-webfont.ttf?v=1.0') format('truetype');
+    src: url('combodo-webfont.woff2?v=2.1') format('woff2'),
+         url('combodo-webfont.woff?v=2.1') format('woff'),
+         url('combodo-webfont.ttf?v=2.1') format('truetype');
     font-weight: normal;
     font-style: normal;
 
@@ -187,13 +187,28 @@
 .fc-closed-request:before {
   content: "3";
 }
+.fc-binoculars:before {
+  content: "B";
+}
+.fc-binoculars-alt:before {
+  content: "b";
+}
 .fc-combodo-icon-o:before {
   content: "C";
 }
 .fc-combodo-icon:before {
   content: "D";
 }
+.fc-itophub-icon:before {
+  content: "E";
+}
+.fc-chameleon-icon:before {
+  content: "F";
+}
 .fc-itop-icon:before {
   content: "I";
 }
+.fc-opensource-icon:before {
+  content: "O";
+}
 

css/font-combodo/glyphs/B.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 264.58333 264.58333"
+   height="1000"
+   width="1000">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer2">
+    <path
+       id="path4516"
+       transform="scale(0.26458333)"
+       d="m 363.57227,214.44727 c -28.72645,0.0164 -55.09978,15.88172 -68.57422,41.25195 l -0.53907,-0.18164 -34.7832,60.49414 c -26.17161,10.74972 -47.91781,30.06712 -61.67773,54.78906 l -0.51367,-0.125 -93.94336,159.60352 0.33984,0.0918 c -14.914544,27.26255 -22.732489,57.83851 -22.734376,88.91407 -3.76e-4,102.32848 82.952766,185.2825 185.281246,185.2832 79.57685,-0.18509 150.14836,-51.16271 175.33008,-126.65039 12.75761,17.44216 33.06009,27.76494 54.66992,27.79687 21.38684,-0.0322 41.50695,-10.14508 54.29297,-27.28906 25.33697,75.22798 95.78021,125.95807 175.16016,126.14258 102.32848,-7e-4 185.28163,-82.95472 185.28125,-185.2832 -0.002,-31.07556 -7.81983,-61.65152 -22.73438,-88.91407 l 0.33985,-0.0918 -93.94336,-159.60352 -0.51367,0.125 c -13.75992,-24.72194 -35.50612,-44.03935 -61.67774,-54.78906 l -34.7832,-60.49414 -0.53906,0.18164 c -13.47444,-25.37023 -39.84777,-41.23555 -68.57422,-41.25195 -42.90975,4.5e-4 -77.69486,34.78556 -77.69531,77.69531 -0.7247,3.23852 -0.16993,12.87304 -0.16993,12.87304 l -2.25,67.8418 H 443.6875 l -2.25,-67.8418 c 0,0 -0.20029,-9.98923 -0.16992,-12.87304 -4.5e-4,-42.90975 -34.78556,-77.69486 -77.69531,-77.69531 z m -92.14454,274.125 c 71.79702,0 130,58.20298 130,130 0,71.79702 -58.20298,130 -130,130 -71.79702,0 -130,-58.20298 -130,-130 0,-71.79702 58.20298,-130 130,-130 z m 449.45313,0 c 71.79702,0 130,58.20298 130,130 0,71.79702 -58.20298,130 -130,130 -71.79702,0 -130,-58.20298 -130,-130 0,-71.79702 58.20298,-130 130,-130 z M 496.1543,607.14258 c 19.72489,-3.1e-4 35.71515,15.98995 35.71484,35.71484 3.1e-4,19.72489 -15.98995,35.71516 -35.71484,35.71485 -19.7249,3.1e-4 -35.71516,-15.98995 -35.71485,-35.71485 -3.1e-4,-19.72489 15.98996,-35.71515 35.71485,-35.71484 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.77952766;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

css/font-combodo/glyphs/E.svg

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="1000"
+   height="1000"
+   viewBox="0 0 264.58333 264.58334"
+   version="1.1"
+   id="svg909">
+  <defs
+     id="defs903" />
+  <metadata
+     id="metadata906">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="fill:#000000;fill-opacity:1"
+     transform="matrix(2.6189878,0,0,2.6189878,-138.11438,-66.566639)"
+     id="layer1">
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 77.776825,48.628779 c -3.105953,0.0165 -2.465143,1.56905 -1.672249,3.00189 0.969595,1.75214 -6.046384,0.53457 -12.856064,7.17372 -3.69523,3.60269 -7.8302,7.46233 -8.56485,18.39112 -0.73465,10.9288 6.57401,26.601051 21.834325,26.890351 14.098468,0.26727 16.523001,-7.762201 17.760671,-13.268961 1.323287,-5.88768 -2.939907,-15.10068 -12.294338,-14.96704 -9.354428,0.13364 -12.428178,6.14692 -12.428178,10.15597 0,4.00904 2.27182,9.35447 8.686288,9.35447 6.414468,0 8.552552,-3.87524 8.953457,-7.2161 0.400905,-3.34087 -1.12866,-6.23284 -5.863206,-6.68176 -3.664545,-0.34747 -5.823431,2.30622 -5.896281,4.44314 -0.100228,2.93996 2.194808,3.98392 3.307291,4.04264 1.112483,0.0587 2.766575,-0.003 2.856155,-1.33635 0.10023,-1.49182 -0.935023,-1.63676 -1.686717,-1.62005 -0.534409,0.0119 -1.147985,-0.88438 -0.985986,-1.50379 0.121989,-0.46643 0.78549,-1.62036 2.790009,-0.81855 2.004523,0.8018 2.544982,3.13823 2.021065,4.67723 -0.534538,1.57021 -1.18617,3.2909 -5.228621,3.17397 -3.536694,-0.1023 -5.411874,-4.25964 -5.328354,-6.68177 0.0939,-2.724 3.190312,-7.1826 8.402068,-6.91534 5.211754,0.26728 8.953352,5.07775 7.884274,10.42314 -1.069079,5.34539 -6.013196,8.82024 -11.759488,8.55297 -5.746294,-0.26727 -11.359094,-6.68189 -10.423654,-13.09636 0.93544,-6.41447 5.87967,-10.95789 12.828675,-11.22516 6.949005,-0.26727 11.885592,0.016 15.894636,0.016 4.009047,0 6.155487,-1.61955 5.353677,-4.96042 -0.8018,-3.34086 -3.786135,-15.85543 -16.689419,-18.91977 -3.29736,-0.78307 -5.483391,-1.09268 -6.895186,-1.0852 z m 13.978992,10.35854 a 3.685268,3.685268 0 0 1 3.685563,3.68505 3.685268,3.685268 0 0 1 -3.685563,3.68556 3.685268,3.685268 0 0 1 -3.685048,-3.68556 3.685268,3.685268 0 0 1 3.685048,-3.68505 z"
+       id="path882" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 138.24445,32.953249 a 13.49711,13.49711 0 0 0 -13.49685,13.49685 13.49711,13.49711 0 0 0 0.0465,1.06195 l -25.043431,7.84087 c 1.104251,1.4075 2.257151,3.10658 3.611151,6.01255 l 23.55566,-7.5799 a 13.49711,13.49711 0 0 0 11.32696,6.1619 13.49711,13.49711 0 0 0 13.49737,-13.49737 13.49711,13.49711 0 0 0 -13.49737,-13.49685 z"
+       id="rect827" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.624193,88.491979 c 0.07421,3.57897 -0.303877,5.04652 -0.587044,6.95772 l 27.570411,8.739001 a 13.49711,13.49711 0 0 0 -0.0134,0.37258 13.49711,13.49711 0 0 0 13.49737,13.49737 13.49711,13.49711 0 0 0 13.49685,-13.49737 13.49711,13.49711 0 0 0 -13.49685,-13.496851 13.49711,13.49711 0 0 0 -11.65201,6.71794 z"
+       id="rect827-1" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path888"
+       cx="93.031555"
+       cy="62.530666"
+       r="1.3701637" />
+  </g>
+</svg>

css/font-combodo/glyphs/F.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="1000"
+   height="1000"
+   viewBox="0 0 264.58333 264.58334"
+   version="1.1"
+   id="svg909">
+  <defs
+     id="defs903" />
+  <metadata
+     id="metadata906">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-32.41665)"
+     id="layer1">
+    <path
+       style="fill:#1b1b1b;fill-opacity:1;stroke:#000000;stroke-width:1.71210456;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 128.74663,48.188011 c -13.29429,0.07062 -10.55146,6.715944 -7.15766,12.848874 4.15012,7.499617 -25.880108,2.288099 -55.027316,30.705397 -15.81655,15.420458 -33.515303,31.940728 -36.659797,78.718798 -3.144494,46.77813 28.138482,113.85946 93.456613,115.09774 60.34513,1.14398 70.72277,-33.22425 76.02032,-56.79463 5.66401,-25.20081 -12.58357,-64.63485 -52.62298,-64.06284 -40.0394,0.57201 -53.195848,26.31042 -53.195848,43.47021 0,17.15974 9.723978,40.03957 37.179578,40.03957 27.4556,0 36.60716,-16.58704 38.32314,-30.88679 1.71598,-14.2998 -4.83096,-26.67818 -25.09606,-28.59968 -15.68521,-1.48726 -24.9258,9.87122 -25.23762,19.0178 -0.429,12.5838 9.39435,17.05222 14.15607,17.30356 4.76172,0.25125 11.84166,-0.0128 12.22509,-5.71993 0.42901,-6.38538 -4.00214,-7.00576 -7.21959,-6.93424 -2.28741,0.0509 -4.91368,-3.78538 -4.22028,-6.43661 0.52215,-1.99644 3.3621,-6.93557 11.94197,-3.50361 8.57988,3.43191 10.89319,13.43244 8.65069,20.01977 -2.28797,6.72091 -5.07712,14.08591 -22.37987,13.58542 -15.13797,-0.43787 -23.16423,-18.23237 -22.80675,-28.59972 0.40192,-11.65944 13.65537,-30.74341 35.96305,-29.59947 22.30767,1.14403 38.32269,21.7341 33.74675,44.61377 -4.57593,22.87966 -25.73805,37.75293 -50.33368,36.60894 -24.59564,-1.14398 -48.619888,-28.60023 -44.615958,-56.05584 4.00393,-27.45561 25.166518,-46.90263 54.910078,-48.04662 29.74356,-1.14398 50.87344,0.0685 68.0332,0.0685 17.15977,0 26.34709,-6.93209 22.91514,-21.23189 -3.43192,-14.29975 -16.20565,-67.865386 -71.43508,-80.981563 -14.11356,-3.351744 -23.47035,-4.676956 -29.5132,-4.644939 z m 59.83374,44.337259 a 15.77391,15.77391 0 0 1 15.77517,15.77298 15.77391,15.77391 0 0 1 -15.77517,15.77516 15.77391,15.77391 0 0 1 -15.77297,-15.77516 15.77391,15.77391 0 0 1 15.77297,-15.77298 z"
+       id="path882" />
+    <circle
+       style="opacity:1;fill:#101010;fill-opacity:1;stroke:#000000;stroke-width:1.71210456;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path888"
+       cx="194.04086"
+       cy="107.69173"
+       r="5.8646588" />
+  </g>
+</svg>

css/font-combodo/glyphs/O.svg

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="1000"
+   viewBox="0 0 264.58333 264.58334"
+   version="1.1"
+   id="svg876"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="O.svg">
+  <defs
+     id="defs870" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-272.85714"
+     inkscape:cy="560"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1005"
+     inkscape:window-x="1911"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata873">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-32.41664)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8.99672318;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 131.53572,50.179132 c -54.174274,0 -100.702568,38.6765 -110.575582,91.938598 -9.873159,53.26282 19.698102,106.06258 70.277674,125.4761 2.319548,0.89024 4.921621,-0.26836 5.811987,-2.58786 L 122.30183,199.2106 c 0.89023,-2.31957 -0.26838,-4.92164 -2.58789,-5.812 -14.87072,-5.70891 -23.515673,-21.14784 -20.612431,-36.80689 2.903191,-15.6588 16.504681,-26.96534 32.434211,-26.96534 15.92952,0 29.53338,11.30654 32.43657,26.96534 2.90326,15.65905 -5.74171,31.09798 -20.61242,36.80689 -2.31951,0.89036 -3.47812,3.49245 -2.58788,5.812 l 25.25202,65.79537 c 0.89038,2.31821 3.49074,3.47652 5.8096,2.58786 50.57958,-19.41352 80.15083,-72.21328 70.27768,-125.4761 -9.87301,-53.262098 -56.4013,-91.938598 -110.57557,-91.938598 z"
+       id="path3773"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccscsssccccss" />
+    <g
+       style="display:inline"
+       id="g3797"
+       transform="matrix(1.2200654,0,0,1.2200654,455.86197,1099.5367)"
+       inkscape:export-filename="/home/rafael/workspace/logo-osi/3/png/logo396x412.png"
+       inkscape:export-xdpi="48.18"
+       inkscape:export-ydpi="48.18">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.25831962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -183.5617,-698.57555 c -5.02556,0 -9.12392,4.09113 -9.12392,9.10782 0,5.01668 4.09836,9.10781 9.12392,9.10781 5.02556,0 9.12392,-4.09113 9.12392,-9.10781 0,-5.01669 -4.09836,-9.10782 -9.12392,-9.10782 z m 0,2.25596 c 3.80399,0 6.8633,3.05458 6.8633,6.85186 0,3.79727 -3.05931,6.85119 -6.8633,6.85119 -3.80399,0 -6.86397,-3.05392 -6.86397,-6.85119 0,-3.79728 3.05998,-6.85186 6.86397,-6.85186 z"
+         id="path3015"
+         inkscape:connector-curvature="0" />
+      <g
+         aria-label="R"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:OpenSymbol;-inkscape-font-specification:'OpenSymbol Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         id="text3793">
+        <path
+           inkscape:connector-curvature="0"
+           d="m -183.7552,-690.46513 q 0.74769,0 1.06902,-0.27807 0.3275,-0.27807 0.3275,-0.91454 0,-0.63028 -0.3275,-0.90217 -0.32133,-0.27189 -1.06902,-0.27189 h -1.00105 v 2.36667 z m -1.00105,1.64369 v 3.4913 h -2.37902 v -9.22569 h 3.63342 q 1.82289,0 2.66946,0.61175 0.85274,0.61175 0.85274,1.93412 0,0.91454 -0.44491,1.50157 -0.43873,0.58703 -1.32855,0.8651 0.48817,0.11123 0.87128,0.50671 0.3893,0.38929 0.78477,1.18642 l 1.29147,2.62002 h -2.53351 l -1.12463,-2.29252 q -0.33986,-0.69208 -0.69208,-0.94543 -0.34604,-0.25335 -0.92689,-0.25335 z"
+           style="font-size:12.65519524px;line-height:1.25"
+           id="path863" />
+      </g>
+    </g>
+  </g>
+</svg>

css/font-combodo/glyphs/b-lowercase.svg

@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 264.58333 264.58334"
+   height="1000"
+   width="1000">
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     style="display:none"
+     transform="translate(0,-32.41665)"
+     id="layer1">
+    <image
+       width="262.41626"
+       height="211.46167"
+       preserveAspectRatio="none"
+       style="image-rendering:optimizeQuality"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAM4AAACmCAIAAAAd2iekAAAACXBIWXMAAAsTAAALEwEAmpwYAAAA
+B3RJTUUH4gMdCzQSNk2I5QAAIABJREFUeNrtfedzY1eW38sBORIgwZw656BuqZVG0monWJ71zrp2
+vVV2+T+Zv8Df/Mku22Xv2ju7W5ODZqSeVufMJruZMwkip4eX8/OHR6JBACQB8IFBwlWXSkKTB+fe
++7vnnnPuCaBhGEB7tEfrB9RegvZoQ6092lBrj/ZofCCH+N3VaiIIgm1Sx4jU8YCaruvlMwdBsOkJ
+t0kdCqljADVja+z/bLVJHQqp4wE1o2yUptrc2WqTOhRSxwNqhmHoul4x4ebEeJvUoZA6HlAzDEPT
+tAoZDkEQBEFNrF2b1MGTOh7ODnPCFWdrP2vXJnXApPY/wAN4mNJ1Xdd182yVpDcMwzAMNzrhNqlD
+IXU8LlBztqUJ7+dgtUkdCqnjATVd11VV1TRt250NQQiCQBDUJnX0SR0PqJUmXG74wDC8n7VrkzpI
+UscDauUCvKQrmBNuSICbhnrZ2hmmkV6TlKppHMfn8gWaYSVJ0jQdhmGCwF0ORzDgI0kCAIA6SVnI
+VfXK8LyQzeWLDCuKkqZpEASiKEoSuM/rtpGkqUsdMFc7EbTwtm0J1Mw5lwtwENzXXaCqKgAYO5Ey
+DIPj+Ew2n87mkunMRiyRKxR4XlAVDUZgp8Pu93p6uyPhcDDg87jdLgSBwdZzVT1UVU1nc6l0NpFM
+rUfj2VyB5TlVVWEYJgnc63F3hTtCHYGA3x8KBjwe98FwtdMOHgOpZhrYFQIcgiAMw/a/dgAAQhBc
+ImUYhqppDMPNL67cffB4bOJNPJmuuUwIDPf3dd+8dumD926Egn4MQ0EQKidlIVc110SWlVQm++e7
+Dx88fr64sqaqaukvAQAwoQ+BYDjUcfHC2Y/fvzk6POhyOuq3FpvgapcdNIe1Pl6LnR0lR47pyzE/
+bFrnkGVZ07TytUMQBEXREilFVReXV3/1u6+evRxnGFZWlApduHygCGwjiUhn+D/+h78eHRp0u13l
+pCzkqnqwHD+3sPjf/tf/i8YSHC9omrq1Nm9xtqm8wzCKoi6n88bVi1/84LPhwX4EQVrE1e44K8kI
+q7AB//SnP7X23jS5tARnul65dgiCwDBs/r8gig+fvPjFr//w6vVUvkApirLzsTEAADB0XVYUhuM2
+YomOYDAYDJAEYTlXtXDGjb+e+t//9PPF5TWOF0qxFRU4MzbXEFBVTRDFTC6fSKZQFA2HO3ZHW3Nc
+7b6DrXi5QizEWfkwWTQVhaZ12+q1K0FW0/SnL8a/unN/bGKS44XdSZZ21DAMUZRm5pfuPnzqcjkv
+XTgL1cdbnVzV/MX5heXbdx9Nzcxvl7g1cFb6QNf1XL4wNjEJgCAEQbduXqv5FU1ztcuN1AqDoFVQ
+M0+DYRjWadwgBMHld4GqatFY/PY3D1+9nqofZ6Ud1TT9xavXvd1dgwO9XrfbKq5qjiLNjL+ZeT42
+UT/Oyq/dVxNTCIz09kS6I51IlYhqmquaEzRHSZJZ/hhvzU1c8cq2n3tzT93WAABBEP54++7M/ALL
+co3izPyAKtILSytLS6ut1rgXl1YWlpapIt0ozszBsOzM3MKf/nxXEITW2QElnJV5DEDA6lA2yBJ5
+VkkUgmAYbk4/q1g7BEEq1k5V1VyhcO/h02wu3xzOzLEWjU3NLljF1U5jam5hbSPWHM7Mkcnl7z54
+ms9TZUbrfrna3eVruUFgpVQrZ7Hpt+GddNuKOVNUcWxikirSqqo1jTMAAHIFKpZI7m6A18/VTocw
+Fk/m8lTTODOPVqFIj72eKonGfXJVjbNyd4EJsla8k1oDtfJA9UYZNbVRRVG2H6wd145m2Zm5RVlR
+9oMzAAAEQaSKNMvxNdHWKFc1KXC8QBVpQRCbxpk5ZFmemVukGXb/XO38tPBWWLQoZBKyVqQ1F4NQ
+rdvCMIyiaE3pyPPiWjS+s/+s3h3VdV2SZJ4X9FpQa5SrGhQMg+d5SZZ1Xd8PzgAA0DRtbX2D4/j9
+c1Vrgtu2r3WhH4hVIGvOZmlCtxUEIZlMaZq+H5yVLW4Nji3RuLf0anCfODNN5kQqxQuChXZACWel
+vTM17NaFGFkGtSZYbMLHraqaIIgUzZSbS01rQjAMEQRewbmFnncCxyAI3CfOTJaoIkPTjCzLJsH9
+cLV9ggeEM2su0P3grFHdlhf4Ik1bgjMAACAIJnDcQjugQhmCwE2xth+cbTGmUTTN8fz+7YCqCR5Q
+aO4hBDDtR7flOH67j2o/OIMQ5G10jbUat6ZpqqqCIABDm06f/eDM/G2aZrb81c1ztX2CYNMeg0O7
+QPdvB9Tp42Y5gSoyFWsIAgAEQQSBEziOoihi/oNs7rGm6aqmSZIkipIgiqIobc4chjEULS2xtZ73
+kiaEoQgMw9qmGAYJAicJgiBwHMcQGIFhaOvnNVVVFVVTFEWSJF4Qq59KizTD84IVXL2dYHOi8XhA
+bZ8aN8dzhWKxJPYRBEZgGEVggiAiXaGOYMDrcbtcLpfD4bDbMBwzDEAUJZ7nM5lcIpWOJVPxREpR
+VFmRURTFMMxCO6AmKQzDMAwFIQjDMAxFO8Mdkc5QONTREfDZbDaSJEAQkCSZZXmG41iGo2g6nc5G
+YwleEBRVVVVV2wrdpmmaFwRLA58ONAQcOWCc7VPj5li+SG1eoJFwcLC/d3Cgb6CvpzsSJkmSwAkc
+w2AYBiEQAkFg62Y0DEPXdE3XJUnKF6jZ+cWnLydiiSSGodbaAdWkMAwNBQORSOc7Vy6dGh32et04
+jsMQBMHQWx3XMHTDMHTz37qqabwgrq1vLCwtLyytLq+ubcQShmFQNCNKcnM4s2qCxwNqlmjcsqI6
+7PbPPr51YmSwKxzyelx2m81ut5EkgWP4nmEzhsPudjn9Pu+pEyP5AkUQhLWe92pSn338wYe3bvp9
+Xp/X63I6UHTvOBfDMBwOO46hnaHA5QtnChQdT6Rm5hZ0w9A13cJwrANONTiIPNCSY7r6zc6ccP06
+6fLq+tr6ht1GdkfCDrttC1gggiCCKDEMy/G8KMmyLEub5xhEEJjACZfT7nG73S4njm9empIkq6qK
+IPD+udplgqqqISiCY2+/tEgzVLFIM5woiaqqAYABwzCOYRiGEThmt9ucDgdJ4CVSqqZxrBBPpThO
+6O3uGujvPfhlPzZQM82xao27ibtA0zRFVTVVBQBD0zSOFxiG5XhRkuVMNp/J5gpUkRMEQRAFQVRM
+xRxD7TZbwOcNBQOhjmAw4PP7vF6vG0NRC7nahZRhGJIk5wtULl/IZPOpdCaVyWbzBY7nZVkBAABF
+EJIkSJKwk6TH7Qr4vV6P22En7Xaby+l02O2mWtmoU8nCZT8eF6j1Grciq6omyXKRZlZW12fml5bX
+NpZX11mW3fUBHgAAwGYje3siN69eun71YmdHEMVQBIastQMqSKmqxgt8dCP+5Pmrxy9erUdj/F4B
+dggMOx32/t7uwYHe0ydGhocGgwEfBMMoghzKsh8PqVaasGHoVmncLMctr64/fvbyzfR8JpuXZVlV
+NVXTavl1a3ibERjGMMzvdb9348rH79/s6+221g6oILW8uv6nP9+7++BpvkDJsqxuf9veyUFo+u4R
+BMYwvCMYuHj+9AfvvTM80Oew24+RHXBwUCsFDpTem5uOeTfXLpfPT88uvHo9tbC0ks0XijSrKEpT
+7Bsogvh93lOjQ7duXrt66bzD4WiaK12v7fIVJenJi1d37z+ZmpnP5PLlD9u746zcEQ2CIIZibrcr
+GPCdGBm6dun82VOjXq+nOa4aneDxuEC314ww9uPj1nWd4/jpufnXkzPTswsra9Fcgdqn511V1VQ6
+IwgCy/OSrNy4djkY8Ddh6OwU1J8vUM9ejn999+HM3CJNM3VyVf3gYRiAJMvpTDadyabSmVg8sbyy
+dvHC2ZMjg6b21hBXTdhzxy7lGARBoDkftywr2VxuZnbh/uNnE5PT+UJxK+aneZyVfrPIsONvZnhB
+8ng8NpJ0OOwNCeydnhZYlpuanf/l7/40v7isKGrTOKv4oWyukMtTyyvrG/Ekw7wzOjLk87jLk6ks
+fPBoxV1nZXJeictaKcfNKKSyoiRT6YdPnv+fn/18em6B44X9vyRW7KiuG5lsDkVRv9/bEQiUxU00
+pnHD8OYENU2fmVv4+s79x8/G6lEfG33A5QVhZS06PTvvdrn8Xi9BEuaq7s5VoztYnpF0RKFWXjvu
+rSberMa9vLr2mz98/dsvb+cLBU3TLcdZ6YNEMk2SRF9vt3MvwbaTxl3a0VQm+8fb976680DZLU64
+SZyVFpkXxPnFFVmWwx1Bj9u1J1dN48xCqEHW4qwcZJtYbip1SpaVuYWln//6ywePnxeoYktxZoqK
+2fnF15PT+/e8T0xOz8wv8oLQIpyVfGb5AnXn/uN/+dXvl5ZXBUGwKvCpInXKwgFZiLOKlOOmy+kI
+gri6Hv3dl18/fzmezmR1vbU4M790fSM+NTMvSXLTqQamq3ZqZj66Ea9D19l/aK6WTGWePBv7zZdf
+r2/EJEneP85Ks2uFrmY91EoXfClwoCGoqaqaSKXu3n985/7jTC5fllzaKpyZgyoWV6Mb8UTtUPJ6
+gvo1TY8nkmvrGwWq2GqcldY8ncl+/c39h09eZHN5M2G46VSDas3nW55yXKTp15Mzv/zdH1mWOzCc
+mfZBLlcYe/2mWseq0/MuK8qL8clcvrCXSLAGZ+Zv64bOMNwvf/en6blFXpDaKccNeERfTUzd/uYh
+y3L6AeLMHAzLzS0sK9t9rfUn96qqOrewyLDsgeHM/E1d1xmGvXPv8ez8UjvluF6cxROpqdn5xeXV
+g8cZAACiKCYSqfK0v4YicDRNSyTTwlaU78HgbPOrdX1ucXl6diGTzTeBs+9iyvHU7Pz84jLLcQeP
+M9PszVNF8x5pItVA1/UCRZvBGgeJM2NLJM8uLE3NzDVkbH4XU47NmPqpmbnoRvxQcGaKJUEQNU2v
+Gem1u8ZtGIam6YIo7pAL3VqcmR+srkUnJmckWa7Hfjz4lGPIKpA1dxpKE9Z1LZ3NRTfihc2EqIPG
+mfnzmq6bkqzRCBzdMBRF2cEjdRA4AwAgV6BW1qKZbH5Px1jpeFfcmy1NnYIOV56VNG5VVReXVhiO
+OyyclaSTKV8bLvJTVgfvUHBmDpphZ+eXlF2jSKoNnYNJOUYswVlz/pFyjVtVtaWVKMsJh4kzADAA
+wCyoC8OQKEmZTG51fSOZzpmFZCRZBgCAwDGnw+73eTvDocH+3nBHkCBwwwBM3+ch4gwAAJbl5peW
+b1y7BOB1LXvJM3UAqaCH03q2OtZF0/SNRHKraM/h4GzTU6Vp+QIVjcWXVtY2YslUOlso0gzLCYKo
+qGZ8NkqShMvp8Hk94VBHX09kZGigr6frcOWZOXhBWI/GNU2tb9m/eynHAABqupHO5MS3ryuHgzNV
+VVfXN6hicfzN9PTcYr5AVZNSFJUXhFy+sLIWBQDA7/OePX3iyoWzPq+nLOL8EHAGAIAoSal0RlHU
+6lCzdsrx5qqpmkZRxfqiIVooOURR+vWXX61H41Td1kkuX7j74MnE5Ex/Xw+/71Jq+5ygLCsFiuIF
+0avr5TG3RyHlGDpgnNX0vGu6nspktIYDCqzfUVVVZ+eWaIZtlBRNM1PTc6WpHQrOzKGqWjKVEcs8
+yRZWMz0eUNvF8y7LSiKZ3qFk2sHhzFRo5E2fRcPWtKIoZrbOIeLM1HqTyXQJakcn5fggLtA9Y95F
+SUqk0pquHS7Ovh2kdF1LpFKCJFqeanAMoLZnzLsgSolU/VKtjbM9pFoilREE0cJUg+NxgdYTgSOK
+YjKV0euSam2c7QU1XUumMoIgHrWU4wPrcrxb7qsoSvXpam2c1SXV4skUzTDVdsDhphxDB4Cz3SMj
+ZFlmWJZhuL1e7to4q4+KrjMMw7BcWb39Q9PPDgJq9accc7xQoOi9kr/bOKufkKGoKlUs8puFc/eV
+cnzUL9CGUo5phs3lCuWfmDXeUQSFERiGIBiGYRhCYEiUZEEQpM2AsO8iznAMs9lIAsdVbXOomqap
+mqIqZsh9iVQ+TzEs5/W4j07K8eF3OaYZJlsoQBCEmhVsYRhFEYLAXU6nnSQJEicJgiQIG4mvrseW
+VtbS2dx3Vp55Pa6R4YH+vh6eFwRe5AWB5wWW52mGEQTJDH/SVFVR1XyhyLD8kepyjLQCZxUBxLun
+tDAMR9NMwOc9fWp0dHigrzsSDnX4fB4IBE2naCkQ7pe//dNGIvldvjdxHD8xNPiTv/pReR6kruuq
+pqVS6UQyvR6LLy2vzs4vMRwriuI+U46PrlRrLuW4rzfy7/7N9yEIdLmcTodZaxRHUESRZV3HTGqa
+piVSmeXVaC5HfZf1s0wuv7iyli9Qkc5Q6YnTfA/AkM6A3zs82Hf98nmaZiEE7u2ONJdy3Iq+s4CF
+Ra9KJ6y8p3apy/EurMuyrOl6qbe1SURWFI7leIHnBYFhuWyu8Hpq7umL8Uw21zjD3x47AATBUDDw
+7jtXL5473RH0O512kiAwDEVguGyBQQRBFFVDywqj1n8jlX+XtXlTlkHNRFg5zswYlTp51Q2D5wWa
+YYpFhmYYlmUZlmMYlmbZfIGKJ9PziyuyrHyXcVZCAIZhp0aHIl1hn9fjdNgdNtJutxE4breTLqfT
+7Xa5Xa4mUo4ruhybYdUWijdroFZKOS5d89DW2PMkyYoiSbIgiKvRjenZ+emZ+eXV9UKBUlXVaPs1
+6iAFAQCCIF6vp7+3+9TJkXOnTvb39ZAkgeNYeQ+QenAGbE8TsdYPZwHUjKpRf6A6w3ATU9OPnr2Y
+mp4vULQkS6qiamZmYhtndZMCzVcnBEERBMcxr8d95vToe+9cPX/mlNPh2BNnqqqWp1eWUqeOnK5W
+Ic/qSWlRNY2m6RevXo+NTy6trqezOZpmzAm3/bT7JAWCAIIgLpezI+Af6u+9fPHs1UvnXS4XUqs6
+aSnluFw5s/zqtBJq5W9Ke+Isnc3NLSxNvJmenV9aWYsyDKuX+R7bOLOKFASCTqdjoK/n5OjQhXOn
+T44MlRdhNUXD1gv1W3lmVsA4ohZoCWp7poJqmhZPpl6OT95/9Gxs/E1Zues2OFpFyixqfuXiufff
+vX7l4tnO8KaXZPOxQVXLW8+2NEXPsgsU2LVMkmEYiqrm8oVf/PaP9x4+3Ygl2uA4YFI9kc4P33vn
+xz/63Of1wjBUSm03dTJo8wGwhalT1kAN2CsbVBDE5bW1//EP/zq/uEzTTJn/pg2OAyIFw7Db5Twx
+Mvif/u4nka4QhqJml2Pzumyi6OKh+dV2GRzPv56c/edf/HZ2Ycnsdd8Gx6GQgmHIbrOdHBn84gef
+nT45YreRpbypJoqUNTpaHvAtiuLEm+kvv747MTlt5ie2wXFYpDRNZ1h2YnKaJAld1y+cO00SxLck
+5dgwjMXltW/uP3n8fGx7Nag2OA6HlGEAsqw8fzmBY5jb7Tp76sS3IeXYLKD89Tf3n41NbK+Q0AbH
+IZMSRHFsYtLhcJwYGcIaeSfdz2ghnEVJun33wfibmXyBaoPjqJHKU8XXU7N/vvdElKTjDTVVVbO5
+wld3HsSTqbYdcARJ6bqRSKa+/uZ+Lkft2dzySEONKtIvx98sr66XXZ1tcBwtUrwgLq+ujY2/2SpQ
+cgyhZhhGKpO9+/AJLwjt94AjS8owDJ4XvnnwJJ3JHIDPqyVQkxUlmc5MvJne6hvXBscRJaUo6vjk
+dDKdkRuuAXU0oJZKZ1dWo1tetPaOHl1ShmEoirK8Gk1lsscUapmV1fWyDNA2OI4uKcMwVtajqfTx
+hFouX4gnkm2cHRdS8Xgqly/UROGRhpqu6xRFV7QFae/oUSaVzeWLRVovA1Yr8vOsh5okyRRNF5nq
+huVtcBxRUlSRpoq0LMvlOKvOszxaUDPdHBRVrOKyvaNHl5RhGFSRyWTyQCtTjq3vcpzOZKpcgu0d
+PeqkqCKdzmaPWZfjVCZH0XQbZ8eLVLFIp9LZlnY5RiyHWiabK9LMtwBnMAyRBOHxuB02G07gKAJD
+EAQCgKZpiqKKksTxAlWkBVFssGD0UYQsVSymM5nylGPLk6asgVp5ynEZ1I4rzkAQxDHM43b19XRd
+unB2oL83FPS7HA4MRwEAEEW5SNOpdG49Gnv1enItGqeKdJ396o6saCzSTDqTK1XraEWXY8QSeVb6
+D0VR8oUix/LHWp457Lab1658+vGtUyeGUQTRdR0ADAgCARAEAMBhh11OR19Pz5VL53/4l5/MzC1+
+def+42dj7GYvtmN5BbMsm8sXFEXBMKwVqe2AtaGRuq6nMlmO57Um9crD3wYIAp0Oxxc/+Oy9d672
+9UTsdpssy7oObKuxiqJmMD4AAHYbee7MSafTEe4I/voPXzEsq+vGcVT1NF3neD6VyUY6OxGkJXmg
+1kBtszSVrscT6aPQkqxpUhiKXb9y8d13ro4MDyAwbBbH273ov9NhPzE8AABGMp2+/+j5zpGGRxdn
+5hBEMZ5Md4XDx6DLsa7rsURKEKRjijMAADAMvXHtUqQzhMBw/V2OMQzr7uq8cfUShqHHFGcAAAiC
+FE+kWlRczTKpZjKn60YsFhcE4fiaYxAEuZzOapztWfQfRRCXy7nD3x4DnJlSLZZIaa1xqgHWdjnW
+dT0aT/KNXaBHaxtkWXkx/jqVyTba/CtPUS9evd6eFXZsXHFbUk2MxZI79Go+GlAzr3bDMGRZTqUz
+jaRFHLltkGTp7oMn9x4+iW7EdtHPKsZadOPugyd3Hz6VZOmY4gwAQFGUEqm0rCgtisi1zAJVFIUq
+0hwv1H0sdls7GILMSogYhqIoiqIIiiKGDqiapphDVXlBEEVJUazsi6hpWjKVvv/4GcOw58+cGhzo
+7QgGdsKZpmnZXH5xee3V66mxiTfJVMZycKAIQhA4SeAIgmAoUtIUVU1TVE1RFFlWJElit9UMaAZn
+AAComsbxPFUselyunZXOIwA1UZJT6exenS52nDAMw06n02EjbTab3Uba7Ta/12O3kQRB4Dhm/jF0
+QFYUSZJkSRZlmWZYiioWaUYQBEEQWY7jBXErcHlfx31peS2Xo1ajsYvnzwwN9HvcLhtBYBhaquEj
+y4ogikWGWV2Pjo1Pzi+uFKiiJThDUdRuI83y0zYbabfbnA67027DcQzDMBzHMBSDYVhVNUmRRUmW
+RJHnhWy+wPE8z4s8z7M8zzDsDg8Ye3Clqmo6nQ13dBxxqEnJdKa+s/V2wjAEISiK45jT6Tw1OjzY
+39vX293b3dUV7kD3Kq6p6zrNMMl0ZmMjEYvHF1fW1qKxbI6SFUWWFWNXB9ee21AoFl+8ej02Mel0
+Onq7Il2dHT6fmyQJU6fJ54vxRHo9HmOYmo60hnEGQRCGoRiKBvz+gf6eE8MDvZFId6TT43aiKFKu
+NcJwpXViGIYsK/FkKhqLr65vLK+uT88ushwnS7KiKmWY25srXdeT6cwJSQKcjqMLNUmUUumGW5IF
+A/6zp09evXz+3JlTLqcDRVEEhs0mLHviTJZlBIG7QsFQwHfh3ClV1Yo0s7oeffnqzcvxyQJVVOoV
+sTtug64bDMPOLi4uLK+UCtxt9prRNU3TLMEZgiBej+vKxXPXLp0fGR70+7wogkAQuL1tErBTSzIQ
+BDEM7enu6gqHrlw8ryhKschMTs++ePV6cmY+kUrXz5Wm6clUVhBbkoRspVRLpbJ7tY/dnDCB4+Fw
+6N3rl0+fHOnqDPu8XrfLiSBw/Q48s3MvCABmdRMMABEE8Xo8HcHAyNDgp9/7YOLNzIuxicXl1Tpy
+gXbbBl03dF1VAHU/kN3ZY4wOD/ZfvXzhwtmTAb/P53U77HYURc0Jbj9ru1knZr0+BIZxAAAA0mG3
+ORy2E6NDiWR6Zm7x/uNniWRK2jLXduFK0/VUKitJRxxqopTMZPTdpJoBAACOYd1d4ZOjw6dOjJw7
+c7Ir3EEQRP0+wz079xIE7vN6Bvp6QsFAb3fX5PTs1OzCylp0ZyXycIxEBEEG+nrOnBw5e/rEydHh
+3u4uE0Nm84B9tiZGEMTv8/q8nq5wqDMUDAZ9M3MLs/OLsXhy9w5duqYlM2nxKEs1wzAEUUxncjs7
+AA0IBEmCGBnqv3b5wtVLF4YG+5poS1Nn514Igvp7uyOdoVOjwz3Px+4/fra8us6wXJUZXwkOFEGG
+BgcURWEYluG4eh7ZSJJw2G0Oux1F4ZXVTUzvgjMQBJ0O+2B/7/vvXr9x9VJXZwhF0UYnWOdawTDU
+Ge4IhwLDg71d4Y7nY68Xl9d4QdzJnaHpejqTFUSxFW8G1kBN0zSeFwoUvYNZYEAQZCOI4cH+v/nx
+D8+cHnXY7ZbgbHcnPoqifb2Rzs6OkaGBn/38N6+nZjiO13ct8Gaz2//z3/8Nw7JzC8vzi8sb8aSq
+aYau67qhG/rbEuZmrUUIQmAo0hUeHugbGuhz2G3/5b/+d5pmdsEZBII2u+3sqRN/+9dfnD1zAkPR
+/UywzrUCQXCwr7crFBrs7/+XX/1+YXGZF8SaO6XreoGieV7QNA1BkKMINZbl8hS1E84AAPC4nJcv
+nP2bH/8wHO6w22zNrZ0sy3s2TK7pmjp75oTDYfvtH29/fecBzbC7XHYwBHWGOi6eO/3ejWuiKFJF
+OpXOUDRNMyxDswzLAwDgdNicLofL6fC4XMFAwGYjMBQBQTCTycEQtPu96XDYPvnw1o/+8tOB/h50
++142PcE618put1+9dD4SCf/fn/3y+dhEvtI7U462IstyHo/7KEKNZrl8ntoJZ36v58qlc3/1o8+7
+usI2kmyidlzJDmhCfQFBEEPR3p7I5598iCLoL377paIohrFj0X8YhnEcRxDYYbe53a5wR1BWFFVV
+FVU1K/YgCIwiiBlHBG9V+FdVDXrbGKD2vYmiyPc/+973Pni3rydSLc+anmBDa9XT1fm3P/kCgqBn
+L8dzhdq94XKFAsMdVagxLJuvwbcBAABJEGdPnfjo1s3B/r4m1m5PO6BOOgSOD/b3SZKcSCafvhyX
+JXlP5d3EaAXRliWkAAARCklEQVQmKrgqXXYguAXVHeQZhqHvXr/y/s3rQwN9BIFbPsF6SJn9qYYH
++z/9+JYoSU+evxLEGspoPl80Zb+1GptFUGPYXKFQjTMAAIb6e29cv3zuzEkzAqdFdkA9A0ORvp7I
+5598kEimo7G4JMlN25u1lSoY3okUjuN9PV0//PyTocFtOLPcDqiHFAiCF8+foYpMNld4Mz1bW6ox
+3BFNOaZZLpcvVlt2KIJ89P7NyxfOkgRxAHbAnqQIHDt9cuTWzWt+nxewFGcwDGMouhOtoN/30fs3
+z5056XTYD8AO2JMUjmHXLp3/9KNbKIJUi618nqJp+oimHLMsm6eoau/OyFD/YH+v3+dt2g5oNJhn
+T1I4hr1/81ow4N/lsmuCKxTFwM1LtMZFHOoIfHzrXQLHDmCCdZLyeFxDg30jwwMIXHmz5QsFhuUA
+q4cFUNM0jWG4YlXlQQzHbl6/0tkZanrtWqEmQxAUDPhPjg6HO4LN4WwHrnYEbqgjcGJ0MNQRKOf8
+wOyAHTcegkIdgVs3ruN4ZdllimZohrU8cM0CqNEMW6SZsqjAzR11OhyXL5zze70NqZamu9wM6t+W
+PNKUmlxNCgQhm812+uRod6TLUq52nGN3V+ep0REMQ0tPqC2dYP2kPG73pQtnHA57xU/KskKzrOWC
+zQKo5QsUw7IV9zqOYR0Bf093l81GNtput/6g/qZJDQ/0NyTV9sNVuCM42Nd7wBOshxRJ4JHOUDDg
+r+i7bRgGy3KFYtHaBwMLoMYwbPUDDkmSPZGuRj3OB6YmB4M+t9t5MFy53a6OoP9w7YAdHRAI0h3p
+IkkCAIytPwAAADwvMgx35FKORVneHj0BAgCAoojD5YCgxs5oS93l5aQIHMcxzMyHaClXEASZcZ0H
+PMF6JQ0IOh226pgaVVVr5UkcugVayyQGARAGoUbX7sDU5D1bl1rFVemLDt0OqE3KMGqaM0YLKsRY
+INVQZDMSeptZquuiJNXD7UG6y8tPrapptUQaCMMQCDbMFQgCEFxj10wikiybdWUObIL1kDIMQ1UV
+URTLogw3+UdgGEWP3nM7SRJ4VZ8iSZZzuUI98d8H7y4HAIBhOZ4XKg6umWJotsVslCsQgkqPP8b2
+Sp8sx1FU0emwH+QE6yGlaZosy7l8ofquxHHMRpJH7gJ1Ou1m0H35EARxI54QJWl3OXxYanIylalK
+PAEgCMQxzDzNjXIFmQ+mGFatnuZyhVg8eUTsgG2yVpIEQYwlUtUvoSRBOB2OIwe1oN/vcbsq9B5V
+VfMFamlpdZf6PIfoLp9bXNqIJyp9zijq87oBAGiOKwiCfF43Wvk8b8STyYXllYN/D9iTFM8Ly2vR
+AlXcClEGS8fG43YFAr4jBzUMw3xeT9mr4ubFIYrSvcfPM9nCUbADyhljWG5yZn57/3gAAACbzdbX
+E9F1vTmuYBju6+2222zb1WsgnkjNzi2aMcCHbweUkcrl80+evtxSqd9KCr/P6/O6cavz8yyAGgSB
+4Y5gf2+k4nNZUcYm3kRj8Qr5fLjucllR3kzNra3HWI6v+CuH3TY02AeBQHNcoShycmTI+TatbXMD
+eV6IxhIzcwuGAR7we8AupARR3Ignx9/MKIpaYc309XaHOoKWB3xb89we6QqPDg9WMKdpWjyRGn89
+FY3Gyu2DQ3SXK4qazuTu3H+USmcrlEgYhn1e9+jQQMnt3ChXKIKcPjHi93pgGC6P8jUraT54/KJA
+Fc0KoAf2HrATKV3XN2LJ11Oziap8ShAER4cHI12dgNXDGqh1hjpGh4dsZI03qDv3Hj1+PkZvtTE4
+RHe5YRh5ino+9vrhk+f5yug6wGG3RbrCA/09W/7MZjzvw4N9PZFOh8MGVPV5ffRs7MX463yNMvuH
+YDPRDPfs5cS9h08r5BkIgnYbOTo82BkKHlGoEQTe0915/erF6u7Meap47+Gzr/583/QJHWLYDMcL
+b6bm/vGff8HxfDUOB/t7Lp47DW0elSa5AgDgwtlTg3091dHkPC/8w89+8Xpqhq3x7QdqM+mGcef+
+o0fPXlI0W+njwLB3rl7q7e6qiN+0ZMA//elP908FBEEUQWw2YmJyRhSlCscSLwg0w+m6Hgz4YQiq
+1m2rPcBNq8k7kaKKzP3Hz3//x9ura9GqFHzD7XS8+86V925cs5HEPrmykUS+UFiPxiR5W5SvYRii
+JFMUjSJoR9C/+142McF6SJkNQP9879Gd+0/Xo3FlezI2DMM+r+fvfvJvq0OFjxDUTE3FYbczHJfJ
+5CrEhqqqLMfn8nlZkZ0Oh40kzaib8ph3q9zl1aQ0TU+lM3cfPLlz79HM/GK1uxKB4XeuXrp14+pA
+Xw8IQvvkiiAwU4JGYwl9u2VnGEaxyBRpRtU0n9djI4maBnKjE6xzrVRVTaQy9x8/u3Pvyer6RnUZ
+vI6A/8P3b3z8/rvuHWsSHg2oQRCEY1jA74un0rl8odSwaEsfl3P5QjyRQhCEwDGCwEmSxDDMKjug
+Jild1zmeX4/GHj55+Yev7swtLFXhzEARZGig94d/8b3TJ0cJHN+JVP1cgSDocDhwAk+m0sUiU/Fe
+oqpqOptLZbIwDBEEQeA4gmz7roYmWD9XDMutR+NPX7z68uu7q+sxafvuAADgdDounDv1ky9+0Bnu
+sDwD1GKomWjz+7yGbuTyhVSm3MQzzFPGMOzy6jrNsC6X0+/3IWbTibqXb8eg/lrqi6woNMPOLy7/
+9svbv/r9nzLZXNUrmQHDkN/n+duffHHh7CmX07kTqUa5wjDM63H7/b7puYUKdcIUNgWqODUzz/Oi
+y2m32UgYgc1rsaEJ1sOVoiiqqnI8PzO3+OXtu7fvPszkCtV2CQzDZ0+d+Px7H1y9fKEV8sx6qG1Z
+o0FRkqIbiZrJvbKixJPpqdmF1fVYwOd1OBw1s9920jmqr5Wa26Dr+sTkzM9//eW//Or3NffbJNIZ
+Cn728fsf3rrhcjrRzWcla4J5HHZ70O/XNC2ZztQMZ9U0LRqLv5qYSqWzdpIMdQTMV4o6J1gnV7wg
+LK6s/tO//uYPt+/OLa6IglTT+o10hj//9MNPPnwPRVGgZcN6qCEI4nY77XZbMpVmuc0cL3Brew0A
+UDWdF8RMNj87v7S0vJovFEAIcjmdEATtJODqVJN5QViPxR8/ffmbL2/fufd4anY+mysoSu36tL2R
+rls3r332vfd9Xg+O49ZaJwiCYCga7giqqmLqZ9W/rqoaL4iZXH5pZXVmbilXyIMAUHqEbdoOMIta
+LC6vPn3+6utvHty+92h+caVA0YqiGrVeOHoinT/+0efvvnPF5/W0qLb35tK0ovCpqmmJZOrB4xd3
+7j1cXd/gBQHcIbnX63F3hUM93V29ka5IJOz3eX0ej8fjcjrs5cXMqq8VcxsMwxBEqUDRxSKVzuZj
+iWQ0Fo9uJDZiCZbl1B0SMSAIPDE8+M7Vi9cuXxge7N+Pxl2Tq3JS84vLj5+NPXr6cmZ+cac4FxiG
+HXZbpCsU6Qx1d4Y7w6FgwOf1egN+n8Nuq0dz0nWdZTmqSOcKVDqTjW7ENmKJWDyZTGcKm+lFNaZm
+t5EDfT3f++jWu9evdIaC1Zi2NuW4JVAzDENVVZph/nzv0f1HzxaXV7cu09p8QyBIEMRgf29XZ7gz
+FAx1BAJ+n81GoptvL4Zh6DAMb7YQ1HTNMCAIUlWN54U8RaVS2VQmE92Ib8STVf0hK50yBI729/V8
+8uF7Vy+d6wqHmvOImnWpqoN5apKKJ1JPX7z68va95dW1Wlf5Nh3D7XJ2hkM9ka7OcCgUCvq8bofN
+hmKoWeAQhk3tFtA0XdU0TdM0VVMUheWFXD6fTmfjqfRGLL66tiFJUllTzxrL7nI5TwwPfHjrxqcf
+vW+vyv8oy/o5wlAz39q0rcDDB4+ffXXn/sTkrChJdXaYg0AQx7HOcMjpcJAkThIYTuA2ktR1Q5Yk
+UZRFWRYEIU/RuXyBrTuxB4Yhu43s7gr//b//q5OjQw67vWmN21S361feGZabnl34n//4s/WNBM/x
+28XtblXZHA673+f1edwkSZIkaSMJgsBAEBREkedEXhB5gaeLTCKVkmTFMHSgjgJvMAwROHHpwpnv
+f/rRh7du1NxBc1jbacpiqJk4M9uXmpQlWd6IJZ6+GP/D13cz2WydaANBMxoWhEAQBLfq1QOAYQCG
+YQBGqUpo/RnYRm93183rlz/54L1QKIBjZjmOAwrqNwxDkuREKvXl7bsPHj9fW4/Vg7PNdYAg80Yu
+i1EHN3teb7W+1nS9fpwFA4Hvf/bRrRtX+3t7qpNAy7scH12olXrklnf+NstRF6jiyvrGs5evnr4Y
+T6Yy9aWzWlPPEYaggN97/cqFC+dOD/b3dAQCJjL2YwdUB1nsScpUKpLp7NLy6tjEm4fPxrLZnKZp
+B1awEobhzlDw+tWL169cGujt9vu81U8CpY0rNWm0EGrWt54tyV7T02buK0mSwYA/4Pf0RLqmZxcW
+l1fjyZQs79KNwQKc2UgyGPD193afOjF05uRopCtkt9kOK6gfBEEURXsinV63qyPoD3UEp2bn19Y2
+srk8Lwitw5lZlLkrHBoe7D99cuTcmRODfX0oilbrYOaN1AqDwGKpViHMTF6rt0EQxKWVtfHJmfmF
+pWQ6m8sXijRdVXy1eZyZO+r1uH1ed2eoY6Cv5/SJ4dGRAdN7t4vybqEdUA8pXhDmFpZmZheWV9cT
+qUyhSBeooqKojW/HjmtFEoTb5fT5vOGOwOjI0MWzp4YG+qpD80vbZ47SJV26tY8W1Mq7HJsEoa2x
+k5AQRWlyduH5y1evp2Zj8aSZwqSqmqapRplToM6i/zAMIwiMwDCOYz6v98rFc9cun+/riTjsNks8
+743aAfWTohl2dW1j7PXUy/HJfKEgSfLWOmh1JAFtw5m5DjCCIDCMIEh3V+e5M6euXblw9uQIQeC7
+gKaEM6Asm9Dy7rMWQM2oGuacdz8QhmEoiiorMk2ziVRmZW19dX1jdS26EUsUikVd04C6i/47nfbe
+nu7+nu7+3shAX3dvd4TAcRAETHuifuXdQjugflIQBIMQqCiqIAjrG7GVtY3V9dhqdGM9usEw3K7d
+bbbjDIZ9Xk9PpLOvt7uvp3ugr7czFHS5nBiKoiiyO85UVS3ZASWQWf5CZTHUSrpk/YJX0zRRkhmW
+LRZpluM4jqNpNlegBEGUFVVWZFGURFESJAkCQQzDCBwnSILEMQInHA671+PyeT02G2m32Ww20k6S
+BIEritKc8m6hHdAoKTPaiuMFnhc4nud5IV+gChTNspwoiYIki4IoSpIsy7quYyiK4xiBYziOkwRu
+I8mOjqDP63HY7TYbabeRdpsNx7E9mTRxVi7PoDKD9yhCrVzUN4Szas+7YRiSLLMcr6m6phvmm7Es
+K5KiQCBgvgmaPXJQFCUJwm632bb0j/qd+Ba+B7SOFC+IHMcLoqgoitnNSJJlWZZVRUEQ2OzyZmYE
+2m02r8dNEET9omgr5dg0dN7Ksy0vsfUvVFZCrc7qBDUPlqIoW9uwebb2E87QJlUnKVVVy/0a9Wg+
+h+zsKLHbHM7K8xBNu7W5tLM2qUZJVbjQWoczy6Qa0NRjWZmnapunsem1a5NqjpR5b5oVJICWDcQq
+kdYczsqVPHPCpq7QJnXwpFqKMytfCxqdcMnZu08B3iZ1KKSOB9RKT6X7n3Cb1KGQOszXgoYmXO0H
+b3rt2qQOntTxkGrlbpGSotCoy7dN6hBJHQ+oVbwolPt7m1i7NqmDJ3U8LtDyCVc8t+1n7dqkDozU
+MZNq5dLbPFttUseI1DGAWrWPt+lT1SZ1KKSOpQXaHt/ZAbWXoD3aUGuPb9X4//0/Sa3hNTUCAAAA
+AElFTkSuQmCC
+"
+       id="image823"
+       x="2.9734159"
+       y="52.273003" />
+  </g>
+  <g
+     id="layer2">
+    <path
+       id="path827-9"
+       d="m 97.624888,39.796021 c -8.178314,0.006 -14.961537,4.568212 -15.54272,10.453627 l -0.226343,-0.0021 -1.86862,19.061368 c -10.48507,6.763065 -15.77113,18.088851 -15.77113,18.088851 l -4.276224,26.459893 0.258381,0.0661 C 50.006857,118.97418 43.274297,126.9138 41.68205,135.75964 l -0.183967,0.014 -7.216098,39.0214 0.316778,0.0109 c -0.07327,0.65029 -0.11842,1.30208 -0.135393,1.9544 -5e-6,17.33952 19.483317,31.39599 43.51724,31.39602 23.49434,-0.0182 42.72694,-13.48746 43.45006,-30.42967 0.0382,-33.56054 -0.12647,-67.01884 -0.28628,-98.079355 0,0 -0.58301,-6.16341 -7.34633,-10.666015 l -0.6258,-17.202566 c 0.0278,-0.242592 0.0447,-0.485771 0.0506,-0.729154 1.9e-4,-6.215145 -6.98334,-11.253585 -15.598012,-11.253579 z M 78.113934,154.49394 c 18.592694,-9e-5 33.665126,10.22596 33.665136,22.84046 0,12.61451 -15.072436,22.84056 -33.665136,22.84047 -18.592498,-1e-4 -33.664614,-10.2261 -33.664612,-22.84047 6e-6,-12.61437 15.07212,-22.84036 33.664612,-22.84046 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.36251795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path898"
+       d="m 134.63546,87.230775 a 17.907058,13.764381 0 0 0 -17.83715,12.695354 h -0.87127 v 49.712211 h 0.83251 a 17.907058,13.76438 0 0 0 17.87591,13.09635 17.907058,13.76438 0 0 0 17.86403,-13.09635 h 0.31057 V 99.926129 h -0.32711 A 17.907058,13.764381 0 0 0 134.63546,87.230775 Z m 0,53.624635 a 10.557147,8.1148223 0 0 1 10.55749,8.11475 10.557147,8.1148223 0 0 1 -10.55749,8.11475 10.557147,8.1148223 0 0 1 -10.55698,-8.11475 10.557147,8.1148223 0 0 1 10.55698,-8.11475 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.00007248;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       id="path827-9-6"
+       d="m 171.1122,39.796021 c 8.17832,0.006 14.96154,4.568212 15.54273,10.453627 l 0.22634,-0.0021 1.86862,19.061369 c 10.48507,6.763074 15.77113,18.08886 15.77113,18.08886 l 4.27623,26.459883 -0.25839,0.0661 c 10.19138,5.05042 16.92394,12.99004 18.51619,21.83588 l 0.18396,0.014 7.2161,39.0214 -0.31678,0.0109 c 0.0733,0.65029 0.11842,1.30208 0.1354,1.9544 0,17.33952 -19.48332,31.39599 -43.51725,31.39602 -23.49434,-0.0182 -42.72693,-13.48746 -43.45005,-30.42967 -0.0382,-33.56054 0.12647,-67.01884 0.28628,-98.079352 0,0 0.58301,-6.163411 7.34633,-10.666016 l 0.6258,-17.202565 c -0.0278,-0.242592 -0.0447,-0.485771 -0.0506,-0.729154 -1.9e-4,-6.215148 6.98334,-11.253588 15.598,-11.253582 z m 19.51096,114.697919 c -18.59269,-9e-5 -33.66512,10.22596 -33.66513,22.84046 0,12.61451 15.07243,22.84056 33.66513,22.84047 18.5925,-1e-4 33.66462,-10.2261 33.66461,-22.84047 0,-12.61437 -15.07212,-22.84036 -33.66461,-22.84046 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.36251807;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>

css/font-combodo/test.html

@@ -18,6 +18,9 @@ aIcons = {
 	'combodo-icon': 'Combodo icon',
 	'combodo-icon-o': 'Combodo icon (outline)',
 	'itop-icon': 'iTop icon',
+	'itophub-icon': 'iTop Hub icon',
+	'chameleon-icon': 'Hub\'s Chameleon icon',
+	'opensource-icon': 'Open Source Logo',
 }
 
 function GenerateTable() {