Release 0.9 of iTop

SVN:0.9[309]

addons/userrights/userrightsmatrix.class.inc.php

@@ -1,29 +1,49 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * UserRightsMatrix (User management Module)
+ * UserRightsMatrix
+ * User management Module 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 
+class UserRightsMatrixUsers extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"name" => "user",
+			"description" => "users and credentials",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "login",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixusers",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeInteger("userid", array("label"=>"User id", "description"=>"User identifier (depends on the business model)", "allowed_values"=>null, "sql"=>"userid", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("login", array("label"=>"login", "description"=>"user identification string", "allowed_values"=>null, "sql"=>"login", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("password", array("label"=>"password", "description"=>"user authentication string", "allowed_values"=>null, "sql"=>"pwd", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("userid");
+		MetaModel::Init_AddFilterFromAttribute("login");
+	}
+}
+
 class UserRightsMatrixClassGrant extends DBObject
 {
 	public static function Init()
@@ -31,7 +51,10 @@ class UserRightsMatrixClassGrant extends DBObject
 		$aParams = array
 		(
 			"category" => "addon/userrights",
+			"name" => "class_permission",
+			"description" => "permissions on classes",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -41,12 +64,18 @@ class UserRightsMatrixClassGrant extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"UserRightsMatrixUsers", "jointype"=> "", "label"=>"user", "description"=>"user account", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("label"=>"Login", "description"=>"Login", "allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("label"=>"class", "description"=>"class name", "allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("label"=>"action", "description"=>"operations to perform on the given class", "allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("label"=>"permission", "description"=>"allowed or not allowed?", "allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("userid");
+		MetaModel::Init_AddFilterFromAttribute("login");
+		MetaModel::Init_AddFilterFromAttribute("class");
+		MetaModel::Init_AddFilterFromAttribute("action");
 	}
 }
 
@@ -57,7 +86,10 @@ class UserRightsMatrixClassStimulusGrant extends DBObject
 		$aParams = array
 		(
 			"category" => "addon/userrights",
+			"name" => "stimulus_permission",
+			"description" => "permissions on stimilus in the life cycle of the object",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -67,12 +99,18 @@ class UserRightsMatrixClassStimulusGrant extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"UserRightsMatrixUsers", "jointype"=> "", "label"=>"user", "description"=>"user account", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("label"=>"Login", "description"=>"Login", "allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("label"=>"class", "description"=>"class name", "allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("label"=>"action", "description"=>"operations to perform on the given class", "allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("label"=>"permission", "description"=>"allowed or not allowed?", "allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("userid");
+		MetaModel::Init_AddFilterFromAttribute("login");
+		MetaModel::Init_AddFilterFromAttribute("class");
+		MetaModel::Init_AddFilterFromAttribute("stimulus");
 	}
 }
 
@@ -83,7 +121,10 @@ class UserRightsMatrixAttributeGrant extends DBObject
 		$aParams = array
 		(
 			"category" => "addon/userrights",
+			"name" => "attribute_permission",
+			"description" => "permissions at the attributes level",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -93,13 +134,20 @@ class UserRightsMatrixAttributeGrant extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"UserRightsMatrixUsers", "jointype"=> "", "label"=>"user", "description"=>"user account", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("label"=>"Login", "description"=>"Login", "allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("label"=>"class", "description"=>"class name", "allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("label"=>"attribute", "description"=>"attribute code", "allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("label"=>"action", "description"=>"operations to perform on the given class", "allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("label"=>"permission", "description"=>"allowed or not allowed?", "allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("userid");
+		MetaModel::Init_AddFilterFromAttribute("login");
+		MetaModel::Init_AddFilterFromAttribute("class");
+		MetaModel::Init_AddFilterFromAttribute("attcode");
+		MetaModel::Init_AddFilterFromAttribute("action");
 	}
 }
 
@@ -118,14 +166,13 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 	);
 
 	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	public function CreateAdministrator($sAdminUser, $sAdminPwd)
 	{
 		// Maybe we should check that no other user with userid == 0 exists
-		$oUser = new UserLocal();
+		$oUser = new UserRightsMatrixUsers();
 		$oUser->Set('login', $sAdminUser);
 		$oUser->Set('password', $sAdminPwd);
-		$oUser->Set('contactid', 1); // one is for root !
-		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+		$oUser->Set('userid', 1); // one is for root !
 
 		// Create a change to record the history of the User object
 		$oChange = MetaModel::NewObject("CMDBChange");
@@ -134,26 +181,21 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		$iChangeId = $oChange->DBInsert();
 
 		// Now record the admin user object
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange);
 		$this->SetupUser($iUserId, true);
 		return true;
 	}
 
-	public function IsAdministrator($oUser)
+	public function IsAdministrator($iUserId)
 	{
-		return ($oUser->GetKey() == 1);
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		return ($oUser->GetKey() == 1);
+		return ($iUserId == 1);
 	}
 
 	public function Setup()
 	{
 		// Users must be added manually
 		// This procedure will then update the matrix when a new user is found or a new class/attribute appears
-		$oUserSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT User"));
+		$oUserSet = new DBObjectSet(DBObjectSearch::FromSibuSQL("UserRightsMatrixUsers"));
 		while ($oUser = $oUserSet->Fetch())
 		{
 			$this->SetupUser($oUser->GetKey());
@@ -239,7 +281,6 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 				}
 			}
 		}
-		/*
 		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
 		if ($bNewUser)
 		{
@@ -263,7 +304,6 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 			$oMenu->Set('user_id', $iUserId);
 			$oMenu->DBInsert();
 		}
-		*/
 	}
 
 
@@ -273,13 +313,50 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		return true;
 	}
 
-	public function GetSelectFilter($oUser, $sClass)
+	public function CheckCredentials($sUserName, $sPassword)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixUsers WHERE login = '$sUserName'"));
+		if ($oSet->Count() < 1)
+		{
+		// todo: throw an exception?
+			return false;
+		}
+
+		$oLogin = $oSet->Fetch();
+		if ($oLogin->Get('password') == $sPassword)
+		{
+			return $oLogin->Get('userid');
+		}
+		// todo: throw an exception?
+		return false;
+	}
+
+	public function GetUserId($sUserName)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixUsers WHERE login = '$sUserName'"));
+		if ($oSet->Count() < 1)
+		{
+		// todo: throw an exception?
+			return false;
+		}
+
+		$oLogin = $oSet->Fetch();
+		return $oLogin->Get('userid');
+	}
+
+	public function GetContactId($sUserName)
+	{
+		// this module has no link with the business data
+		return null;
+	}
+
+	public function GetFilter($sUserName, $sClass)
 	{
 		$oNullFilter  = new DBObjectSearch($sClass);
 		return $oNullFilter;
 	}
 
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	public function IsActionAllowed($iUserId, $sClass, $iActionCode, $oInstanceSet = null)
 	{
 		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
 		{
@@ -287,7 +364,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		}
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '$iUserId'"));
 		if ($oSet->Count() < 1)
 		{
 			return UR_ALLOWED_NO;
@@ -307,7 +384,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		return $iRetCode;
 	}
 
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	public function IsActionAllowedOnAttribute($iUserId, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
 	{
 		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
 		{
@@ -315,7 +392,7 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		}
 		$sAction = self::$m_aActionCodes[$iActionCode];
 
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND action = '$sAction' AND userid = '$iUserId'"));
 		if ($oSet->Count() < 1)
 		{
 			return UR_ALLOWED_NO;
@@ -335,9 +412,9 @@ class UserRightsMatrix extends UserRightsAddOnAPI
 		return $iRetCode;
 	}
 
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	public function IsStimulusAllowed($iUserId, $sClass, $sStimulusCode, $oInstanceSet = null)
 	{
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '$iUserId'"));
 		if ($oSet->Count() < 1)
 		{
 			return UR_ALLOWED_NO;

addons/userrights/userrightsnull.class.inc.php

@@ -1,43 +1,28 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
  * UserRightsNull
  * User management Module - say Yeah! to everything
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
+
 class UserRightsNull extends UserRightsAddOnAPI
 {
 	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	public function CreateAdministrator($sAdminUser, $sAdminPwd)
 	{
 		return true;
 	}
 
-	public function IsAdministrator($oUser)
-	{
-		return true;
-	}
-
-	public function IsPortalUser($oUser)
+	public function IsAdministrator($iUserId)
 	{
 		return true;
 	}
@@ -52,23 +37,39 @@ class UserRightsNull extends UserRightsAddOnAPI
 		return true;
 	}
 
-	public function GetSelectFilter($oUser, $sClass)
+	public function CheckCredentials($sUserName, $sPassword)
+	{
+		return 1;
+	}
+
+	public function GetUserId($sUserName)
+	{
+		return 1;
+	}
+
+	public function GetContactId($sUserName)
+	{
+		// this module has no link with the business data
+		return null;
+	}
+
+	public function GetFilter($sUserName, $sClass)
 	{
 		$oNullFilter  = new DBObjectSearch($sClass);
 		return $oNullFilter;
 	}
 
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	public function IsActionAllowed($iUserId, $sClass, $iActionCode, $oInstanceSet = null)
 	{
 		return UR_ALLOWED_YES;
 	}
 
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	public function IsStimulusAllowed($iUserId, $sClass, $sStimulusCode, $oInstanceSet = null)
 	{
 		return UR_ALLOWED_YES;
 	}
 
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	public function IsActionAllowedOnAttribute($iUserId, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
 	{
 		return UR_ALLOWED_YES;
 	}

application/ajaxwebpage.class.inc.php

@@ -1,30 +1,15 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+require_once("../application/webpage.class.inc.php");
 /**
  * Simple web page with no includes, header or fancy formatting, useful to
  * generate HTML fragments when called by an AJAX method
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopApplication
+ * @access		public 
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <dflaven@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  */
-
-require_once("../application/webpage.class.inc.php");
  
 class ajax_page extends WebPage
 {
@@ -42,8 +27,6 @@ class ajax_page extends WebPage
     {
         parent::__construct($s_title);
         $this->m_sReadyScript = "";
-		$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
     }	
 
 	
@@ -82,6 +65,69 @@ class ajax_page extends WebPage
     {
 	}
 	
+    /**
+     * Adds a tabular content to the web page
+     * @param Hash $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
+     * @param Hash $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A column 'pkey' is expected for each row
+     * @param Hash $aParams Hash array. Extra parameters for the table. Entry 'class' holds the class of the objects listed in the table
+     * @return void
+     */	  
+	public function table($aConfig, $aData, $aParams = array())
+	{
+		// WARNING WARNING WARNING
+		// This whole function is actually a copy paste from iTopWebPage::table
+		$oAppContext = new ApplicationContext();
+		
+		static $iNbTables = 0;
+		$iNbTables++;
+		$sHtml = "";
+		$sHtml .= "<table class=\"listResults\">\n";
+		$sHtml .= "<thead>\n";
+		$sHtml .= "<tr>\n";
+		foreach($aConfig as $sName=>$aDef)
+		{
+			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
+		}
+		$sHtml .= "</tr>\n";
+		$sHtml .= "</thead>\n";
+		$sHtml .= "<tbody>\n";
+		foreach($aData as $aRow)
+		{
+			if (false) //(isset($aParams['preview']) && $aParams['preview'])
+			{
+				$sHtml .= "<tr id=\"Row_".$iNbTables."_".$aRow['key']."\" onClick=\"DisplayPreview(".$iNbTables.",".$aRow['key'].",'".$aParams['class']."')\">\n";
+			}
+			else if (isset($aRow['key']))
+			{
+				$sHtml .= "<tr onDblClick=\"DisplayDetails(".$aRow['key'].",'".$aParams['class']."')\">\n";
+			}
+			else
+			{
+				$sHtml .= "<tr>\n";
+			}
+			foreach($aConfig as $sName=>$aVoid)
+			{
+				if ($sName != 'key')
+				{
+					$sValue = empty($aRow[$sName]) ? '&nbsp;' : $aRow[$sName];
+					$sHtml .= "<td>$sValue</td>\n";
+				}
+				else
+				{
+					$sUIPage = cmdbAbstractObject::ComputeUIPage($aParams['class']);
+					$sHtml .= "<td><a class=\"no-arrow\" href=\"$sUIPage?operation=details&id=".$aRow['key']."&class=".$aParams['class']."&".$oAppContext->GetForLink()."\"><img src=\"../images/zoom.gif\" title=\"Details\" border=\"0\"></a></td>\n";
+				}
+			}
+			$sHtml .= "</tr>\n";
+		}
+		$sHtml .= "</tbody>\n";
+		$sHtml .= "</table>\n";
+		if (isset($aParams['preview']) && $aParams['preview'])
+		{
+			$sHtml .= "<div class=\"PreviewPane\" id=\"PreviewPane_".$iNbTables."\" style=\"height:100px;border:1px solid black;margin-top:2px;padding:3px;text-align:left;display:none;\">Preview Pane</div>";
+		}
+		$this->add($sHtml);	
+	}
 	/**
 	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
 	 * NOT implemented in this version of the class.

application/application.inc.php

@@ -1,29 +1,7 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Includes all the classes to have the application up and running
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
+// Includes all the classes to have the application up and running
 require_once('../application/applicationcontext.class.inc.php');
+require_once('../application/usercontext.class.inc.php');
 require_once('../application/cmdbabstract.class.inc.php');
 require_once('../application/displayblock.class.inc.php');
 require_once('../application/audit.category.class.inc.php');

application/applicationcontext.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class ApplicationContext
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once("../application/utils.inc.php");
 /**
  * Helper class to store and manipulate the parameters that make the application's context
@@ -57,52 +33,19 @@ class ApplicationContext
 		if (empty(self::$aDefaultValues))
 		{
 			self::$aDefaultValues = array();
-			$aContext = utils::ReadParam('c', array());
 			foreach($this->aNames as $sName)
 			{
-				$sValue = isset($aContext[$sName]) ? $aContext[$sName] : '';
+				$sValue = utils::ReadParam($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');
-						$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
@@ -112,7 +55,7 @@ class ApplicationContext
 		$aParams = array();
 		foreach($this->aValues as $sName => $sValue)
 		{
-			$aParams[] = "c[$sName]".'='.urlencode($sValue);
+			$aParams[] = $sName.'='.urlencode($sValue);
 		}
 		return implode("&", $aParams);
 	}
@@ -126,7 +69,7 @@ class ApplicationContext
 		$sContext = "";
 		foreach($this->aValues as $sName => $sValue)
 		{
-			$sContext .= "<input type=\"hidden\" name=\"c[$sName]\" value=\"$sValue\" />\n";
+			$sContext .= "<input type=\"hidden\" name=\"$sName\" value=\"$sValue\" />\n";
 		}
 		return $sContext;
 	}
@@ -137,21 +80,7 @@ class ApplicationContext
 	 */
 	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;
+		return $this->aValues;
 	}
 	/**
 	 * Removes the specified parameter from the context, for example when the same parameter

application/audit.category.class.inc.php

@@ -1,32 +1,11 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+require_once('../application/cmdbabstract.class.inc.php');
 
 /**
  * This class manages the audit "categories". Each category defines a set of objects
  * to check and is linked to a set of rules that determine the valid or invalid objects
  * inside the set 
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
-
-require_once('../application/cmdbabstract.class.inc.php');
-
 class AuditCategory extends cmdbAbstractObject
 {
 	public static function Init()
@@ -34,23 +13,30 @@ class AuditCategory extends cmdbAbstractObject
 		$aParams = array
 		(
 			"category" => "application",
+			"name" => "AuditCategory",
+			"description" => "A section inside the overall audit",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array('name'),
 			"db_table" => "priv_auditcategory",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
+			"display_template" => "../application/templates/audit_category.html",
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("definition_set", array("allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", array("linked_class"=>"AuditRule", "ext_key_to_me"=>"category_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Category Name", "description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("label"=>"Audit Category Description", "description"=>"Long description for this audit category", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("definition_set", array("label"=>"Definition Set", "description"=>"SibusQL expression defining the set of objects to audit", "allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("description");
+		MetaModel::Init_AddFilterFromAttribute("definition_set");
 
 		// Display lists
-		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
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', '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

application/audit.rule.class.inc.php

@@ -1,33 +1,12 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+require_once('../application/audit.category.class.inc.php');
 
 /**
  * This class manages the audit "rule" linked to a given audit category.
- * Each rule is based on an OQL expression that returns either the "good" objects
+ * Each rule is based ona SibusQL expression that returns either the "good" objects
  * or the "bad" ones. The core audit engines computes the complement to the definition
  * set when needed to obtain either the valid objects, or the ones with an error
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
-
-require_once('../application/audit.category.class.inc.php');
-
 class AuditRule extends cmdbAbstractObject
 {
 	public static function Init()
@@ -35,26 +14,36 @@ class AuditRule extends cmdbAbstractObject
 		$aParams = array
 		(
 			"category" => "application",
+			"name" => "AuditRule",
+			"description" => "A rule to check for a given Audit category",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array('name'),
 			"db_table" => "priv_auditrule",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"display_template" => "../business/templates/default.html",
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("query", array("allowed_values"=>null, "sql"=>"query", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("allowed_values"=>new ValueSetEnum('true,false'), "sql"=>"valid_flag", "default_value"=>"true", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values"=>null, "sql"=>"category_id", "targetclass"=>"AuditCategory", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values"=>null, "extkey_attcode"=> 'category_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Rule Name", "description"=>"Short name for this rule", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("label"=>"Audit Rule Description", "description"=>"Long description for this audit rule", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("query", array("label"=>"Query to Run", "description"=>"The SibusQL expression to run", "allowed_values"=>null, "sql"=>"query", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("label"=>"Valid objects?", "description"=>"True if the rule returns the valid objects, false otherwise", "allowed_values"=>new ValueSetEnum('true,false'), "sql"=>"valid_flag", "default_value"=>"true", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("label"=>"Category", "description"=>"The category for this rule", "allowed_values"=>null, "sql"=>"category_id", "targetclass"=>"AuditCategory", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("label"=>"Category", "description"=>"Name of the category for this rule", "allowed_values"=>null, "extkey_attcode"=> 'category_id', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("description");
+		MetaModel::Init_AddFilterFromAttribute("query");
+		MetaModel::Init_AddFilterFromAttribute("valid_flag");
+		MetaModel::Init_AddFilterFromAttribute("category_id");
+		MetaModel::Init_AddFilterFromAttribute("category_name");
 
 		// Display lists
 		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
+		MetaModel::Init_SetZListItems('list', array('category_id', 'name', '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

application/clipage.class.inc.php

@@ -1,83 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * CLI page 
- * The page adds the content-type text/XML and the encoding into the headers
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-require_once("../application/webpage.class.inc.php");
-
-class CLIPage
-{
-    function __construct($s_title)
-    {
-    }	
-
-    public function output()
-    {
-    }
-
-	public function add($sText)
-	{
-		echo $sText;
-	}	
-
-	public function p($sText)
-	{
-		echo $sText."\n";
-	}	
-
-	public function add_comment($sText)
-	{
-		echo "#".$sText."\n";
-	}	
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-		$aCells = array();
-		foreach($aConfig as $sName=>$aDef)
-		{
-			if (strlen($aDef['description']) > 0)
-			{
-				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
-			}
-			else
-			{
-				$aCells[] = $aDef['label'];
-			}
-		}
-		echo implode(';', $aCells)."\n";
-
-		foreach($aData as $aRow)
-		{
-			$aCells = array();
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$sValue = $aRow["$sName"];
-				$aCells[] = $sValue;
-			}
-			echo implode(';', $aCells)."\n";
-		}
-	}
-}
-
-?>

application/csvpage.class.inc.php

@@ -1,31 +1,9 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+require_once("../application/webpage.class.inc.php");
 /**
  * Simple web page with no includes or fancy formatting, useful to generateXML documents
  * The page adds the content-type text/XML and the encoding into the headers
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */
-
-require_once("../application/webpage.class.inc.php");
-
 class CSVPage extends WebPage
 {
     function __construct($s_title)
@@ -45,52 +23,13 @@ class CSVPage extends WebPage
         echo trim($this->s_content);
     }
 
-	public function small_p($sText)
-	{
+    public function small_p($sText)
+    {
 	}
-
-	public function add($sText)
-	{
-		$this->s_content .= $sText;
-	}	
-
-	public function p($sText)
-	{
-		$this->s_content .= $sText."\n";
-	}	
-
-	public function add_comment($sText)
-	{
-		$this->s_content .= "#".$sText."\n";
-	}	
-
+	
 	public function table($aConfig, $aData, $aParams = array())
 	{
-		$aCells = array();
-		foreach($aConfig as $sName=>$aDef)
-		{
-			if (strlen($aDef['description']) > 0)
-			{
-				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
-			}
-			else
-			{
-				$aCells[] = $aDef['label'];
-			}
-		}
-		$this->s_content .= implode(';', $aCells)."\n";
-
-		foreach($aData as $aRow)
-		{
-			$aCells = array();
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$sValue = $aRow["$sName"];
-				$aCells[] = $sValue;
-			}
-			$this->s_content .= implode(';', $aCells)."\n";
-		}
 	}
 }
 
-?>
+?>

application/dialogstack.class.inc.php

@@ -0,0 +1,252 @@
+<?php
+/**
+ * Helper class to allow modal-style dialog box in an html form
+ *
+ * Possible improvement: do not use _SESSION for the caller's data,
+ *  instead set a member variable with caller information
+ *  and take the opportunity of the first edit button to place the information
+ *  into a hidden field   
+ *
+ * Usage:
+ */
+
+define('DLGSTACK_OK', 1);
+define('DLGSTACK_CANCEL', 2);
+
+//session_name("dialogstack");
+session_start();
+
+
+class dialogstack
+{
+	private static $m_bCurrPageDeclared = false;
+	/**
+	 * Declare the current page as being a dialog issuer, potentially pop...
+	 */
+	static public function DeclareCaller($sTitle)
+	{
+		self::$m_bCurrPageDeclared = false;
+		$_SESSION['dialogstack_calleruri'] = $_SERVER["REQUEST_URI"];
+		$_SESSION['dialogstack_callertitle'] = $sTitle;
+
+		if (isset($_POST["dialogstackpop"]) && ($_POST["dialogstackpop"] == count($_SESSION['dialogstack_currdlg'])))
+		{
+			// Pop !
+			array_pop($_SESSION['dialogstack_currdlg']);
+		} 
+	}
+
+	/**
+	 * True if the current page has been loaded from an "dialog startup button"
+	 */
+	static private function GetRetArgName()
+	{
+		foreach($_REQUEST as $sArgName=>$sArgValue)
+		{
+			if (strstr($sArgName, "dlgstack_go,"))
+			{
+				$aTokens = explode(",", $sArgName);
+				return self::ArgNameDecode($aTokens[1]);
+			}
+		}
+		return "";
+	}
+
+	/**
+	 * Protect against weird effects of PHP interpreting brackets...
+	 */
+	static private function ArgNameEncode($sArgName)
+	{
+		return str_replace(array('[', ']'), array('_bracket_open_', '_bracket_close_'), $sArgName);
+	}
+	static private function ArgNameDecode($sCodedArgName)
+	{
+		return str_replace(array('_bracket_open_', '_bracket_close_'), array('[', ']'), $sCodedArgName);
+	}
+
+	/**
+	 * True if the current page has been loaded from an "dialog startup button"
+	 */
+	static public function IsDialogStartup()
+	{
+		return (strlen(self::GetRetArgName()) > 0);
+	}
+
+
+	/**
+	 * Helper to  
+	 */
+	static private function RemoveArg(&$aValues, $sKey, &$retval = null)
+	{
+		if (isset($aValues[$sKey]))
+		{
+			if (empty($retval))
+			{
+				$retval = $aValues[$sKey];
+			}
+			unset($aValues[$sKey]);
+		}
+	}
+	
+
+	/**
+	 * Record current page args, and returns the initial value for the dialog 
+	 */
+	static public function StartDialog()
+	{
+		if (!isset($_SESSION['dialogstack_currdlg']))
+		{
+			// Init stack
+			$_SESSION['dialogstack_currdlg'] = array();
+		}
+
+		$sRetArgName = self::GetRetArgName();
+		$sCodedArgName = self::ArgNameEncode($sRetArgName);
+
+		$sArgForRetArgName = "dlgstack_init_".$sCodedArgName;
+		$sButtonName = "dlgstack_go,".$sCodedArgName;
+
+		// Do not record utility arguments, neither the current value (stored separately)
+		//
+		$initValue = null;
+		$aPost = $_POST;
+		self::RemoveArg($aPost, $sArgForRetArgName, $initValue);
+		self::RemoveArg($aPost, $sButtonName);
+		self::RemoveArg($aPost, 'dlgstack_onok_page', $sOnOKPage);
+		self::RemoveArg($aPost, 'dlgstack_onok_args', $aOnOKArgs);
+		$aGet = $_GET;
+		self::RemoveArg($aGet, $sArgForRetArgName, $initValue);
+		self::RemoveArg($aGet, $sButtonName);
+		self::RemoveArg($aGet, 'dlgstack_onok_page', $sOnOKPage);
+		self::RemoveArg($aGet, 'dlgstack_onok_args', $aOnOKArgs);
+
+		if (self::$m_bCurrPageDeclared)
+		{
+			throw new Exception("DeclareCaller() must not be called before StartDialog()");
+		}
+
+		$aCall = array(
+				"title"=>$_SESSION['dialogstack_callertitle'],
+				"uri"=>$_SESSION['dialogstack_calleruri'],
+				"post"=>$aPost,
+				"get"=>$aGet,
+				"retarg"=>$sRetArgName,
+				"initval"=>$initValue,
+		);
+		if (isset($sOnOKPage)) $aCall["onok_page"] = $sOnOKPage;
+		if (isset($aOnOKArgs)) $aCall["onok_args"] = $aOnOKArgs;
+
+		array_push($_SESSION['dialogstack_currdlg'], $aCall);
+		return $initValue;
+	}
+	/**
+	 * Render a button to launch a new dialog
+	 */
+	static public function RenderEditableField($sTitle, $sArgName, $sCurrValue, $bAddFieldValue, $sOnOKPage = "", $aOnOKArgs = array())
+	{
+		$sRet = "";
+		$sCodedArgName = self::ArgNameEncode($sArgName);
+		if ($bAddFieldValue)
+		{
+			$sRet .= "<input type=\"hidden\" name=\"$sArgName\" value=\"$sCurrValue\">\n";
+		}
+		$sRet .= "<input type=\"hidden\" name=\"dlgstack_init_$sCodedArgName\" value=\"$sCurrValue\">\n";
+		$sRet .= "<input type=\"submit\" name=\"dlgstack_go,$sCodedArgName\" value=\"$sTitle\">\n";
+		if (!empty($sOnOKPage))
+		{
+			$sRet .= "<input type=\"hidden\" name=\"dlgstack_onok_page\" value=\"$sCurrValue\">\n";
+		}
+		foreach($aOnOKArgs as $sArgName=>$value)
+		{
+			$sRet .= "<input type=\"hidden\" name=\"dlgstack_onok_args[$sArgName]\" value=\"$value\">\n";
+		}
+		return $sRet;
+	}
+	/**
+	 * Render a [set of] hidden field, from a value that may be an array
+	 */
+	static private function RenderHiddenField($sName, $value)
+	{
+		$sRet = "";
+		if (is_array($value))
+		{
+			foreach($value as $sKey=>$subvalue)
+			{
+				$sRet .= self::RenderHiddenField($sName.'['.$sKey.']', $subvalue);
+			}
+		}
+		else
+		{
+			$sRet .= "<input type=\"hidden\" name=\"$sName\" value=\"$value\">\n";
+		}
+		return $sRet;
+	}
+	/**
+	 * Render a form to end the current dialog and return to the caller
+	 */
+	static public function RenderEndDialogForm($iButtonStyle, $sTitle, $sRetValue = null)
+	{
+		$aCall = end($_SESSION['dialogstack_currdlg']);
+		if (!$aCall) return;
+		return self::privRenderEndDialogForm($aCall, $iButtonStyle, $sTitle, $sRetValue);
+	}
+
+	/**
+	 * Returns an array of buttons to get back to upper dialog levels
+	 */
+	static public function GetCurrentStack()
+	{
+		$aRet = array();
+		if (isset($_SESSION['dialogstack_currdlg']))
+		{
+			foreach ($_SESSION['dialogstack_currdlg'] as $aCall)
+			{
+				$aRet[] = self::privRenderEndDialogForm($aCall, DLGSTACK_CANCEL, $aCall["title"]);
+			}
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Render a form to end the current dialog and return to the caller
+	 */
+	static private function privRenderEndDialogForm($aCall, $iButtonStyle, $sTitle, $sRetValue = null)
+	{
+		if (($iButtonStyle == DLGSTACK_OK) && isset($aCall["onok_page"])) $sFormAction = $aCall["onok_page"];
+		else                                                              $sFormAction = $aCall["uri"];  
+
+		$sRet = "<form method=\"post\" action=\"$sFormAction\">\n";
+		foreach ($aCall["post"] as $sName=>$value)
+		{
+			$sRet .= self::RenderHiddenField($sName, $value);
+		}
+		if ($iButtonStyle == DLGSTACK_OK)
+		{
+			if (isset($aCall["onok_args"]))
+			{
+				foreach($aCall["onok_args"] as $sArgName=>$value)
+				{
+					$sRet .= "<input type=\"hidden\" name=\"$sArgName\" value=\"$value\">\n";
+				}
+			}
+			$sRet .= "<input type=\"hidden\" name=\"".$aCall["retarg"]."\" value=\"$sRetValue\">\n";
+			$sRet .= "<input type=\"submit\" name=\"dlgstackOK\" value=\"$sTitle, (OK) Back to ".$aCall["title"]."\">\n";
+		}
+		elseif ($iButtonStyle == DLGSTACK_CANCEL)
+		{
+			if (!is_null($aCall["initval"]))
+			{
+				$sRet .= "<input type=\"hidden\" name=\"".$aCall["retarg"]."\" value=\"".$aCall["initval"]."\">\n";
+			}
+			$sRet .= "<input type=\"submit\" name=\"dlgstackCANCEL\" value=\"$sTitle\">\n";
+		}
+		else
+		{
+			throw new Exception("Wrong value for button style ($iButtonStyle)");		
+		}
+		$sRet .= "<input type=\"hidden\" name=\"dialogstackpop\" value=\"".count($_SESSION['dialogstack_currdlg'])."\">\n";
+		$sRet .= "</form>\n";
+		return $sRet;
+	}
+}
+?>

application/iotask.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Persistent class InputOutputTask
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('../application/cmdbabstract.class.inc.php');
 
 /**
@@ -36,30 +12,40 @@ class InputOutputTask extends cmdbAbstractObject
 		$aParams = array
 		(
 			"category" => "application",
+			"name" => "IOTask",
+			"description" => "Input / Output Task for synchronizing information with external data sources",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
 			"db_table" => "priv_iotask",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"display_template" => "../business/templates/default.html",
 		);
 		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values"=>new ValueSetEnum('Input, Ouput'), "sql"=>"category", "default_value"=>"Input", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values"=>new ValueSetEnum('File, Database, Web Service'), "sql"=>"source_type", "default_value"=>"File", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", array("allowed_values"=>new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql"=>"source_subtype", "default_value"=>"CSV", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values"=>null, "sql"=>"source_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category"=>"", "more_values"=>"", "sql"=>"objects_class", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"test_mode", "default_value"=>'No', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Task Name", "description"=>"Short name for this task", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("label"=>"Task Description", "description"=>"Long description for this task", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("label"=>"Category", "description"=>"Type of task", "allowed_values"=>new ValueSetEnum('Input, Ouput'), "sql"=>"category", "default_value"=>"Input", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("label"=>"Source Type", "description"=>"Type of data source", "allowed_values"=>new ValueSetEnum('File, Database, Web Service'), "sql"=>"source_type", "default_value"=>"File", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", array("label"=>"Source Subtype", "description"=>"Subtype of Data Source", "allowed_values"=>new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql"=>"source_subtype", "default_value"=>"CSV", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("label"=>"Source Path", "description"=>"Path to the icon o the menu", "allowed_values"=>null, "sql"=>"source_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("label"=>"Objects Class", "description"=>"Class of the objects processed by this task", "class_category"=>"", "more_values"=>"", "sql"=>"objects_class", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("label"=>"Test Mode", "description"=>"If set to 'Yes' the modifications are not applied", "allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"test_mode", "default_value"=>'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("label"=>"Verbose Mode", "description"=>"If set to 'Yes' extra debug information is added to the log", "allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("label"=>"Options", "description"=>"Reconciliation options", "allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("description");
+		MetaModel::Init_AddFilterFromAttribute("category");
+		MetaModel::Init_AddFilterFromAttribute("source_type");
+		MetaModel::Init_AddFilterFromAttribute("source_subtype");
+		MetaModel::Init_AddFilterFromAttribute("objects_class");
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
 		// Search criteria
 		MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form
 		MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the advanced search form

application/itopwebpage.class.inc.php

@@ -1,43 +1,19 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class iTopWebPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once("../application/nicewebpage.class.inc.php");
+require_once("../application/usercontext.class.inc.php");
 require_once("../application/applicationcontext.class.inc.php");
-require_once("../application/user.preferences.class.inc.php");
 /**
  * Web page with some associated CSS and scripts (jquery) for a fancier display
  */
 class iTopWebPage extends NiceWebPage
 {
 	private $m_sMenu;
-//	private $m_currentOrganization;
+	private $m_currentOrganization;
 	private $m_aTabs;
 	private $m_sCurrentTabContainer;
 	private $m_sCurrentTab;
 	
-    public function __construct($sTitle)
+    public function __construct($sTitle, $currentOrganization)
     {
         parent::__construct($sTitle);
         $this->m_sCurrentTabContainer = '';
@@ -46,319 +22,98 @@ class iTopWebPage extends NiceWebPage
 		$this->m_sMenu = "";
 		$oAppContext = new ApplicationContext();
 		$sExtraParams = $oAppContext->GetForLink();
-//		$this->m_currentOrganization = $currentOrganization;
 		$this->add_header("Content-type: text/html; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
-		$this->add_linked_stylesheet("../css/jquery.treeview.css");
-		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
-//		$this->add_linked_stylesheet("../css/date.picker.css");
-		$this->add_linked_script('../js/jquery.layout.min.js');
-		$this->add_linked_script('../js/jquery.ba-bbq.min.js');
-//		$this->add_linked_script("../js/jquery.dimensions.js");
+		$this->m_currentOrganization = $currentOrganization;
+		$this->add_linked_script("../js/jquery.dimensions.js");
+		$this->add_linked_script("../js/splitter.js");
 		$this->add_linked_script("../js/jquery.tablehover.js");
 		$this->add_linked_script("../js/jquery.treeview.js");
 		$this->add_linked_script("../js/jquery.autocomplete.js");
 		$this->add_linked_script("../js/jquery.bgiframe.js");
-		$this->add_linked_script("../js/jquery.positionBy.js");
-		$this->add_linked_script("../js/jquery.popupmenu.js");
+		$this->add_linked_script("../js/jquery.jdMenu.js");
 		$this->add_linked_script("../js/date.js");
-//		$this->add_linked_script("../js/jquery.date.picker.js");
+		$this->add_linked_script("../js/jquery.date.picker.js");
 		$this->add_linked_script("../js/jquery.tablesorter.min.js");
-		$this->add_linked_script("../js/jquery.blockUI.js");
 		$this->add_linked_script("../js/utils.js");
+		//$this->add_linked_script("../js/jquery-ui-personalized-1.5.3.js");
 		$this->add_linked_script("../js/swfobject.js");
+		$this->add_linked_stylesheet("../css/jquery.treeview.css");
+		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
+		$this->add_linked_stylesheet("../css/date.picker.css");
 		$this->add_ready_script(
 <<<EOF
-	try
-	{
-	var myLayout; // a var is required because this page utilizes: myLayout.allowOverflow() method
-
-	$(document).ready(function () {
-		// Layout
-		paneSize = GetUserPreference('menu_size', 300)
-		myLayout = $('body').layout({
-			west : 	{
-						minSize: 200, size: paneSize, spacing_open: 16, spacing_close: 16, slideTrigger_open: "mouseover", hideTogglerOnSlide: true,
-					 	onclose_end: function(name, elt, state, options, layout)
-					 	{
-					 			if (state.isSliding == false)
-					 			{
-					 				SetUserPreference('menu_pane', 'closed', true);
-					 			}
-					 	},
-					 	onresize_end: function(name, elt, state, options, layout)
-					 	{
-					 			if (state.isSliding == false)
-					 			{
-					 				SetUserPreference('menu_size', state.size, true);
-					 			}
-					 	},
-					 				
-					 	onopen_end: function(name, elt, state, options, layout)
-					 	{
-					 		if (state.isSliding == false)
-					 		{
-					 			SetUserPreference('menu_pane', 'open', true);
-					 		}
-					 	}
-					},
-			center:	{
-					 	onresize_end: function(name, elt, state, options, layout)
-					 	{
-					 			$('.v-resizable').each( function() {
-					 				var fixedWidth = $(this).parent().innerWidth() - 6;
-					 				$(this).width(fixedWidth);
-					 				// Make sure it cannot be resized horizontally
-									$(this).resizable('options', { minWidth: fixedWidth, maxWidth:  fixedWidth });
-									// Now adjust all the child 'items'
-					 				var innerWidth = $(this).innerWidth() - 10;
-					 				$(this).find('.item').width(innerWidth);
-					 			});
-					 	}
-				
-				 	}
-		});
-		myLayout.addPinBtn( "#tPinMenu", "west" );
-		//myLayout.open( "west" );
-		$('.ui-layout-resizer-west').html('<img src="../images/splitter-top-corner.png"/>');
-		if (GetUserPreference('menu_pane', 'open') == 'closed')
-		{
-			myLayout.close('west');
-		}
-
-		// Accordion Menu
-		$("#accordion").accordion({ header: "h3", navigation: true, autoHeight: false, collapsible: false, icons: false }); // collapsible will be enabled once the item will be selected
- 	});
-	//add new widget called TruncatedList to properly display truncated lists when they are sorted
-	$.tablesorter.addWidget({ 
-	    // give the widget a id 
-	    id: "truncatedList", 
-	    // format is called when the on init and when a sorting has finished 
-	    format: function(table)
-	    { 
-			// Check if there is a "truncated" line
-			this.truncatedList = false;  
-			if ($("tr td.truncated",table).length > 0)
-			{
-				this.truncatedList = true;
-			}
-			if (this.truncatedList)
-			{
-				$("tr td",table).removeClass('truncated');
-				$("tr:last td",table).addClass('truncated');
-			}
-	    } 
+	// Vertical splitter. The min/max/starting sizes for the left (A) pane
+	// are set here. All values are in pixels.
+	$("#MySplitter").splitter({
+		type: "v", 
+		minA: 100, initA: 250, maxA: 500,
+		accessKey: "|"
 	});
-		
+
+	// Horizontal splitter, nested in the right pane of the vertical splitter.
+	if ( $("#TopPane").length > 0)
+	{
+		$("#RightPane").splitter({
+			type: "h" //,
+			//minA: 100, initA: 150, maxA: 500,
+			//accessKey: "_"
+		});
+	}
 	
-	$.tablesorter.addWidget({ 
-	    // give the widget a id 
-	    id: "myZebra", 
-	    // format is called when the on init and when a sorting has finished 
-	    format: function(table)
-	    {
-	    	// Replace the 'red even' lines by 'red_even' since most browser do not support 2 classes selector in CSS, etc..
-			$("tbody tr:even",table).addClass('even');
-			$("tbody tr.red:even",table).removeClass('red').removeClass('even').addClass('red_even');
-			$("tbody tr.orange:even",table).removeClass('orange').removeClass('even').addClass('orange_even');
-			$("tbody tr.green:even",table).removeClass('green').removeClass('even').addClass('green_even');
-			// In case we sort again the table, we need to remove the added 'even' classes on odd rows
-			$("tbody tr:odd",table).removeClass('even');
-			$("tbody tr.red_even:odd",table).removeClass('even').removeClass('red_even').addClass('red');
-			$("tbody tr.orange_even:odd",table).removeClass('even').removeClass('orange_even').addClass('orange');
-			$("tbody tr.green_even:odd",table).removeClass('even').removeClass('green_even').addClass('green');
-	    } 
-	});
-		
-	// Tabs, using JQuery BBQ to store the history
-	// The "tab widgets" to handle.
-	var tabs = $('div[id^=tabbedContent]');
-	    
-	// This selector will be reused when selecting actual tab widget A elements.
-	var tab_a_selector = 'ul.ui-tabs-nav a';
-	  
-	// Enable tabs on all tab widgets. The `event` property must be overridden so
-	// that the tabs aren't changed on click, and any custom event name can be
-	// specified. Note that if you define a callback for the 'select' event, it
-	// will be executed for the selected tab whenever the hash changes.
-	tabs.tabs({ event: 'change' });
-	  
-	// Define our own click handler for the tabs, overriding the default.
-	tabs.find( tab_a_selector ).click(function()
-	{
-		var state = {};
-				  
-		// Get the id of this tab widget.
-		var id = $(this).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
-		  
-		// Get the index of this tab.
-		var idx = $(this).parent().prevAll().length;
-		
-		// Set the state!
-		state[ id ] = idx;
-		$.bbq.pushState( state );
-	});
-	
-	// Bind an event to window.onhashchange that, when the history state changes,
-	// iterates over all tab widgets, changing the current tab as necessary.
-	$(window).bind( 'hashchange', function(e)
-	{
-		// Iterate over all tab widgets.
-		tabs.each(function()
-		{  
-			// Get the index for this tab widget from the hash, based on the
-			// appropriate id property. In jQuery 1.4, you should use e.getState()
-			// instead of $.bbq.getState(). The second, 'true' argument coerces the
-			// string value to a number.
-			var idx = $.bbq.getState( this.id, true ) || 0;
-			  
-			// Select the appropriate tab for this tab widget by triggering the custom
-			// event specified in the .tabs() init above (you could keep track of what
-			// tab each widget is on using .data, and only select a tab if it has
-			// changed).
-			$(this).find( tab_a_selector ).eq( idx ).triggerHandler( 'change' );
-		});
+	// Manually set the outer splitter's height to fill the browser window.
+	// This must be re-done any time the browser window is resized.
+	$(window).bind("resize", function(){
+		var ms = $("#MySplitter");
+		var top = ms.offset().top;		// from dimensions.js
+		var wh = $(window).height();
+		// Account for margin or border on the splitter container
+		var mrg = parseInt(ms.css("marginBottom")) || 0;
+		var brd = parseInt(ms.css("borderBottomWidth")) || 0;
+		ms.css("height", (wh-top-mrg-brd)+"px");
 
-		// Iterate over all truncated lists to find whether they are expanded or not
-		$('a.truncated').each(function()
-		{
-			var state = $.bbq.getState( this.id, true ) || 'close';
-			if (state == 'open')
-			{
-				$(this).trigger('open');
-			}
-			else
-			{
-				$(this).trigger('close');	
-			}
-		});
-	});
-	  
-	// End of Tabs handling
+		// IE fires resize for splitter; others don't so do it here
+		if ( !jQuery.browser.msie )
+			ms.trigger("resize");
+
+		
+	}).trigger("resize");
+	
+	var ms = $("#MySplitter");
+	ms.trigger("resize");
+
+	if ( $("#TopPane").length > 0)
+	{
+		$("#RightPane").trigger("resize");
+	}
+	
+	$("#tabbedContent > ul").tabs( 1, { fxFade: true, fxSpeed: 'fast' } ); // tabs
 	$("table.listResults").tableHover(); // hover tables
-	// Check each 'listResults' table for a checkbox in the first column and make the first column sortable only if it does not contain a checkbox in the header
-	$(".listResults").each( function()
-		{
-			var table = $(this);
-			var id = $(this).parent();
-			var checkbox = (table.find('th:first :checkbox').length > 0);
-			if (checkbox)
-			{
-				// There is a checkbox in the first column, don't make it sortable
-				table.tablesorter( { headers: { 0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
-			}
-			else
-			{
-				// There is NO checkbox in the first column, all columns are considered sortable
-				table.tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
-			}
-		});
-	$(".date-pick").datepicker({
-			showOn: 'button',
-			buttonImage: '../images/calendar.png',
-			buttonImageOnly: true,
-			dateFormat: 'yy-mm-dd',
-			constrainInput: false,
-			changeMonth: true,
-			changeYear: true
-		});
-	$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
-	// Adjust initial size
-	$('.v-resizable').each( function()
-		{
-			var parent_id = $(this).parent().id;
-			// Restore the saved height
-			var iHeight = GetUserPreference(parent_id+'_'+this.id+'_height', undefined);
-			if (iHeight != undefined)
-			{
-				$(this).height(parseInt(iHeight, 10)); // Parse in base 10 !);
-			}
-			// Adjust the child 'item''s height and width to fit
-			var container = $(this);
-			var fixedWidth = container.parent().innerWidth() - 6;
-			// Set the width to fit the parent
-			$(this).width(fixedWidth);
-			var headerHeight = $(this).find('.drag_handle').height();
-			// Now adjust the width and height of the child 'item'
-			container.find('.item').height(container.innerHeight() - headerHeight - 12).width(fixedWidth - 10);
-		}
-	);
-	// Make resizable, vertically only everything that claims to be v-resizable !
-	$('.v-resizable').resizable( { handles: 's', minHeight: $(this).find('.drag_handle').height(), minWidth: $(this).parent().innerWidth() - 6, maxWidth: $(this).parent().innerWidth() - 6, stop: function()
-		{
-			// Adjust the content
-			var container = $(this);
-			var headerHeight = $(this).find('.drag_handle').height();
-			container.find('.item').height(container.innerHeight() - headerHeight - 12);//.width(container.innerWidth());
-			var parent_id = $(this).parent().id;
-			SetUserPreference(parent_id+'_'+this.id+'_height', $(this).height(), true); // true => persistent
-		}
-	} );
-	// Restore the persisted sortable order, for all sortable lists... if any
-	$('.sortable').each(function()
-	{
-		var sTemp = GetUserPreference(this.id+'_order', undefined);
-		if (sTemp != undefined)
-		{
-			var aSerialized = sTemp.split(',');
-			var sortable = $(this);
-		    $.each(aSerialized, function(i,v) {
-		      var item = $('#menu_'+v);
-		      if (item.length >  0) // Check that the menu exists
-		      {
-		      		sortable.append(item);
-		      }
-		    });
-		}
-	});
-
-	// Make sortable, everything that claims to be sortable
-	$('.sortable').sortable( {axis: 'y', cursor: 'move', handle: '.drag_handle', stop: function()
-		{
-			if ($(this).hasClass('persistent'))
-			{
-				// remember the sort order for next time the page is loaded...
-				sSerialized = $(this).sortable('serialize', {key: 'menu'});
-				var sTemp = sSerialized.replace(/menu=/g, '');
-				SetUserPreference(this.id+'_order', sTemp.replace(/&/g, ','), true); // true => persistent !
-			}
-		}
-	});
-	docWidth = $(document).width();
-	$('#ModalDlg').dialog({ autoOpen: false, modal: true, width: 0.8*docWidth }); // JQuery UI dialogs
-	ShowDebug();
-	$('#logOffBtn>ul').popupmenu();
-//	$.history.init(history_callback);
-//	$("a[rel='history']").click(function()
-//	{
-//		$.history.load(this.href.replace(/^.*#/, ''));
-//		return false;
-//	});
-	}
-	catch(err)
-	{
-		// Do something with the error !
-		alert(err);
-	}
+	$(".listResults").tablesorter( { headers: { 0:{sorter: false }}, widgets: ['zebra']} ); // sortable and zebra tables
+	$(".date-pick").datePicker( {clickInput: false, createButton: true, startDate: '2000-01-01'} ); // Date picker
+	$('#ModalDlg').jqm({ajax: '@href', trigger: 'a.jqmTrigger', overlay:70, modal:true, toTop:true}); // jqModal Window
 	
 	//$('.display_block').draggable(); // make the blocks draggable
 EOF
 );
-		$sUserPrefs = appUserPreferences::GetAsJSON();
-		$this->add_script(
-<<<EOF
-//		// for JQuery history
-//		function history_callback(hash)
-//		{
-//			// do stuff that loads page content based on hash variable
-//			var aMatches = /^tab_(.*)$/.exec(hash);
-//			if (aMatches != null)
-//			{
-//				var tab = $('#'+hash);
-//				tab.parents('div[id^=tabbedContent]:first').tabs('select', aMatches[1]);
-//			}
-//		}
-
+		$this->add_script("
+		// For automplete
+		function findValue(li) {
+			if( li == null ) return alert(\"No match!\");
+			
+			// if coming from an AJAX call, let's use the CityId as the value
+			if( !!li.extra ) var sValue = li.extra[0];
+			
+			// otherwise, let's just display the value in the text box
+			else var sValue = li.selectValue;
+			
+			//alert(\"The value you selected was: \" + sValue);
+		}
+		
+		function selectItem(li) {
+			findValue(li);
+		}
+		
 		function formatItem(row) {
 			return row[0];
 		}
@@ -367,67 +122,8 @@ EOF
 		{
 			window.history.back();
 		}
-		
-		function BackToDetails(sClass, id)
-		{
-			window.location.href = './UI.php?operation=details&class='+sClass+'&id='+id;
-		}
-
-		
-		function BackToList(sClass)
-		{
-			window.location.href = './UI.php?operation=search_oql&oql_class='+sClass+'&oql_clause=WHERE id=0';
-		}
-
-		function ShowDebug()
-		{
-			if ($('#rawOutput > div').html() != '')
-			{
-				$('#rawOutput').dialog( {autoOpen: true, modal:false});
-			}
-		}
-		
-		var oUserPreferences = $sUserPrefs;
-EOF
-);
-		
-		// Add the standard menus
-		/*
-		 * +--------------------+
-		 * | Welcome            |
-		 * +--------------------+
-		 * 		Welcome To iTop
-		 * +--------------------+
-		 * | Tools              |
-		 * +--------------------+
-		 * 		CSV Import
-		 * +--------------------+
-		 * | Admin Tools        | << Only present if the user is an admin
-		 * +--------------------+
-		 *		User Accounts
-		 *		Profiles
-		 *		Notifications
-		 *		Run Queries
-		 *		Export
-		 *		Data Model
-		 *		Universal Search
-		 */
-		$oWelcomeMenu = new MenuGroup('WelcomeMenu', 10 /* fRank */);
-		new TemplateMenuNode('WelcomeMenuPage', '../application/templates/welcome_menu.html', $oWelcomeMenu->GetIndex() /* oParent */, 1 /* fRank */);
-		
-		$oToolsMenu = new MenuGroup('DataAdministration', 70 /* fRank */, 'Organization', UR_ACTION_MODIFY, UR_ALLOWED_YES|UR_ALLOWED_DEPENDS);
-		new WebPageMenuNode('CSVImportMenu', '../pages/csvimport.php', $oToolsMenu->GetIndex(), 1 /* fRank */);
-
-		// Add the admin menus
-		$oAdminMenu = new MenuGroup('AdminTools', 80 /* fRank */);
-		new OQLMenuNode('UserAccountsMenu', 'SELECT User', $oAdminMenu->GetIndex(), 1 /* fRank */);
-		new OQLMenuNode('ProfilesMenu', 'SELECT URP_Profiles', $oAdminMenu->GetIndex(), 2 /* fRank */);
-		new TemplateMenuNode('NotificationsMenu', '../application/templates/notifications_menu.html', $oAdminMenu->GetIndex(), 3 /* fRank */);
-		new OQLMenuNode('AuditCategories', 'SELECT AuditCategory', $oAdminMenu->GetIndex(), 4 /* fRank */);
-		new WebPageMenuNode('RunQueriesMenu', '../pages/run_query.php', $oAdminMenu->GetIndex(), 8 /* fRank */);
-		new WebPageMenuNode('ExportMenu', '../webservices/export.php', $oAdminMenu->GetIndex(), 9 /* fRank */);
-		new WebPageMenuNode('DataModelMenu', '../pages/schema.php', $oAdminMenu->GetIndex(), 10 /* fRank */);
-		new WebPageMenuNode('UniversalSearchMenu', '../pages/UniversalSearch.php', $oAdminMenu->GetIndex(), 11 /* fRank */);
+		");
+		$this->DisplayMenu();
 	}
 	
 	public function AddToMenu($sHtml)
@@ -435,69 +131,78 @@ EOF
 		$this->m_sMenu .= $sHtml;
 	}
 
-	public function GetSiloSelectionForm()
-	{
-		// List of visible Organizations
-		$iCount = 0;
-		if (MetaModel::IsValidClass('Organization'))
-		{
-			$oSearchFilter = new DBObjectSearch('Organization');
-			$oSet = new CMDBObjectSet($oSearchFilter);
-			$iCount = $oSet->Count();
-		}
-		switch($iCount)
-		{
-			case 0:
-			// No such dimension/silo => nothing to select
-			$sHtml = '<div id="SiloSelection"><!-- nothing to select --></div>';
-			break;
-			
-			case 1:
-			// Only one possible choice... no selection, but display the value
-			$oOrg = $oSet->Fetch();
-			$sHtml = '<div id="SiloSelection">'.$oOrg->GetName().'</div>';
-			$sHtml .= '';
-			break;
-			
-			default:
-			$oAppContext = new ApplicationContext();
-			$iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
-			$sHtml = '<div id="SiloSelection">';
-			$sHtml .= '<form style="display:inline" action="'.$_SERVER['PHP_SELF'].'"><select style="width:150px;font-size:x-small" name="c[org_id]" title="Pick an organization" onChange="this.form.submit();">';
-			$sSelected = ($iCurrentOrganization == '') ? ' selected' : '';
-			$sHtml .= '<option value=""'.$sSelected.'>'.Dict::S('UI:AllOrganizations').'</option>';
-			while($oOrg = $oSet->Fetch())
-			{
-				if ($iCurrentOrganization == $oOrg->GetKey())
-				{
-//					$oCurrentOrganization = $oOrg;
-					$sSelected = " selected";
-			
-				}
-				else
-				{
-					$sSelected = "";
-				}
-				$sHtml .= '<option value="'.$oOrg->GetKey().'"'.$sSelected.'>'.$oOrg->GetName().'</option>';
-			}
-			$sHtml .= '</select>';
-			// Add other dimensions/context information to this form
-//			$oAppContext = new ApplicationContext();
-			$oAppContext->Reset('org_id'); // org_id is handled above and we want to be able to change it here !
-			$sHtml .= $oAppContext->GetForForm();		
-			$sHtml .= '</form>';
-			$sHtml .= '</div>';
-		}
-		return $sHtml;		
-	}
-	
     public function DisplayMenu()
     {
+        // Combo box to select the organization
+		$this->AddToMenu("<div id=\"OrganizationSelection\">
+			  <form style=\"display:inline\" action=\"{$_SERVER['PHP_SELF']}\"><select style=\"width:150px;font-size:x-small\" name=\"org_id\" title=\"Pick an organization\" onChange=\"this.form.submit();\">\n");
+		// List of visible Organizations
+		$oContext = new UserContext();
+		$oSearchFilter = $oContext->NewFilter("bizOrganization");
+		$oSet = new CMDBObjectSet($oSearchFilter);
+		$sSelected = ($this->m_currentOrganization == '') ? ' selected' : '';
+		$this->AddToMenu("<option value=\"\"$sSelected> All Organizations </option>");
+		if ($oSet->Count() > 0)
+		while($oOrg = $oSet->Fetch())
+		{
+			if ($this->m_currentOrganization == $oOrg->GetKey())
+			{
+				$oCurrentOrganization = $oOrg;
+				$sSelected = " selected";
+			}
+			else
+			{
+				$sSelected = "";
+			}
+			$this->AddToMenu("<option value=\"".$oOrg->GetKey()."\"$sSelected>".$oOrg->Get('name')."</option>\n");
+		}
+		$this->AddToMenu("</select>\n");
+		// Add other dimensions/context information to this form
+		$oAppContext = new ApplicationContext();
+		$oAppContext->Reset('org_id'); // Org id is handled above and we want to be able to change it here !
+		$this->AddToMenu($oAppContext->GetForForm());		
+		$this->AddToMenu("</form>\n");
+		$this->AddToMenu("</div>\n");
+		$this->AddToMenu("<ul id=\"browser\" class=\"dir\">\n");
+
 		// Display the menu
 		$oAppContext = new ApplicationContext();
-		$iAccordionIndex = 0;
+		// 1) Application defined menus
+		$oSearchFilter = $oContext->NewFilter("menuNode");
+		$oSearchFilter->AddCondition('parent_id', 0, '=');
+		$oSearchFilter->AddCondition('type', 'application', '=');
+		// There may be more criteria added later to have a specific menu based on the user's profile
+		$oSet = new CMDBObjectSet($oSearchFilter, array('rank' => true));
+		while ($oRootMenuNode = $oSet->Fetch())
+		{
+			$oRootMenuNode->DisplayMenu($this, 'application', $oAppContext->GetAsHash());
+		}
+		// 2) User defined menus (Bookmarks)
+		$oSearchFilter = $oContext->NewFilter("menuNode");
+		$oSearchFilter->AddCondition('parent_id', 0, '=');
+		$oSearchFilter->AddCondition('type', 'user', '=');
+		$oSearchFilter->AddCondition('user_id', UserRights::GetUserId(), '=');
+		// There may be more criteria added later to have a specific menu based on the user's profile
+		$oSet = new CMDBObjectSet($oSearchFilter, array('rank' => true));
+		while ($oRootMenuNode = $oSet->Fetch())
+		{
+			$oRootMenuNode->DisplayMenu($this, 'user', $oAppContext->GetAsHash());
+		}
+		// 3) Administrator menu
+		if (userRights::IsAdministrator())
+		{
+			$oSearchFilter = $oContext->NewFilter("menuNode");
+			$oSearchFilter->AddCondition('parent_id', 0, '=');
+			$oSearchFilter->AddCondition('type', 'administrator', '=');
+			// There may be more criteria added later to have a specific menu based on the user's profile
+			$oSet = new CMDBObjectSet($oSearchFilter, array('rank' => true));
+			while ($oRootMenuNode = $oSet->Fetch())
+			{
+				$oRootMenuNode->DisplayMenu($this, 'administrator', $oAppContext->GetAsHash());
+			}
+		}
 
-		ApplicationMenu::DisplayMenu($this, $oAppContext->GetAsHash());
+		$this->AddToMenu("</ul>\n");
     }
 
 	/**
@@ -505,17 +210,6 @@ EOF
 	 */
     public function output()
     {
-		$this->DisplayMenu(); // Compute the menu
-
-		// Put here the 'ready scripts' that must be executed after all others
-    	$this->add_ready_script(
-<<<EOF
-	// Since the event is only triggered when the hash changes, we need to trigger
-	// the event now, to handle the hash the page may have loaded with.
-	$(window).trigger( 'hashchange' );
-
-EOF
-);
         foreach($this->a_headers as $s_header)
         {
             header($s_header);
@@ -525,10 +219,8 @@ EOF
         echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
         echo "<html>\n";
         echo "<head>\n";
-        // Make sure that Internet Explorer renders the page using its latest/highest/greatest standards !
-        echo "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n";
-        echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
         echo "<title>{$this->s_title}</title>\n";
+        echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
         echo $this->get_base_tag();
         // Stylesheets MUST be loaded before any scripts otherwise
         // jQuery scripts may face some spurious problems (like failing on a 'reload')
@@ -575,131 +267,18 @@ EOF
         echo "</head>\n";
         echo "<body>\n";
 
-
-
-
-
-
-
-
-		// Render the revision number
+		// Display the header
 		if (ITOP_REVISION == '$WCREV$')
 		{
 			// This is NOT a version built using the buil system, just display the main version
-			$sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
+			$sVersionString = "iTop Version ".ITOP_VERSION;
 		}
 		else
 		{
 			// This is a build made from SVN, let display the full information
-			$sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
+			$sVersionString = "iTop Version ".ITOP_VERSION." revision ".ITOP_REVISION.", built on: ".ITOP_BUILD_DATE;
 		}
-
-		// Render the text of the global search form
-		$sText = Utils::ReadParam('text', '');
-		$sOnClick = "";
-		if (empty($sText))
-		{
-			// if no search text is supplied then
-			// 1) the search text is filled with "your search"
-			// 2) clicking on it will erase it
-			$sText = Dict::S("UI:YourSearch");
-			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
-		}
-
-		$sForm = $this->GetSiloSelectionForm();
-		
-		// Render the tabs in the page (if any)
-		foreach($this->m_aTabs as $sTabContainerName => $m_aTabs)
-		{
-			$sTabs = '';
-			$container_index = 0;
-			if (count($m_aTabs) > 0)
-			{
-			  $sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$container_index}\" class=\"light\">\n";
-			  $sTabs .= "<ul>\n";
-			  // Display the unordered list that will be rendered as the tabs
-	          $i = 0;
-			  foreach($m_aTabs as $sTabName => $sTabContent)
-			  {
-			      $sTabs .= "<li><a href=\"#tab_$i\" class=\"tab\"><span>".htmlentities($sTabName, ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
-			      $i++;
-	          }
-			  $sTabs .= "</ul>\n";
-			  // Now add the content of the tabs themselves
-			  $i = 0;
-			  foreach($m_aTabs as $sTabName => $sTabContent)
-			  {
-			      $sTabs .= "<div id=\"tab_$i\">".$sTabContent."</div>\n";
-			      $i++;
-	          }
-			  $sTabs .= "</div>\n<!-- end of tabs-->\n";
-	        }
-			$this->s_content = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $this->s_content);
-			$container_index++;
-		}
-		$sUserName = UserRights::GetUser();
-		$sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
-		if (UserRights::IsAdministrator())
-		{
-			$sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
-		}
-		else
-		{
-			$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);		
-		}
-		$sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/onOffBtn.png\"><ul>";
-		$sLogOffMenu .= "<li><span>$sLogonMessage</span></li>\n";
-		
-		if (utils::CanLogOff() && UserRights::CanLogOff())
-		{
-			//$sLogOffMenu .= "<li><a href=\"../pages/UI.php?loginop=logoff\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
-			$sLogOffMenu .= "<li><a href=\"../pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a></li>\n";
-		}
-		if (UserRights::CanChangePassword())
-		{
-			$sLogOffMenu .= "<li><a href=\"../pages/UI.php?loginop=change_pwd\">".Dict::S('UI:ChangePwdMenu')."</a></li>\n";
-		}
-		$sLogOffMenu .= "</ul>\n</li>\n</ul></span>\n";
-
-		//$sLogOffMenu = "<span id=\"logOffBtn\" style=\"height:55px;padding:0;margin:0;\"><img src=\"../images/onOffBtn.png\"></span>";
-
-		echo '<div id="left-pane" class="ui-layout-west">';
-		echo '<!-- Beginning of the left pane -->';
-		echo '	<div id="header-logo">';
-		echo '	<div id="top-left"></div><div id="logo"><a href="http://www.combodo.com/itop"><img src="../images/itop-logo.png" title="'.$sVersionString.'" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
-		echo '	</div>';
-		echo '	<div class="header-menu">';
-		echo '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
-		echo '		<div style="width:100%; text-align:center;">'.$sForm.'</div>';
-		echo '	</div>';
-		echo '	<div id="menu" class="ui-layout-content">';
-		echo '		<div id="inner_menu">';
-		echo '			<div id="accordion">';
-		echo $this->m_sMenu;
-		echo '			<!-- Beginning of the accordion menu -->';
-		echo '			<!-- End of the accordion menu-->';
-		echo '			</div>';
-		echo '		</div> <!-- /inner menu -->';
-		echo '	</div> <!-- /menu -->';
-		echo '	<div class="footer"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png"/></a></div>';
-		echo '<!-- End of the left pane -->';
-		echo '</div>';
-
-		echo '<div class="ui-layout-center">';
-		echo '	<div id="top-bar" style="width:100%">';
-		echo '		<div id="global-search"><form action="../pages/UI.php"><table><tr><td id="g-search-input"><input type="text" name="text" value="'.$sText.'"'.$sOnClick.'/></td>';
-		echo '<td><input type="image" src="../images/searchBtn.png"/></a></td>';
-		echo '<td><a style="background:transparent;" href="http://www.combodo.com/itop-help" target="_blank"><img style="border:0;padding-left:20px;padding-right:10px;" title="'.Dict::S('UI:Help').'" src="../images/help.png"/></td>';
-		echo '<td style="padding-right:20px;padding-left:10px;">'.$sLogOffMenu.'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
-		//echo '<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
-		echo '	</div>';
-		echo '	<div class="ui-layout-content">';
-		echo '	<!-- Beginning of page content -->';
-		echo $this->s_content;
-		echo '	<!-- End of page content -->';
-		echo '	</div>';
-		echo '</div>';
-/*		
+		echo "<div id=\"Header\">\n";
 		echo "<div class=\"iTopLogo\" title=\"$sVersionString\"><span>iTop</span></div>\n";
 		//echo "<div id=\"GlobalSearch\"><div style=\"border: 1px solid #999; padding:1px; background-color:#fff;\"><img src=\"../images/magnifier.gif\"/><input style=\"border:0\" type=\"text\" size=\"15\" title=\"Global Search\"></input></div></div>\n";
 		$sText = Utils::ReadParam('text', '');
@@ -709,27 +288,17 @@ EOF
 			// if no search text is supplied then
 			// 1) the search text is filled with "your search"
 			// 2) clicking on it will erase it
-			$sText = Dict::S("UI:YourSearch");
+			$sText = "Your search";
 			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
 		}
 		$sUserName = UserRights::GetUser();
 		$sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
-		if (UserRights::IsAdministrator())
-		{
-			$sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
-		}
-		else
-		{
-			$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);		
-		}
-		$sLogOffBtn = Dict::S('UI:Button:Logoff');
-		$sSearchBtn = Dict::S('UI:Button:GlobalSearch');
-		echo "<div id=\"Login\" style=\"position:absolute; top:18px; right:16px; width:600px;\">{$sLogonMessage}&nbsp;&nbsp;";
+		echo "<div id=\"Login\" style=\"position:absolute; top:18px; right:16px; width:500px;\">Logged in as '$sUserName'&nbsp;$sIsAdmin&nbsp;&nbsp;";
 		echo "<form action=\"../pages/UI.php\" method=\"post\" style=\"display:inline\">\n";
-		echo "<input type=\"submit\" value=\"$sLogOffBtn\" />\n";
+		echo "<input type=\"submit\" value=\"Log off\" />\n";
 		echo "<input type=\"hidden\" name=\"loginop\" value=\"logoff\" />\n";
 		echo "</form>\n";
-		echo "<form action=\"../pages/UI.php\" style=\"display:inline\"><div style=\"padding:1px; background-color:#fff;display:inline;\"><img src=\"../images/magnifier.gif\"/><input style=\"border:0\" type=\"text\" size=\"15\" title=\"Global Search\" name=\"text\" value=\"$sText\"$sOnClick></input></div><input type=\"submit\" value=\"$sSearchBtn\" />
+		echo "<form action=\"../pages/UI.php\" style=\"display:inline\"><div style=\"padding:1px; background-color:#fff;display:inline;\"><img src=\"../images/magnifier.gif\"/><input style=\"border:0\" type=\"text\" size=\"15\" title=\"Global Search\" name=\"text\" value=\"$sText\"$sOnClick></input></div><input type=\"submit\" value=\"Search\" />
 			  <input type=\"hidden\" name=\"operation\" value=\"full_text\" /></form>\n";
 		echo "</div>\n";
 
@@ -742,21 +311,48 @@ EOF
 		echo "  </div> <!-- LeftPane -->\n";
 		
 		echo "<div id=\"RightPane\">\n";
-    
+        
+		// Render the tabs in the page (if any)
+		foreach($this->m_aTabs as $sTabContainerName => $m_aTabs)
+		{
+			$sTabs = '';
+			if (count($m_aTabs) > 0)
+			{
+			  $sTabs = "<!-- tabs -->\n<div id=\"tabbedContent\" class=\"light\">\n";
+			  $sTabs .= "<ul>\n";
+			  // Display the unordered list that will be rendered as the tabs
+	          $i = 0;
+			  foreach($m_aTabs as $sTabName => $sTabContent)
+			  {
+			      $sTabs .= "<li><a href=\"#fragment_$i\" class=\"tab\"><span>".htmlentities($sTabName)."</span></a></li>\n";
+			      $i++;
+	          }
+			  $sTabs .= "</ul>\n";
+			  // Now add the content of the tabs themselves
+			  $i = 0;
+			  foreach($m_aTabs as $sTabName => $sTabContent)
+			  {
+			      $sTabs .= "<div id=\"fragment_$i\">".$sTabContent."</div>\n";
+			      $i++;
+	          }
+			  $sTabs .= "</div>\n<!-- end of tabs-->\n";
+	        }
+			$this->s_content = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $this->s_content);
+		}
         
 		// Display the page's content
         echo $this->s_content;
 
-*/
         // Add the captured output
         if (trim($s_captured_output) != "")
         {
-            echo "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">$s_captured_output</div></div>\n";
+            echo "<div class=\"raw_output\">$s_captured_output</div>\n";
         }
         echo $this->s_deferred_content;
-		echo "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
-		echo "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
-
+		echo "<div class=\"jqmWindow\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
+		echo "</div> <!-- RightPane -->\n";
+		echo "</div> <!-- Splitter -->\n";
+		echo "<div class=\"jqmWindow\" id=\"ModalDlg\"></div>";
 		echo "</body>\n";
         echo "</html>\n";
     }
@@ -795,36 +391,6 @@ EOF
 		return $sPreviousTab;
 	}
 	
-	/**
-	 * Make the given tab the active one, as if it were clicked
-	 * DOES NOT WORK: apparently in the *old* version of jquery
-	 * that we are using this is not supported... TO DO upgrade
-	 * the whole jquery bundle...
-	 */
-	public function SelectTab($sTabContainer, $sTabLabel)
-	{
-		$container_index = 0;
-		$tab_index = 0;
-		foreach($this->m_aTabs as $sCurrentTabContainerName => $aTabs)
-		{
-			if ($sTabContainer == $sCurrentTabContainerName)
-			{
-				foreach($aTabs as $sCurrentTabLabel => $void)
-				{
-					if ($sCurrentTabLabel == $sTabLabel)
-					{
-						break;
-					}
-					$tab_index++;
-				}	
-				break;
-			}
-			$container_index++;
-		}
-		$sSelector = '#tabbedContent_'.$container_index.' > ul';
-		$this->add_ready_script("$('$sSelector').tabs('select', $tab_index);");
-	}
-	
 	public function StartCollapsibleSection($sSectionLabel, $bOpen = false)
 	{
 		$this->add($this->GetStartCollapsibleSection($sSectionLabel, $bOpen));

application/itopwizardwebpage.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class iTopWizardWebPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('itopwebpage.class.inc.php');
 /**
  * Web page to display a wizard in the iTop framework

application/loginwebpage.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class LoginWebPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once("../application/nicewebpage.class.inc.php");
 /**
  * Web page used for displaying the login form
@@ -32,154 +8,63 @@ class LoginWebPage extends NiceWebPage
     public function __construct()
     {
         parent::__construct("iTop Login");
-        $this->add_style(<<<EOF
+        $this->add_style("
 body {
-	background: #eee;
+	background-color: #eee;
 	margin: 0;
 	padding: 0;
 }
-#login-logo {
-	margin-top: 150px;
-	width: 300px;
-	padding-left: 20px;
-	padding-right: 20px;
-	padding-top: 10px;
-	padding-bottom: 10px;
-	margin-left: auto;
-	margin-right: auto;
-	background: #f6f6f1;
-	height: 54px;
-	border-top: 1px solid #000;
-	border-left: 1px solid #000;
-	border-right: 1px solid #000;
-	border-bottom: 0;
-	text-align: center;
-}
-#login-logo img {
-	border: 0;
-}
 #login {
-	width: 300px;
+	width: 230px;
 	margin-left: auto;
 	margin-right: auto;
+	margin-top: 150px;
 	padding: 20px;
 	background-color: #fff;
-	border-bottom: 1px solid #000;
-	border-left: 1px solid #000;
-	border-right: 1px solid #000;
-	border-top: 0;
+	border: 1px solid #000;
 }
 .center {
 	text-align: center;
 }
 
 h1 {
-	color: #1C94C4;
+	color: #83b217;
 	font-size: 16pt;
 }
 .v-spacer {
 	padding-top: 1em;
 }
-EOF
-);
+		");
 	}
 	
-	public function DisplayLoginForm($sLoginType, $bFailedLogin = false)
-	{
-		switch($sLoginType)
-		{
-			case 'basic':
-			case 'url':
-			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_VERSION));
-			$this->add_header('HTTP/1.0 401 Unauthorized');
-			// Note: displayed when the user will click on Cancel
-			$this->add('<p><strong>'.Dict::S('UI:Login:Error:AccessRestricted').'</strong></p>');
-			break;
-			
-			case 'external':
-			case 'form':
-			default: // In case the settings get messed up...
-			$sAuthUser = utils::ReadParam('auth_user', '');
-			$sAuthPwd = utils::ReadParam('suggest_pwd', '');
-	
-			$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
-			$this->add("<div id=\"login-logo\"><a href=\"http://www.combodo.com/itop\"><img title=\"$sVersionShort\" src=\"../images/itop-logo.png\"></a></div>\n");
-			$this->add("<div id=\"login\">\n");
-			$this->add("<h1>".Dict::S('UI:Login:Welcome')."</h1>\n");
-			if ($bFailedLogin)
-			{
-				$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectLoginPassword')."</p>\n");
-			}
-			else
-			{
-				$this->add("<p>".Dict::S('UI:Login:IdentifyYourself')."</p>\n");
-			}
-			$this->add("<form method=\"post\">\n");
-			$this->add("<table>\n");
-			$this->add("<tr><td><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label></td><td><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"$sAuthUser\" /></td></tr>\n");
-			$this->add("<tr><td><label for=\"pwd\">".Dict::S('UI:Login:PasswordPrompt').":</label></td><td><input id=\"pwd\" type=\"password\" name=\"auth_pwd\" value=\"$sAuthPwd\" /></td></tr>\n");
-			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"> <input type=\"submit\" value=\"".Dict::S('UI:Button:Login')."\" /></td></tr>\n");
-			$this->add("</table>\n");
-			$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
-			$this->add("</form>\n");
-			$this->add("</div>\n");
-			break;
-		}
-	}
-
-	public function DisplayChangePwdForm($bFailedLogin = false)
+	public function DisplayLoginForm($bFailedLogin = false)
 	{
 		$sAuthUser = utils::ReadParam('auth_user', '');
 		$sAuthPwd = utils::ReadParam('suggest_pwd', '');
 
-		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
-		$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
-		$this->add_script(<<<EOF
-function GoBack()
-{
-	window.history.back();
-}
-
-function DoCheckPwd()
-{
-	if ($('#new_pwd').val() != $('#retype_new_pwd').val())
-	{
-		alert('$sInconsistenPwdMsg');
-		return false;
-	}
-	return true;
-}
-EOF
-);
-		$this->add("<div id=\"login-logo\"><a href=\"http://www.combodo.com/itop\"><img title=\"$sVersionShort\" src=\"../images/itop-logo.png\"></a></div>\n");
 		$this->add("<div id=\"login\">\n");
-		$this->add("<h1>".Dict::S('UI:Login:ChangeYourPassword')."</h1>\n");
+		$this->add("<h1>Welcome to iTop!</h1>\n");
 		if ($bFailedLogin)
 		{
-			$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectOldPassword')."</p>\n");
+			$this->add("<p class=\"hilite\">Incorrect login/password, please try again.</p>\n");
+		}
+		else
+		{
+			$this->add("<p>Please identify yourself before continuing.</p>\n");
 		}
 		$this->add("<form method=\"post\">\n");
 		$this->add("<table>\n");
-		$this->add("<tr><td><label for=\"old_pwd\">".Dict::S('UI:Login:OldPasswordPrompt').":</label></td><td><input type=\"password\" id=\"old_pwd\" name=\"old_pwd\" value=\"\" /></td></tr>\n");
-		$this->add("<tr><td><label for=\"new_pwd\">".Dict::S('UI:Login:NewPasswordPrompt').":</label></td><td><input type=\"password\" id=\"new_pwd\" name=\"new_pwd\" value=\"\" /></td></tr>\n");
-		$this->add("<tr><td><label for=\"retype_new_pwd\">".Dict::S('UI:Login:RetypeNewPasswordPrompt').":</label></td><td><input type=\"password\" id=\"retype_new_pwd\" name=\"retype_new_pwd\" value=\"\" /></td></tr>\n");
-		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\">  <input type=\"button\" onClick=\"GoBack();\" value=\"".Dict::S('UI:Button:Cancel')."\" />&nbsp;&nbsp;<input type=\"submit\" onClick=\"return DoCheckPwd();\" value=\"".Dict::S('UI:Button:ChangePassword')."\" /></td></tr>\n");
+		$this->add("<tr><td><label for=\"user\">User Name:</label></td><td><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"$sAuthUser\" /></td></tr>\n");
+		$this->add("<tr><td><label for=\"pwd\">Password:</label></td><td><input id=\"pwd\" type=\"password\" name=\"auth_pwd\" value=\"$sAuthPwd\" /></td></tr>\n");
+		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"> <input type=\"submit\" value=\"Enter iTop\" /></td></tr>\n");
 		$this->add("</table>\n");
-		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"do_change_pwd\" />\n");
+		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
 		$this->add("</form>\n");
 		$this->add("</div>\n");
 	}
 
-	static function ResetSession()
+	static protected function ResetSession()
 	{
-		if (isset($_SESSION['login_mode']))
-		{
-			$sPreviousLoginMode = $_SESSION['login_mode'];
-		}
-		else
-		{
-			$sPreviousLoginMode = '';
-		}
 		// Unset all of the session variables.
 		$_SESSION = array();
 		// If it's desired to kill the session, also delete the session cookie.
@@ -191,221 +76,51 @@ EOF
 		// Finally, destroy the session.
 		session_destroy();
 	}
-
-	static function SecureConnectionRequired()
-	{
-		return utils::GetConfig()->GetSecureConnectionRequired();
-	}
-
-	static function IsConnectionSecure()
-	{
-		$bSecured = false;
-
-		if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off'))
-		{
-			$bSecured = true;
-		}
-		return $bSecured;
-	}
 	
-	protected static function Login()
-	{
-		if (self::SecureConnectionRequired() && !self::IsConnectionSecure())
-		{
-			// Non secured URL... redirect to a secured one
-			$sUrl = Utils::GetAbsoluteUrl(true /* query string */, true /* force HTTPS */);
-			header("Location: $sUrl");			
-			exit;
-		}
-
-		$aAllowedLoginTypes = utils::GetConfig()->GetAllowedLoginTypes();
-
-		if (isset($_SESSION['auth_user']))
-		{
-			//echo "User: ".$_SESSION['auth_user']."\n";
-			// Already authentified
-			UserRights::Login($_SESSION['auth_user']); // Login & set the user's language
-			return true;
-		}
-		else
-		{
-			$index = 0;
-			$sLoginMode = '';
-			$sAuthentication = 'internal';
-			while(($sLoginMode == '') && ($index < count($aAllowedLoginTypes)))
-			{
-				$sLoginType = $aAllowedLoginTypes[$index];
-				switch($sLoginType)
-				{
-					case 'form':
-					// iTop standard mode: form based authentication
-					$sAuthUser = utils::ReadPostedParam('auth_user', '');
-					$sAuthPwd = utils::ReadPostedParam('auth_pwd', '');
-					if ($sAuthUser != '')
-					{
-						$sLoginMode = 'form';
-					}
-					break;
-					
-					case 'basic':
-					// Standard PHP authentication method, works with Apache...
-					// Case 1) Apache running in CGI mode + rewrite rules in .htaccess
-					if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
-					{
-						list($sAuthUser, $sAuthPwd) = explode(':' , base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
-						$sLoginMode = 'basic';
-					}
-					else if (isset($_SERVER['PHP_AUTH_USER']))
-					{
-						$sAuthUser = $_SERVER['PHP_AUTH_USER'];
-						$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
-						$sLoginMode = 'basic';
-					}
-					break;
-
-					case 'external':
-					// Web server supplied authentication
-					$bExternalAuth = false;
-                    $sExtAuthVar = utils::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
-                    $sEval = '$bExternalAuth = isset('.$sExtAuthVar.');';
-                    eval($sEval);
-                    if ($bExternalAuth)
-                    {
-						eval('$sAuthUser = '.$sExtAuthVar.';'); // Retrieve the value
-						$sAuthPwd = ''; // No password in this case the web server already authentified the user...
-						$sLoginMode = 'external';
-						$sAuthentication = 'external';
-					}
-					break;
-
-					case 'url':
-					// Credentials passed directly in the url
-					$sAuthUser = utils::ReadParam('auth_user', '');
-					if ($sAuthUser != '')
-					{
-						$sAuthPwd = utils::ReadParam('auth_pwd', '');
-						$sLoginMode = 'url';
-					}		
-					break;	
-				}
-				$index++;
-			}
-			//echo "\nsLoginMode: $sLoginMode (user: $sAuthUser / pwd: $sAuthPwd\n)";
-			if ($sLoginMode == '')
-			{
-				// First connection
-				$sDesiredLoginMode = utils::ReadParam('login_mode');
-				if (in_array($sDesiredLoginMode, $aAllowedLoginTypes))
-				{
-					$sLoginMode = $sDesiredLoginMode;
-				}
-				else
-				{
-					$sLoginMode = $aAllowedLoginTypes[0]; // First in the list...
-				}
-				$oPage = new LoginWebPage();
-				$oPage->DisplayLoginForm( $sLoginMode, false /* no previous failed attempt */);
-				$oPage->output();
-				exit;
-			}
-			else
-			{
-				if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sAuthentication))
-				{
-					self::ResetSession();
-					$oPage = new LoginWebPage();
-					$oPage->DisplayLoginForm( $sLoginMode, true /* failed attempt */);
-					$oPage->output();
-					exit;
-				}
-				else
-				{
-					// User is Ok, let's save it in the session and proceed with normal login
-					UserRights::Login($sAuthUser, $sAuthentication); // Login & set the user's language
-					$_SESSION['auth_user'] = $sAuthUser;
-					$_SESSION['login_mode'] = $sLoginMode;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 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
-	 * @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
-	 */
-	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false)
+	static function DoLogin()
 	{
 		$operation = utils::ReadParam('loginop', '');
-		session_name(utils::GetConfig()->Get('session_name'));
 		session_start();
 
 		if ($operation == 'logoff')
 		{
-			if (isset($_SESSION['login_mode']))
+			self::ResetSession();
+		}
+		
+		if (!isset($_SESSION['auth_user']) || !isset($_SESSION['auth_pwd']))
+		{
+			if ($operation == 'login')
 			{
-				$sLoginMode = $_SESSION['login_mode'];
+				$sAuthUser = utils::ReadParam('auth_user', '', 'post');
+				$sAuthPwd = utils::ReadParam('auth_pwd', '', 'post');
 			}
 			else
 			{
-				$aAllowedLoginTypes = utils::GetConfig()->GetAllowedLoginTypes();
-				if (count($aAllowedLoginTypes) > 0)
-				{
-					$sLoginMode = $aAllowedLoginTypes[0];
-				}
-				else
-				{
-					$sLoginMode = 'form';
-				}
+				$oPage = new LoginWebPage();
+				$oPage->DisplayLoginForm();
+				$oPage->output();
+				exit;
 			}
+		}
+		else
+		{
+			$sAuthUser = $_SESSION['auth_user'];
+			$sAuthPwd = $_SESSION['auth_pwd'];
+		}
+		if (!UserRights::Login($sAuthUser, $sAuthPwd))
+		{
 			self::ResetSession();
 			$oPage = new LoginWebPage();
-			$oPage->DisplayLoginForm( $sLoginMode, false /* not a failed attempt */);
-			$oPage->output();
-			exit;
-		}		
-		else if ($operation == 'change_pwd')
-		{
-			$sAuthUser = $_SESSION['auth_user'];
-			UserRights::Login($sAuthUser); // Set the user's language
-			$oPage = new LoginWebPage();
-			$oPage->DisplayChangePwdForm();
+			$oPage->DisplayLoginForm( true /* failed attempt */);
 			$oPage->output();
 			exit;
 		}
-		if ($operation == 'do_change_pwd')
+		else
 		{
-			$sAuthUser = $_SESSION['auth_user'];
-			UserRights::Login($sAuthUser); // Set the user's language
-			$sOldPwd = utils::ReadPostedParam('old_pwd');
-			$sNewPwd = utils::ReadPostedParam('new_pwd');
-			if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
-			{
-				$oPage = new LoginWebPage();
-				$oPage->DisplayChangePwdForm(true); // old pwd was wrong
-				$oPage->output();
-			}
-		}
-		
-		self::Login();
-
-		if ($bMustBeAdmin && !UserRights::IsAdministrator())
-		{	
-			require_once('../setup/setuppage.class.inc.php');
-			$oP = new SetupWebPage(Dict::S('UI:PageTitle:FatalError'));
-			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");	
-			$oP->p("<a href=\"../pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
-			$oP->output();
-			exit;
-		}
-		elseif ( (!$bIsAllowedToPortalUsers) && (UserRights::IsPortalUser()))
-		{
-			// No rights to be here, redirect to the portal
-			header('Location: ../portal/index.php');
+			$_SESSION['auth_user'] = $sAuthUser ;
+			$_SESSION['auth_pwd'] = $sAuthPwd;
+			
 		}
 	}
-
 } // End of class
 ?>

application/menunode.class.inc.php

@@ -1,666 +1,215 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+require_once('../core/attributedef.class.inc.php');
+require_once('../core/filterdef.class.inc.php');
+require_once('../core/stimulus.class.inc.php');
+require_once('../core/MyHelpers.class.inc.php');
+
+require_once('../core/cmdbsource.class.inc.php');
+require_once('../core/sqlquery.class.inc.php');
+
+require_once('../core/dbobject.class.php');
+require_once('../core/dbobjectsearch.class.php');
+require_once('../core/dbobjectset.class.php');
+
+require_once('../application/displayblock.class.inc.php');
 
 /**
- * Construction and display of the application's main menu
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * This class manages en entries in the menu tree on the left of the iTop pages
  */
-
-require_once('../application/utils.inc.php');
-require_once('../application/template.class.inc.php');
-
-
-/**
- * This class manipulates, stores and displays the navigation menu used in the application
- * In order to improve the modularity of the data model and to ease the update/migration
- * between evolving data models, the menus are no longer stored in the database, but are instead
- * built on the fly each time a page is loaded.
- * The application's menu is organized into top-level groups with, inside each group, a tree of menu items.
- * Top level groups do not display any content, they just expand/collapse.
- * Sub-items drive the actual content of the page, they are based either on templates, OQL queries or full (external?) web pages.
- *
- * Example:
- * Here is how to insert the following items in the application's menu:
- *   +----------------------------------------+
- *   | Configuration Management Group         | >> Top level group
- *   +----------------------------------------+
- *		+ Configuration Management Overview     >> Template based menu item
- *		+ Contacts								>> Template based menu item
- *			+ Persons							>> Plain list (OQL based)
- *			+ Teams								>> Plain list (OQL based)
- *
- * // Create the top-level group. fRank = 1, means it will be inserted after the group '0', which is usually 'Welcome'
- * $oConfigMgmtMenu = new MenuGroup('ConfigurationManagementMenu', 1);
- * // Create an entry, based on a custom template, for the Configuration management overview, under the top-level group
- * new TemplateMenuNode('ConfigurationManagementMenu', '../somedirectory/configuration_management_menu.html', $oConfigMgmtMenu->GetIndex(), 0);
- * // Create an entry (template based) for the overview of contacts
- * $oContactsMenu = new TemplateMenuNode('ContactsMenu', '../somedirectory/configuration_management_menu.html',$oConfigMgmtMenu->GetIndex(), 1);
- * // Plain list of persons
- * new OQLMenuNode('PersonsMenu', 'SELECT bizPerson', $oContactsMenu->GetIndex(), 0);
- *
- */
- 
-class ApplicationMenu
+class menuNode extends DBObject
 {
-	static $aRootMenus = array();
-	static $aMenusIndex = array();
-	
-	/**
-	 * Main function to add a menu entry into the application, can be called during the definition
-	 * of the data model objects
-	 */
-	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex = -1, $fRank)
+	public static function Init()
 	{
-		$index = self::GetMenuIndexById($oMenuNode->GetMenuId());
-		if ($index == -1)
-		{
-			// The menu does not already exist, insert it
-			$index = count(self::$aMenusIndex);
-			self::$aMenusIndex[$index] = array( 'node' => $oMenuNode, 'children' => array());
-			if ($iParentIndex == -1)
-			{
-				self::$aRootMenus[] = array ('rank' => $fRank, 'index' => $index);
-			}
-			else
-			{
-				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
-			}
-		}
-		return $index;
-	}
-	
-	/**
-	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 */
-	static public function DisplayMenu(iTopWebPage $oPage, $aExtraParams)
-	{
-		// Sort the root menu based on the rank
-		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
-		$iAccordion = 0;
-		$iActiveMenu = ApplicationMenu::GetActiveNodeId();
-		foreach(self::$aRootMenus as $aMenu)
-		{
-			$oMenuNode = self::GetMenuNode($aMenu['index']);
-			if (($oMenuNode->GetMenuId() == 'AdminTools') && (!UserRights::IsAdministrator())) continue; // Don't display the admin menu for non admin users
-			if (!$oMenuNode->IsEnabled()) continue; // Don't display a non-enabled menu
-			$oPage->AddToMenu('<h3>'.$oMenuNode->GetTitle().'</h3>');
-			$oPage->AddToMenu('<div>');
-			$aChildren = self::GetChildren($aMenu['index']);
-			if (count($aChildren) > 0)
-			{
-				$oPage->AddToMenu('<ul>');
-				$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
-				$oPage->AddToMenu('</ul>');
-				if ($bActive)
-				{
-					$oPage->add_ready_script("$('#accordion').accordion('activate', $iAccordion);");
-					$oPage->add_ready_script("$('#accordion').accordion('option', {collapsible: true});"); // Make it auto-collapsible once it has been opened properly
-				}
-			}
-			$oPage->AddToMenu('</div>');
-			$iAccordion++;
-		}
-	}
-	
-	/**
-	 * Handles the display of the sub-menus (called recursively if necessary)
-	 * @return true if the currently selected menu is one of the submenus
-	 */
-	static protected function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
-	{
-		// Sort the menu based on the rank
-		$bActive = false;
-		usort($aMenus, array('ApplicationMenu', 'CompareOnRank'));
-		foreach($aMenus as $aMenu)
-		{
-			$index = $aMenu['index'];
-			$oMenu = self::GetMenuNode($index);
-			if ($oMenu->IsEnabled())
-			{
-				$aChildren = self::GetChildren($index);
-				$sCSSClass = (count($aChildren) > 0) ? ' class="submenu"' : '';
-				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
-				if ($sHyperlink != '')
-				{
-					$oPage->AddToMenu('<li'.$sCSSClass.'><a href="'.$oMenu->GetHyperlink($aExtraParams).'">'.$oMenu->GetTitle().'</a></li>');
-				}
-				else
-				{
-					$oPage->AddToMenu('<li'.$sCSSClass.'>'.$oMenu->GetTitle().'</li>');
-				}
-				$aCurrentMenu = self::$aMenusIndex[$index];
-				if ($iActiveMenu == $index)
-				{
-					$bActive = true;
-				}
-				if (count($aChildren) > 0)
-				{
-					$oPage->AddToMenu('<ul>');
-					$bActive |= self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
-					$oPage->AddToMenu('</ul>');
-				}
-			}
-		}
-		return $bActive;
-	}
-	/**
-	 * Helper function to sort the menus based on their rank
-	 */
-	static public function CompareOnRank($a, $b)
-	{
-		$result = 1;
-		if ($a['rank'] == $b['rank'])
-		{
-			$result = 0;
-		}
-		if ($a['rank'] < $b['rank'])
-		{
-			$result = -1;
-		}
-		return $result;
-	}
-	
-	/**
-	 * Helper function to retrieve the MenuNodeObject based on its ID
-	 */
-	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
-	 */
-	static protected function GetChildren($index)
-	{
-		return self::$aMenusIndex[$index]['children'];
-	}
-	
-	/**
-	 * Helper function to get the ID of a menu based on its name
-	 * @param string $sTitle Title of the menu (as passed when creating the menu)
-	 * @return integer ID of the menu, or -1 if not found
-	 */
-	static public function GetMenuIndexById($sTitle)
-	{
-		$index = -1;
-		foreach(self::$aMenusIndex as $aMenu)
-		{
-			if ($aMenu['node']->GetMenuId() == $sTitle)
-			{
-				$index = $aMenu['node']->GetIndex();
-				break;
-			}
-		}
-		return $index;
-	}
-	
-	/**
-	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
-	 * @return MenuNode or null if there is no menu at all !
-	 */
-	static public function GetActiveNodeId()
-	{
-		$oAppContext = new ApplicationContext();
-		$iMenuIndex = $oAppContext->GetCurrentValue('menu', -1);
+		$aParams = array
+		(
+			"category" => "gui",
+			"name" => "menuNode",
+			"description" => "Main menu configuration elements",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_menunode",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+//		MetaModel::Init_AddAttribute(new AttributeExternalKey("change", array("label"=>"change", "description"=>"change", "allowed_values"=>null, "sql"=>"changeid", "targetclass"=>"CMDBChange", "jointype"=>"closed")));
+//		MetaModel::Init_AddAttribute(new AttributeExternalField("date", array("label"=>"date", "description"=>"date and time of the change", "allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"date")));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Menu Name", "description"=>"Short name for this menu", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("label", array("label"=>"Menu Description", "description"=>"Long description for this menu", "allowed_values"=>null, "sql"=>"label", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("hyperlink", array("label"=>"Hyperlink", "description"=>"Hyperlink to the page", "allowed_values"=>null, "sql"=>"hyperlink", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("icon_path", array("label"=>"Menu Icon", "description"=>"Path to the icon o the menu", "allowed_values"=>null, "sql"=>"icon_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("template", array("label"=>"Template", "description"=>"HTML template for the view", "allowed_values"=>null, "sql"=>"template", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("label"=>"Type", "description"=>"Type of menu", "allowed_values"=>new ValueSetEnum('application,user,administrator'), "sql"=>"type", "default_value"=>"application", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("rank", array("label"=>"Display rank", "description"=>"Sort order for displaying the menu", "allowed_values"=>null, "sql"=>"rank", "default_value" => 999, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("label"=>"Parent Menu Item", "description"=>"Parent Menu Item", "allowed_values"=>null, "sql"=>"parent_id", "targetclass"=>"menuNode", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("parent_name", array("label"=>"Parent Menu Item", "description"=>"Parent Menu Item", "allowed_values"=>null, "extkey_attcode"=>"parent_id", "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeInteger("user_id", array("label"=>"Owner of the menu", "description"=>"User who owns this menu (for user defined menus)", "allowed_values"=>null, "sql"=>"user_id", "default_value" => 0, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("label");
+		MetaModel::Init_AddFilterFromAttribute("parent_id");
+		MetaModel::Init_AddFilterFromAttribute("rank");
+		MetaModel::Init_AddFilterFromAttribute("type");
+		MetaModel::Init_AddFilterFromAttribute("user_id");
 		
-		if ($iMenuIndex  == -1)
-		{
-			// Make sure the root menu is sorted on 'rank'
-			usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
-			$oFirstGroup = self::GetMenuNode(self::$aRootMenus[0]['index']);
-			$oMenuNode = self::GetMenuNode(self::$aMenusIndex[$oFirstGroup->GetIndex()]['children'][0]['index']);
-			$iMenuIndex = $oMenuNode->GetIndex();
-		}
-		return $iMenuIndex;
-	}	
-}
-
-/**
- * Root class for all the kind of node in the menu tree, data model providers are responsible for instantiating
- * MenuNodes (i.e instances from derived classes) in order to populate the application's menu. Creating an objet
- * derived from MenuNode is enough to have it inserted in the application's main menu.
- * The class iTopWebPage, takes care of 3 items:
- * +--------------------+
- * | Welcome            |
- * +--------------------+
- * 		Welcome To iTop
- * +--------------------+
- * | Tools              |
- * +--------------------+
- * 		CSV Import
- * +--------------------+
- * | Admin Tools        |
- * +--------------------+
- *		User Accounts
- *		Profiles
- *		Notifications
- *		Run Queries
- *		Export
- *		Data Model
- *		Universal Search
- *
- * All the other menu items must constructed along with the various data model modules
- */
-abstract class MenuNode
-{
-	protected $sMenuId;
-	protected $index;
-
-	/**
-	 * Class of objects to check if the menu is enabled, null if none
-	 */
-	protected $m_sEnableClass;
-
-	/**
-	 * User Rights Action code to check if the menu is enabled, null if none
-	 */
-	protected $m_iEnableAction;
-
-	/**
-	 * User Rights allowed results (actually a bitmask) to check if the menu is enabled, null if none
-	 */
-	protected $m_iEnableActionResults;
-	
-	/**
-	 * 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)
-	 * @param integer $iParentIndex ID of the parent menu, pass -1 for top level (group) items
-	 * @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
-	 */
-	public function __construct($sMenuId, $iParentIndex = -1, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES)
-	{
-		$this->sMenuId = $sMenuId;
-		$this->m_sEnableClass = $sEnableClass;
-		$this->m_iEnableAction = $iActionCode;
-		$this->m_iEnableActionResults = $iAllowedResults;
-		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
+		MetaModel::Init_SetZListItems('details', array('parent_id', 'name', 'label', 'hyperlink', 'template', 'rank', 'type')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('parent_id', 'name', 'label', 'rank', 'type')); // Attributes to be displayed for a list
 	}
 	
-	public function GetMenuId()
+	public function IsVisible()
 	{
-		return $this->sMenuId;
-	}
-	
-	public function GetTitle()
-	{
-		return Dict::S("Menu:$this->sMenuId");
-	}
-	
-	public function GetLabel()
-	{
-		return Dict::S("Menu:$this->sMenuId+");
-	}
-	
-	public function GetIndex()
-	{
-		return $this->index;
-	}
-	
-	public function GetHyperlink($aExtraParams)
-	{
-		$aExtraParams['c[menu]'] = $this->GetIndex();
-		return $this->AddParams('../pages/UI.php', $aExtraParams);
-	}
-	
-	/**
-	 * Tells whether the menu is enabled (i.e. displayed) for the current user
-	 * @return bool True if enabled, false otherwise
-	 */
-	public function IsEnabled()
-	{
-		if ($this->m_sEnableClass != null)
-		{
-			if (MetaModel::IsValidClass($this->m_sEnableClass))
-			{
-				$iResult = UserRights::IsActionAllowed($this->m_sEnableClass, $this->m_iEnableAction);
-				if (($iResult & $this->m_iEnableActionResults))
-				{
-					return true;
-				}
-			}
-			return false;
-		}
 		return true;
 	}
 	
-	public abstract function RenderContent(WebPage $oPage, $aExtraParams = array());
-	
-	protected function AddParams($sHyperlink, $aExtraParams)
+	public function GetMenuName()
 	{
-		if (count($aExtraParams) > 0)
+		return $this->Get('name');
+	}
+
+	public function GetMenuIcon()
+	{
+		return $this->Get('icon_path');
+	}
+
+	public function GetMenuLabel()
+	{
+		return $this->Get('label');
+	}
+	
+	public function GetMenuLink($aExtraParams)
+	{
+		$aExtraParams['menu'] = $this->GetKey(); // Make sure we overwrite the current menu id (if any)
+		$aParams = array();
+		foreach($aExtraParams as $sName => $sValue)
 		{
-			$aQuery = array();
-			$sSeparator = '?';
-			if (strpos($sHyperlink, '?') !== false)
-			{
-				$sSeparator = '&';
-			}
-			foreach($aExtraParams as $sName => $sValue)
-			{
-				$aQuery[] = urlencode($sName).'='.urlencode($sValue);
-			}
-			$sHyperlink .= $sSeparator.implode('&', $aQuery);
+			$aParams[] = urlencode($sName)."=".urlencode($sValue);
 		}
-		return $sHyperlink;
+		return $this->Get('hyperlink')."?".implode("&", $aParams);
 	}
-}
 
-/**
- * This class implements a top-level menu group. A group is just a container for sub-items
- * it does not display a page by itself
- */
-class MenuGroup extends MenuNode
-{
-	/**
-	 * Create a top-level menu group 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 float $fRank Number used to order the list, the groups 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 MenuGroup
-	 */
-	public function __construct($sMenuId, $fRank, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES)
+	public function GetChildNodesSet($sType = null)
 	{
-		parent::__construct($sMenuId, -1 /* no parent, groups are at root level */, $fRank, $sEnableClass, $iActionCode, $iAllowedResults);
-	}
-	
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		assert(false); // Shall never be called, groups do not display any content
-	}
-}
+		$aParams = array();
 
-/**
- * This class defines a menu item which content is based on a custom template.
- * Note the template can be either a local file or an URL !
- */
-class TemplateMenuNode extends MenuNode
-{
-	protected $sTemplateFile;
-	
-	/**
-	 * 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 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
-	 */
-	public function __construct($sMenuId, $sTemplateFile, $iParentIndex, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults);
-		$this->sTemplateFile = $sTemplateFile;
-	}
-	
-	public function GetHyperlink($aExtraParams)
-	{
-		if ($this->sTemplateFile == '') return '';
-		return parent::GetHyperlink($aExtraParams);
-	}
-	
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		$sTemplate = @file_get_contents($this->sTemplateFile);
-		if ($sTemplate !== false)
+		if ($sType == 'user')
 		{
-			$oTemplate = new DisplayTemplate($sTemplate);
-			$oTemplate->Render($oPage, $aExtraParams);
+			$sSelectChilds = 'SELECT menuNode AS m WHERE m.parent_id = :parent AND type = :type AND m.user_id = :user';
+			$aParams = array('parent' => $this->GetKey(), 'type' => $sType, 'user' => UserRights::GetUserId());
+		}
+		elseif ($sType != null)
+		{
+			$sSelectChilds = 'SELECT menuNode AS m WHERE m.parent_id = :parent AND type = :type';
+			$aParams = array('parent' => $this->GetKey(), 'type' => $sType);
 		}
 		else
 		{
-			$oPage->p("Error: failed to load template file: '{$this->sTemplateFile}'"); // No need to translate ?
+			$sSelectChilds = 'SELECT menuNode AS m WHERE m.parent_id = :parent';
+			$aParams = array('parent' => $this->GetKey());
 		}
+		$oSearchFilter = DBObjectSearch::FromOQL($sSelectChilds);
+		$oSet = new CMDBObjectSet($oSearchFilter, array('rank' => true), $aParams);
+		return $oSet;
 	}
-}
 
-/**
- * This class defines a menu item that uses a standard template to display a list of items therefore it allows
- * only two parameters: the page's title and the OQL expression defining the list of items to be displayed
- */
-class OQLMenuNode extends MenuNode
-{
-	protected $sPageTitle;
-	protected $sOQL;
-	protected $bSearch;
-	
-	/**
-	 * 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)
-	 * @param string $sOQL OQL query defining the set of objects to be displayed
-	 * @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 Whether or not to display a (collapsed) search frame at the top of the page
-	 * @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
-	 */
-	public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults);
-		$this->sPageTitle = "Menu:$sMenuId+";
-		$this->sOQL = $sOQL;
-		$this->bSearch = $bSearch;
-		$this->m_aParams = array();
-		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
-		// of the class specified by the OQL...
-	}
-	
-	/**
-	 * Set some extra parameters to be passed to the display block to fine tune its appearence
-	 * @param Hash $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
-	 */
-	public function SetParameters($aParams)
-	{
-		$this->m_aParams = $aParams;
-	}
-	
 	public function RenderContent(WebPage $oPage, $aExtraParams = array())
 	{
-		$aExtraParams = array_merge($aExtraParams, $this->m_aParams);
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL($this->sOQL);
-			$sIcon = MetaModel::GetClassIcon($oSearch->GetClass());
-		}
-		catch(Exception $e)
-		{
-			$sIcon = '';
-		}
-		// The standard template used for all such pages: a (closed) search form at the top and a list of results at the bottom
-		$sTemplate = '';
-
-		if ($this->bSearch)
-		{
-			$sTemplate .= <<<EOF
-<itopblock BlockClass="DisplayBlock" type="search" asynchronous="false" encoding="text/oql">$this->sOQL</itopblock>
-EOF;
-		}
-		$sParams = '';
-		if (!empty($this->m_aParams))
-		{
-			$sParams = 'parameters="';
-			foreach($this->m_aParams as $sName => $sValue)
-			{
-				$sParams .= $sName.':'.$sValue.';';
-			}
-			$sParams .= '"';
-		}
-		$sTemplate .= <<<EOF
-<p class="page-header">$sIcon<itopstring>$this->sPageTitle</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" $sParams>$this->sOQL</itopblock>
-EOF;
+		$sTemplate = $this->Get('template');
 		$oTemplate = new DisplayTemplate($sTemplate);
 		$oTemplate->Render($oPage, $aExtraParams);
-	}
-}
-/**
- * This class defines a menu item that displays a search form for the given class of objects
- */
-class SearchMenuNode extends MenuNode
-{
-	protected $sPageTitle;
-	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 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
-	 */
-	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults);
-		$this->sPageTitle = "Menu:$sMenuId+";
-		$this->sClass = $sClass;
+		//$this->ProcessTemplate($sTemplate, $oPage, $aExtraParams);
 	}
 	
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	public function DisplayMenu(iTopWebPage $oP, $sType, $aExtraParams)
 	{
-		// The standard template used for all such pages: an open search form at the top
-		$sTemplate = <<<EOF
-<itopblock BlockClass="DisplayBlock" type="search" asynchronous="false" encoding="text/oql" parameters="open:true">SELECT $this->sClass</itopblock>
-EOF;
-		$oTemplate = new DisplayTemplate($sTemplate);
-		$oTemplate->Render($oPage, $aExtraParams);
-	}
-}
-
-/**
- * This class defines a menu that points to any web page. It takes only two parameters:
- * - The hyperlink to point to
- * - The name of the menu
- * Note: the parameter menu=xxx (where xxx is the id of the menu itself) will be added to the hyperlink
- * in order to make it the active one, if the target page is based on iTopWebPage and therefore displays the menu
- */
-class WebPageMenuNode extends MenuNode
-{
-	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)
-	 * @param string $sHyperlink 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
-	 * @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
-	 */
-	public function __construct($sMenuId, $sHyperlink, $iParentIndex, $fRank = 0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults);
-		$this->sHyperlink = $sHyperlink;
-	}
-
-	public function GetHyperlink($aExtraParams)
-	{
-		$aExtraParams['c[menu]'] = $this->GetIndex();
-		return $this->AddParams( $this->sHyperlink, $aExtraParams);
-	}
-	
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		assert(false); // Shall never be called, the external web page will handle the display by itself
-	}
-}
-
-/**
- * This class defines a menu that points to the page for creating a new object of the specified class.
- * It take only one parameter: the name of the class
- * Note: the parameter menu=xxx (where xxx is the id of the menu itself) will be added to the hyperlink
- * in order to make it the active one
- */
-class NewObjectMenuNode extends MenuNode
-{
-	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)
-	 * @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 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
-	 */
-	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank);
-		$this->sClass = $sClass;
-	}
-
-	public function GetHyperlink($aExtraParams)
-	{
-		$sHyperlink = '../pages/UI.php?operation=new&class='.$this->sClass;
-		$aExtraParams['c[menu]'] = $this->GetIndex();
-		return $this->AddParams($sHyperlink, $aExtraParams);
-	}
-
-	/**
-	 * Overload the check of the "enable" state of this menu to take into account
-	 * derived classes of objects
-	 */
-	public function IsEnabled()
-	{
-		// Enable this menu, only if the current user has enough rights to create such an object, or an object of
-		// any child class
-	
-		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
-		$bActionIsAllowed = false;
-	
-		foreach($aSubClasses as $sCandidateClass)
+		$oP->AddToMenu("<li><a href=\"".$this->GetMenuLink($aExtraParams)."\" title=\"".$this->GetMenuLabel()."\">".$this->GetMenuName()."</a>");
+		$oSet = $this->GetChildNodesSet($sType);
+		if ($oSet->Count() > 0)
 		{
-			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
+			$oP->AddToMenu("\n<ul>\n");
+			while($oChildNode = $oSet->Fetch())
 			{
-				$bActionIsAllowed = true;
-				break; // Enough for now
+				$oChildNode->DisplayMenu($oP, $sType, $aExtraParams);
+			}
+			$oP->AddToMenu("</ul>\n");
+		}
+		$oP->AddToMenu("</li>\n");
+	}
+	static public function DisplayCreationForm(WebPage $oP, $sClass, $sFilter, $aExtraParams = array())
+	{
+		$oFilter = DBObjectSearch::unserialize($sFilter);
+		$oP->p('Create a new menu item for: '.$oFilter->__DescribeHTML());
+		$oP->add('<form action="UniversalSearch.php" method="post">');
+		$oP->add('<input type="hidden" name="operation" value="add_menu">');
+		$oP->add('<input type="hidden" name="filter" value="'.$sFilter.'">');
+		$oP->add('<input type="hidden" name="class" value="'.$sClass.'">');
+		$oP->p('Menu Label: <input type="text" name="label" size="30">');
+		$oP->p('Description: <input type="text" name="description" size="30">');
+		$oP->add('<p>Insert after: <select name="previous_node_id">');
+		$aNodes = self::GetMenuAsArray(null, 'user');
+		foreach($aNodes as $aNodeDesc)
+		{
+			$oP->add('<option value="'.$aNodeDesc['id'].'">'.str_repeat('&nbsp;&nbsp;&nbsp;', $aNodeDesc['depth']).$aNodeDesc['label'].'</option>');
+		}
+		$oP->add('</select></p>');
+		$oP->p('<input type="checkbox" name="child_item" value="1"> Create as a child menu item');
+		$oP->p('<input type="submit" value=" Ok "> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="jqmClose" value="Cancel">');
+		$oP->add('</form>');
+	}
+	
+	static public function GetMenuAsArray($oRootNode = null, $sType = 'application', $iDepth = 0)
+	{
+		$aNodes = array();
+		if (is_object($oRootNode))
+		{
+			$oChildSet = $oRootNode->GetChildNodesSet($sType);
+			while($oNode = $oChildSet->Fetch())
+			{
+				$aNodes[] = array('depth' => $iDepth, 'id' => $oNode->GetKey(), 'label' => $oNode->GetName());
+				$aNodes = array_merge($aNodes, self::GetMenuAsArray($oNode, $sType, $iDepth+1));
 			}
 		}
-		return $bActionIsAllowed;		
-	}	
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+		else
+		{
+			$oSearchFilter = new DbObjectSearch("menuNode");
+			$oSearchFilter->AddCondition('parent_id', 0, '=');
+			if ($sType != null)
+			{
+				$oSearchFilter->AddCondition('type', $sType, '=');
+				if ($sType == 'user')
+				{
+				    $oSearchFilter->AddCondition('user_id', UserRights::GetUserId(), '=');
+				}
+			}
+			$oRootSet = new CMDBObjectSet($oSearchFilter, array('rank' => true));
+			while($oNode = $oRootSet->Fetch())
+			{
+				$aNodes[] = array('depth' => $iDepth, 'id' => $oNode->GetKey(), 'label' => $oNode->GetName());
+				$aNodes = array_merge($aNodes, self::GetMenuAsArray($oNode, $sType, $iDepth+1));
+			}
+		}
+		return $aNodes;
+	}
+	/**
+	 * Returns a set of all the nodes following the current node in the tree
+	 * (i.e. nodes with the same parent but with a greater rank)
+	 */
+	public function GetNextNodesSet($sType = 'application')
 	{
-		assert(false); // Shall never be called, the external web page will handle the display by itself
+		$oSearchFilter = new DBObjectSearch("menuNode");
+		$oSearchFilter->AddCondition('parent_id', $this->Get('parent_id'));
+		$oSearchFilter->AddCondition('rank', $this->Get('rank'), '>');
+		if ($sType != null)
+		{
+			$oSearchFilter->AddCondition('type', $sType, '=');
+			if ($sType == 'user')
+			{
+			    $oSearchFilter->AddCondition('user_id', UserRights::GetUserId(), '=');
+			}
+		}
+		$oSet = new DBObjectSet($oSearchFilter, array('rank'=> true)); // Order by rank (true means ascending)
+		return $oSet;
 	}
 }
 ?>

application/nicewebpage.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class NiceWebPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once("../application/webpage.class.inc.php");
 /**
  * Web page with some associated CSS and scripts (jquery) for a fancier display
@@ -35,18 +11,16 @@ class NiceWebPage extends WebPage
     {
         parent::__construct($s_title);
 		$this->m_aReadyScripts = array();
-		$this->add_linked_script("../js/jquery-1.4.2.min.js");
-		//$this->add_linked_script("../js/jquery.history_remote.pack.js");
-		$this->add_linked_stylesheet('../css/ui-lightness/jquery-ui-1.8.2.custom.css');
-		$this->add_linked_script('../js/jquery-ui-1.8.2.custom.min.js');
+		$this->add_linked_script("../js/jquery.latest.js");
+		$this->add_linked_script("../js/jquery.history_remote.pack.js");
 		//$this->add_linked_script("../js/ui.resizable.js");
-//		$this->add_linked_script("../js/ui.tabs.js");
+		$this->add_linked_script("../js/ui.tabs.js");
 		$this->add_linked_script("../js/hovertip.js");
-//		$this->add_linked_script("../js/jqModal.js");
+		$this->add_linked_script("../js/jqModal.js");
 		$this->add_linked_stylesheet("../css/light-grey.css");
-//		$this->add_linked_stylesheet("../js/themes/light/light.tabs.css");
+		$this->add_linked_stylesheet("../js/themes/light/light.tabs.css");
 		//$this->add_linked_stylesheet("../css/jquery.tabs-ie.css", "lte IE 7");
-//		$this->add_linked_stylesheet("../css/jqModal.css");
+		$this->add_linked_stylesheet("../css/jqModal.css");
 		$this->add_ready_script('    window.setTimeout(hovertipInit, 1);');
     }
 	
@@ -61,20 +35,14 @@ class NiceWebPage extends WebPage
 		// $aTopLevelClasses = array('bizService', 'bizContact', 'logInfra', 'bizDocument');
 		// These are classes wich root class is cmdbAbstractObject ! 
 		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
-		$aValidClasses = array();
 		foreach(MetaModel::GetClasses('bizmodel') as $sClassName)
 		{
 			if (is_null($iActionCode) || UserRights::IsActionAllowed($sClassName, $iActionCode))
 			{
 				$sSelected = ($sClassName == $sDefaultValue) ? " SELECTED" : "";
-				$sDescription = MetaModel::GetClassDescription($sClassName);
-				$sDisplayName = MetaModel::GetName($sClassName);
-				$aValidClasses[$sDisplayName] = "<option style=\"width: ".$iWidthPx." px;\" title=\"$sDescription\" value=\"$sClassName\"$sSelected>$sDisplayName</option>";
+				$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"$sClassName\"$sSelected>$sClassName - ".MetaModel::GetClassDescription($sClassName)."</option>");
 			}
 		}
-		ksort($aValidClasses);
-		$this->add(implode("\n", $aValidClasses));
-		
 		$this->add("</select>");
 	}
 
@@ -85,7 +53,7 @@ class NiceWebPage extends WebPage
 		foreach($aChoices as $sKey => $sValue)
 		{
 			$sSelected = ($sKey == $sDefaultValue) ? " SELECTED" : "";
-			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."</option>");
+			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"$sKey\"$sSelected>$sValue</option>");
 		}
 		$this->add("</select>");
 	}

application/portalwebpage.class.inc.php

@@ -1,176 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class PortalWebPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-require_once("../application/nicewebpage.class.inc.php");
-require_once("../application/applicationcontext.class.inc.php");
-require_once("../application/user.preferences.class.inc.php");
-/**
- * Web page with some associated CSS and scripts (jquery) for a fancier display
- * of the Portal web page
- */
-class PortalWebPage extends NiceWebPage
-{
-	/**
-	 * Portal menu
-	 */
-	protected $m_aMenuButtons;
-	
-    public function __construct($sTitle, $sAlternateStyleSheet = '')
-    {
-    	$this->m_aMenuButtons = array();
-        parent::__construct($sTitle);
-		$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
-		$this->add_linked_stylesheet("../css/jquery.treeview.css");
-		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
-		if ($sAlternateStyleSheet != '')
-		{
-			$this->add_linked_stylesheet("../portal/$sAlternateStyleSheet/portal.css");
-		}
-		else
-		{
-			$this->add_linked_stylesheet("../portal/portal.css");
-		}
-		$this->add_linked_script('../js/jquery.layout.min.js');
-		$this->add_linked_script('../js/jquery.ba-bbq.min.js');
-		$this->add_linked_script("../js/jquery.tablehover.js");
-		$this->add_linked_script("../js/jquery.treeview.js");
-		$this->add_linked_script("../js/jquery.autocomplete.js");
-		$this->add_linked_script("../js/jquery.bgiframe.js");
-		$this->add_linked_script("../js/jquery.positionBy.js");
-		$this->add_linked_script("../js/jquery.popupmenu.js");
-		$this->add_linked_script("../js/date.js");
-		$this->add_linked_script("../js/jquery.tablesorter.min.js");
-		$this->add_linked_script("../js/jquery.blockUI.js");
-		$this->add_linked_script("../js/utils.js");
-		$this->add_linked_script("../js/forms-json-utils.js");
-		$this->add_linked_script("../js/swfobject.js");
-		$this->add_ready_script(
-<<<EOF
-try
-{
-	//add new widget called TruncatedList to properly display truncated lists when they are sorted
-	$.tablesorter.addWidget({ 
-	    // give the widget a id 
-	    id: "truncatedList", 
-	    // format is called when the on init and when a sorting has finished 
-	    format: function(table)
-	    { 
-			// Check if there is a "truncated" line
-			this.truncatedList = false;  
-			if ($("tr td.truncated",table).length > 0)
-			{
-				this.truncatedList = true;
-			}
-			if (this.truncatedList)
-			{
-				$("tr td",table).removeClass('truncated');
-				$("tr:last td",table).addClass('truncated');
-			}
-	    } 
-	});
-		
-	
-	$.tablesorter.addWidget({ 
-	    // give the widget a id 
-	    id: "myZebra", 
-	    // format is called when the on init and when a sorting has finished 
-	    format: function(table)
-	    {
-	    	// Replace the 'red even' lines by 'red_even' since most browser do not support 2 classes selector in CSS, etc..
-			$("tbody tr:even",table).addClass('even');
-			$("tbody tr.red:even",table).removeClass('red').removeClass('even').addClass('red_even');
-			$("tbody tr.orange:even",table).removeClass('orange').removeClass('even').addClass('orange_even');
-			$("tbody tr.green:even",table).removeClass('green').removeClass('even').addClass('green_even');
-	    } 
-	});
-		
-	$("table.listResults").tableHover(); // hover tables
-	$(".listResults").tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
-	$(".date-pick").datepicker({
-			showOn: 'button',
-			buttonImage: '../images/calendar.png',
-			buttonImageOnly: true,
-			dateFormat: 'yy-mm-dd',
-			constrainInput: false,
-			changeMonth: true,
-			changeYear: true
-		});
-	$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
-}
-catch(err)
-{
-	// Do something with the error !
-	alert(err);
-}
-EOF
-);
-
-	$this->add_script(
-<<<EOF
-	function CheckSelection(sMessage)
-	{
-		var bResult = ($('input:checked').length > 0);
-		if (!bResult)
-		{
-			alert(sMessage);
-		}
-		return bResult;
-	}
-
-	function GoBack()
-	{
-		var form = $('#request_form');
-		var step = $('input[name=step]');
-
-		form.unbind('submit'); // De-activate validation
-		step.val(step.val() -2); // To go Back one step: next step is x, current step is x-1, previous step is x-2
-		form.submit(); // Go
-	}
-EOF
-);
-		
-	}
-	
-	/**
-	 * Add a button to the portal's main menu
-	 */
-	public function AddMenuButton($sId, $sLabel, $sHyperlink)
-	{
-		$this->m_aMenuButtons[] = array('id' => $sId, 'label' => $sLabel, 'hyperlink' => $sHyperlink);
-	}
-	
-	public function output()
-	{
-		$this->AddMenuButton('logoff', 'Portal:Disconnect', '../pages/logoff.php?portal=1'); // This menu is always present and is the last one
-		foreach($this->m_aMenuButtons as $aMenuItem)
-		{
-			$sMenu .= "<a class=\"button\" id=\"{$aMenuItem['id']}\" href=\"{$aMenuItem['hyperlink']}\"><span>".Dict::S($aMenuItem['label'])."</span></a>";
-		}
-		$this->s_content = '<div id="portal"><div id="banner"><div id="logo"></div>'.$sMenu.'</div><div id="content">'.$this->s_content.'</div></div>';
-		parent::output();
-	}
-}
-?>

application/startup.inc.php

@@ -1,29 +1,8 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+define('ITOP_VERSION', '0.9');
+define('ITOP_REVISION', '$WCREV$');
+define('ITOP_BUILD_DATE', '$WCNOW$');
 
-/**
- * File to include to initialize the datamodel in memory
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-require_once('../core/cmdbobject.class.inc.php');
 require_once('../application/utils.inc.php');
 
 MetaModel::Startup(ITOP_CONFIG_FILE);

application/template.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class DisplayTemplate
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('../application/displayblock.class.inc.php');
 /**
  * This class manages the special template format used internally to build the iTop web pages
@@ -35,7 +11,7 @@ class DisplayTemplate
 	
 	public function __construct($sTemplate)
 	{
-		$this->m_aTags = array('itopblock', 'itopcheck', 'itoptabs', 'itoptab', 'itoptoggle', 'itopstring');
+		$this->m_aTags = array('itopblock', 'itoptabs', 'itoptab', 'itoptoggle');
 		$this->m_sTemplate = $sTemplate;
 	}
 	
@@ -55,23 +31,11 @@ class DisplayTemplate
 			$oPage->add(substr($this->m_sTemplate, $iBeforeTagPos, $iStart - $iBeforeTagPos));
 			if ($sTag == DisplayBlock::TAG_BLOCK)
 			{
-				try
+				$oBlock = DisplayBlock::FromTemplate($sOuterTag);
+				if (is_object($oBlock))
 				{
-					$oBlock = DisplayBlock::FromTemplate($sOuterTag);
-					if (is_object($oBlock))
-					{
-						$oBlock->Display($oPage, 'block_'.self::$iBlockCount, $aParams);
-					}
+					$oBlock->Display($oPage, 'block_'.self::$iBlockCount, $aParams);
 				}
-				catch(OQLException $e)
-				{
-					$oPage->p('Error in template (please contact your administrator) - Invalid query<!--'.$sOuterTag.'-->');
-				}
-				catch(Exception $e)
-				{
-					$oPage->p('Error in template (please contact your administrator)<!--'.$e->getMessage().'--><!--'.$sOuterTag.'-->');
-				}
-				
 				self::$iBlockCount++;
 			}
 			else
@@ -86,6 +50,7 @@ class DisplayTemplate
 			$iStart = $iEnd;
 			$iEnd = strlen($this->m_sTemplate); 
 			$iCount++;
+			if ($iCount > 10) break; //@@@ Why ?? Debug ??
 		}
 		$oPage->add(substr($this->m_sTemplate, $iAfterTagPos));
 	}
@@ -167,22 +132,8 @@ class DisplayTemplate
 				$oPage->SetCurrentTabContainer('');
 			break;
 			
-			case 'itopcheck':
-				$sClassName = $aAttributes['class'];
-				if (MetaModel::IsValidClass($sClassName) && UserRights::IsActionAllowed($sClassName, UR_ACTION_READ))
-				{
-					$oTemplate = new DisplayTemplate($sContent);
-					$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				}
-				else
-				{
-					// Leave a trace for those who'd like to understand why nothing is displayed
-					$oPage->add("<!-- class $sClassName does not exist, skipping some part of the template -->\n");
-				}
-			break;
-			
 			case 'itoptab':
-				$oPage->SetCurrentTab(Dict::S(str_replace('_', ' ', $aAttributes['name'])));
+				$oPage->SetCurrentTab(str_replace('_', ' ', $aAttributes['name']));
 				$oTemplate = new DisplayTemplate($sContent);
 				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
 				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent).'</pre>');
@@ -192,17 +143,13 @@ class DisplayTemplate
 			case 'itoptoggle':
 				$sName = isset($aAttributes['name']) ? $aAttributes['name'] : 'Tagada';
 				$bOpen = isset($aAttributes['open']) ? $aAttributes['open'] : true;
-				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
+				$oPage->StartCollapsibleSection($sName, $bOpen);
 				$oTemplate = new DisplayTemplate($sContent);
 				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
 				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent).'</pre>');
 				$oPage->EndCollapsibleSection();
 			break;
 			
-			case 'itopstring':
-				$oPage->add(Dict::S($sContent));
-			break;
-			
 			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
 				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
 			break;
@@ -224,23 +171,23 @@ class DisplayTemplate
 		$sTemplate = '<div class="page_header">
 		<div class="actions_details"><a href="#"><span>Actions</span></a></div>
 		<h1>$class$: <span class="hilite">$name$</span></h1>
-		<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = \'$class$\'</itopblock>
+		<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = \'$class$\'</itopblock>
 		</div>
 		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
-		<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT NetworkDevice AS d WHERE d.id = $id$</itopblock>
+		<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/sibusql">bizNetworkDevice: pkey = $pkey$</itopblock>
 		<itoptabs>
 			<itoptab name="Interfaces">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</itopblock>
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">bizInterface: device_id = $pkey$</itopblock>
 			</itoptab>
 			<itoptab name="Contacts">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Contact AS c JOIN lnkContactToCI AS l ON l.contact_id = c.id WHERE l.ci_id = $id$</itopblock>
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">bizContact: PKEY IS contact_id IN (ContactsLinks: object_id = $pkey$)</itopblock>
 			</itoptab>
 			<itoptab name="Documents">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Document AS d JOIN lnkDocumentToCI as l ON l.document_id = d.id WHERE l.ci_id = $id$)</itopblock>
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">bizDocument: PKEY IS doc_id IN (lnkDocumentRealObject: object_id = $pkey$)</itopblock>
 			</itoptab>
 		</itoptabs>';
 		
-		$oPage = new iTopWebPage('Unit Test');
+		$oPage = new iTopWebPage('Unit Test', 3);
 		//$oPage->add("Template content: <pre>".htmlentities($sTemplate)."</pre>\n");
 		$oTemplate = new DisplayTemplate($sTemplate);
 		$oTemplate->Render($oPage, array('class'=>'Network device','pkey'=> 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3));

application/templates/audit_category.html

@@ -1,12 +1,12 @@
 <div class="page_header">
-	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $id$</itopblock>
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
 	<h1>$class$: <span class="hilite">$name$</span></h1>
-	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'</itopblock>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
 </div>
 <img src="../../images/clean.png" style="margin-top:-20px; margin-right:10px; float:right">
-<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $id$</itopblock>
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/sibusql">$class$: pkey = $pkey$</itopblock>
 <itoptabs>
 	<itoptab name="Rules">
-		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT AuditRule WHERE category_id = $id$</itopblock>
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">AuditRule: category_id = $pkey$</itopblock>
 	</itoptab>
 </itoptabs>

application/templates/notifications_menu.html

@@ -1,20 +0,0 @@
-<div class="page_header" style="padding:0.5em;">
-<h1><itopstring>UI:NotificationsMenu:Title</itopstring></h1>
-</div>
-<itoptoggle name="UI:NotificationsMenu:Help" open="true">
-<div style="padding: 1em; font-size:10pt;background:#E8F3CF;margin-top: 0.25em;">
-<img src="../images/bell.png" style="margin-top: -60px; margin-right: 10px; float: right;">
-<itopstring>UI:NotificationsMenu:HelpContent</itopstring>
-</div>
-</itoptoggle>
-<p>&nbsp;</p>
-<itoptabs>
-	<itoptab name="UI:NotificationsMenu:Triggers">
-		<h2><itopstring>UI:NotificationsMenu:AvailableTriggers</itopstring></h2>
-		<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT Trigger</itopblock>
-	</itoptab>
-	<itoptab name="UI:NotificationsMenu:Actions">
-		<h2><itopstring>UI:NotificationsMenu:AvailableActions</itopstring></h2>
-		<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql">SELECT ActionEmail</itopblock>
-	</itoptab>
-</itoptabs>

application/templates/welcome_menu.html

@@ -1,201 +0,0 @@
-<style>
-.main_container {
-	width: 100%;
-	border: 0;
-	overflow-y: hidden;
-	overflow-x: hidden;
-	margin-bottom: 5px;
-	margin-top: 5px;
-	border-bottom: #ccc 1px solid;
-	border-top: #ccc 1px solid;
-}
-.main_header {
-	width:100%;
-	height: 60px;
-	cursor: move;
-	background-color: #F1F1F6;
-}
-.main_header h1 {
-	color: #1C94C4;
-	margin-top:0;
-	margin-bottom:0;
-	padding-top: 10px;
-	padding-bottom: 10px;p
-	font-size: 16px;
-	line-height: 16px;
-}
-.main_header img {
-	margin-top: 10px;
-	margin-right: 10px;
-	float:left;
-}
-.item {
-	overflow-y: auto;
-	overflow-x: hidden;
-	background-color: #fff;
-	padding: 5px;
-	height: auto;
-}
-.main_menu {
-	overflow-y: auto;
-	overflow-x: hidden;
-	height: auto;
-	background-color: #eee;
-	width: 100%;
-}
-.element {
-	display: inline-block;
-}
-.element a {
-	font-size: 10px;
-}
-.element a.actions {
-	font-size: 16px;
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-.element a img {
-	border: 0;
-}
-.summary-details {
-	float:right;
-	margin-top: 5px;
-}
-
-.summary-details td {
-	text-align: center;
-	background: transparent;
-	padding: 5px;
-}
-.summary-details th {
-	text-align: center;
-	background: #CCC;
-	padding: 5px;
-	color: #eee;
-}
-a.summary {
-	text-decoration: none;
-	background: transparent;
-	color: #666;
-}
-a.summary:hover {
-	text-decoration: underline;
-}
-</style>
-<script>
-var sSerialized = '';
-function DumpPositions()
-{
-	sSerialized = $('.sortable').sortable('serialize', {key: 'menu'});
-	alert(sSerialized);
-}
-
-function RestorePositions()
-{	height: auto;
-    var arr = $('#main_menu .main_container').get();    
-    arr.reverse();
-
-	var sTemp = sSerialized.replace(/menu=/g, '');
-	alert(sTemp);
-	var aSerialized = sTemp.split('&');
-	console.log(aSerialized);
-    $.each(aSerialized, function(i,v) {
-      console.log(i+' => '+v);
-      var $menu = $('#menu_'+v);
-      if ($menu.length >  0) // Check that the menu exists
-      {
-      	$('#main_menu').append($menu);
-      }
-    });
-}
-</script>
-<div id="main_menu" class="sortable persistent">
-
-<div id="menu_1" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="main_cfg">
-
-<img src="../modules/itop-config-mgmt-1.0.0/images/database.png"/>
-<itopblock BlockClass="DisplayBlock" type="summary" asynchronous="false" encoding="text/oql" parameters="title[block]:Menu_ConfigManagement;context_filter:1;label[block]:UI_WelcomeMenu_AllConfigItems;status[block]:status;status_codes[block]:implementation,production,obsolete">SELECT FunctionalCI</itopblock>
-
-</div>
-
-<div class="item">
-
-<div class="element">
-<itopcheck class="BusinessProcess">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT BusinessProcess</itopblock>
-</itopcheck>
-</div>
-
-<div class="element">
-<itopcheck class="Contact">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Contact</itopblock>
-</itopcheck>
-</div>
-
-<div class="element">
-<itopcheck class="Location">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Location</itopblock>
-</itopcheck>
-</div>
-
-<div class="element">
-<itopcheck class="Server">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Server</itopblock>
-</itopcheck>
-</div>
-
-<div class="element">
-<itopcheck class="DatabaseInstance">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT DatabaseInstance</itopblock>
-</itopcheck>
-</div>
-
-<div class="element">
-<itopcheck class="NetworkDevice">
-<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT NetworkDevice</itopblock>
-</itopcheck>
-</div>
-
-</div>
-</div>
-
-<itopcheck class="UserRequest">
-
-<div id="menu_2" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="main_helpdesk">
-<img src="../modules/itop-request-mgmt-1.0.0/images/user-request-deadline.png"/>
-<itopblock BlockClass="DisplayBlock" type="summary" asynchronous="false" encoding="text/oql" parameters="title[block]:Menu_RequestManagement;context_filter:1;label[block]:UI_WelcomeMenu_AllOpenRequests;status[block]:status;status_codes[block]:new,assigned,escalated_tto,escalated_ttr,resolved">SELECT UserRequest WHERE status != "closed"</itopblock>
-</div>
-
-<div class="item">
-<p style="text-align:left; font-family:Verdana, Arial, sans-serif; font-size:14px;"><itopstring>UI:WelcomeMenu:MyCalls</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" parameters="menu:1">SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved")</itopblock>
-</div>
-
-</div>
-
-</itopcheck>
-
-<itopcheck class="Incident">
-
-<div id="menu_3" class="main_container v-resizable">
-
-<div class="main_header drag_handle" id="main_incident">
-<img src="../modules/itop-incident-mgmt-1.0.0/images/incident-escalated.png"/>
-<itopblock BlockClass="DisplayBlock" type="summary" asynchronous="false" encoding="text/oql" parameters="title[block]:Menu_IncidentManagement;context_filter:1;label[block]:UI_WelcomeMenu_OpenIncidents;status[block]:status;status_codes[block]:new,assigned,escalated_tto,escalated_ttr,resolved">SELECT Incident WHERE status != "closed"</itopblock>
-</div>
-
-<div class="item">
-<p style="text-align:left; font-family:Verdana, Arial, sans-serif; font-size:14px;"><itopstring>UI:WelcomeMenu:MyIncidents</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" parameters="menu:1">SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</itopblock>
-</div>
-
-</itopcheck>
-
-</div>
-
-</div>

application/templates/welcome_popup.html

@@ -1,46 +0,0 @@
-<div style="width:100%;background: url(../images/welcome.jpg) top left no-repeat;">
-<style>
-.dashboard {
-vertical-align:top;
-width:50%;
-border:0px solid #000;
-background-color:#F9F9F1;
-padding:10px;
-text-align:left;
-font-size:10pt;
-}
-.dashboard2 {
-vertical-align:top;
-width:50%;
-border:0px solid #000;
--moz-border-radius:10px;
-padding:5px;
-text-align:left;
-}
-
-td.dashboard li {
-margin-top: 5px;
-display: list-item;
-}
-td div.display_block {
-padding:0;
-}
-tr td.dashboard2,  tr td.dashboard2 ul {
-font-size:10pt;
-}
-</style>
-<p></p>
-<p></p>
-<p style="text-align:left; font-size:32px;padding-left:400px;padding-top:40px;margin-bottom:30px;margin-top:0;color:#FFFFFF;"><itopstring>UI:WelcomeMenu:Title</itopstring></p>
-<p></p>
-<table border="0" style="padding:10px;border-spacing: 10px;width:100%">
-<tr>
-<td class="dashboard2">
-<itopstring>UI:WelcomeMenu:LeftBlock</itopstring>
-</td>
-<td class="dashboard2">
-<itopstring>UI:WelcomeMenu:RightBlock</itopstring>
-</td>
-</tr>
-</table>
-</div>

application/transaction.class.inc.php

@@ -1,97 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * This class records the pending "transactions" corresponding to forms that have not been
- * submitted yet, in order to prevent double submissions. When created a transaction remains valid
- * until the user's session expires
- * @package     iTop
- */
-
-
-class privUITransaction
-{
-	/**
-	 * Create a new transaction id, store it in the session and return its id
-	 * @param void
-	 * @return int The identifier of the new transaction
-	 */
-	public static function GetNewTransactionId()
-	{
-		if (!isset($_SESSION['transactions']))
-		{
-				$_SESSION['transactions'] = array();
-		}
-		// Strictly speaking, the two lines below should be grouped together
-		// by a critical section
-		// sem_acquire($rSemIdentified);
-		$id = 1 + count($_SESSION['transactions']);
-		$_SESSION['transactions'][$id] = true;
-		// sem_release($rSemIdentified);
-		
-		return sprintf("%d", $id);
-	}
-
-	/**
-	 * Check whether a transaction is valid or not and (optionally) remove the valid transaction from
-	 * the session so that another call to IsTransactionValid for the same transaction id
-	 * will return false
-	 * @param int $id Identifier of the transaction, as returned by GetNewTransactionId
-	 * @param bool $bRemoveTransaction True if the transaction must be removed
-	 * @return bool True if the transaction is valid, false otherwise
-	 */	
-	public static function IsTransactionValid($id, $bRemoveTransaction = true)
-	{
-		$bResult = false;
-		if (isset($_SESSION['transactions']))
-		{
-			// Strictly speaking, the eight lines below should be grouped together
-			// inside the same critical section as above
-			// sem_acquire($rSemIdentified);
-			if (isset($_SESSION['transactions'][$id]))
-			{
-				$bResult = true;
-				if ($bRemoveTransaction)
-				{
-					unset($_SESSION['transactions'][$id]);
-				}
-			}
-			// sem_release($rSemIdentified);
-		}
-		return $bResult;
-	}
-	
-	/**
-	 * Removes the transaction specified by its id
-	 * @param int $id The Identifier (as returned by GetNewTranscationId) of the transaction to be removed.
-	 * @return void
-	 */
-	public static function RemoveTransaction($id)
-	{
-		if (isset($_SESSION['transactions']))
-		{
-			// Strictly speaking, the three lines below should be grouped together
-			// inside the same critical section as above
-			// sem_acquire($rSemIdentified);
-			if (isset($_SESSION['transactions'][$id]))
-			{
-				unset($_SESSION['transactions'][$id]);
-			}
-			// sem_release($rSemIdentified);
-		}		
-	}
-}
-?>

application/ui.linkswidget.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class UILinksWidget
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('../application/webpage.class.inc.php');
 require_once('../application/displayblock.class.inc.php');
 
@@ -32,222 +8,129 @@ class UILinksWidget
 	protected $m_sAttCode;
 	protected $m_sNameSuffix;
 	protected $m_iInputId;
-	protected $m_aAttributes;
-	protected $m_sExtKeyToRemote;
-	protected $m_sLinkedClass;
-	protected $m_sRemoteClass;
-	protected $m_bDuplicatesAllowed;
-	protected static $iWidgetIndex = 0;
 	
-	public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '', $bDuplicatesAllowed = false)
+	public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '')
 	{
 		$this->m_sClass = $sClass;
 		$this->m_sAttCode = $sAttCode;
 		$this->m_sNameSuffix = $sNameSuffix;
 		$this->m_iInputId = $iInputId;
-		$this->m_bDuplicatesAllowed = $bDuplicatesAllowed;
-		$this->m_aEditableFields = array();
-		self::$iWidgetIndex++;
-			
+	}
+	
+	public function Display(WebPage $oPage, $oCurrentValuesSet = null)
+	{
+		$sHTMLValue = '';
+		$sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
+		// #@# todo - add context information, otherwise any value will be authorized for external keys
+		$aAllowedValues = MetaModel::GetAllowedValues_att($this->m_sClass, $this->m_sAttCode, array(), '');
 		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
-		$this->m_sLinkedClass = $oAttDef->GetLinkedClass();
-		$this->m_sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
-		$oLinkingAttDef = 	MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
-		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
+		$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
 		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
 		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
-		$sDefaultState = MetaModel::GetDefaultState($this->m_sClass);		
+		$sDefaultState = MetaModel::GetDefaultState($this->m_sClass);
 
-		$this->m_aEditableFields = array();
-		$this->m_aTableConfig = array();
-		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".self::$iWidgetIndex.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
-
-		foreach(MetaModel::ListAttributeDefs($this->m_sLinkedClass) as $sAttCode=>$oAttDef)
+		$aAttributes = array();
+		$sLinkedClass = $oAttDef->GetLinkedClass();
+		foreach(MetaModel::ListAttributeDefs($sLinkedClass) as $sAttCode=>$oAttDef)
 		{
 			if ($sStateAttCode == $sAttCode)
 			{
 				// State attribute is always hidden from the UI
 			}
-			else if (!$oAttDef->IsExternalField() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
+			else if (!$oAttDef->IsExternalField() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $sExtKeyToRemote))
 			{
-				$iFlags = MetaModel::GetAttributeFlags($this->m_sLinkedClass, $sDefaultState, $sAttCode);				
+				$iFlags = MetaModel::GetAttributeFlags($this->m_sClass, $sDefaultState, $sAttCode);				
 				if ( !($iFlags & OPT_ATT_HIDDEN) && !($iFlags & OPT_ATT_READONLY) )
 				{
-					$this->m_aEditableFields[] = $sAttCode;
-					$this->m_aTableConfig[$sAttCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());				
+					$aAttributes[] = $sAttCode;
 				}
 			}
 		}
-		
-		$this->m_aTableConfig['static::key'] = array( 'label' => MetaModel::GetName($this->m_sRemoteClass), 'description' => MetaModel::GetClassDescription($this->m_sRemoteClass));
-		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		$sAttributes = "['".implode("','", $aAttributes)."']";
+		if ($oCurrentValuesSet != null)
 		{
-			// TO DO: check the state of the attribute: hidden or visible ?
-			if ($sFieldCode != 'finalclass')
+			// Serialize the link set into a JSon object
+			$aCurrentValues = array();
+			while($oLinkObj = $oCurrentValuesSet->Fetch())
 			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sRemoteClass, $sFieldCode);
-				$this->m_aTableConfig['static::'.$sFieldCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
-			}
-		}
-	}
-	
-	/**
-	 * A one-row form for editing a link record
-	 * @param WebPage $oP Web page used for the ouput
-	 * @param DBObject $oLinkedObj The object to which all the elements of the linked set refer to
-	 * @param mixed $linkObjOrId Either the object linked or a unique number for new link records to add
-	 * @param Hash $aArgs Extra context arguments
-	 * @return string The HTML fragment of the one-row form
-	 */
-	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId = null, $aArgs = array() )
-	{
-		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
-		$aRow = array();
-		if(is_object($linkObjOrId))
-		{
-			$key = $linkObjOrId->GetKey();
-			$sPrefix .= "[$key][";
-			$sNameSuffix = "]"; // To make a tabular form
-			$aArgs['prefix'] = $sPrefix;
-			$aRow['form::checkbox'] = "<input class=\"selection\" type=\"checkbox\" onChange=\"oWidget".self::$iWidgetIndex.".OnSelectChange();\" value=\"$key\">";
-			$aRow['form::checkbox'] .= "<input type=\"hidden\" name=\"attr_{$sPrefix}id{$sNameSuffix}\" value=\"$key\">";
-			foreach($this->m_aEditableFields as $sFieldCode)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $linkObjOrId->Get($sFieldCode), '' /* DisplayValue */, $key, $sNameSuffix, 0, $aArgs);
+				$sRow = '{';
+				foreach($aAttributes as $sLinkAttCode)
+				{
+					$sRow.= "\"$sLinkAttCode\": \"".addslashes($oLinkObj->Get($sLinkAttCode))."\", ";
+				}
+				$sRow .= "\"$sExtKeyToRemote\": ".$oLinkObj->Get($sExtKeyToRemote).'}';
+				$aCurrentValues[] = $sRow;
 			}
+			$sJSON = '['.implode(',', $aCurrentValues).']';
 		}
 		else
 		{
-			// form for creating a new record
-			$sPrefix .= "[$linkObjOrId][";
-			$sNameSuffix = "]"; // To make a tabular form
-			$aArgs['prefix'] = $sPrefix;
-			$aRow['form::checkbox'] = "<input class=\"selection\" type=\"checkbox\" onChange=\"oWidget".self::$iWidgetIndex.".OnSelectChange();\" value=\"$linkObjOrId\">";
-			$aRow['form::checkbox'] .= "<input type=\"hidden\" name=\"attr_{$sPrefix}id{$sNameSuffix}\" value=\"\">";
-			foreach($this->m_aEditableFields as $sFieldCode)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, '' /* TO DO/ call GetDefaultValue($oObject->ToArgs()) */, '' /* DisplayValue */, '' /* id */, $sNameSuffix, 0, $aArgs);
-			}
+//echo "JSON VA IECH<br/>\n";
 		}
+//echo "JASON: $sJSON<br/>\n";;
 
-		$aRow['static::key'] = $oLinkedObj->GetHyperLink();
-		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		// Many values (or even a unknown list) display an autocomplete
+		if ( (count($aAllowedValues) == 0) || (count($aAllowedValues) > 50) )
 		{
-			$aRow['static::'.$sFieldCode] = $oLinkedObj->GetAsHTML($sFieldCode);
-		}
-		return $aRow;
-	}
-
-	/**
-	 * Display one row of the whole form
-	 * @return none
-	 */
-	protected function DisplayFormRow(WebPage $oP, $aConfig, $aRow, $iRowId)
-	{
-		$sHtml = '';
-		$sHtml .= "<tr id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_row_$iRowId\">\n";
-		foreach($aConfig as $sName=>$void)
-		{
-			$sHtml .= "<td>".$aRow[$sName]."</td>\n";
-		}
-		$sHtml .= "</tr>\n";
-		
-		return $sHtml;
-	}
-	
-	/**
-	 * 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
-	 * @return string Html fragment representing the form table
-	 */
-	protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
-	{
-		$sHtml = '';
-		$sHtml .= "<table class=\"listResults\">\n";
-		// Header
-		$sHtml .= "<thead>\n";
-		$sHtml .= "<tr>\n";
-		foreach($aConfig as $sName=>$aDef)
-		{
-			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
-		}
-		$sHtml .= "</tr>\n";
-		$sHtml .= "</thead>\n";
-		
-		// Content
-		$sHtml .= "</tbody>\n";
-		if (count($aData) == 0)
-		{
-			$sHtml .= "<tr id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."<input type=\"hidden\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\"></td></td>";
+			// too many choices, use an autocomplete
+			// The input for the auto complete
+			$sTitle = $oAttDef->GetDescription();
+			$sHTMLValue .= "<script type=\"text/javascript\">\n";
+			$sHTMLValue .= "oLinkWidget{$this->m_iInputId} = new LinksWidget('{$this->m_iInputId}', '$sLinkedClass', '$sExtKeyToMe', '$sExtKeyToRemote', $sAttributes);\n";
+			$sHTMLValue .= "</script>\n";
+			$oPage->add_at_the_end($this->GetObjectPickerDialog($oPage, $sTargetClass, 'oLinkWidget'.$this->m_iInputId.'.OnOk')); // Forms should not be inside forms
+			$oPage->add_at_the_end($this->GetLinkObjectDialog($oPage, $this->m_iInputId)); // Forms should not be inside forms
+			$sHTMLValue .= "<input type=\"text\" id=\"ac_{$this->m_iInputId}\" size=\"35\" value=\"\" title=\"Type the first 3 characters\"/>";
+			$sHTMLValue .= "<input type=\"button\" id=\"ac_add_{$this->m_iInputId}\" value=\" Add... \"  class=\"action\" onClick=\"oLinkWidget{$this->m_iInputId}.AddObject();\"/>";
+			$sHTMLValue .= "&nbsp;<input type=\"button\" value=\"Browse...\"  class=\"action\" onClick=\"return ManageObjects('$sTitle', '$sTargetClass', '$this->m_iInputId', '$sExtKeyToRemote');\"/>";
+			// another hidden input to store & pass the object's Id
+			$sHTMLValue .= "<input type=\"hidden\" id=\"id_ac_{$this->m_iInputId}\" onChange=\"EnableAddButton('{$this->m_iInputId}');\"/>\n";
+			$sHTMLValue .= "<input type=\"hidden\" id=\"{$this->m_iInputId}\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\"/>\n";
+			$oPage->add_ready_script("\$('#{$this->m_iInputId}').val('$sJSON');\noLinkWidget{$this->m_iInputId}.Init();\n\$('#ac_{$this->m_iInputId}').autocomplete('./ajax.render.php', { scroll:true, minChars:3, onItemSelect:selectItem, onFindValue:findValue, formatItem:formatItem, autoFill:true, keyHolder:'#id_ac_{$this->m_iInputId}', extraParams:{operation:'ui.linkswidget', sclass:'{$this->m_sClass}', attCode:'{$this->m_sAttCode}', max:30}});");
+			$oPage->add_ready_script("\$('#ac_add_{$this->m_iInputId}').attr('disabled', 'disabled');");
+			$oPage->add_ready_script("\$('#ac_{$this->m_iInputId}').result( function(event, data, formatted) { if (data) { $('#id_ac_{$this->m_iInputId}').val(data[1]); $('#ac_add_{$this->m_iInputId}').attr('disabled', ''); } else { $('#ac_add_{$this->m_iInputId}').attr('disabled', 'disabled'); } } );");
 		}
 		else
 		{
-			foreach($aData as $iRowId => $aRow)
+			// Few choices, use a normal 'select'
+			$sHTMLValue = "<select name=\"attr_{$this->m_sAttCode}\"  id=\"{$this->m_iInputId}\">\n";
+			$sHTMLValue .= "<option value=\"0\">--- select a value ---</option>\n";
+			if (count($aAllowedValues) > 0)
 			{
-				$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
-			}		
+				foreach($aAllowedValues as $key => $value)
+				{
+					$sHTMLValue .= "<option value=\"$key\"$sSelected>$value</option>\n";
+				}
+			}
+			$sHTMLValue .= "</select>\n";
 		}
-		$sHtml .= "</tbody>\n";
-		
-		// Footer
-		$sHtml .= "</table>\n";
-		
-		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
-	 * @return string The HTML fragment to be inserted into the page
-	 */
-	public function Display(WebPage $oPage, DBObjectSet $oValue, $aArgs = array())
-	{
-		$iWidgetIndex = self::$iWidgetIndex;
-		$sHtmlValue = '';
-		$sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
-		$sHtmlValue .= "<div id=\"linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
-		$oValue->Rewind();
-		$aForm = array();
-		while($oCurrentLink = $oValue->Fetch())
+		$sHTMLValue .= "<div id=\"{$this->m_iInputId}_values\">\n";
+		if ($oCurrentValuesSet != null)
 		{
-			$aRow = array();
-			$key = $oCurrentLink->GetKey();
-			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote));
-
-			$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs);
+		 	// transform the DBObjectSet into a CMDBObjectSet !!!
+			$aLinkedObjects = $oCurrentValuesSet->ToArray(false);
+			// Actual values will be displayed asynchronously, no need to display them here
+			//if (count($aLinkedObjects) > 0)
+			//{
+			//	$oSet = CMDBObjectSet::FromArray($sLinkedClass, $aLinkedObjects);
+			//	$oDisplayBlock = DisplayBlock::FromObjectSet($oSet, 'list');
+			//	$sHTMLValue .= $oDisplayBlock->GetDisplay($oPage, $this->m_iInputId.'_current', array('linkage' => $sExtKeyToMe, 'menu' => false));
+			//}
 		}
-		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
-		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
-		$oPage->add_ready_script(<<<EOF
-		oWidget$iWidgetIndex = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates);
-		oWidget$iWidgetIndex.Init();
-EOF
-);
-		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget$iWidgetIndex.RemoveSelected();\" >";
-		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget$iWidgetIndex.AddObjects();\"></span>\n";
-		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
-		$sHtmlValue .= "</div>\n";
-		$oPage->add_at_the_end($this->GetObjectPickerDialog($oPage)); // To prevent adding forms inside the main form
-		return $sHtmlValue;
+		$sHTMLValue .= "</div>\n";
+		return $sHTMLValue;
 	}
-	
 	/**
 	 * This static function is called by the Ajax Page when there is a need to fill an autocomplete combo
-	 * @param $oPage WebPage The ajax page used for the output (sent back to the browser)
+	 * @param $oPage WebPage The ajax page used for the put^put (sent back to the browser
+	 * @param $oContext UserContext The context of the user (for limiting the search)
 	 * @param $sClass string The name of the class of the current object being edited
 	 * @param $sAttCode string The name of the attribute being edited
 	 * @param $sName string The partial name that was typed by the user
 	 * @param $iMaxCount integer The maximum number of items to return
 	 * @return void
 	 */	 	 	  	 	 	 	
-	static public function Autocomplete(WebPage $oPage, $sClass, $sAttCode, $sName, $iMaxCount)
+	static public function Autocomplete(WebPage $oPage, UserContext $oContext, $sClass, $sAttCode, $sName, $iMaxCount)
 	{
 		// #@# todo - add context information, otherwise any value will be authorized for external keys
 		$aAllowedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, array() /* $aArgs */, $sName);
@@ -267,7 +150,7 @@ EOF
 			$oAttDef = 	$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
 			$sLinkedClass = $oAttDef->GetLinkedClass();
 			$sSearchClass = self::GetTargetClass($sClass, $sAttCode);
-			$oFilter = new DBObjectSearch($sSearchClass);
+			$oFilter = $oContext->NewFilter($sSearchClass);
 			$sSearchAttCode = MetaModel::GetNameAttributeCode($sSearchClass);
 			$oFilter->AddCondition($sSearchAttCode, $sName, 'Begins with');
 			$oSet = new CMDBObjectSet($oFilter, array($sSearchAttCode => true));
@@ -300,7 +183,7 @@ EOF
 			foreach($aObject as $sAttCode => $value)
 			{
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-				if ($oAttDef->IsExternalKey() && ($value != 0))
+				if ($oAttDef->IsExternalKey())
 				{
 					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value); // @@ optimization, don't do & query per object in the set !
 					$oObj->Set($sAttCode, $oTargetObj);
@@ -319,7 +202,6 @@ EOF
 		$aExtraParams['target_attr'] = $sExtKeyToRemote;
 		$aExtraParams['menu'] = false;
 		$aExtraParams['select'] = false;
-		$aExtraParams['view_link'] = false;
 		
 		cmdbAbstractObject::DisplaySet($oPage, $oSet, $aExtraParams);
 	}
@@ -344,100 +226,105 @@ EOF
 		return $sTargetClass;
 	}
 	
-	protected function GetObjectPickerDialog($oPage)
+	protected function GetObjectPickerDialog($oPage, $sTargetClass, $sOkFunction)
 	{
-		$sHtml = "<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\">";
-		$sHtml .= "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
-		$iWidgetIndex = self::$iWidgetIndex;
-		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
-		$oSet = new CMDBObjectSet($oFilter);
-		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}", array('open' => true));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\" OnSubmit=\"return oWidget$iWidgetIndex.DoAddObjects(this.id);\">\n";
-		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
-		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
-		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">";
-		$sHtml .= "</div>\n";
-		$sHtml .= "</form>\n";
-		$sHtml .= "</div>\n";
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget$iWidgetIndex.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget$iWidgetIndex.SearchObjectsToAdd);");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget$iWidgetIndex.UpdateSizes);");
-		return $sHtml;
+		$sHTML = <<< EOF
+		<div class="jqmWindow" id="ManageObjectsDlg_{$this->m_iInputId}">
+		<div class="wizContainer">
+		<div class="page_header"><h1 id="Manage_DlgTitle_{$this->m_iInputId}">Selected Objects</h1></div>
+		<table width="100%">
+			<tr>
+				<td>
+					<p>Selected objects:</p>
+					<button type="button" class="action" onClick="FilterLeft('$sTargetClass');"><span> Filter... </span></button>
+					<p><select id="selected_objects_{$this->m_iInputId}" size="10" multiple onChange="Manage_UpdateButtons('$this->m_iInputId')" style="width:300px;">
+					</select></p>
+				</td>
+				<td style="text-align:center; valign:middle;">
+					<p><button type="button" id="btn_add_objects_{$this->m_iInputId}" onClick="Manage_AddObjects('$this->m_iInputId');"> &lt;&lt; Add </button></p>
+					<p><button type="button" id="btn_remove_objects_{$this->m_iInputId}" onClick="Manage_RemoveObjects('$this->m_iInputId');"> Remove &gt;&gt; </button></p>
+				</td>
+				<td>
+					<p>Available objects:</p>
+					<button type="button" class="action" onClick="FilterRight('$sTargetClass');"><span> Filter... </span></button>
+					<p><select id="available_objects_{$this->m_iInputId}" size="10" multiple onChange="Manage_UpdateButtons('$this->m_iInputId')" style="width:300px;">
+					</select></p>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="3">
+				<input type="submit" class="jqmClose" onClick="$('#ManageObjectsDlg_{$this->m_iInputId}').jqmHide(); $sOkFunction('$sTargetClass', 'selected_objects')" value=" Ok " />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button type="button" class="jqmClose"> Cancel</button>
+				</td>
+			</tr>
+		</table>
+		</div>
+		</div>
+EOF;
+		$oPage->add_ready_script("$('#ManageObjectsDlg_$this->m_iInputId').jqm({overlay:70, modal:true, toTop:true});"); // jqModal Window
+		//$oPage->add_ready_script("UpdateObjectList('$sClass');");
+		return $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 m_sRemoteClass
-	 * @param Array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of the search
-	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array())
+	
+	protected function GetLinkObjectDialog($oPage, $sId)
 	{
-		if ($sRemoteClass != '')
+		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
+		$sLinkedClass = $oAttDef->GetLinkedClass();
+		$sStateAttCode = MetaModel::GetStateAttributeCode($sLinkedClass);
+		$sDefaultState = MetaModel::GetDefaultState($sLinkedClass);
+		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
+		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+		$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+		
+		$sHTML = "<div class=\"jqmWindow\" id=\"LinkDlg_$sId\">\n";
+		$sHTML .= "<div class=\"wizContainer\">\n";
+		$sHTML .= "<div class=\"page_header\"><h1>".MetaModel::GetName($sLinkedClass)." attributes</h1></div>\n";
+		$sHTML .= "<form action=\"./UI.php\" onSubmit=\"return oLinkWidget$sId.OnLinkOk();\">\n";
+		$index = 0;
+		$aAttrsMap = array();
+		$aDetails = array();
+		foreach(MetaModel::ListAttributeDefs($sLinkedClass) as $sAttCode=>$oAttDef)
 		{
-			// 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);		
-		}
-		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
-		{
-			// Positive IDs correspond to existing link records
-			// negative IDs correspond to "remote" objects to be linked
-			$aLinkIds = array();
-			$aRemoteObjIds = array();
-			foreach($aAlreadyLinkedIds as $iId)
+			if ($sStateAttCode == $sAttCode)
 			{
-				if ($iId > 0)
+				// State attribute is always hidden from the UI
+				//$sHTMLValue = $this->GetState();
+				//$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $sHTMLValue);
+			}
+			else if (!$oAttDef->IsExternalField() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $sExtKeyToRemote))
+			{
+				$iFlags = MetaModel::GetAttributeFlags($sLinkedClass, $sDefaultState, $sAttCode);				
+				if ($iFlags & OPT_ATT_HIDDEN)
 				{
-					$aLinkIds[] = $iId;
+					// Attribute is hidden, do nothing
 				}
 				else
 				{
-					$aRemoteObjIds[] = -$iId;
+					if ($iFlags & OPT_ATT_READONLY)
+					{
+						// Attribute is read-only
+						$sHTMLValue = $this->GetAsHTML($sAttCode);
+					}
+					else
+					{
+						$sValue = ""; //$this->Get($sAttCode);
+						$sDisplayValue = ""; //$this->GetDisplayValue($sAttCode);
+						$sSubId = $sId.'_'.$index;
+						$aAttrsMap[$sAttCode] = $sSubId;
+						$index++;
+						$sHTMLValue = cmdbAbstractObject::GetFormElementForField($oPage, $sLinkedClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sSubId, $this->m_sAttCode);
+					}
+					$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $sHTMLValue);
 				}
 			}
-			
-			if (count($aLinkIds) >0)
-			{
-				// Search for the links to find to which "remote" object they are linked
-				$oLinkFilter = new DBObjectSearch($this->m_sLinkedClass);
-				$oLinkFilter->AddCondition('id', $aLinkIds, 'IN');
-				$oLinkSet = new CMDBObjectSet($oLinkFilter);
-				while($oLink = $oLinkSet->Fetch())
-				{
-					$aRemoteObjIds[] = $oLink->Get($this->m_sExtKeyToRemote);
-				}
-			}
-			$oFilter->AddCondition('id', $aRemoteObjIds, 'NOTIN');
-		}
-		$oSet = new CMDBObjectSet($oFilter);
-		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, 'ResultsToAdd', array('menu' => false, 'selection_mode' => true, 'display_limit' => false)); // Don't display the 'Actions' menu on the results
-	}
-	
-	public function DoAddObjects(WebPage $oP, $aLinkedObjectIds = array())
-	{
-		$aTable = array();
-		foreach($aLinkedObjectIds as $iObjectId)
-		{
-			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId);
-			if (is_object($oLinkedObj))
-			{
-				$aRow = $this->GetFormRow($oP, $oLinkedObj, -$iObjectId ); // Not yet created link get negative Ids
-				$oP->add($this->DisplayFormRow($oP, $this->m_aTableConfig, $aRow, -$iObjectId)); 
-			}
-			else
-			{
-				$oP->p(Dict::Format('UI:Error:Object_Class_Id_NotFound', $this->m_sLinkedClass, $iObjectId));
-			}
 		}
+		$sHTML .= $oPage->GetDetails($aDetails);
+		$sHTML .= "<input type=\"submit\" class=\"jqmClose\" onClick=\"oLinkWidget$sId.OnLinkOk()\" value=\" Ok \" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button type=\"button\" class=\"jqmClose\"  onClick=\"oLinkWidget$sId.OnLinkCancel()\"> Cancel</button>\n";
+		$sHTML .= "</form>\n";
+		$sHTML .= "</div>\n";
+		$sHTML .= "</div>\n";
+		$oPage->add_ready_script("$('#LinkDlg_$sId').jqm({overlay:70, modal:true, toTop:true});"); // jqModal Window
+		//$oPage->add_ready_script("UpdateObjectList('$sClass');");
+		return $sHTML;
 	}
 }
 ?>

application/ui.passwordwidget.class.inc.php

@@ -1,71 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class UIPasswordWidget
- * UI wdiget for displaying and editing one-way encrypted passwords
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-require_once('../application/webpage.class.inc.php');
-require_once('../application/displayblock.class.inc.php');
-
-class UIPasswordWidget 
-{
-	protected static $iWidgetIndex = 0;
-	protected $sAttCode;
-	protected $sNameSuffix;
-	protected $iId;
-	
-	public function __construct($sAttCode, $iInputId, $sNameSuffix = '')
-	{
-		self::$iWidgetIndex++;
-		$this->sAttCode = $sAttCode;
-		$this->sNameSuffix = $sNameSuffix;
-		$this->iId = $iInputId;
-	}
-	
-	/**
-	 * Get the HTML fragment corresponding to the linkset editing widget
-	 * @param WebPage $oP The web page used for all the output
-	 * @param Hash $aArgs Extra context arguments
-	 * @return string The HTML fragment to be inserted into the page
-	 */
-	public function Display(WebPage $oPage, $aArgs = array())
-	{
-		$sCode = $this->sAttCode.$this->sNameSuffix;
-		$iWidgetIndex = self::$iWidgetIndex;
-		$sPasswordValue = utils::ReadPostedParam("attr_$sCode", '*****');
-		$sConfirmPasswordValue = utils::ReadPostedParam("attr_{$sCode}_confirmed", '*****');
-		$sChangedValue = (($sPasswordValue != '*****') || ($sConfirmPasswordValue != '*****')) ? 1 : 0;
-		$sHtmlValue = '';
-		$sHtmlValue = '<input type="password" maxlength="255" name="attr_'.$sCode.'" id="'.$this->iId.'" value="'.htmlentities($sPasswordValue, ENT_QUOTES, 'UTF-8').'"/>&nbsp;<span id="v_'.$this->iId.'"></span><br/>';
-		$sHtmlValue .= '<input type="password" maxlength="255" id="'.$this->iId.'_confirm" value="'.htmlentities($sConfirmPasswordValue, ENT_QUOTES, 'UTF-8').'" name="attr_'.$sCode.'_confirmed"/> '.Dict::S('UI:PasswordConfirm').' <input type="button" value="'.Dict::S('UI:Button:ResetPassword').'" onClick="ResetPwd(\''.$this->iId.'\');">';
-		$sHtmlValue .= '<input type="hidden" id="'.$this->iId.'_changed" name="attr_'.$sCode.'_changed" value="'.$sChangedValue.'"/>';
-
-		$oPage->add_ready_script("$('#$this->iId').bind('keyup change', function(evt) { return PasswordFieldChanged('$this->iId') } );"); // Bind to a custom event: validate
-		$oPage->add_ready_script("$('#$this->iId').bind('keyup change', function(evt) { return PasswordFieldChanged('$this->iId') } );"); // Bind to a custom event: validate
-		$oPage->add_ready_script("$('#$this->iId').bind('keyup change validate', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate
-		$oPage->add_ready_script("$('#{$this->iId}_confirm').bind('keyup change', function(evt, sFormId) { return ValidatePasswordField('$this->iId', sFormId) } );"); // Bind to a custom event: validate
-
-		return $sHtmlValue;
-	}
-}
-?>

application/uilinkswizard.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class UILinksWizard
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 class UILinksWizard
 {
 	protected $m_sClass;
@@ -43,7 +19,7 @@ class UILinksWizard
 		
 		$this->m_aEditableFields = array();
 		$this->m_aTableConfig = array();
-		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onChange=\"var value = this.checked; $('.selection').each( function() { this.checked = value; } );OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
+		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onChange=\"var value = this.checked; $('.selection').each( function() { this.checked = value; } );OnSelectChange();\">", 'description' => "Select / Deselect All");
 		foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
 		{
 			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
@@ -70,7 +46,7 @@ class UILinksWizard
 		}
 		if (empty($this->m_sLinkedClass))
 		{
-			throw( new Exception(Dict::Format('UI:Error:IncorrectLinkDefinition_LinkedClass_Class', $sLinkedClass, $sClass)));
+			throw( new Exception("Incorrect link definition: the class of objects to manage: '$sLinkedClass' was not found as an external key in the class '$sClass'"));
 		}
 		foreach(MetaModel::GetZListItems($this->m_sLinkedClass, 'list') as $sFieldCode)
 		{
@@ -79,11 +55,11 @@ class UILinksWizard
 		}
 	}
 
-	public function Display(WebPage $oP, $aExtraParams = array())
+	public function Display(WebPage $oP, UserContext $oContext, $aExtraParams = array())
 	{
 		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sLinkageAttr);
 		$sTargetClass = $oAttDef->GetTargetClass();
-		$oTargetObj = MetaModel::GetObject($sTargetClass, $this->m_iObjectId);
+		$oTargetObj = $oContext->GetObject($sTargetClass, $this->m_iObjectId);
 
 		$oP->set_title("iTop - ".MetaModel::GetName($this->m_sLinkedClass)." objects linked with ".MetaModel::GetName(get_class($oTargetObj)).": ".$oTargetObj->GetName());
 		$oP->add("<div class=\"wizContainer\">\n");
@@ -95,12 +71,10 @@ class UILinksWizard
 		$oP->add("<input type=\"hidden\" name=\"linkage\" value=\"{$this->m_sLinkageAttr}\">\n");
 		$oP->add("<input type=\"hidden\" name=\"object_id\" value=\"{$this->m_iObjectId}\">\n");
 		$oP->add("<input type=\"hidden\" name=\"linking_attcode\" value=\"{$this->m_sLinkingAttCode}\">\n");
-		$oP->add("<h1>".Dict::Format('UI:ManageObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName(get_class($oTargetObj)), "<span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span>")."</h1>\n");
+		$oP->add("<h1>Manage ".MetaModel::GetName($this->m_sLinkedClass)."s linked with ".MetaModel::GetName(get_class($oTargetObj)).": <span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span></h1>\n");
 		$oP->add("</div>\n");
 		$oP->add("<script type=\"text/javascript\">\n");
-		$oP->add(
-<<<EOF
-		function OnSelectChange()
+		$oP->add("function OnSelectChange()
 		{
 			var nbChecked = $('.selection:checked').length;
 			if (nbChecked > 0)
@@ -132,7 +106,7 @@ class UILinksWizard
 		function AddObjects()
 		{
 			// TO DO: compute the list of objects already linked with the current Object
-			$.post( 'ajax.render.php', { 'operation': 'addObjects',
+			$.get( 'ajax.render.php', { 'operation': 'addObjects',
 										'class': '{$this->m_sClass}',
 										'linkageAttr': '{$this->m_sLinkageAttr}',
 										'linkedClass': '{$this->m_sLinkedClass}',
@@ -145,7 +119,7 @@ class UILinksWizard
 					$('#ModalDlg').css('width', dlgWidth);
 					$('#ModalDlg').css('left', 50);
 					$('#ModalDlg').css('top', 50);
-					$('#ModalDlg').dialog( 'open' );
+					$('#ModalDlg').jqmShow();
 				},
 				'html'
 			);
@@ -158,10 +132,7 @@ class UILinksWizard
 						   'linkedClass': '{$this->m_sLinkedClass}',
 						   'objectId': '{$this->m_iObjectId}'
 						 }
-			if ($('#'+currentFormId+' :input[name=class]').val() != undefined)
-			{
-				theMap.linkedClass = $('#'+currentFormId+' :input[name=class]').val();
-			}
+			
 			// Gather the parameters from the search form
 			$('#'+currentFormId+' :input').each(
 				function(i)
@@ -175,11 +146,22 @@ class UILinksWizard
 			theMap['operation'] = 'searchObjectsToAdd';
 			
 			// Run the query and display the results
-			$.post( 'ajax.render.php', theMap, 
+			$.get( 'ajax.render.php', theMap, 
 				function(data)
 				{
 					$('#SearchResultsToAdd').html(data);
-					$('#SearchResultsToAdd .listResults').tablesorter( { headers: {0: false}}, widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
+					nb_rows = $('#SearchResultsToAdd table.listResults tr').length;
+					if(nb_rows > 10)
+					{
+						yOffset = $('#ModalDlg').height() - $('#SearchResultsToAdd table.listResults tbody').height();
+						tbodyHeight = $(document).height() - 100 - yOffset;
+						if ($('#ModalDlg').height() > ($(document).height() - 100))
+						{
+							$('#SearchResultsToAdd table.listResults tbody').attr('height', tbodyHeight);
+							$('#SearchResultsToAdd .listResults tbody').css('overflow', 'auto');
+							$('#SearchResultsToAdd .listResults').tablesorter( { headers: { 0:{sorter: false }}, widgets: ['zebra']} ); // sortable and zebra tables
+						}
+					}
 					
 				},
 				'html'
@@ -223,7 +205,7 @@ class UILinksWizard
 			theMap['operation'] = 'doAddObjects';
 			
 			// Run the query and display the results
-			$.post( 'ajax.render.php', theMap, 
+			$.get( 'ajax.render.php', theMap, 
 				function(data)
 				{
 					//console.log('Data: ' + data);
@@ -233,11 +215,11 @@ class UILinksWizard
 					}
 					$('.listResults tbody').append(data);
 					$('.listResults').trigger('update');
-					$('.listResults').tablesorter( { headers: {0: false}}, widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
+					$('.listResults').tablesorter( { headers: { 0:{sorter: false }}, widgets: ['zebra']} ); // sortable and zebra tables
 				},
 				'html'
 			);
-			$('#ModalDlg').dialog('close');
+			$('#ModalDlg').jqmHide();
 			return false;
 		}
 		
@@ -248,18 +230,10 @@ class UILinksWizard
 			$('#btnRemove').attr('disabled','disabled');
 			$('#linksToRemove').val('');
 		}
-		
-		function SubmitHook() 
-		{
-			var the_form = this;
-			SearchObjectsToAdd(the_form.id);
-			return false;
-		}
-EOF
-);
+		");
 		$oP->Add("</script>\n");
 		$oP->add_ready_script("InitForm();");
-		$oFilter = new DBObjectSearch($this->m_sClass);
+		$oFilter = $oContext->NewFilter($this->m_sClass);
 		$oFilter->AddCondition($this->m_sLinkageAttr, $this->m_iObjectId, '=');
 		$oSet = new DBObjectSet($oFilter);
 		$aForm = array();
@@ -267,17 +241,17 @@ EOF
 		{
 			$aRow = array();
 			$key = $oCurrentLink->GetKey();
-			$oLinkedObj = MetaModel::GetObject($this->m_sLinkedClass, $oCurrentLink->Get($this->m_sLinkingAttCode));
+			$oLinkedObj = $oContext->GetObject($this->m_sLinkedClass, $oCurrentLink->Get($this->m_sLinkingAttCode));
 
 			$aForm[$key] = $this->GetFormRow($oP, $oLinkedObj, $oCurrentLink);
 		}
 		//var_dump($aTableLabels);
 		//var_dump($aForm);
 		$this->DisplayFormTable($oP, $this->m_aTableConfig, $aForm);
-		$oP->add("<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"RemoveSelected();\" >");
-		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sLinkedClass))."\" onClick=\"AddObjects();\"></span>\n");
-		$oP->add("<span style=\"float:right;\"><input id=\"btnCancel\" type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"BackToDetails('".$sTargetClass."', ".$this->m_iObjectId.");\">");
-		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnOk\" type=\"submit\" value=\"".Dict::S('UI:Button:Ok')."\"></span>\n");
+		$oP->add("<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"btnRemove\" type=\"button\" value=\" Remove ".MetaModel::GetName($this->m_sLinkedClass)."s \" onClick=\"RemoveSelected();\" >");
+		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnAdd\" type=\"button\" value=\" Add ".MetaModel::GetName($this->m_sLinkedClass)."s... \" onClick=\"AddObjects();\"></span>\n");
+		$oP->add("<span style=\"float:right;\"><input id=\"btnCancel\" type=\"button\" value=\" Cancel \" onClick=\"goBack();\">");
+		$oP->add("&nbsp;&nbsp;&nbsp;<input id=\"btnOk\" type=\"submit\" value=\" Ok \"></span>\n");
 		$oP->add("<span style=\"clear:both;\"><p>&nbsp;</p></span>\n");
 		$oP->add("</div>\n");
 		$oP->add("</form>\n");
@@ -311,7 +285,7 @@ EOF
 			foreach($this->m_aEditableFields as $sFieldCode)
 			{
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sFieldCode);
-				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sClass, $sFieldCode, $oAttDef, '' /* TO DO/ call GetDefaultValue($oObject->ToArgs()) */, '' /* DisplayValue */, '' /* id */, $sNameSuffix);
+				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sClass, $sFieldCode, $oAttDef, '' /* TO DO/ call GetDefaultValue */, '' /* DisplayValue */, '' /* id */, $sNameSuffix);
 			}
 		}
 		foreach(MetaModel::GetZListItems($this->m_sLinkedClass, 'list') as $sFieldCode)
@@ -338,7 +312,7 @@ EOF
 		$oP->add("</tbody>\n");
 		if (count($aData) == 0)
 		{
-			$oP->add("<tr id=\"empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."</td></td>");
+			$oP->add("<tr id=\"empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">The list is empty, use 'Add...' to add elements.</td></td>");
 		}
 		else
 		{
@@ -363,42 +337,41 @@ EOF
 		$oP->add("</tr>\n");
 	}
 	
-	public function DisplayAddForm(WebPage $oP)
+	public function DisplayAddForm(WebPage $oP, UserContext $oContext)
 	{
 		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sLinkageAttr);
 		$sTargetClass = $oAttDef->GetTargetClass();
-		$oTargetObj = MetaModel::GetObject($sTargetClass, $this->m_iObjectId);
+		$oTargetObj = $oContext->GetObject($sTargetClass, $this->m_iObjectId);
 		$oP->add("<div class=\"wizContainer\">\n");
-		//$oP->add("<div class=\"page_header\">\n");
-		//$oP->add("<h1>".Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName(get_class($oTargetObj)), "<span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span>")."</h1>\n");
-		//$oP->add("</div>\n");
+		$oP->add("<div class=\"page_header\">\n");
+		$oP->add("<h1>Add ".MetaModel::GetName($this->m_sLinkedClass)."s to ".MetaModel::GetName(get_class($oTargetObj)).": <span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span></h1>\n");
+		$oP->add("</div>\n");
 
-		$oFilter = new DBObjectSearch($this->m_sLinkedClass);
+		$oFilter = $oContext->NewFilter($this->m_sLinkedClass);
 		$oSet = new CMDBObjectSet($oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'search', false);
 		$oBlock->Display($oP, 'SearchFormToAdd', array('open' => true));
 		$oP->Add("<form id=\"ObjectsAddForm\" OnSubmit=\"return DoAddObjects(this.id);\">\n");
 		$oP->Add("<div id=\"SearchResultsToAdd\">\n");
-		$oP->Add("<div style=\"height: 100px; background: #fff;border-color:#F6F6F1 #E6E6E1 #E6E6E1 #F6F6F1; border-style:solid; border-width:3px; text-align: center; vertical-align: center;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n");
+		$oP->Add("<div style=\"height: 100px; background: #fff;border-color:#F6F6F1 #E6E6E1 #E6E6E1 #F6F6F1; border-style:solid; border-width:3px; text-align: center; vertical-align: center;\"><p>Use the search form above to search for objects to be added.</p></div>\n");
 		$oP->Add("</div>\n");
-		$oP->add("<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#ModalDlg').dialog('close');\">&nbsp;&nbsp;<input type=\"submit\" value=\"".Dict::S('UI:Button:Add')."\">");
+		$oP->add("<input type=\"button\" value=\"Cancel\" onClick=\"$('#ModalDlg').jqmHide();\">&nbsp;&nbsp;<input type=\"submit\" value=\" Add \">");
 		$oP->Add("</div>\n");
 		$oP->Add("</form>\n");
-		$oP->add_ready_script("$('#ModalDlg').dialog('option', {title:'".Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class_Instance', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName(get_class($oTargetObj)), "<span class=\"hilite\">".$oTargetObj->GetHyperlink()."</span>")."'});");
-		$oP->add_ready_script("$('div#SearchFormToAdd form').bind('submit.uilinksWizard', SubmitHook);");
+		$oP->add_ready_script("$('div#SearchFormToAdd form').bind('submit', function() {var the_form = this; SearchObjectsToAdd(the_form.id); return false;});");
 	}
 
-	public function SearchObjectsToAdd(WebPage $oP)
+	public function SearchObjectsToAdd(WebPage $oP, UserContext $oContext)
 	{
 		//$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sLinkageAttr);
 
-		$oFilter = new DBObjectSearch($this->m_sLinkedClass);
+		$oFilter = $oContext->NewFilter($this->m_sLinkedClass);
 		$oSet = new CMDBObjectSet($oFilter);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
 		$oBlock->Display($oP, 'ResultsToAdd', array('menu' => false, 'selection_mode' => true, 'display_limit' => false)); // Don't display the 'Actions' menu on the results
 	}
 	
-	public function DoAddObjects(WebPage $oP, $aLinkedObjectIds = array())
+	public function DoAddObjects(WebPage $oP, UserContext $oContext, $aLinkedObjectIds = array())
 	{
 		//$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sLinkageAttr);
 		//$sTargetClass = $oAttDef->GetTargetClass();
@@ -406,7 +379,7 @@ EOF
 		$aTable = array();
 		foreach($aLinkedObjectIds as $iObjectId)
 		{
-			$oLinkedObj = MetaModel::GetObject($this->m_sLinkedClass, $iObjectId);
+			$oLinkedObj = $oContext->GetObject($this->m_sLinkedClass, $iObjectId);
 			if (is_object($oLinkedObj))
 			{
 				$aRow = $this->GetFormRow($oP, $oLinkedObj, -$iObjectId ); // Not yet created link get negative Ids
@@ -414,7 +387,7 @@ EOF
 			}
 			else
 			{
-				echo Dict::Format('UI:Error:Object_Class_Id_NotFound', $this->m_sLinkedClass, $iObjectId);
+				echo "Object: $sTargetClass - Id: $iObjectId not found <br/>\n";
 			}
 		}
 		//var_dump($aTable);

application/uiwizard.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class UIWizard
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 class UIWizard
 {
 	protected $m_oPage;
@@ -62,9 +38,9 @@ class UIWizard
 		$sJSHandlerCode = ''; // Javascript code to be executed each time this step of the wizard is entered
 		foreach($aStep as $sAttCode)
 		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-			if ($oAttDef->IsWritable())
+			if ($sAttCode != 'finalclass') // Do not display the attribute that stores the actual class name
 			{
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 				$sAttLabel = $oAttDef->GetLabel();
 				$iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
 		
@@ -82,11 +58,11 @@ class UIWizard
 					$aOptions[] = 'Prerequisites: '.implode(', ', $aPrerequisites);
 				}
 				
-				$sFieldFlag = (($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) || (!$oAttDef->IsNullAllowed()) )? ' <span class="hilite">*</span>' : '';
-				$oDefaultValuesSet = $oAttDef->GetDefaultValue(/* $oObject->ToArgs() */); // @@@ TO DO: get the object's current value if the object exists
+				$sFieldFlag = ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) ? ' <span class="hilite">*</span>' : '';
+				$oDefaultValuesSet = $oAttDef->GetDefaultValue(); // @@@ TO DO: get the object's current value if the object exists
 				$sHTMLValue = cmdbAbstractObject::GetFormElementForField($this->m_oPage, $this->m_sClass, $sAttCode, $oAttDef, $oDefaultValuesSet, '', "att_$iMaxInputId", '', $iOptions, $aArgs);
-				$aFieldsMap["att_$iMaxInputId"] = $sAttCode;
-				$aDetails[] = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().$sFieldFlag.'</span>', 'value' => "<span id=\"field_att_$iMaxInputId\">$sHTMLValue</span>");
+				$aFieldsMap[$iMaxInputId] = $sAttCode;
+				$aDetails[] = array('label' => $oAttDef->GetLabel().$sFieldFlag, 'value' => "<div id=\"field_$iMaxInputId\">$sHTMLValue</div>");
 				if ($oAttDef->GetValuesDef() != null)
 				{
 					$sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
@@ -108,9 +84,9 @@ class UIWizard
 		$sDisabled = $bFinishEnabled ? '' : 'disabled';
 		$nbSteps = count($this->m_aWizardSteps['mandatory']) + count($this->m_aWizardSteps['optional']);
 		$this->m_oPage->add("<div style=\"text-align:center\">
-		<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" $sBackButtonDisabled onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />
-		<input type=\"button\" value=\"".Dict::S('UI:Button:Next')."\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
-		<input type=\"button\" value=\"".Dict::S('UI:Button:Finish')."\" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
+		<input type=\"button\" value=\"&lt;&lt; Back \" $sBackButtonDisabled onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />
+		<input type=\"button\" value=\" Next &gt;&gt;\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
+		<input type=\"button\" value=\" Finish \" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
 		</div>\n");
 		$this->m_oPage->add("
 <script type=\"text/javascript\">
@@ -135,7 +111,7 @@ $sJSHandlerCode
 		$oAppContext = new ApplicationContext();
 		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
 		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
-		$this->m_oPage->P(Dict::S('UI:Wizard:FinalStepTitle'));
+		$this->m_oPage->P("Final step: confirmation");
 		$this->m_oPage->add("<input type=\"hidden\" name=\"operation\" value=\"wizard_apply_new\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\" />\n");
 		$this->m_oPage->add("<input type=\"hidden\" id=\"wizard_json_obj\" name=\"json_obj\" value=\"\" />\n");
@@ -152,7 +128,6 @@ $sJSHandlerCode
 		$this->m_oPage->add("<div id=\"object_preview\">\n");
 		$this->m_oPage->add("</div>\n");
 		$this->m_oPage->add($oAppContext->GetForForm());		
-		$this->m_oPage->add("<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />");
 		$this->m_oPage->add("<input type=\"submit\" value=\"Create ".MetaModel::GetName($this->m_sClass)."\" />\n");
 		$this->m_oPage->add("</div>\n");
 		$this->m_oPage->add("</form>\n");
@@ -170,52 +145,46 @@ $sJSHandlerCode
 		$aFieldsDone = array(); // Store all the fields that are already covered by a previous step of the wizard
 	
 		$aStates = MetaModel::EnumStates($this->m_sClass);
-		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
 		
 		$aMandatoryAttributes = array();
 		// Some attributes are always mandatory independently of the state machine (if any)
         foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
         {
             $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-            if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() && 
-			    $oAttDef->IsWritable() && ($sAttCode != $sStateAttCode) )
+            if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed())
             {
                 $aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY;
             }
         }
 
         // Now check the attributes that are mandatory in the specified state
-		if ( (!empty($this->m_sTargetState)) && (count($aStates[$this->m_sTargetState]['attribute_list']) > 0) )
+   		if ( (!empty($this->m_sTargetState)) && (count($aStates[$this->m_sTargetState]['attribute_list']) > 0) )
 		{
 			// Check all the fields that *must* be included in the wizard for this
 			// particular target state
 			$aFields = array();
 			foreach($aStates[$this->m_sTargetState]['attribute_list'] as $sAttCode => $iOptions)
 			{
-				if ( (isset($aMandatoryAttributes[$sAttCode])) && 
-					 ($aMandatoryAttributes[$sAttCode] & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) )
-				{
-					$aMandatoryAttributes[$sAttCode] |= $iOptions;
-				}
-				else
-				{
-					$aMandatoryAttributes[$sAttCode] = $iOptions;
-				}
-			}
-		}
-        
-		// Check all the fields that *must* be included in the wizard
-		// i.e. all mandatory, must-change or must-prompt fields that are
-		// not also read-only or hidden.
-		// Some fields may be required (null not allowed) from the database
-		// perspective, but hidden or read-only from the user interface perspective 
+                if (isset($aMandatoryAttributes[$sAttCode]))
+                {
+                    $aMandatoryAttributes[$sAttCode] |= $iOptions;
+                }
+			    else
+			    {
+                    $aMandatoryAttributes[$sAttCode] = $iOptions;
+                }
+            }
+        }
+            
+		// Check all the fields that *must* be included in the wizard 
 		$aFields = array();
 		foreach($aMandatoryAttributes as $sAttCode => $iOptions)
 		{
-			if ( ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) &&
-				 !($iOptions & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) )
+			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+			$sAttLabel = $oAttDef->GetLabel();
+	
+			if ( ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) )
 			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
 				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
 				$aFields[$sAttCode] = array();
 				foreach($aPrerequisites as $sCode)
@@ -226,48 +195,39 @@ $sJSHandlerCode
 		}
 			
 		// Now use the dependencies between the fields to order them
-		// Start from the order of the 'details'
-		$aList = MetaModel::GetZListItems($this->m_sClass, 'details');
-		$index = 0;
-		$aOrder = array();
-		foreach($aFields as $sAttCode => $void)
+		while(count($aFields) > 0)
 		{
-				$aOrder[$sAttCode] = 999; // At the end of the list...
-		}
-		foreach($aList as $sAttCode)
-		{
-			if (array_key_exists($sAttCode, $aFields))
+			$aCurrentStep = array();
+			foreach($aFields as $sAttCode => $aDependencies)
 			{
-				$aOrder[$sAttCode] = $index;
-			}
-			$index++;
-		}
-		foreach($aFields as $sAttCode => $aDependencies)
-		{
-			// All fields with no remaining dependencies can be entered at this
-			// step of the wizard
-			if (count($aDependencies) > 0)
-			{
-				$iMaxPos = 0;
-				// Remove this field from the dependencies of the other fields
-				foreach($aDependencies as $sDependentAttCode => $void)
+				// All fields with no remaining dependencies can be entered at this
+				// step of the wizard
+				if (count($aDependencies) == 0)
 				{
-					// position the current field after the ones it depends on
-					$iMaxPos = max($iMaxPos, 1+$aOrder[$sDependentAttCode]);
+					$aCurrentStep[] = $sAttCode;
+					$aFieldsDone[$sAttCode] = '';
+					unset($aFields[$sAttCode]);
+					// Remove this field from the dependencies of the other fields
+					foreach($aFields as $sUpdatedCode => $aDummy)
+					{
+						// remove the dependency
+						unset($aFields[$sUpdatedCode][$sAttCode]);
+					}
 				}
 			}
+			if (count($aCurrentStep) == 0)
+			{
+				// This step of the wizard would contain NO field !
+				echo "<strong>Error:</strong> Circular reference in the dependencies between the fields.";
+				print_r($aFields);
+				break;
+			}
+			$aWizardSteps['mandatory'][] = $aCurrentStep;
 		}
-		asort($aOrder);
-		$aCurrentStep = array();
-		foreach($aOrder as $sAttCode => $rank)
-		{
-			$aCurrentStep[] = $sAttCode;
-			$aFieldsDone[$sAttCode] = '';
-		}
-		$aWizardSteps['mandatory'][] = $aCurrentStep;
 
 
 		// Now computes the steps to fill the optional fields
+		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
 		$aFields = array(); // reset
 		foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
 		{
@@ -319,7 +279,7 @@ $sJSHandlerCode
 			if (count($aCurrentStep) == 0)
 			{
 				// This step of the wizard would contain NO field !
-				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
+				$oPage->add("<strong>Error:</strong> Circular reference in the dependencies between the fields.");
 				print_r($aFields);
 				break;
 			}

application/user.preferences.class.inc.php

@@ -1,177 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Store and retrieve user's preferences (i.e persistent per user settings)
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-require_once('../core/dbobject.class.php');
-require_once('../core/userrights.class.inc.php');
-
-/**
- * This class is used to store, in a persistent manner, user related settings (preferences)
- * For each user, one record in the database will be created, making their preferences permanent and storing a list
- * of properties (pairs of name/value strings)
- * This overcomes some limitations of cookies: limited number of cookies, maximum size, depends on the browser, etc..
- * This class is used in conjunction with the GetUserPreferences/SetUserPreferences javascript functions (utils.js)
- */
-class appUserPreferences extends DBObject
-{
-	static $oUserPrefs = null; // Local cache
-	
-	/**
-	 * Get the value of the given property/preference
-	 * If not set, the default value will be returned
-	 * @param string $sCode Code/Name of the property to set
-	 * @param string $sDefaultValue The default value
-	 * @return string The value of the property for the current user
-	 */
-	static function GetPref($sCode, $sDefaultValue)
-	{
-		if (self::$oUserPrefs == null)
-		{
-			self::Load();
-		}
-		$aPrefs = self::$oUserPrefs->Get('preferences');
-		if (isset($aPrefs[$sCode]))
-		{
-			return $aPrefs[$sCode];
-		}
-		else
-		{
-			return $sDefaultValue;
-		}
-	}
-	
-	/**
-	 * Set the value for a given preference, and stores it into the database
-	 * @param string $sCode Code/Name of the property/preference to set
-	 * @param string $sValue Value to set
-	 */
-	static function SetPref($sCode, $sValue)
-	{
-		if (self::$oUserPrefs == null)
-		{
-			self::Load();
-		}
-		$aPrefs = self::$oUserPrefs->Get('preferences');
-		$aPrefs[$sCode] = $sValue;
-		self::$oUserPrefs->Set('preferences', $aPrefs);
-		self::Save();
-	}
-	
-	/**
-	 * Call this function to get all the preferences for the user, packed as a JSON object
-	 * @return string JSON representation of the preferences
-	 */
-	static function GetAsJSON()
-	{
-		if (self::$oUserPrefs == null)
-		{
-			self::Load();
-		}
-		$aPrefs = self::$oUserPrefs->Get('preferences');
-		return json_encode($aPrefs);
-	}
-
-	/**
-	 * Call this function if the user has changed (like when doing a logoff...)
-	 */
-	static public function Reset()
-	{
-		self::$oUserPrefs = null;
-	}
-	/**
-	 * Call this function to ERASE all the preferences from the current user
-	 */
-	static public function ClearPreferences()
-	{
-		self::$oUserPrefs = null;
-	}
-	
-	static protected function Save()
-	{
-		if (self::$oUserPrefs != null)
-		{
-			if (self::$oUserPrefs->IsModified())
-			{
-				self::$oUserPrefs->DBUpdate();
-			}
-		}
-	}
-	
-	/**
-	 * Loads the preferences for the current user, creating the record in the database
-	 * if needed
-	 */
-	static protected function Load()
-	{
-		if (self::$oUserPrefs != null) return;
-		$oSearch = new DBObjectSearch('appUserPreferences');
-		$oSearch->AddCondition('userid', UserRights::GetUserId(), '=');
-		$oSet = new DBObjectSet($oSearch);
-		$oObj = $oSet->Fetch();
-		if ($oObj == null)
-		{
-			// No prefs (yet) for this user, create the object
-			$oObj = new appUserPreferences();
-			$oObj->Set('userid', UserRights::GetUserId());
-			$oObj->Set('preferences', array()); // Default preferences: an empty array
-			try
-			{
-				$oObj->DBInsert();
-			}
-			catch(Exception $e)
-			{
-				// Ignore errors
-			}
-		}
-		self::$oUserPrefs = $oObj;
-	}
-
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "userid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_app_preferences",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("preferences", array("allowed_values"=>null, "sql"=>"preferences", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	/**
-	* Overloading this function here to secure a fix done right before the release
-	* The real fix should be to implement this verb in DBObject	
-	*/
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		$this->DBDelete();
-	}
-}
-?>

application/usercontext.class.inc.php

@@ -0,0 +1,106 @@
+<?php
+require_once('../core/cmdbobject.class.inc.php');
+require_once('../core/userrights.class.inc.php');
+/**
+ * Helper class to capture a user's restrictions (access rights, profiles...) as a set of limiting conditions
+ *
+ * **** NOW OBSOLETE *** SHOULD BE REPLACED EVERYWHERE BY UserRights *****
+ * 
+ *
+ *
+ *     
+ * Usage:
+ * 1) Build the user's context (from her rights, a lookup in the database, a cookie, whatever)
+ * 	$oContext = new UserContext();
+ *  $oContext->AddCondition('SomeClass', 'someFilter', 'SomeValue', '=');
+ *   ...
+ *
+ * 2) Use the restrictions contained in the context when retrieving objects either when:
+ * getting directly an instance of an object
+ * $oObj = $oContext->GetObject('myClass', 'someKey'); // Instead of $oObj = MetaModel::GetObject('Klass', 'someKey');
+ * or when building a new search filter
+ * $oFilter = $oContext->NewFilter('myClass'); // Instead of $oFilter = new CMDBSearchFilter('Klass');
+ */
+class UserContext
+{
+	/**
+	 * Hash array to store the restricting conditions by myClass
+	 */
+	protected $m_aConditions;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->m_aConditions = array();
+	}
+	/**
+	 * Create a new search filter for the given class of objects that already contains the context's restrictions
+	 */
+	public function NewFilter($sClass)
+	{
+		return UserRights::GetFilter($sClass);
+		/*
+		$oFilter = new CMDBSearchFilter($sClass);
+		foreach($this->m_aConditions as $sConditionClass => $aConditionList)
+		{
+			// Add to the filter all the conditions of the parent classes of this class
+			if ($this->IsSubclass($sConditionClass,$sClass))
+			{
+				foreach($aConditionList as $sFilterCode => $aCondition)
+				{
+					$oFilter->AddCondition($sFilterCode, $aCondition['value'], $aCondition['operator']);
+				}
+			}
+		}
+		return $oFilter;
+		*/
+	}
+	/**
+	 * Retrieve an instance of an object (if allowed by the context)
+	 */
+	public function GetObject($sClass, $sKey)
+	{
+		$oObject = null;
+		$oFilter = $this->NewFilter($sClass);
+		$oFilter->AddCondition('pkey', $sKey, '=');
+		$oSet = new CMDBObjectSet($oFilter);
+		if ($oSet->Count() > 0)
+		{
+			$oObject = $oSet->Fetch();
+		}
+		return $oObject;
+	}
+	
+	/**
+	 * Add a restriction to the context for a given class of objects (and all its persistent subclasses)
+	 */
+	public function AddCondition($sClass, $sFilterCode, $value, $sOperator)
+	{
+		if(!isset($this->m_aConditions[$sClass]))
+		{
+			$this->m_aConditions[$sClass] = array();
+		}
+		$this->m_aConditions[$sClass][$sFilterCode] = array('value'=>$value, 'operator'=>$sOperator);
+	}
+	
+	/**
+	 * Check if a given class is a subclass of (or same as) another one
+	 */
+	protected function IsSubclass($sParentClass, $sSubclass)
+	{
+		$bResult = false;
+		if ($sParentClass == $sSubclass)
+		{
+			$bResult = true;
+		}
+		else
+		{
+			$aParentList = MetaModel::EnumParentClasses($sSubclass);
+			$bResult = in_array($sParentClass, $aParentList);
+		}
+		return $bResult;
+	}
+}
+?>

application/utils.inc.php

@@ -1,30 +1,5 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Static class utils
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('../core/config.class.inc.php');
-require_once('../application/transaction.class.inc.php');
 
 define('ITOP_CONFIG_FILE', '../config-itop.php');
 
@@ -32,50 +7,13 @@ class FileUploadException extends Exception
 {
 }
 
-
-/**
- * Helper functions to interact with forms: read parameters, upload files...
- * @package     iTop
- */
 class utils
 {
-	private static $m_sConfigFile = ITOP_CONFIG_FILE;
 	private static $m_oConfig = null;
 
-
-	public static function IsModeCLI()
+	public static function ReadParam($sName, $defaultValue = "")
 	{
-		global $argv;
-		if (isset($argv))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-
-	public static function ReadParam($sName, $defaultValue = "", $bAllowCLI = false)
-	{
-		global $argv;
-		$retValue = $defaultValue;
-		if (isset($_REQUEST[$sName]))
-		{
-			$retValue = $_REQUEST[$sName];
-		}
-		elseif ($bAllowCLI && isset($argv))
-		{
-			foreach($argv as $iArg => $sArg)
-			{
-				if (preg_match('/^--'.$sName.'=(.*)$/', $sArg, $aMatches))
-				{
-					$retValue = $aMatches[1];
-				}
-			}
-		}
-		return $retValue;
+		return isset($_REQUEST[$sName]) ? $_REQUEST[$sName] : $defaultValue;
 	}
 	
 	public static function ReadPostedParam($sName, $defaultValue = "")
@@ -113,7 +51,7 @@ class utils
 					        $sMimeType = $sType;
 					   }
 					}
-					@finfo_close($rInfo);
+					@finfo_close($finfo);
 				}
 				$oDocument = new ormDocument($doc_content, $sMimeType, $_FILES[$sName]['name']);
 				break;
@@ -124,27 +62,27 @@ class utils
 				
 				case UPLOAD_ERR_FORM_SIZE:
 				case UPLOAD_ERR_INI_SIZE:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadedFileTooBig', ini_get('upload_max_filesize')));
+				throw new FileUploadException("Uploaded file is too big. (Max allowed size is ".ini_get('upload_max_filesize').". Check you PHP configuration for upload_max_filesize.");
 				break;
 
 				case UPLOAD_ERR_PARTIAL:
-				throw new FileUploadException(Dict::S('UI:Error:UploadedFileTruncated.'));
+				throw new FileUploadException("File upload failed, file has been truncated.");
 				break;
 				
 				case UPLOAD_ERR_NO_TMP_DIR:
-				throw new FileUploadException(Dict::S('UI:Error:NoTmpDir'));
+				throw new FileUploadException("Missing a temporary folder.");
 				break;
 
 				case UPLOAD_ERR_CANT_WRITE:
-				throw new FileUploadException(Dict::Format('UI:Error:CannotWriteToTmp_Dir', ini_get('upload_tmp_dir')));
+				throw new FileUploadException("Unable to write the temporary file to the disk (upload_tmp_dir = ".ini_get('upload_tmp_dir').")");
 				break;
 
 				case UPLOAD_ERR_EXTENSION:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $_FILES[$sName]['name']));
+				throw new FileUploadException("File upload stopped by extension. (Original file name: ".$_FILES[$sName]['name'].")");
 				break;
 				
 				default:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $_FILES[$sName]['error']));
+				throw new FileUploadException("File upload failed, unknown cause (Error code = ".$_FILES[$sName]['error'].")");
 				break;
 
 			}
@@ -154,17 +92,14 @@ class utils
 	
 	public static function GetNewTransactionId()
 	{
-		return privUITransaction::GetNewTransactionId();
+		// TO DO implement the real mechanism here
+		return sprintf("%08x", rand(0,2000000000));
 	}
 	
-	public static function IsTransactionValid($sId, $bRemoveTransaction = true)
+	public static function IsTransactionValid($sId)
 	{
-		return privUITransaction::IsTransactionValid($sId, $bRemoveTransaction);
-	}
-	
-	public static function RemoveTransaction($sId)
-	{
-		return privUITransaction::RemoveTransaction($sId);
+		// TO DO implement the real mechanism here
+		return true;
 	}
 	
 	public static function ReadFromFile($sFileName)
@@ -173,15 +108,6 @@ class utils
 		return file_get_contents($sFileName);
 	}
 
-	/**
-	 * Specify the application config file
-	 * @param string path to the config file
-	 * @return void
-	 */	 	 	 	
-	public static function SpecifyConfigFile($sFilePath)
-	{
-		self::$m_sConfigFile = $sFilePath;
-	}
 	/**
 	 * Get access to the application config file
 	 * @param none
@@ -191,7 +117,7 @@ class utils
 	{
 		if (self::$m_oConfig == null)
 		{
-			self::$m_oConfig = new Config(self::$m_sConfigFile);
+			self::$m_oConfig = new Config(ITOP_CONFIG_FILE);
 		}
 		return self::$m_oConfig;
 	}
@@ -225,36 +151,20 @@ class utils
     /**
      * Returns an absolute URL to the current page
      * @param $bQueryString bool True to also get the query string, false otherwise
-     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
      * @return string The absolute URL to the current page
      */                   
-	static public function GetAbsoluteUrl($bQueryString = true, $bForceHTTPS = false)
+	static public function GetAbsoluteUrl($bQueryString = true)
 	{
 		// Build an absolute URL to this page on this server/port
-		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-		if (self::GetConfig()->GetSecureConnectionRequired() || self::GetConfig()->GetHttpsHyperlinks())
+		$sServerName = $_SERVER['SERVER_NAME'];
+		$sProtocol = isset($_SERVER['HTTPS']) ? 'https' : 'http';
+		if ($sProtocol == 'http')
 		{
-			// If a secure connection is required, or if the URL is requested to start with HTTPS
-			// then any URL must start with https !
-			$bForceHTTPS = true;
-		}
-		if ($bForceHTTPS)
-		{
-			$sProtocol = 'https';
-			$sPort = '';
+			$sPort = ($_SERVER['SERVER_PORT'] == 80) ? '' : ':'.$_SERVER['SERVER_PORT'];
 		}
 		else
 		{
-			$sProtocol = (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!="off")) ? 'https' : 'http';
-			$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
-			if ($sProtocol == 'http')
-			{
-				$sPort = ($iPort == 80) ? '' : ':'.$iPort;
-			}
-			else
-			{
-				$sPort = ($iPort == 443) ? '' : ':'.$iPort;
-			}
+			$sPort = ($_SERVER['SERVER_PORT'] == 443) ? '' : ':'.$_SERVER['SERVER_PORT'];
 		}
 		// $_SERVER['REQUEST_URI'] is empty when running on IIS
 		// Let's use Ivan Tcholakov's fix (found on www.dokeos.com)
@@ -285,46 +195,5 @@ class utils
 		
 		return $sUrl;
 	}
-	
-    /**
-     * Returns the absolute URL PATH of the current page
-     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
-     * @return string The absolute URL to the current page
-     */                   
-	static public function GetAbsoluteUrlPath($bForceHTTPS = false)
-	{
-		$sAbsoluteUrl = self::GetAbsoluteUrl(false, $bForceHTTPS); // False => Don't get the query string
-		$sAbsoluteUrl = substr($sAbsoluteUrl, 0, 1+strrpos($sAbsoluteUrl, '/')); // remove the current page, keep just the path, up to the last /
-		return $sAbsoluteUrl;
-	}
-
-    /**
-     * Returns the absolute URL to the server's root path
-     * @param $bForceHTTPS bool True to force HTTPS, false otherwise
-     * @return string The absolute URL to the server's root, without the first slash
-     */                   
-	static public function GetAbsoluteUrlRoot($bForceHTTPS = false)
-	{
-		$sAbsoluteUrl = self::GetAbsoluteUrl(false, $bForceHTTPS); // False => Don't get the query string
-		$sServerPos = 3 + strpos($sAbsoluteUrl, '://');
-		$iFirstSlashPos = strpos($sAbsoluteUrl, '/', $sServerPos);
-		if ($iFirstSlashPos !== false)
-		{
-			$sAbsoluteUrl = substr($sAbsoluteUrl, 0, $iFirstSlashPos); // remove the current page, keep just the path, without the first /
-		}
-		return $sAbsoluteUrl;
-	}
-
-	/**
-	 * Tells whether or not log off operation is supported.
-	 * Actually in only one case:
-	 * 1) iTop is using an internal authentication
-	 * 2) the user did not log-in using the "basic" mode (i.e basic authentication) or by passing credentials in the URL
-	 * @return boolean True if logoff is supported, false otherwise
-	 */
-	static function CanLogOff()
-	{
-		return (isset($_SESSION['login_mode']) && $_SESSION['login_mode'] == 'form');
-	}
 }
 ?>

application/webpage.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class WebPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 /**
  * Simple helper class to ease the production of HTML pages
  *
@@ -111,13 +87,6 @@ class WebPage
         return "<p>$s_html</p>\n";
     }
     
-	/**
-	* Adds a tabular content to the web page
-	* @param Hash $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
-	* @param Hash $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A column 'pkey' is expected for each row
-	* @param Hash $aParams Hash array. Extra parameters for the table.
-	* @return void
-	*/	  
 	public function table($aConfig, $aData, $aParams = array())
 	{
 		$this->add($this->GetTable($aConfig, $aData, $aParams));
@@ -142,9 +111,13 @@ class WebPage
 		$sHtml .= "<tbody>\n";
 		foreach($aData as $aRow)
 		{
-			if (isset($aRow['@class'])) // Row specific class, for hilighting certain rows
+			if (false) //(isset($aParams['preview']) && $aParams['preview'])
 			{
-				$sHtml .= "<tr class=\"{$aRow['@class']}\">\n";				
+				$sHtml .= "<tr id=\"Row_".$iNbTables."_".$aRow['key']."\" onClick=\"DisplayPreview(".$iNbTables.",".$aRow['key'].",'".$aParams['class']."')\">\n";
+			}
+			else if (isset($aRow['key']))
+			{
+				$sHtml .= "<tr onDblClick=\"DisplayDetails(".$aRow['key'].",'".$aParams['class']."')\">\n";
 			}
 			else
 			{
@@ -152,10 +125,17 @@ class WebPage
 			}
 			foreach($aConfig as $sName=>$aAttribs)
 			{
-				$aMatches = array();
 				$sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : '';
-				$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
-				$sHtml .= "<td $sClass>$sValue</td>\n";
+				if ($sName != 'key')
+				{
+					$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
+					$sHtml .= "<td $sClass>$sValue</td>\n";
+				}
+				else
+				{
+					$sUIPage = cmdbAbstractObject::ComputeUIPage($aParams['class']);
+					$sHtml .= "<td><a class=\"no-arrow\" href=\"$sUIPage?operation=details&id=".$aRow['key']."&class=".$aParams['class']."&".$oAppContext->GetForLink()."\"><img src=\"../images/zoom.gif\" title=\"Details\" border=\"0\"></a></td>\n";
+				}
 			}
 			$sHtml .= "</tr>\n";
 		}
@@ -269,7 +249,6 @@ class WebPage
         echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
         echo "<html>\n";
         echo "<head>\n";
-         echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
         echo "<title>{$this->s_title}</title>\n";
         echo $this->get_base_tag();
         foreach($this->a_linked_scripts as $s_script)

application/wizardhelper.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class WizardHelper
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('../application/uiwizard.class.inc.php');
 
 class WizardHelper
@@ -39,19 +15,13 @@ class WizardHelper
 	 */	 	 	 	
 	public function GetTargetObject($bReadUploadedFiles = false)
 	{
-		if (isset($this->m_aData['m_oCurrentValues']['id']))
-		{
-			$oObj = MetaModel::GetObject($this->m_aData['m_sClass'], $this->m_aData['m_oCurrentValues']['id']);
-		}
-		else
-		{
-			$oObj = MetaModel::NewObject($this->m_aData['m_sClass']);
-		}
-		foreach($this->m_aData['m_oCurrentValues'] as $sAttCode => $value)
+		$oObj = MetaModel::NewObject($this->m_aData['m_sClass']);
+		foreach($this->m_aData['m_aCurrentValues'] as $iIndex => $value)
 		{
+			$sAttCode = array_search($iIndex, $this->m_aData['m_oFieldsMap']);
 			// Because this is stored in a Javascript array, unused indexes
 			// are filled with null values
-			if ( ($sAttCode !='id') && ($sAttCode !== false) && ($value !== null))
+			if ( ($sAttCode !== false) && ($value !== null))
 			{
 				$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
 				if (($oAttDef->IsLinkSet()) && ($value != '') )
@@ -76,7 +46,7 @@ class WizardHelper
 							if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) )
 							{
 								$sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode);
-								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] != 0) )
+								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') )
 								{
 									// For external keys: load the target object so that external fields
 									// get filled too
@@ -134,6 +104,7 @@ class WizardHelper
 		// Protect against a request for a non existing field
 		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
 		{
+			$iIndex = $this->m_aData['m_oFieldsMap'][$sAttCode];
 			$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
 			if ($oAttDef->GetEditClass() == 'List')
 			{
@@ -153,13 +124,13 @@ class WizardHelper
 					}
 					$aData[] = $aRow;
 				}
-				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
+				$this->m_aData['m_aDefaultValue'][$iIndex] = json_encode($aData);
 				
 			}
 			else
 			{
 				// Normal handling for all other scalar attributes
-				$this->m_aData['m_oDefaultValue'][$sAttCode] = $value;
+				$this->m_aData['m_aDefaultValue'][$iIndex] = $value;
 			}
 		}
 	}
@@ -174,7 +145,8 @@ class WizardHelper
 		// Protect against a request for a non existing field
 		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
 		{
-			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
+			$iIndex = $this->m_aData['m_oFieldsMap'][$sAttCode];
+			$this->m_aData['m_aAllowedValues'][$iIndex] = $sHtml;
 		}
 	}
 	
@@ -229,15 +201,7 @@ class WizardHelper
 	
 	public function GetIdForField($sFieldName)
 	{
-		$sResult = '';
-		// It may happen that the field we'd like to update does not
-		// exist in the form. For example, if the field should be hidden/read-only
-		// in the current state of the object
-		if (isset($this->m_aData['m_oFieldsMap'][$sFieldName]))
-		{
-			$sResult = $this->m_aData['m_oFieldsMap'][$sFieldName];
-		}
-		return $sResult;
+		return $this->m_aData['m_oFieldsMap'][$sFieldName];
 	}
 	
 	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)

application/xmlpage.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class XMLPage
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once("../application/webpage.class.inc.php");
 /**
  * Simple web page with no includes or fancy formatting, useful to generateXML documents
@@ -30,63 +6,23 @@ require_once("../application/webpage.class.inc.php");
  */
 class XMLPage extends WebPage
 {
-	/**
-	 * For big XML files, it's better NOT to store everything in memory and output the XML piece by piece
-	 */
-	var $m_bPassThrough;
-	var $m_bHeaderSent;
-	
-    function __construct($s_title, $bPassThrough = false)
+    function __construct($s_title)
     {
         parent::__construct($s_title);
-        $this->m_bPassThrough = $bPassThrough;
-        $this->m_bHeaderSent = false;
-        $this->add_header("Content-type: text/xml; charset=utf-8");
+		$this->add_header("Content-type: text/xml; charset=utf-8");
 		$this->add_header("Cache-control: no-cache");
 		$this->add_header("Content-location: export.xml");
+		$this->add("<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n");
     }	
 
     public function output()
     {
-    	if (!$this->m_bPassThrough)
-    	{
-			$this->add("<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n");
-			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
-	        foreach($this->a_headers as $s_header)
-	        {
-	            header($s_header);
-	        }
-	        echo trim($this->s_content);
-    	}
-    }
-    
-    public function add($sText)
-    {
-    	if (!$this->m_bPassThrough)
-    	{
-    		parent::add($sText);
-    	}
-    	else
-    	{
-    		if ($this->m_bHeaderSent)
-    		{
-		   		echo $sText;
-    		}
-    		else
-    		{
-		        $s_captured_output = ob_get_contents();
-		        ob_end_clean();
-		        foreach($this->a_headers as $s_header)
-		        {
-		            header($s_header);
-		        }
-				echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n";
-		        echo trim($s_captured_output);
-		        echo trim($this->s_content);
-		        echo $sText;
-		        $this->m_bHeaderSent = true;
-    		}
-     	}
+		$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
+        foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+        echo trim($this->s_content);
     }
 
     public function small_p($sText)

business/ChangeMgmt.business.php

@@ -0,0 +1,305 @@
+<?php
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* A Change Ticket
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizChangeTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Change",
+			"description" => "Change ticket",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",  
+			"state_attcode" => "ticket_status",
+			"reconc_keys" => array("title"),
+			"db_table" => "change_ticket",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/change.html",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Ticket Ref", "description"=>"Refence number ofr this change", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("title", array("label"=>"Title", "description"=>"Overview of the Change", "allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeString("type", array("label"=>"Change Type", "description"=>"Type of the Change", "allowed_values"=>new ValueSetEnum("Routine, Normal, Emergency"), "sql"=>"type", "default_value"=>"Routine", "is_null_allowed"=>true, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeString("domain", array("label"=>"Domain", "description"=>"Domain for the Change", "allowed_values"=>new ValueSetEnum("Network,Server,Desktop,Application"), "sql"=>"domain", "default_value"=>"Desktop", "is_null_allowed"=>false, "depends_on"=>array())));
+
+    MetaModel::Init_AddAttribute(new AttributeString("reason", array("label"=>"Reason For Change", "description"=>"Reason for the Change", "allowed_values"=>null, "sql"=>"reason", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("requestor_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Requestor", "description"=>"who is requesting this change", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p WHERE p.org_id = :this->org_id'), "sql"=>"requestor_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id"))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("requestor_mail", array("label"=>"Requestor", "description"=>"mail of user requesting this change", "allowed_values"=>null, "extkey_attcode"=> 'requestor_id', "target_attcode"=>"email")));
+
+    
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Customer", "description"=>"who is impacted by the ticket", "allowed_values"=>null, "sql"=>"customer", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("label"=>"Customer", "description"=>"Name of the customer impacted by this ticket", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeEnum("ticket_status", array("label"=>"Status", "description"=>"Status of the ticket", "allowed_values"=>new ValueSetEnum("New, Validated,Rejected,Assigned,PlannedScheduled,Approved,NotApproved,Implemented,Monitored, Closed"), "sql"=>"change_status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array())));
+		// SetPossibleValues("status",array("Open","Monitored","Closed"));
+
+		MetaModel::Init_AddAttribute(new AttributeDate("creation_date", array("label"=>"Creation Date", "description"=>"Change creation date", "allowed_values"=>null, "sql"=>"creation_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    	// définir une date de défaut à maintenant, alias creation ou modification du ticket
+		MetaModel::Init_AddAttribute(new AttributeDate("last_update", array("label"=>"Last Update", "description"=>"last time the Ticket was modified", "allowed_values"=>null, "sql"=>"last_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeDate("start_date", array("label"=>"Start Date", "description"=>"Time the change is expected to start", "allowed_values"=>null, "sql"=>"start_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("end_date", array("label"=>"End Date", "description"=>"Date when the change is supposed to end", "allowed_values"=>null, "sql"=>"end_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("close_date", array("label"=>"Closure Date", "description"=>"Date when the Ticket was closed", "allowed_values"=>null, "sql"=>"closed_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Risk Assessment", "description"=>"Impact of the change", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Workgroup", "description"=>"which workgroup is owning ticket", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("label"=>"Workgroup", "description"=>"name of workgroup managing the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'workgroup_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Agent", "description"=>"who is managing the ticket", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('workgroup_id'))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("label"=>"Agent", "description"=>"name of agent managing the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email")));
+
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("supervisorgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Supervisor Group", "description"=>"which workgroup is supervising ticket", "allowed_values"=>null, "sql"=>"supervisorgroup_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("supervisorgroup_name", array("label"=>"Supervisor Group", "description"=>"name of the group supervising the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'supervisorgroup_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("supervisor_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Supervisor", "description"=>"who is managing the ticket", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->supervisorgroup_id'), "sql"=>"supervisor_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('supervisorgroup_id'))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("supervisor_mail", array("label"=>"Supervisor", "description"=>"name of agent supervising the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'supervisor_id', "target_attcode"=>"email")));
+
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("managergroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Manager Group", "description"=>"which workgroup is approving ticket", "allowed_values"=>null, "sql"=>"managergroup_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("managergroup_name", array("label"=>"Manager Group", "description"=>"name of workgroup approving the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'managergroup_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("manager_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Manager", "description"=>"who is approving the ticket", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->managergroup_id'), "sql"=>"manager_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('managergroup_id'))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("manager_mail", array("label"=>"Manager", "description"=>"name of agent approving the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'manager_id', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeEnum("outage", array("label"=>"Planned Outage", "description"=>"Flag to define if there is a planned outage", "allowed_values"=>new ValueSetEnum("Yes,No"), "sql"=>"outage", "default_value"=>"No", "is_null_allowed"=>true, "depends_on"=>array())));
+
+
+		MetaModel::Init_AddAttribute(new AttributeText("change_request", array("label"=>"Change Request", "description"=>"Description of Change required", "allowed_values"=>null, "sql"=>"change_req", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("change_log", array("label"=>"Implementation Log", "description"=>"List all action performed during the change", "allowed_values"=>null, "sql"=>"change_log", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeText("fallback", array("label"=>"Fallback Plan", "description"=>"Instruction to come back to former situation", "allowed_values"=>null, "sql"=>"fallback", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeInteger("assignment_count", array("label"=>"Assignment Count", "description"=>"Number of times this ticket was assigned or reassigned", "allowed_values"=>null, "sql"=>"assignment_count", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("impacted_infra_manual", array("label"=>"Impacted Infrastructure", "description"=>"CIs that are impacted by this change", "linked_class"=>"lnkInfraChangeTicket", "ext_key_to_me"=>"ticket_id", "ext_key_to_remote"=>"infra_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("title");
+		MetaModel::Init_AddFilterFromAttribute("type");
+		MetaModel::Init_AddFilterFromAttribute("domain");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("requestor_id");
+		MetaModel::Init_AddFilterFromAttribute("ticket_status");
+		MetaModel::Init_AddFilterFromAttribute("creation_date");
+		MetaModel::Init_AddFilterFromAttribute("start_date");
+		MetaModel::Init_AddFilterFromAttribute("last_update");
+		MetaModel::Init_AddFilterFromAttribute("end_date");
+		MetaModel::Init_AddFilterFromAttribute("close_date");
+		MetaModel::Init_AddFilterFromAttribute("workgroup_id");
+		MetaModel::Init_AddFilterFromAttribute("workgroup_name");
+		MetaModel::Init_AddFilterFromAttribute("supervisorgroup_id");
+		MetaModel::Init_AddFilterFromAttribute("managergroup_id");
+		MetaModel::Init_AddFilterFromAttribute("supervisor_id");
+		MetaModel::Init_AddFilterFromAttribute("manager_id");
+		MetaModel::Init_AddFilterFromAttribute("agent_id");
+		MetaModel::Init_AddFilterFromAttribute("impact");
+		MetaModel::Init_AddFilterFromAttribute("assignment_count");
+		MetaModel::Init_AddFilterFromAttribute("outage");
+
+		// doit-on aussi ajouter un filtre sur les extfields lié à une extkey ? ici le name de l'agent?
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name','title', 'org_id','type','domain','requestor_id','change_request','ticket_status', 'outage','impact', 'last_update', 'start_date','end_date', 'assignment_count', 'workgroup_id','agent_id','supervisorgroup_id','supervisor_id','managergroup_id','manager_id','change_log','fallback')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('name', 'title', 'org_id', 'ticket_status','outage','start_date','type')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'title', 'org_id', 'ticket_status','type', 'outage','requestor_id','workgroup_id','agent_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'title', 'org_id', 'ticket_status','type', 'outage','workgroup_id','agent_id')); // Criteria of the advanced search form
+
+		// State machine
+		MetaModel::Init_DefineState("New", array("label"=>"New (Unassigned)", "description"=>"Newly created ticket", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_MANDATORY, 'title' => OPT_ATT_MANDATORY, 'reason' => OPT_ATT_MANDATORY, 'impacted_infra_manual' => OPT_ATT_MANDATORY,
+												 'assignment_count' => OPT_ATT_HIDDEN, 'end_date' => OPT_ATT_HIDDEN, 'workgroup_id' => OPT_ATT_HIDDEN, 'supervisorgroup_id' => OPT_ATT_HIDDEN, 'managergroup_id' => OPT_ATT_HIDDEN, 'supervisor_id' => OPT_ATT_HIDDEN, 'manager_id' => OPT_ATT_HIDDEN, 'agent_id' => OPT_ATT_HIDDEN )));
+		MetaModel::Init_DefineState("Validated", array("label"=>"Validated", "description"=>"Ticket is validated", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY, 'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY, 'impacted_infra_manual' => OPT_ATT_MANDATORY,
+												 'assignment_count' => OPT_ATT_HIDDEN, 'end_date' => OPT_ATT_HIDDEN, 'workgroup_id' => OPT_ATT_MUSTCHANGE, 'supervisorgroup_id' => OPT_ATT_MUSTCHANGE, 'managergroup_id' => OPT_ATT_MUSTCHANGE, 'supervisor_id' => OPT_ATT_HIDDEN, 'manager_id' => OPT_ATT_HIDDEN, 'agent_id' => OPT_ATT_HIDDEN)));
+		MetaModel::Init_DefineState("Rejected", array("label"=>"Rejected", "description"=>"This ticket is not approved", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'org_id' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN, 'end_date' => OPT_ATT_HIDDEN)));
+		MetaModel::Init_DefineState("Assigned", array("label"=>"Assigned", "description"=>"Ticket is assigned", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY, 'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY, 'impacted_infra_manual' => OPT_ATT_MANDATORY,
+												 'assignment_count' => OPT_ATT_HIDDEN, 'end_date' => OPT_ATT_HIDDEN, 'workgroup_id' => OPT_ATT_MANDATORY, 'supervisorgroup_id' => OPT_ATT_MANDATORY, 'managergroup_id' => OPT_ATT_MANDATORY, 'supervisor_id' => OPT_ATT_MUSTCHANGE, 'manager_id' => OPT_ATT_MUSTCHANGE, 'agent_id' => OPT_ATT_MUSTCHANGE)));
+		
+    MetaModel::Init_DefineState("PlannedScheduled", array("label"=>"Planned&Scheduled", "description"=>"Evaluation is done for this change", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'org_id' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN,'start_date' => OPT_ATT_MANDATORY, 'end_date' => OPT_ATT_MANDATORY, 'impact' => OPT_ATT_MANDATORY, 'workgroup_id' => OPT_ATT_READONLY,'supervisorgroup_id' => OPT_ATT_READONLY, 'managergroup_id' => OPT_ATT_READONLY, 'supervisor_id' => OPT_ATT_MANDATORY, 'manager_id' => OPT_ATT_MANDATORY, 'agent_id' => OPT_ATT_MANDATORY, 'change_log' => OPT_ATT_MANDATORY,'fallback' => OPT_ATT_MANDATORY,'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY,'requestor_id' => OPT_ATT_READONLY,'domain' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY)));
+		MetaModel::Init_DefineState("Approved", array("label"=>"Approved", "description"=>"Ticket is approved by CAB", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'org_id' => OPT_ATT_READONLY,'outage' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN,'start_date' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_MANDATORY, 'impact' => OPT_ATT_READONLY, 'workgroup_id' => OPT_ATT_READONLY,'supervisorgroup_id' => OPT_ATT_READONLY, 'managergroup_id' => OPT_ATT_READONLY, 'supervisor_id' => OPT_ATT_READONLY, 'manager_id' => OPT_ATT_READONLY, 'agent_id' => OPT_ATT_MANDATORY, 'change_log' => OPT_ATT_MANDATORY,'fallback' => OPT_ATT_MANDATORY,'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY,'requestor_id' => OPT_ATT_READONLY,'domain' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY)));
+		MetaModel::Init_DefineState("NotApproved", array("label"=>"Not Approved", "description"=>"Ticket has not been approved by CAB", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'org_id' => OPT_ATT_READONLY,'outage' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN,'start_date' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_MANDATORY, 'impact' => OPT_ATT_READONLY, 'workgroup_id' => OPT_ATT_READONLY,'supervisorgroup_id' => OPT_ATT_READONLY, 'managergroup_id' => OPT_ATT_READONLY, 'supervisor_id' => OPT_ATT_READONLY, 'manager_id' => OPT_ATT_READONLY, 'agent_id' => OPT_ATT_MANDATORY, 'change_log' => OPT_ATT_MANDATORY,'fallback' => OPT_ATT_MANDATORY,'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY,'requestor_id' => OPT_ATT_READONLY,'domain' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY)));
+		MetaModel::Init_DefineState("Implemented", array("label"=>"Implementation", "description"=>"Work is in progress for this ticket", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'org_id' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN,'start_date' => OPT_ATT_READONLY,'outage' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_MANDATORY, 'impact' => OPT_ATT_READONLY, 'workgroup_id' => OPT_ATT_READONLY,'supervisorgroup_id' => OPT_ATT_READONLY, 'managergroup_id' => OPT_ATT_READONLY, 'supervisor_id' => OPT_ATT_READONLY, 'manager_id' => OPT_ATT_READONLY, 'agent_id' => OPT_ATT_MANDATORY, 'change_log' => OPT_ATT_MANDATORY,'fallback' => OPT_ATT_MANDATORY,'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY,'requestor_id' => OPT_ATT_READONLY,'domain' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY)));
+		MetaModel::Init_DefineState("Monitored", array("label"=>"Monitored", "description"=>"Change performed is now monitored", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'org_id' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN,'start_date' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_READONLY, 'impact' => OPT_ATT_READONLY, 'workgroup_id' => OPT_ATT_READONLY,'supervisorgroup_id' => OPT_ATT_READONLY, 'managergroup_id' => OPT_ATT_READONLY, 'supervisor_id' => OPT_ATT_READONLY, 'manager_id' => OPT_ATT_READONLY, 'agent_id' => OPT_ATT_READONLY, 'change_log' => OPT_ATT_READONLY,'fallback' => OPT_ATT_READONLY,'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY,'requestor_id' => OPT_ATT_READONLY,'domain' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY)));
+	  	MetaModel::Init_DefineState("Closed", array("label"=>"Closed", "description"=>"Ticket is closed", "attribute_inherit"=>null, "attribute_list"=>array('name' => OPT_ATT_READONLY,'outage' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY,'assignment_count' => OPT_ATT_HIDDEN,'start_date' => OPT_ATT_READONLY,'end_date' => OPT_ATT_READONLY,'last_update' => OPT_ATT_READONLY,'close_date' => OPT_ATT_READONLY, 'impact' => OPT_ATT_READONLY, 'workgroup_id' => OPT_ATT_READONLY,'supervisorgroup_id' => OPT_ATT_READONLY, 'managergroup_id' => OPT_ATT_READONLY, 'supervisor_id' => OPT_ATT_READONLY, 'manager_id' => OPT_ATT_READONLY, 'agent_id' => OPT_ATT_READONLY, 'change_log' => OPT_ATT_READONLY,'fallback' => OPT_ATT_READONLY,'title' => OPT_ATT_READONLY, 'reason' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY,'requestor_id' => OPT_ATT_READONLY,'domain' => OPT_ATT_READONLY,'change_request' => OPT_ATT_READONLY,'creation_date' => OPT_ATT_READONLY)));
+
+		MetaModel::Init_DefineStimulus("ev_validate", new StimulusUserAction(array("label"=>"Validate this change", "description"=>"Make sure it is a valid change request")));
+		MetaModel::Init_DefineStimulus("ev_reject", new StimulusUserAction(array("label"=>"Reject this change", "description"=>"This change request is rejected because it is a non valid one")));
+		MetaModel::Init_DefineStimulus("ev_assign", new StimulusUserAction(array("label"=>"Assign this change", "description"=>"This change request is assigned")));
+
+		MetaModel::Init_DefineStimulus("ev_reopen", new StimulusUserAction(array("label"=>"Modify this change", "description"=>"Update change request to make it valid")));
+		MetaModel::Init_DefineStimulus("ev_plan", new StimulusUserAction(array("label"=>"Plan this change", "description"=>"Plan and Schedule this change for validation")));
+	  	MetaModel::Init_DefineStimulus("ev_approve", new StimulusUserAction(array("label"=>"Approve this change", "description"=>"This change is approved by CAB")));
+		MetaModel::Init_DefineStimulus("ev_replan", new StimulusUserAction(array("label"=>"Update planning and schedule", "description"=>"Modify Plan and Schedule in order to have this change re-validated")));
+		MetaModel::Init_DefineStimulus("ev_notapprove", new StimulusUserAction(array("label"=>"Not approve this change", "description"=>"This change is not approved by CAB")));
+		MetaModel::Init_DefineStimulus("ev_implement", new StimulusUserAction(array("label"=>"Implement this change", "description"=>"Implementation pahse for current change")));
+		MetaModel::Init_DefineStimulus("ev_monitor", new StimulusUserAction(array("label"=>"Monitor this change", "description"=>"Starting monitoring period for this change")));
+		MetaModel::Init_DefineStimulus("ev_finish", new StimulusUserAction(array("label"=>"Close change", "description"=>"Change is done, and can be closed")));
+
+		MetaModel::Init_DefineTransition("New", "ev_validate", array("target_state"=>"Validated", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("New", "ev_reject", array("target_state"=>"Rejected", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Rejected", "ev_reopen", array("target_state"=>"New", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Validated", "ev_assign", array("target_state"=>"Assigned", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Assigned", "ev_plan", array("target_state"=>"PlannedScheduled", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+
+		MetaModel::Init_DefineTransition("PlannedScheduled", "ev_approve", array("target_state"=>"Approved", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("PlannedScheduled", "ev_notapprove", array("target_state"=>"NotApproved", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("NotApproved", "ev_replan", array("target_state"=>"PlannedScheduled", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Approved", "ev_implement", array("target_state"=>"Implemented", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Implemented", "ev_monitor", array("target_state"=>"Monitored", "actions"=>array('SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Implemented", "ev_finish", array("target_state"=>"Closed", "actions"=>array('SetClosureDate','SetLastUpDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Monitored", "ev_finish", array("target_state"=>"Closed", "actions"=>array('SetClosureDate','SetLastUpDate'), "user_restriction"=>null));		
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('org_id', $oGenerator->GetOrganizationId());
+		$this->Set('title', $oGenerator->GenerateString("enum(Site,Server,Line)| |enum(is down,is flip-flopping,is not responding)"));
+		$this->Set('agent_id', $oGenerator->GenerateKey("bizPerson", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_status', $oGenerator->GenerateString("enum(Open,Closed,Closed,Monitored)"));
+		$this->Set('start_date', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+		$this->Set('last_update', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+		$this->Set('end_date', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+	}
+	
+	
+	
+	// State machine actions
+	public function IncrementAssignmentCount($sStimulusCode)
+	{
+		$this->Set('assignment_count', $this->Get('assignment_count') + 1);
+		return true;
+	}
+	
+	public function SetClosureDate($sStimulusCode)
+	{
+		$this->Set('end_date', time());
+		return true;
+	}
+	public function SetLastUpDate($sStimulusCode)
+	{
+		$this->Set('last_update', time());
+		return true;
+	}
+
+	public function ComputeValues()
+	{
+		$iKey = $this->GetKey();
+		if ($iKey < 0)
+		{
+			// Object not yet in the Database
+			$iKey = MetaModel::GetNextKey(get_class($this));
+		}
+		$sName = sprintf('C-%06d', $iKey);
+		$this->Set('name', $sName);
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Infra and a Change Ticket
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkInfraChangeTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Infra Change Ticket",
+			"description" => "Infra impacted by a Change ticket",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "impact",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("impact"),  // ????
+			"db_table" => "infra_changeticket",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_id", array("targetclass"=>"logInfra", "jointype"=> '', "label"=>"Infrastructure", "description"=>"The infrastructure impacted", "allowed_values"=>null, "sql"=>"infra_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_name", array("label"=>"Infrastructure Name", "description"=>"Name of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ticket_id", array("targetclass"=>"bizChangeTicket", "jointype"=> '', "label"=>"Ticket", "description"=>"Ticket number", "allowed_values"=>null, "sql"=>"ticket_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("label"=>"Ticket Name", "description"=>"Name of the ticket", "allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Level of impact of the infra by the related ticket", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("infra_id");
+		MetaModel::Init_AddFilterFromAttribute("ticket_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('infra_id', 'ticket_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('infra_id', 'ticket_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('infra_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('impact', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+}
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any contact and a Contract
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkContactChange extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "ContactChangeLink",
+			"description" => "Contact associated to a change",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "role",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("role"),  // ????
+			"db_table" => "contact_change",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contact_id", array("targetclass"=>"bizContact", "jointype"=> '', "label"=>"Contact", "description"=>"The contact linked to contract", "allowed_values"=>null, "sql"=>"contact_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contact_mail", array("label"=>"Contact E-mail", "description"=>"Mail for the contact", "allowed_values"=>null, "extkey_attcode"=> 'contact_id', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("change_id", array("targetclass"=>"bizChangeTicket", "jointype"=> '', "label"=>"Change Ticket", "description"=>"Change ticket ID", "allowed_values"=>null, "sql"=>"change_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("change_number", array("label"=>"Change Ticket", "description"=>"Ticket number for this change", "allowed_values"=>null, "extkey_attcode"=> 'change_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("role", array("label"=>"Role", "description"=>"Role of this contact for this change", "allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("change_id");
+		MetaModel::Init_AddFilterFromAttribute("contact_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('change_id', 'contact_id', 'role')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('change_id', 'contact_id', 'role')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('change_id', 'contact_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('change_id', 'contact_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('contract_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('contact_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('role', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+
+?>

business/Changes-04-Sep-2007.php

@@ -0,0 +1,32 @@
+Changements principaux:
+- la classe AbstractObject est sortie du biz model
+- join_type remplacé par is_null_allowed (placé à la fin pour être + facile à retrouver)
+- j'ai enlevé toute la classe logLocatedObject qui était en commentaire
+- Enlevé 'address' de l'advanced search sur une location car ce n'est plus un critère de recherche possible (remplacé par country)
+- Ajouté des critères de recherche sur bizCircuit
+- Ajouté les ZList sur bizCircuit
+- Ajouté les Zlist pour bizInterface
+- Ajouté les Zlist pour lnkInfraInfra
+- Ajouté les Zlist pour lnkInfraTicket
+
+Dans AbstractObject: désactivé l'affichage des contacts liés qui ne marche pas pour les tickets.
+
+Bug fix ?
+- J'ai rajouté un blindage if (is_object($proposedValue) &&... dans AttributeDate::MakeRealValue mais je ne comprends pas d'où sort la classe DateTime... et pourtant il y en a...
+
+Améliorations:
+- Ajouter une vérification des ZList (les attributs/critèresde recherche déclarés dans la liste existent-ils pour cet objet)
+
+Ne marche pas:
+- Objets avec des clefs externes vides
+- Enums !!!!
+
+Data Generator:
+Organization '1' updated.
+5 Location objects created.
+19 PC objects created.
+19 Network Device objects created.
+42 Person objects created.
+6 Incident objects created.
+17 Infra Group objects created.
+34 Infra Infra objects created.

business/KEDB.business.php

@@ -0,0 +1,163 @@
+<?php
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* Description of known error
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizKnownError extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Known Error",
+			"description" => "Error documented for a known issue",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array("org_id", "name"), // inherited attributes
+			"db_table" => "known_error",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/knownError.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+    MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Name", "description"=>"Name to identify this error", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Organization", "description"=>"Organization for this known error", "allowed_values"=>null, "sql"=>"cust_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("cust_name", array("label"=>"Organization", "description"=>"Company / Department owning this object", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+
+   	MetaModel::Init_AddAttribute(new AttributeText("symptom", array("label"=>"Symptom", "description"=>"Description of this error", "allowed_values"=>null, "sql"=>"symptom", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+ 	 	MetaModel::Init_AddAttribute(new AttributeText("root_cause", array("label"=>"Root cause", "description"=>"Original cause for this known error", "allowed_values"=>null, "sql"=>"rootcause", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+ 	  MetaModel::Init_AddAttribute(new AttributeText("workaround", array("label"=>"Workaround", "description"=>"Work around to fix this error", "allowed_values"=>null, "sql"=>"workaround", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+ 		MetaModel::Init_AddAttribute(new AttributeText("solution", array("label"=>"Solution", "description"=>"Description of this contract", "allowed_values"=>null, "sql"=>"solution", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+ 
+    MetaModel::Init_AddAttribute(new AttributeString("error_code", array("label"=>"Error Code", "description"=>"Key word to identify error", "allowed_values"=>null, "sql"=>"error_code", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("domain", array("label"=>"Domain", "description"=>"Domain for this known error, network, desktop, ...", "allowed_values"=>new ValueSetEnum("Network, Server, Application, Desktop"), "sql"=>"domain", "default_value"=>"Application", "is_null_allowed"=>false, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeString("vendor", array("label"=>"Vendor", "description"=>"Vendor concerned by this known error", "allowed_values"=>null, "sql"=>"vendor", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeString("model", array("label"=>"Model", "description"=>"Model concerned by this known error, it may be an application, a device ...", "allowed_values"=>null, "sql"=>"model", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeString("version", array("label"=>"Version", "description"=>"Version related to model impacted by known error", "allowed_values"=>null, "sql"=>"version", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("cust_name");
+		MetaModel::Init_AddFilterFromAttribute("error_code");
+		MetaModel::Init_AddFilterFromAttribute("domain");
+		
+
+
+		
+
+		MetaModel::Init_SetZListItems('details', array('name', 'org_id','error_code','domain','vendor','model','version', 'symptom','root_cause','workaround','solution')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'org_id','error_code', 'symptom')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'error_code','domain')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'org_id','error_code', 'error_code','symptom')); // Criteria of the advanced search form
+
+	}
+	
+	// State machine actions
+	public function IncrementVersion($sStimulusCode)
+	{
+		$this->Set('version_number', $this->Get('version_number') + 1);
+		return true;
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Infra and a Known Error
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkInfraError extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "InfraErrorLinks",
+			"description" => "Infra related to a known error",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("infra_id","error_id"),  // ????
+			"db_table" => "infra_error_links",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_id", array("targetclass"=>"logInfra", "jointype"=> '', "label"=>"Infrastructure", "description"=>"The infrastructure impacted", "allowed_values"=>null, "sql"=>"infra_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_name", array("label"=>"Infrastructure Name", "description"=>"Name of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_status", array("label"=>"Status", "description"=>"Status of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"status")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("error_id", array("targetclass"=>"bizKnownError", "jointype"=> '', "label"=>"Error", "description"=>"Error id", "allowed_values"=>null, "sql"=>"error_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("error_name", array("label"=>"Error Name", "description"=>"Name of the error", "allowed_values"=>null, "extkey_attcode"=> 'error_id', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddFilterFromAttribute("infra_id");
+		MetaModel::Init_AddFilterFromAttribute("error_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('infra_id', 'error_id')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('infra_id', 'infra_status','error_id')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('infra_id', 'error_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('infra_id', 'error_id')); // Criteria of the advanced search form
+	}
+
+	
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Contract and a Document
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkDocumentError extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "DocumentsErrorLinks",
+			"description" => "A link between a document and a known error",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "link_type",
+			"state_attcode" => "",
+			"reconc_keys" => array("doc_name", "error_name"),
+			"db_table" => "documents_error_link",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("doc_id", array("targetclass"=>"bizDocument", "label"=>"Document", "description"=>"id of the Document", "allowed_values"=>null, "sql"=>"doc_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("doc_name", array("label"=>"Document Name", "description"=>"name of the document", "allowed_values"=>null, "extkey_attcode"=> 'doc_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("error_id", array("targetclass"=>"bizKnownError", "label"=>"Error", "description"=>"Error linked to this document", "allowed_values"=>null, "sql"=>"error_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("error_name", array("label"=>"Error Name", "description"=>"name of the linked error", "allowed_values"=>null, "extkey_attcode"=> 'error_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("link_type", array("label"=>"Link Type", "description"=>"More information", "allowed_values"=>null, "sql"=>"link_type", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("doc_id");
+		MetaModel::Init_AddFilterFromAttribute("doc_name");
+		MetaModel::Init_AddFilterFromAttribute("error_id");
+		MetaModel::Init_AddFilterFromAttribute("error_name");
+		MetaModel::Init_AddFilterFromAttribute("link_type");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('doc_id', 'error_name', 'link_type')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('doc_id', 'error_name', 'link_type')); // Attributes to be displayed for a list
+	}
+}
+
+
+?>

business/ServiceDesk.business.php

@@ -0,0 +1,276 @@
+<?php
+
+
+/**
+ * ServiceDesk.businnes.php
+ * Define business model for Service Desk module
+ *
+ * @package     iTopBizModelSamples
+ * @author      Erwan Taloc <erwan.taloc@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* An Incident Ticket
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizServiceCall extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "ServiceCall",
+			"description" => "Service Call from customer",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",  
+			"state_attcode" => "call_status",
+			"reconc_keys" => array("title"),
+			"db_table" => "servicecall",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/serviceCall.html",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Service Call Ref", "description"=>"Refence identifier for this service call", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("title", array("label"=>"Title", "description"=>"Overview of the service call", "allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+   	
+    MetaModel::Init_AddAttribute(new AttributeEnum("type", array("label"=>"Type", "description"=>"Type of the Incident", "allowed_values"=>new ValueSetEnum("Network,Server,Desktop,Application"), "sql"=>"type", "default_value"=>"Server", "is_null_allowed"=>false, "depends_on"=>array())));
+     MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Customer", "description"=>"Customer concerned by this service call", "allowed_values"=>null, "sql"=>"customer", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("label"=>"Customer", "description"=>"Name of the customer raising this service call", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeEnum("call_status", array("label"=>"Status", "description"=>"Status of the ticket", "allowed_values"=>new ValueSetEnum("New, Assigned, WorkInProgress,Resolved,Closed"), "sql"=>"call_status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array())));
+		// SetPossibleValues("status",array("Open","Monitored","Closed"));
+		MetaModel::Init_AddAttribute(new AttributeText("call_description", array("label"=>"Description", "description"=>"Description of the call as describe by caller", "allowed_values"=>null, "sql"=>"call_description", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("creation_date", array("label"=>"Creation date", "description"=>"Call creation date", "allowed_values"=>null, "sql"=>"creation_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    // définir une date de défaut à maintenant, alias creation ou modification du ticket
+		MetaModel::Init_AddAttribute(new AttributeDate("last_update", array("label"=>"Last update", "description"=>"last time the call was modified", "allowed_values"=>null, "sql"=>"last_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeDate("next_update", array("label"=>"Next update", "description"=>"next time the Ticket is expected to be  modified", "allowed_values"=>null, "sql"=>"next_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDate("end_date", array("label"=>"Closure Date", "description"=>"Date when the call was closed", "allowed_values"=>null, "sql"=>"closed_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Caller", "description"=>"person that trigger this call", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p WHERE p.org_id = :this->org_id'), "sql"=>"caller_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('org_id'))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("caller_mail", array("label"=>"Caller", "description"=>"Person that trigger this call", "allowed_values"=>null, "extkey_attcode"=> 'caller_id', "target_attcode"=>"email")));
+	
+  	MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Impact for this call", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+  	MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Workgroup", "description"=>"which workgroup is owning call", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("label"=>"Workgroup", "description"=>"name of workgroup managing the call", "allowed_values"=>null, "extkey_attcode"=> 'workgroup_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Agent", "description"=>"who is managing the call", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id"))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("label"=>"Agent", "description"=>"mail of agent managing the call", "allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email")));
+		// Comment afficher le first + last name de l'agent ? Est-ce utile d'ajouter ce champ?
+		MetaModel::Init_AddAttribute(new AttributeText("action_log", array("label"=>"Action Logs", "description"=>"List all action performed during the call", "allowed_values"=>null, "sql"=>"action_log", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("severity", array("label"=>"Severity", "description"=>"Field defining the criticity for the call", "allowed_values"=>new ValueSetEnum("critical,medium,low"), "sql"=>"criticity", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("resolution", array("label"=>"Resolution", "description"=>"Description of the resolution", "allowed_values"=>null, "sql"=>"resolution", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source", array("label"=>"Source", "description"=>"source type for this call", "allowed_values"=>new ValueSetEnum("phone,E-mail,Fax"), "sql"=>"source", "default_value"=>"phone", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("impacted_infra_manual", array("label"=>"Impacted Infrastructure", "description"=>"CIs that are not meeting the SLA", "linked_class"=>"lnkInfraCall", "ext_key_to_me"=>"call_id", "ext_key_to_remote"=>"infra_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("related_tickets", array("label"=>"Related Incident", "description"=>"Other incident tickets related to this call", "linked_class"=>"lnkCallTicket", "ext_key_to_me"=>"call_id", "ext_key_to_remote"=>"ticket_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(/*'impacted_infra_computed',*/ 'impacted_infra_manual'))));
+
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("title");
+		MetaModel::Init_AddFilterFromAttribute("type");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("caller_id");
+		MetaModel::Init_AddFilterFromAttribute("call_status");
+		MetaModel::Init_AddFilterFromAttribute("creation_date");
+		MetaModel::Init_AddFilterFromAttribute("last_update");
+		MetaModel::Init_AddFilterFromAttribute("end_date");
+		MetaModel::Init_AddFilterFromAttribute("workgroup_id");
+		MetaModel::Init_AddFilterFromAttribute("agent_id");
+		MetaModel::Init_AddFilterFromAttribute("severity");
+    MetaModel::Init_AddFilterFromAttribute("source");
+
+		// doit-on aussi ajouter un filtre sur les extfields lié à une extkey ? ici le name de l'agent?
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name','title', 'org_id', 'type','call_status','source', 'severity','creation_date', 'call_description', 'caller_id', 'impact', 'last_update', 'end_date', 'workgroup_id','agent_id','action_log','resolution')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('name', 'title', 'org_id', 'type','call_status','severity','creation_date')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'title', 'org_id','source', 'caller_id','type', 'call_status', 'severity','creation_date', 'last_update','end_date','agent_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'title', 'org_id', 'caller_id','type', 'call_status', 'severity','creation_date', 'last_update','end_date','agent_id')); // Criteria of the advanced search form
+
+		// State machine
+		MetaModel::Init_DefineState("New", array("label"=>"New (Unassigned)", "description"=>"Newly created call", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_HIDDEN, 'last_update' =>  OPT_ATT_READONLY,
+												 "title"=>OPT_ATT_MANDATORY, "org_id"=>OPT_ATT_MANDATORY, "caller_id"=>OPT_ATT_MANDATORY, "call_description"=>OPT_ATT_MANDATORY, "creation_date"=>OPT_ATT_MANDATORY, "workgroup_id"=>OPT_ATT_MANDATORY,
+												 "severity"=>OPT_ATT_MANDATORY, "agent_id"=>OPT_ATT_HIDDEN,"impacted_infra_manual"=>OPT_ATT_MANDATORY, "related_tickets"=>OPT_ATT_MUSTPROMPT)));
+		MetaModel::Init_DefineState("Assigned", array("label"=>"Assigned", "description"=>"Call is assigned to somebody", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY, "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY,"source"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "call_description"=>OPT_ATT_READONLY, "creation_date"=>OPT_ATT_READONLY,'end_date' => OPT_ATT_HIDDEN, "workgroup_id"=>OPT_ATT_READONLY, "agent_id"=>OPT_ATT_MUSTCHANGE)));
+		MetaModel::Init_DefineState("WorkInProgress", array("label"=>"Work In Progress", "description"=>"Work is in progress", "attribute_inherit"=>null, "attribute_list"=>array('name' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_HIDDEN, 'last_update' =>  OPT_ATT_READONLY,
+												 "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY,"source"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "call_description"=>OPT_ATT_READONLY, "creation_date"=>OPT_ATT_READONLY, "workgroup_id"=>OPT_ATT_READONLY,
+												 "severity"=>OPT_ATT_MANDATORY, "agent_id"=>OPT_ATT_MANDATORY,"action_log"=>OPT_ATT_MUSTPROMPT,"impacted_infra_manual"=>OPT_ATT_MANDATORY, "related_tickets"=>OPT_ATT_MUSTPROMPT)));
+		MetaModel::Init_DefineState("Resolved", array("label"=>"Resolved", "description"=>"Call is resolved", "attribute_inherit"=>null, "attribute_list"=>array('name' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_HIDDEN, 'last_update' =>  OPT_ATT_READONLY,
+												 "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY, "source"=>OPT_ATT_READONLY,"caller_id"=>OPT_ATT_READONLY, "call_description"=>OPT_ATT_READONLY, "creation_date"=>OPT_ATT_READONLY, "workgroup_id"=>OPT_ATT_READONLY,
+												 "severity"=>OPT_ATT_READONLY, "agent_id"=>OPT_ATT_READONLY,"action_log"=>OPT_ATT_READONLY,"impacted_infra_manual"=>OPT_ATT_MANDATORY, "related_tickets"=>OPT_ATT_MUSTPROMPT, "resolution"=>OPT_ATT_MUSTCHANGE)));
+		MetaModel::Init_DefineState("Closed", array("label"=>"Closed", "description"=>"Call is closed", "attribute_inherit"=>null, "attribute_list"=>array('name' => OPT_ATT_READONLY, 'end_date' => OPT_ATT_READONLY, 'last_update' =>  OPT_ATT_READONLY,"next_update"=>OPT_ATT_READONLY,
+												 "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY,"source"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "call_description"=>OPT_ATT_READONLY, "creation_date"=>OPT_ATT_READONLY,"impact"=>OPT_ATT_READONLY,"type"=>OPT_ATT_READONLY, "workgroup_id"=>OPT_ATT_READONLY,
+												 "severity"=>OPT_ATT_READONLY, "agent_id"=>OPT_ATT_READONLY,"action_log"=>OPT_ATT_READONLY,"impacted_infra_manual"=>OPT_ATT_READONLY, "related_tickets"=>OPT_ATT_READONLY, "resolution"=>OPT_ATT_READONLY)));
+
+		MetaModel::Init_DefineStimulus("ev_assign", new StimulusUserAction(array("label"=>"Assign this call", "description"=>"Assign this call to a group and an agent")));
+		MetaModel::Init_DefineStimulus("ev_reassign", new StimulusUserAction(array("label"=>"Reassign this call", "description"=>"Reassign this call to a different group and agent")));
+		MetaModel::Init_DefineStimulus("ev_start_working", new StimulusUserAction(array("label"=>"Work on this call", "description"=>"Start working on this call")));
+		MetaModel::Init_DefineStimulus("ev_resolve", new StimulusUserAction(array("label"=>"Resolve this call", "description"=>"Resolve this call")));
+		MetaModel::Init_DefineStimulus("ev_close", new StimulusUserAction(array("label"=>"Close this call", "description"=>"Close this call")));
+
+		MetaModel::Init_DefineTransition("New", "ev_assign", array("target_state"=>"Assigned", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Assigned", "ev_reassign", array("target_state"=>"Assigned", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Assigned", "ev_start_working", array("target_state"=>"WorkInProgress", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("WorkInProgress", "ev_reassign", array("target_state"=>"Assigned", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("WorkInProgress", "ev_resolve", array("target_state"=>"Resolved", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Resolved", "ev_close", array("target_state"=>"Closed", "actions"=>array('SetLastUpdate','SetClosureDate'), "user_restriction"=>null));
+		
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('org_id', $oGenerator->GetOrganizationId());
+		$this->Set('title', $oGenerator->GenerateString("enum(Site,Server,Line)| |enum(is down,is flip-flopping,is not responding)"));
+		$this->Set('agent_id', $oGenerator->GenerateKey("bizPerson", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('call_status', $oGenerator->GenerateString("enum(Open,Closed,Closed,Monitored)"));
+		$this->Set('creation_date', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+		$this->Set('last_update', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+		$this->Set('end_date', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+	}
+	
+	// State machine actions
+
+	
+	public function SetClosureDate($sStimulusCode)
+	{
+		$this->Set('end_date', time());
+		return true;
+	}
+	
+			public function SetLastUpdate($sStimulusCode)
+	{
+		$this->Set('last_update', time());
+		return true;
+	}
+	
+	public function ComputeValues()
+	{
+		$iKey = $this->GetKey();
+		if ($iKey < 0)
+		{
+			// Object not yet in the Database
+			$iKey = MetaModel::GetNextKey(get_class($this));
+		}
+		$sName = sprintf('S-%06d', $iKey);
+		$this->Set('name', $sName);
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any ticket and a Call
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkCallTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Call Ticket",
+			"description" => "Ticket related to a call",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "impact",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("impact"),  // ????
+			"db_table" => "call_ticket",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ticket_id", array("targetclass"=>"bizIncidentTicket", "jointype"=> '', "label"=>"Related Ticket", "description"=>"The related ticket", "allowed_values"=>null, "sql"=>"ticket_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("label"=>"Related ticket", "description"=>"Name of the related ticket", "allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("call_id", array("targetclass"=>"bizServiceCall", "jointype"=> '', "label"=>"Call", "description"=>"Ticket number", "allowed_values"=>null, "sql"=>"call_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("call_name", array("label"=>"Call name", "description"=>"Name of the call", "allowed_values"=>null, "extkey_attcode"=> 'call_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Impact on the call", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("ticket_id");
+		MetaModel::Init_AddFilterFromAttribute("call_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('ticket_id', 'call_id', 'impact')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('ticket_id', 'call_id', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('ticket_id', 'call_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('ticket_id', 'call_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('call_id', $oGenerator->GenerateKey("bizServiceCall", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('impact', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Infra and a Call
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkInfraCall extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Infra Call",
+			"description" => "Infra concerned by a call",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "impact",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("impact"),  // ????
+			"db_table" => "infra_call",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_id", array("targetclass"=>"logInfra", "jointype"=> '', "label"=>"Infrastructure", "description"=>"The infrastructure impacted", "allowed_values"=>null, "sql"=>"infra_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_name", array("label"=>"Infrastructure Name", "description"=>"Name of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("call_id", array("targetclass"=>"bizServiceCall", "jointype"=> '', "label"=>"Call", "description"=>"Call number", "allowed_values"=>null, "sql"=>"call_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("call_name", array("label"=>"Call name", "description"=>"Name of the call", "allowed_values"=>null, "extkey_attcode"=> 'call_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Level of impact of the infra by the related ticket", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("infra_id");
+		MetaModel::Init_AddFilterFromAttribute("call_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('infra_id', 'call_id', 'impact')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('infra_id', 'call_id', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('infra_id', 'call_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('infra_id', 'call_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('infra_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('call_id', $oGenerator->GenerateKey("bizServiceCall", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('impact', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+
+
+
+
+?>

business/ServiceMgmt.business.php

@@ -0,0 +1,338 @@
+<?php
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* Description of a service provided by an organization
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizService extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Service",
+			"description" => "Service provided by an organization",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",
+			//"state_attcode" => "status",
+			"state_attcode" => "",
+			"reconc_keys" => array("org_id", "name"), // inherited attributes
+			"db_table" => "services",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/service.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+    MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Name", "description"=>"Name of the service", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Provider", "description"=>"Provider for this service", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("provider_name", array("label"=>"Provider", "description"=>"name of the Provider", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+ 	  MetaModel::Init_AddAttribute(new AttributeEnum("service_category", array("label"=>"Service Category", "description"=>"Category for this contract", "allowed_values"=>new ValueSetEnum("Server,Network,End-User,Desktop,Application"), "sql"=>"service_category", "default_value"=>"End-User", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("label"=>"Description", "description"=>"Description of this service", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("label"=>"Status", "description"=>"Status of the service", "allowed_values"=>new ValueSetEnum("New, Implementation,Production,Obsolete"), "sql"=>"status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("label"=>"Type", "description"=>"Type of the service", "allowed_values"=>new ValueSetEnum("Hardware,Software,Support"), "sql"=>"type", "default_value"=>"Support", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("service_category");
+		MetaModel::Init_AddFilterFromAttribute("type");
+		MetaModel::Init_AddFilterFromAttribute("status");
+
+/*
+		// Life cycle
+		MetaModel::Init_DefineState("New", array("label"=>"New", "description"=>"Newly created service", "attribute_inherit"=>null,
+												 "attribute_list"=>array()));
+		MetaModel::Init_DefineState("Implementation", array("label"=>"Implementing", "description"=>"The service is being worked on", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+		MetaModel::Init_DefineState("Production", array("label"=>"Production", "description"=>"The service is effective in production", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+		MetaModel::Init_DefineState("Obsolete", array("label"=>"Obsolete", "description"=>"The service is no more deleivered", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+	
+		MetaModel::Init_DefineStimulus("ev_implement", new StimulusUserAction(array("label"=>"Implement this service", "description"=>"This service is under construction")));
+		MetaModel::Init_DefineStimulus("ev_move2prod", new StimulusUserAction(array("label"=>"Move to production", "description"=>"This service is now on production")));
+		MetaModel::Init_DefineStimulus("ev_obsolete", new StimulusUserAction(array("label"=>"Obsolete", "description"=>"Thi service is no more delivered")));
+
+		MetaModel::Init_DefineTransition("New", "ev_implement", array("target_state"=>"Implementation", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Implementation", "ev_move2prod", array("target_state"=>"Production", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Production", "ev_obsolete", array("target_state"=>"Obsolete", "actions"=>array('IncrementVersion'), "user_restriction"=>null));
+*/	
+
+		MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id','service_category','type','status','description')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'status', 'org_id','service_category','type')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status','org_id','service_category','type')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status','org_id','service_category','type')); // Criteria of the advanced search form
+
+	}
+	
+	// State machine actions
+	public function IncrementVersion($sStimulusCode)
+	{
+		$this->Set('version_number', $this->Get('version_number') + 1);
+		return true;
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* Description of a contract signed with a customer
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizContract extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Contract",
+			"description" => "Contract signed by an organization",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",
+			//"state_attcode" => "status",
+			"state_attcode" => "",
+			"reconc_keys" => array("org_id", "name"), // inherited attributes
+			"db_table" => "contracts",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/contract.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+    MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Name", "description"=>"Name of the contract", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Customer", "description"=>"Customer for this contract", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("label"=>"Customer", "description"=>"name of the Customer", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"bizService", "label"=>"Service", "description"=>"Provider for this contract", "allowed_values"=>null, "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("provider_name", array("label"=>"Provider", "description"=>"name of the service provider", "allowed_values"=>null, "extkey_attcode"=> 'service_id', "target_attcode"=>"provider_name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("service_name", array("label"=>"Service", "description"=>"name of the service", "allowed_values"=>null, "extkey_attcode"=> 'service_id', "target_attcode"=>"name")));
+ 		MetaModel::Init_AddAttribute(new AttributeExternalKey("team_id", array("targetclass"=>"bizTeam", "label"=>"Team", "description"=>"Team managing this contract", "allowed_values"=>null, "sql"=>"team_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("team_name", array("label"=>"Team", "description"=>"name of the team managing this contract", "allowed_values"=>null, "extkey_attcode"=> 'team_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeEnum("service_level", array("label"=>"Service Level", "description"=>"Level of service for this contract", "allowed_values"=>new ValueSetEnum("Gold,Silver,Bronze"), "sql"=>"service_level", "default_value"=>"Bronze", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("cost_unit", array("label"=>"Cost Unit", "description"=>"Cost unit to compute global cost for this contract", "allowed_values"=>new ValueSetEnum("Devices,Persons,Applications,Global"), "sql"=>"cost_unit", "default_value"=>"Global", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("cost_freq", array("label"=>"Billing frequency", "description"=>"Frequency of cost for this contract", "allowed_values"=>new ValueSetEnum("Monthly,Yearly,Once"), "sql"=>"cost_freq", "default_value"=>"Once", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("cost", array("label"=>"Cost", "description"=>"Cost of this contract", "allowed_values"=>null, "sql"=>"cost", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("currency", array("label"=>"Currency", "description"=>"Currency of cost for this contract", "allowed_values"=>new ValueSetEnum("Euros,Dollars"), "sql"=>"currency", "default_value"=>"Euros", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("label"=>"Description", "description"=>"Description of this contract", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("move2prod_date", array("label"=>"Date of Move To Production", "description"=>"Date when the contract is on production", "allowed_values"=>null, "sql"=>"move2prod_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("end_prod", array("label"=>"Date of End Of Production", "description"=>"Date when the contract is stopped", "allowed_values"=>null, "sql"=>"end_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("label"=>"Status", "description"=>"Status of the contract", "allowed_values"=>new ValueSetEnum("New, Negotiating, Signed, Production,Finished"), "sql"=>"status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("label"=>"Type", "description"=>"Type of the contract", "allowed_values"=>new ValueSetEnum("Hardware,Software,Support,Licence"), "sql"=>"type", "default_value"=>"Support", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("version_number", array("label"=>"Version", "description"=>"Revision number for this contract", "allowed_values"=>null, "sql"=>"version_number", "default_value"=>1, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("service_name");
+		MetaModel::Init_AddFilterFromAttribute("provider_name");
+		MetaModel::Init_AddFilterFromAttribute("service_id");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("team_id");
+		MetaModel::Init_AddFilterFromAttribute("team_name");
+		MetaModel::Init_AddFilterFromAttribute("service_level");
+		MetaModel::Init_AddFilterFromAttribute("end_prod");
+		MetaModel::Init_AddFilterFromAttribute("status");
+		MetaModel::Init_AddFilterFromAttribute("version_number");
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("type");
+
+
+/*
+		// Life cycle
+		MetaModel::Init_DefineState("New", array("label"=>"New", "description"=>"Newly created contract", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_MANDATORY,'org_id' => OPT_ATT_MANDATORY, 'service_id' => OPT_ATT_MANDATORY,'type' => OPT_ATT_MANDATORY, 'description' => OPT_ATT_MANDATORY)));
+		MetaModel::Init_DefineState("Negotiating", array("label"=>"Negotiating", "description"=>"The contract is being worked on", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY)));
+		MetaModel::Init_DefineState("Signed", array("label"=>"Signed", "description"=>"The contract has been signed", "attribute_inherit"=>null,
+													"attribute_list"=>array( 'name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY, 'service_id' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY, 'service_level' => OPT_ATT_MANDATORY , 'cost_unit' => OPT_ATT_MANDATORY , 'cost_freq' => OPT_ATT_MANDATORY , 'cost' => OPT_ATT_MANDATORY, 'currency' => OPT_ATT_MANDATORY)));
+		MetaModel::Init_DefineState("Production", array("label"=>"Production", "description"=>"The contract is effective in production", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY, 'service_id' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY, 'service_level' => OPT_ATT_READONLY , 'cost_unit' => OPT_ATT_READONLY , 'cost_freq' => OPT_ATT_READONLY , 'cost' => OPT_ATT_READONLY, 'currency' => OPT_ATT_READONLY,'move2prod_date' => OPT_ATT_MUSTPROMPT,'end_prod' => OPT_ATT_MANDATORY)));
+		MetaModel::Init_DefineState("Finished", array("label"=>"Finished", "description"=>"The contract is terminated", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY,'org_id' => OPT_ATT_READONLY, 'service_id' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY, 'service_level' => OPT_ATT_READONLY , 'cost_unit' => OPT_ATT_READONLY , 'cost_freq' => OPT_ATT_READONLY , 'cost' => OPT_ATT_READONLY, 'currency' => OPT_ATT_READONLY,'move2prod_date' => OPT_ATT_READONLY,'end_prod' => OPT_ATT_READONLY,'team_id' => OPT_ATT_READONLY,'description' => OPT_ATT_READONLY)));
+
+		MetaModel::Init_DefineStimulus("ev_negociate", new StimulusUserAction(array("label"=>"Negotiate this contract", "description"=>"This version of the contract is published")));
+		MetaModel::Init_DefineStimulus("ev_sign", new StimulusUserAction(array("label"=>"Sign this contract", "description"=>"This contract is being signed")));
+		MetaModel::Init_DefineStimulus("ev_begin", new StimulusUserAction(array("label"=>"Move to production", "description"=>"The contract becomes applicable in production")));
+		MetaModel::Init_DefineStimulus("ev_terminate", new StimulusUserAction(array("label"=>"Ends this contract", "description"=>"The contract is ending")));
+
+		MetaModel::Init_DefineTransition("New", "ev_negociate", array("target_state"=>"Negotiating", "actions"=>array('IncrementVersion'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Negotiating", "ev_sign", array("target_state"=>"Signed", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Negotiating", "ev_terminate", array("target_state"=>"Finished", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Signed", "ev_begin", array("target_state"=>"Production", "actions"=>array('SetProdDate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Signed", "ev_terminate", array("target_state"=>"Finished", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Production", "ev_terminate", array("target_state"=>"Finished", "actions"=>array(), "user_restriction"=>null));
+*/
+
+		MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'service_id','provider_name','type','description','team_id','service_level','cost','currency','cost_unit','cost_freq','move2prod_date','end_prod', 'version_number')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'status', 'org_id', 'service_id','provider_name','service_name','service_level','type')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status','service_id','provider_name','team_name','service_level','type')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status','service_id','team_name', 'service_level', 'org_id')); // Criteria of the advanced search form
+
+	}
+	
+	// State machine actions
+	public function IncrementVersion($sStimulusCode)
+	{
+		$this->Set('version_number', $this->Get('version_number') + 1);
+		return true;
+	}
+	
+		public function SetProdDate($sStimulusCode)
+	{
+		$this->Set('move2prod_date', time());
+		return true;
+	}
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Infra and a Contract
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkInfraContract extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "InfraContractLinks",
+			"description" => "Infra covered by a contract",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "coverage",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("infra_id","contract_id"),  // ????
+			"db_table" => "infra_contract_links",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_id", array("targetclass"=>"logInfra", "jointype"=> '', "label"=>"Infrastructure", "description"=>"The infrastructure impacted", "allowed_values"=>null, "sql"=>"infra_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_name", array("label"=>"Infrastructure Name", "description"=>"Name of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_status", array("label"=>"Status", "description"=>"Status of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"status")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "jointype"=> '', "label"=>"Contract", "description"=>"Contract id", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("label"=>"Contract Name", "description"=>"Name of the contract", "allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("coverage", array("label"=>"Coverage", "description"=>"coverage for the given infra", "allowed_values"=>null, "sql"=>"coverage", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeString("service_level", array("label"=>"Service Level", "description"=>"service level for the given infra", "allowed_values"=>null, "sql"=>"sla", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+
+		MetaModel::Init_AddFilterFromAttribute("infra_id");
+		MetaModel::Init_AddFilterFromAttribute("contract_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('infra_id', 'contract_id', 'coverage','service_level')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('infra_id', 'infra_status','contract_id' , 'coverage','service_level')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('infra_id', 'contract_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('infra_id', 'contract_id')); // Criteria of the advanced search form
+	}
+
+	
+}
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any contact and a Contract
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkContactContract extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "ContactContractLink",
+			"description" => "Contact associated to a contract",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "role",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("role"),  // ????
+			"db_table" => "contact_Contract",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contact_id", array("targetclass"=>"bizContact", "jointype"=> '', "label"=>"Contact", "description"=>"The contact linked to contract", "allowed_values"=>null, "sql"=>"contact_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contact_mail", array("label"=>"Contact E-mail", "description"=>"Mail for the contact", "allowed_values"=>null, "extkey_attcode"=> 'contact_id', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "jointype"=> '', "label"=>"Contract", "description"=>"Contract ID", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("label"=>"Contract Name", "description"=>"Name of the contract", "allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("role", array("label"=>"Role", "description"=>"Role of this contact for this contract", "allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("contract_id");
+		MetaModel::Init_AddFilterFromAttribute("contact_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contract_id', 'contact_id', 'role')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('contract_id', 'contact_id', 'role')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('contract_id', 'contact_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('contract_id', 'contact_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('contract_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('contact_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('role', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Contract and a Document
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkDocumentContract extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "DocumentsContractLinks",
+			"description" => "A link between a document and another contract",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "link_type",
+			"state_attcode" => "",
+			"reconc_keys" => array("doc_name", "contract_name"),
+			"db_table" => "documents_contracts",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("doc_id", array("targetclass"=>"bizDocument", "label"=>"Document", "description"=>"id of the Document", "allowed_values"=>null, "sql"=>"doc_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("doc_name", array("label"=>"Document Name", "description"=>"name of the document", "allowed_values"=>null, "extkey_attcode"=> 'doc_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "label"=>"Contract", "description"=>"Contract linked to this document", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("label"=>"Contract Name", "description"=>"name of the linked contract", "allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("link_type", array("label"=>"Link Type", "description"=>"More information", "allowed_values"=>null, "sql"=>"link_type", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("doc_id");
+		MetaModel::Init_AddFilterFromAttribute("doc_name");
+		MetaModel::Init_AddFilterFromAttribute("contract_id");
+		MetaModel::Init_AddFilterFromAttribute("contract_name");
+		MetaModel::Init_AddFilterFromAttribute("link_type");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('doc_id', 'contract_name', 'link_type')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('doc_id', 'contract_name', 'link_type')); // Attributes to be displayed for a list
+	}
+}
+
+// require_once('ServiceRequest.business.php');
+
+?>

business/ServiceRequest.business.php

@@ -0,0 +1,184 @@
+<?php
+
+
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* Description of a service request
+* 
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizServiceRequest extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "ServiceRequest",
+			"description" => "Service request",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array("org_id", "name"), // inherited attributes
+			"db_table" => "serviceRequests",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/serviceRequest.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Request Ref", "description"=>"Refence number ofr this service request", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("title", array("label"=>"Title", "description"=>"Overview of the Service Request", "allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Customer", "description"=>"Customer for this service request", "allowed_values"=>null, "sql"=>"customer_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("label"=>"Customer", "description"=>"name of the Customer", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("label"=>"Description", "description"=>"Description of this service request", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("label"=>"Status", "description"=>"Status of the service request", "allowed_values"=>new ValueSetEnum("Open,approved,rejected,assigned,pending,closed"), "sql"=>"status", "default_value"=>"Open", "is_null_allowed"=>false, "depends_on"=>array())));
+ 	  MetaModel::Init_AddAttribute(new AttributeExternalKey("requester_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Requester", "description"=>"person that trigger service request", "allowed_values"=>null, "sql"=>"requester_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("requester_mail", array("label"=>"Requester", "description"=>"Person that trigger this service request", "allowed_values"=>null, "extkey_attcode"=> 'requester_id', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeEnum("priority", array("label"=>"Priority", "description"=>"Field defining the priority for this service request", "allowed_values"=>new ValueSetEnum("critical,medium,low"), "sql"=>"priority", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source", array("label"=>"Source", "description"=>"source type for this call", "allowed_values"=>new ValueSetEnum("phone,E-mail,Fax"), "sql"=>"source", "default_value"=>"phone", "is_null_allowed"=>false, "depends_on"=>array())));
+
+  	MetaModel::Init_AddAttribute(new AttributeExternalKey("coordinator_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Coordinator", "description"=>"which workgroup is controlling this request", "allowed_values"=>null, "sql"=>"coordinator_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("coordinator_name", array("label"=>"Coordinator", "description"=>"name of workgroup coordinating this service request", "allowed_values"=>null, "extkey_attcode"=> 'coordinator_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Coordinator Agent", "description"=>"who is managing the ticket", "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("coordinator_id"))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("label"=>"Coordinator Agent", "description"=>"mail of agent coordinating this service request", "allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("requester_id");
+		MetaModel::Init_AddFilterFromAttribute("priority");
+		MetaModel::Init_AddFilterFromAttribute("coordinator_id");
+		MetaModel::Init_AddFilterFromAttribute("agent_id");
+		MetaModel::Init_AddFilterFromAttribute("status");
+		MetaModel::Init_AddFilterFromAttribute("source");
+
+
+/*
+		// Life cycle
+		MetaModel::Init_DefineState("New", array("label"=>"New", "description"=>"Newly created service", "attribute_inherit"=>null,
+												 "attribute_list"=>array()));
+		MetaModel::Init_DefineState("Implementation", array("label"=>"Implementing", "description"=>"The service is being worked on", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+		MetaModel::Init_DefineState("Production", array("label"=>"Production", "description"=>"The service is effective in production", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+		MetaModel::Init_DefineState("Obsolete", array("label"=>"Obsolete", "description"=>"The service is no more deleivered", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+	
+		MetaModel::Init_DefineStimulus("ev_implement", new StimulusUserAction(array("label"=>"Implement this service", "description"=>"This service is under construction")));
+		MetaModel::Init_DefineStimulus("ev_move2prod", new StimulusUserAction(array("label"=>"Move to production", "description"=>"This service is now on production")));
+		MetaModel::Init_DefineStimulus("ev_obsololete", new StimulusUserAction(array("label"=>"Obsolete", "description"=>"Thi service is no more delivered")));
+
+		MetaModel::Init_DefineTransition("New", "ev_implement", array("target_state"=>"Implementation", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Implementation", "ev_move2prod", array("target_state"=>"Production", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Production", "ev_obsolete", array("target_state"=>"Obsolete", "actions"=>array('IncrementVersion'), "user_restriction"=>null));
+*/	
+
+		MetaModel::Init_SetZListItems('details', array('name', 'title','status', 'org_id','priority','requester_id','description','source','coordinator_id','agent_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'title','status', 'org_id','priority')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status','org_id','priority','requester_id','source','coordinator_id','agent_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status','org_id','priority','requester_id','source','coordinator_id','agent_id')); // Criteria of the advanced search form
+
+	}
+	
+	// State machine actions
+	public function IncrementVersion($sStimulusCode)
+	{
+		$this->Set('version_number', $this->Get('version_number') + 1);
+		return true;
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* Description of a service item
+* 
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizServiceItem extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "ServiceItem",
+			"description" => "Service Item",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array("request_id", "name"), // inherited attributes
+			"db_table" => "serviceItems",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Request Ref", "description"=>"Refence number for this service item", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("title", array("label"=>"Title", "description"=>"Overview of the Service item", "allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("request_id", array("targetclass"=>"bizServiceRequest", "label"=>"Service Request", "description"=>"Corresponding service request", "allowed_values"=>null, "sql"=>"request_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("request_name", array("label"=>"Service Request", "description"=>"name of the request", "allowed_values"=>null, "extkey_attcode"=> 'request_id', "target_attcode"=>"name")));
+	  MetaModel::Init_AddAttribute(new AttributeExternalKey("contract_id", array("targetclass"=>"bizContract", "label"=>"Service", "description"=>"Corresponding service", "allowed_values"=>null, "sql"=>"contract_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contract_name", array("label"=>"Service Name", "description"=>"name of the service", "allowed_values"=>null, "extkey_attcode"=> 'contract_id', "target_attcode"=>"name")));
+  	MetaModel::Init_AddAttribute(new AttributeText("description", array("label"=>"Description", "description"=>"Description of this service request", "allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("label"=>"Status", "description"=>"Status of the service request", "allowed_values"=>new ValueSetEnum("Open,approved,rejected,assigned,pending,closed"), "sql"=>"status", "default_value"=>"Open", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("priority", array("label"=>"Priority", "description"=>"priority corresponding to service request", "allowed_values"=>null, "extkey_attcode"=> 'request_id', "target_attcode"=>"priority")));
+		MetaModel::Init_AddAttribute(new AttributeText("comment", array("label"=>"Comment", "description"=>"Comment of this service item", "allowed_values"=>null, "sql"=>"comment", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+  	MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Workgroup", "description"=>"which workgroup working on this service item", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("label"=>"Workgroup", "description"=>"name of workgroup working on this service item", "allowed_values"=>null, "extkey_attcode"=> 'workgroup_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Coordinator Agent", "description"=>"who is managing the service item", "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id"))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("label"=>"Agent", "description"=>"mail of agent coordinating this service item", "allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("request_id");
+		MetaModel::Init_AddFilterFromAttribute("contract_id");
+		MetaModel::Init_AddFilterFromAttribute("priority");
+		MetaModel::Init_AddFilterFromAttribute("workgroup_id");
+		MetaModel::Init_AddFilterFromAttribute("agent_id");
+		MetaModel::Init_AddFilterFromAttribute("status");
+		MetaModel::Init_AddFilterFromAttribute("priority");
+
+
+/*
+		// Life cycle
+		MetaModel::Init_DefineState("New", array("label"=>"New", "description"=>"Newly created service", "attribute_inherit"=>null,
+												 "attribute_list"=>array()));
+		MetaModel::Init_DefineState("Implementation", array("label"=>"Implementing", "description"=>"The service is being worked on", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+		MetaModel::Init_DefineState("Production", array("label"=>"Production", "description"=>"The service is effective in production", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+		MetaModel::Init_DefineState("Obsolete", array("label"=>"Obsolete", "description"=>"The service is no more deleivered", "attribute_inherit"=>null,
+												"attribute_list"=>array()));
+	
+		MetaModel::Init_DefineStimulus("ev_implement", new StimulusUserAction(array("label"=>"Implement this service", "description"=>"This service is under construction")));
+		MetaModel::Init_DefineStimulus("ev_move2prod", new StimulusUserAction(array("label"=>"Move to production", "description"=>"This service is now on production")));
+		MetaModel::Init_DefineStimulus("ev_obsololete", new StimulusUserAction(array("label"=>"Obsolete", "description"=>"Thi service is no more delivered")));
+
+		MetaModel::Init_DefineTransition("New", "ev_implement", array("target_state"=>"Implementation", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Implementation", "ev_move2prod", array("target_state"=>"Production", "actions"=>array(), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Production", "ev_obsolete", array("target_state"=>"Obsolete", "actions"=>array('IncrementVersion'), "user_restriction"=>null));
+*/	
+
+		MetaModel::Init_SetZListItems('details', array('name', 'title','request_id','contract_id','status','priority','description','comment','workgroup_id','agent_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'title','status', 'contract_id','priority')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name','request_id','contract_id','status','priority','workgroup_id','agent_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name','request_id','contract_id','status','priority','workgroup_id','agent_id')); // Criteria of the advanced search form
+
+	}
+	
+
+}
+
+
+
+
+
+?>

business/business_itopbegins.class.inc.php

@@ -0,0 +1,261 @@
+<?php
+
+require_once('../core/MyHelpers.class.inc.php');
+require_once('../core/cmdbobject.class.inc.php');
+
+/**
+ * business_itopbegins.class.inc.php
+ * User defined objects, for unit testing 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Business implementation demo
+///////////////////////////////////////////////////////////////////////////////
+
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbContact extends CMDBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "klassContact",
+			"description" => "klass contact description",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "att_contact_name",
+			"state_attcode" => "",
+			"reconc_keys" => array("att_contact_name"),
+			"db_table" => "contact",
+			"db_key_field" => "contactid",
+			"db_finalclass_field" => "actualclass",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("att_contact_name", array("label"=>"name of the contact", "description"=>"blah", "allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeInteger("att_contact_availability", array("label"=>"degree of availability in percent", "description"=>"blah", "allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"availability")));
+		MetaModel::Init_AddAttribute(new AttributeDate("start_date", array("label"=>"Starting date", "description"=>"Incident starting date", "allowed_values"=>null, "sql"=>"start_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("att_contact_name");
+		MetaModel::Init_AddFilterFromAttribute("att_contact_availability");
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbPerson extends cmdbContact
+{
+	public static function Init()
+	{
+		$oValsDunsNumber = new ValueSetObjects("cmdbCompany: att_company_dunsnumber Begins with '$[duns_prm::]'", "att_company_dunsnumber", array("att_company_dunsnumber"=>true));
+
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "klassPerson",
+			"description" => "klass person description",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "att_contact_name",
+			"state_attcode" => "",
+			"reconc_keys" => array("att_contact_name"),
+			"db_table" => "person",
+			"db_key_field" => "personid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("att_person_email", array("label"=>"iMaile", "description"=>"imelle", "allowed_values"=>$oValsDunsNumber, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeString("att_person_name", array("label"=>"secName", "description"=>"secondary name", "allowed_values"=>new ValueSetEnum(array("nom1", "nom2", "nom10", "no", "noms", "")), "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"name")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("att_person_email");
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbSubcontractor extends cmdbPerson
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "klassSubcontractor",
+			"description" => "klass subcontractor description",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "att_contact_name",
+			"state_attcode" => "",
+			"reconc_keys" => array("att_contact_name"),
+			"db_table" => "subcontractor",
+			"db_key_field" => "subcontractorid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("att_contractinfo", array("label"=>"contract info", "description"=>"blah", "allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"contractinfo")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ext_subcontractor_provider", array("label"=>"ssii", "description"=>"blah", "allowed_values"=>null, "sql"=>"provider", "targetclass"=>"cmdbProvider", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("extatt_subcontractor_provider_ref", array("label"=>"ref", "description"=>"blah", "allowed_values"=>null, "extkey_attcode"=>"ext_subcontractor_provider", "target_attcode"=>"att_provider_ref")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ext_subcontractor_tutor", array("label"=>"tutor", "description"=>"blah", "allowed_values"=>null, "sql"=>"tutor", "targetclass"=>"cmdbPerson", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("extatt_subcontractor_tutor_email", array("label"=>"tutor email", "description"=>"blah", "allowed_values"=>null, "extkey_attcode"=>"ext_subcontractor_tutor", "target_attcode"=>"att_person_email")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("extatt_subcontractor_tutor_secondname", array("label"=>"2ndname (ext field)", "description"=>"blah", "allowed_values"=>null, "extkey_attcode"=>"ext_subcontractor_tutor", "target_attcode"=>"att_person_name")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("extatt_subcontractor_tutor_secondname");
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbCrowd extends cmdbObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "klassCrowd",
+			"description" => "klass crowd description",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "att_crowd_peoplecount",
+			"state_attcode" => "",
+			"reconc_keys" => array("att_crowd_peoplecount"),
+			"db_table" => "crowd",
+			"db_key_field" => "crowdid",
+			"db_finalclass_field" => "crowdclass",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeInteger("att_crowd_peoplecount", array("label"=>"people count", "description"=>"blah", "allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"peoplecount")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("att_crowd_peoplecount");
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbCompany extends cmdbCrowd
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "klassCompany",
+			"description" => "klass company description",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "att_company_dunsnumber",
+			"state_attcode" => "",
+			"reconc_keys" => array("att_company_dunsnumber"),
+			"db_table" => "company",
+			"db_key_field" => "companyid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("att_company_dunsnumber", array("label"=>"duns number", "description"=>"blah", "allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"dunsnumber")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("att_company_dunsnumber");
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbProvider extends cmdbCompany
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "klassProvider",
+			"description" => "klass provider description",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "att_provider_ref",
+			"state_attcode" => "",
+			"reconc_keys" => array("att_provider_ref"),
+			"db_table" => "provider",
+			"db_key_field" => "providerid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeInteger("att_provider_ref", array("label"=>"provider ref", "description"=>"blah", "allowed_values"=>null, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array(), "sql"=>"providerref")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("att_provider_ref");
+	}
+}
+
+
+?>

business/business_test.class.inc.php

@@ -0,0 +1,366 @@
+<?php
+
+require_once('../core/MyHelpers.class.inc.php');
+require_once('../core/cmdbobject.class.inc.php');
+
+/**
+ * business_test.class.inc.php
+ * User defined objects, for unit testing 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+
+///////////////////////////////////////////////////////////////////////////////
+// Business implementation demo
+///////////////////////////////////////////////////////////////////////////////
+
+MetaModel::RegisterRelation("Potes", array("description"=>"ceux dont l'email ressemble au mien", "verb_down"=>"est pote de", "verb_up"=>"est pote de"));
+
+
+MetaModel::RegisterZList("list1", array("description"=>"une premiere list, just for fun", "type"=>"attributes"));
+MetaModel::RegisterZList("list2", array("description"=>"la secunda e meliora", "type"=>"attributes"));
+MetaModel::RegisterZList("list3", array("description"=>"la variante qui tue", "type"=>"filters"));
+
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbObjectHomeMade extends cmdbObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "anyObject",
+			"description" => "std object",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(""),
+			"db_table" => "",
+			"db_key_field" => "",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+	}
+
+	public static function GetRelationQueries($sRelCode)
+	{
+		//trigger_error("GetRelationQueries: cmdbObjectHomeMade");
+		switch ($sRelCode)
+		{
+		case "Potes":
+			$aRels = array("xxxx" => array("sQuery"=>"cmdbContact: pkey = 40", "bPropagate"=>true, "iDistance"=>3));
+			return $aRels;
+		}
+	}
+}
+
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbContact extends cmdbObjectHomeMade
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Contact",
+			"description" => "Un object que l'on peut communiquer avec",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "name",
+			"state_attcode" => "etat",
+			"reconc_keys" => array("name"),
+			"db_table" => "contact",
+			"db_key_field" => "contactid",
+			"db_finalclass_field" => "actualclass",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("etat", array("label"=>"l'etat", "description"=>"les etats d'ame d'eric", "allowed_values"=>new ValueSetEnum('justborn, 15, 21'), "sql"=>"etat", "default_value"=>"justborn", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"nom", "description"=>"ze equipe", "allowed_values"=>null, "sql"=>"name", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("email", array("label"=>"iMaile", "description"=>"imelle", "allowed_values"=>null, "sql"=>"email", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("owner", array("label"=>"owned by", "description"=>"organization owning the team", "allowed_values"=>null, "sql"=>"ownerorg", "targetclass"=>"cmdbOrga", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ownername", array("label"=>"owned by", "description"=>"name of organization owning the team", "allowed_values"=>null, "extkey_attcode"=>"owner", "target_attcode"=>"_name_")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ownertnut", array("label"=>"owntnut", "description"=>"blah tnut blah", "allowed_values"=>null, "extkey_attcode"=>"owner", "target_attcode"=>"_dunsnumber_")));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSet("myworkshops", array("label"=>"held workshops", "description"=>"blah tnut blah", "depends_on"=>array(), "linked_class"=>"cmdbLiens", "ext_key_to_me"=>"tocontact", "count_min"=>1, "count_max"=>10, "allowed_values"=>null)));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("owner");
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("ownername");
+
+		MetaModel::Init_SetZListItems("list1", array("name", "email"));
+		MetaModel::Init_SetZListItems("list2", array());
+		MetaModel::Init_SetZListItems("list3", array("ownername"));
+
+		MetaModel::Init_DefineState("justborn", array("label"=>"just born", "description"=>"too young to die", "attribute_inherit"=>null, "attribute_list"=>array("owner"=>OPT_ATT_MANDATORY)));
+		MetaModel::Init_DefineState("15", array("label"=>"student", "description"=>"stupid age", "attribute_inherit"=>"justborn", "attribute_list"=>array("owner"=>OPT_ATT_MUSTPROMPT, "email"=>OPT_ATT_MUSTPROMPT)));
+		MetaModel::Init_DefineState("21", array("label"=>"old", "description"=>"one foot in the grave", "attribute_inherit"=>"15", "attribute_list"=>array("email"=>OPT_ATT_READONLY|OPT_ATT_MUSTCHANGE)));
+
+		MetaModel::Init_DefineStimulus("toschool", new StimulusUserAction(array("label"=>"go to school", "description"=>"start learning stupid things")));
+		MetaModel::Init_DefineStimulus("raise", new StimulusUserAction(array("label"=>"grow!", "description"=>"eat tons of BigMACs")));
+
+		MetaModel::Init_DefineTransition("justborn", "toschool", array("target_state"=>"15", "actions"=>array('MyLifecycleHandler', 'MyLifecycleHandler2'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("15", "raise", array("target_state"=>"21", "actions"=>null, "user_restriction"=>null));
+	}
+
+	public static function GetRelationQueries($sRelCode)
+	{
+		//trigger_error("GetRelationQueries: cmdbContact");
+		switch ($sRelCode)
+		{
+		case "Potes":
+			$aRels = array(
+				"zz1" => array("sQuery"=>"cmdbContact: name Begins with '\$[this.name::]' AND pkey != \$[this.pkey::]", "bPropagate"=>false, "iDistance"=>3),
+				"zz2" => array("sQuery"=>"cmdbContact: owner = \$[this.owner::] AND owner != 2", "bPropagate"=>false, "iDistance"=>3),
+			);
+			return array_merge($aRels, parent::GetRelationQueries($sRelCode));
+		}
+	}
+
+	public function MyLifecycleHandler($sStimulusCode)
+	{
+		echo "<p>youhou!</p>";
+		return true;
+	}
+	public function MyLifecycleHandler2($sStimulusCode)
+	{
+		echo "<p>... les papous...</p>";
+		return true;
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbTeam extends cmdbContact
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Equipado",
+			"description" => "Un regroupement de gens",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "email",
+			"state_attcode" => "",
+			"reconc_keys" => array("email"),
+			"db_table" => "team",
+			"db_key_field" => "teamid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_OverloadAttributeParams("email", array("label"=>"email2", "description"=>"emailleu22"));
+		MetaModel::Init_AddAttribute(new AttributeInteger("headcount", array("label"=>"nombre", "description"=>"combien ils sont", "allowed_values"=>null, "sql"=>"headcount", "default_value"=>654321, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("headcount");
+
+		MetaModel::Init_SetZListItems("noneditable", array("name"));
+	}
+
+	public function ComputeValues()
+	{
+		//echo "Set(), function ComputeValues has been found for ".get_class($this)."<br/>\n";
+		$this->Set("name", $this->Get("email")." and ".$this->Get("headcount"));
+	}
+
+	public static function GetRelationQueries($sRelCode)
+	{
+		//trigger_error("GetRelationQueries: cmdbTeam");
+		switch ($sRelCode)
+		{
+		case "Potes":
+			//$aRels = array("Relies on" => array("sQuery"=>"cmdbContact: name Begins with 'Louis'", "bPropagate"=>false, "iDistance"=>3));
+			return array_merge(array(), parent::GetRelationQueries($sRelCode));
+		}
+	}
+}
+
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbOrga extends cmdbObjectHomeMade
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Organization",
+			"description" => "Une entite qui possede des choses",
+			"key_type" => "",
+			"key_label" => "",
+			"name_attcode" => "_name_",
+			"state_attcode" => "",
+			"reconc_keys" => array("_name_"),
+			"db_table" => "organization",
+			"db_key_field" => "orgid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("_name_", array("label"=>"namo", "description"=>"official company name", "allowed_values"=>null, "sql"=>"name", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("_status_", array("label"=>"step", "description"=>"step or status, etc.", "allowed_values"=>null, "sql"=>"status", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("_dunsnumber_", array("label"=>"duns debile number", "description"=>"une bonne idee a OVSD", "allowed_values"=>null, "sql"=>"dunsnumber", "default_value"=>99007, "is_null_allowed"=>false, "depends_on"=>array())));
+// not yet allowed		MetaModel::Init_AddAttribute(new AttributeInteger("_dunsnumberBY2_", array("label"=>"dummy duns", "description"=>"deux fois plus debile", "allowed_values"=>null, "sql"=>"dunsnumber * 3.141592654")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("_name_");
+
+		MetaModel::Init_SetZListItems("list1", array("_status_"));
+		MetaModel::Init_SetZListItems("list2", array());
+		MetaModel::Init_SetZListItems("list3", array("_name_"));
+	}
+
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbLiens extends cmdbObjectHomeMade
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Liens_entre_contacts_et_workshop",
+			"description" => "Une entite qui lie des contacts et workshops",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "function",
+			"state_attcode" => "",
+			"reconc_keys" => array("function"),
+			"db_table" => "role_ws",
+			"db_key_field" => "linkid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("function", array("label"=>"fonction", "description"=>"la fonction...", "allowed_values"=>null, "sql"=>"function", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("a1", array("label"=>"a1", "description"=>"a1", "allowed_values"=>null, "sql"=>"a1", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("a2", array("label"=>"a1", "description"=>"a2", "allowed_values"=>null, "sql"=>"a2", "default_value"=>"XXXX", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// What makes it being a link...
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("toworkshop", array("label"=>"participates in", "description"=>"workshop in wich the person is participating", "allowed_values"=>null, "sql"=>"ws_id", "targetclass"=>"cmdbWorkshop", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ws_info", array("label"=>"name", "description"=>"namedescription", "allowed_values"=>null, "extkey_attcode"=>"toworkshop", "target_attcode"=>"namitus")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("tocontact", array("label"=>"is held by", "description"=>"people involved in that mess", "allowed_values"=>null, "sql"=>"contactid", "targetclass"=>"cmdbContact", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contact_info", array("label"=>"name", "description"=>"namedescription", "allowed_values"=>null, "extkey_attcode"=>"tocontact", "target_attcode"=>"name")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("function");
+
+		MetaModel::Init_SetZListItems("list1", array("toworkshop", "contact_info"));
+		MetaModel::Init_SetZListItems("list2", array("function"));
+		MetaModel::Init_SetZListItems("list3", array("function"));
+	}
+
+	public static function GetRelationQueries($sRelCode)
+	{
+		throw new CoreException("GetRelationQueries: cmdbLiens");
+		return array("Relies on" => array("sQuery"=>"", "bPropagate"=>true, "iDistance"=>3));
+	}
+}
+
+/**
+ * blah blah 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+class cmdbWorkshop extends cmdbObjectHomeMade
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Workshop",
+			"description" => "Une entite qui pond des theories insensees",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "namitus",
+			"state_attcode" => "",
+			"reconc_keys" => array("namitus"),
+			"db_table" => "workshop",
+			"db_key_field" => "ws_id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("namitus", array("label"=>"namo", "description"=>"nom imbitique pour pondeurs de debilites", "allowed_values"=>null, "sql"=>"name", "default_value"=>"XXXX", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("namitus");
+
+		MetaModel::Init_SetZListItems("list1", array("namitus"));
+		MetaModel::Init_SetZListItems("list2", array());
+		MetaModel::Init_SetZListItems("list3", array("namitus"));
+	}
+
+	public static function GetRelationQueries($sRelCode)
+	{
+		throw new CoreException("GetRelationQueries: cmdbWorkshop");
+		return array("Relies on" => array("sQuery"=>"", "bPropagate"=>true, "iDistance"=>3));
+	}
+}
+
+
+?>

business/incidentMgmt.business.php

@@ -0,0 +1,372 @@
+<?php
+
+
+/**
+ * incident<business<php
+ * Define business model for incident mgmt module
+ *
+ * @package     iTopBizModelSamples
+ * @author      Erwan Taloc <erwan.taloc@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* An Incident Ticket
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class bizIncidentTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Incident",
+			"description" => "Incident ticket",
+			"key_type" => "autoincrement",
+			"key_label" => "id",
+			"name_attcode" => "name",  
+			"state_attcode" => "ticket_status",
+			"reconc_keys" => array("title"),
+			"db_table" => "incident",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/ticket.html",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Ticket Ref", "description"=>"Refence number ofr this incident", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("title", array("label"=>"Title", "description"=>"Overview of the Incident", "allowed_values"=>null, "sql"=>"title", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+   	
+    MetaModel::Init_AddAttribute(new AttributeEnum("type", array("label"=>"Type", "description"=>"Type of the Incident", "allowed_values"=>new ValueSetEnum("Network,Server,Desktop,Application"), "sql"=>"type", "default_value"=>"Server", "is_null_allowed"=>false, "depends_on"=>array())));
+     MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"bizOrganization", "label"=>"Customer", "description"=>"who is impacted by the ticket", "allowed_values"=>null, "sql"=>"customer", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("customer_name", array("label"=>"Customer", "description"=>"Name of the customer impacted by this ticket", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeEnum("ticket_status", array("label"=>"Status", "description"=>"Status of the ticket", "allowed_values"=>new ValueSetEnum("New, Assigned, WorkInProgress, Resolved, Closed"), "sql"=>"ticket_status", "default_value"=>"New", "is_null_allowed"=>false, "depends_on"=>array())));
+		// SetPossibleValues("status",array("Open","Monitored","Closed"));
+		MetaModel::Init_AddAttribute(new AttributeText("initial_situation", array("label"=>"Initial Situation", "description"=>"Initial situation of the Incident", "allowed_values"=>null, "sql"=>"initial_situation", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("current_situation", array("label"=>"Current Situation", "description"=>"Current situation of the Incident", "allowed_values"=>null, "sql"=>"current_situation", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("start_date", array("label"=>"Starting date", "description"=>"Incident starting date", "allowed_values"=>null, "sql"=>"start_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+    // définir une date de défaut à maintenant, alias creation ou modification du ticket
+		MetaModel::Init_AddAttribute(new AttributeDate("last_update", array("label"=>"Last update", "description"=>"last time the Ticket was modified", "allowed_values"=>null, "sql"=>"last_update", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+	      MetaModel::Init_AddAttribute(new AttributeDate("next_update", array("label"=>"Next update", "description"=>"next time the Ticket is expected to be  modified", "allowed_values"=>null, "sql"=>"next_update", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDate("end_date", array("label"=>"Closure Date", "description"=>"Date when the Ticket was closed", "allowed_values"=>null, "sql"=>"closed_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	  MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Caller", "description"=>"person that trigger incident", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p WHERE p.org_id = :this->org_id'), "sql"=>"caller_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id"))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("caller_mail", array("label"=>"Caller", "description"=>"Person that trigger this incident", "allowed_values"=>null, "extkey_attcode"=> 'caller_id', "target_attcode"=>"email")));
+	
+  	MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Impact of the Incident", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+  	MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"bizWorkgroup", "jointype"=> "", "label"=>"Workgroup", "description"=>"which workgroup is owning ticket", "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("label"=>"Workgroup", "description"=>"name of workgroup managing the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'workgroup_id', "target_attcode"=>"name")));  
+    MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"bizPerson", "jointype"=> "", "label"=>"Agent", "description"=>"who is managing the ticket", "allowed_values"=>new ValueSetObjects('SELECT bizPerson AS p JOIN lnkContactTeam AS l ON l.contact_id=p.id JOIN bizTeam AS t ON l.team_id=t.id JOIN bizWorkgroup AS w ON w.team_id=t.id WHERE w.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array('workgroup_id'))));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("agent_mail", array("label"=>"Agent", "description"=>"mail of agent managing the Ticket", "allowed_values"=>null, "extkey_attcode"=> 'agent_id', "target_attcode"=>"email")));
+		// Comment afficher le first + last name de l'agent ? Est-ce utile d'ajouter ce champ?
+		MetaModel::Init_AddAttribute(new AttributeText("action_log", array("label"=>"Action Logs", "description"=>"List all action performed during the incident", "allowed_values"=>null, "sql"=>"action_log", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("severity", array("label"=>"Severity", "description"=>"Field defining the criticity if the incident", "allowed_values"=>new ValueSetEnum("critical,medium,low"), "sql"=>"criticity", "default_value"=>"low", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("assignment_count", array("label"=>"Assignment Count", "description"=>"Number of times this ticket was assigned or reassigned", "allowed_values"=>null, "sql"=>"assignment_count", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("resolution", array("label"=>"Resolution", "description"=>"Description of the resolution", "allowed_values"=>null, "sql"=>"resolution", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("impacted_infra_manual", array("label"=>"Impacted Infrastructure", "description"=>"CIs that are not meeting the SLA", "linked_class"=>"lnkInfraTicket", "ext_key_to_me"=>"ticket_id", "ext_key_to_remote"=>"infra_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("related_tickets", array("label"=>"Related Tickets", "description"=>"Other incident tickets related to this one", "linked_class"=>"lnkRelatedTicket", "ext_key_to_me"=>"ticket_id", "ext_key_to_remote"=>"rel_ticket_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(/*'impacted_infra_computed',*/ 'impacted_infra_manual'))));
+
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("title");
+		MetaModel::Init_AddFilterFromAttribute("type");
+		MetaModel::Init_AddFilterFromAttribute("org_id");
+		MetaModel::Init_AddFilterFromAttribute("caller_id");
+		MetaModel::Init_AddFilterFromAttribute("ticket_status");
+		MetaModel::Init_AddFilterFromAttribute("start_date");
+		MetaModel::Init_AddFilterFromAttribute("last_update");
+		MetaModel::Init_AddFilterFromAttribute("end_date");
+		MetaModel::Init_AddFilterFromAttribute("workgroup_id");
+		MetaModel::Init_AddFilterFromAttribute("agent_id");
+		MetaModel::Init_AddFilterFromAttribute("severity");
+		MetaModel::Init_AddFilterFromAttribute("assignment_count");
+
+		// doit-on aussi ajouter un filtre sur les extfields lié à une extkey ? ici le name de l'agent?
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name','title', 'org_id', 'type','ticket_status', 'severity','start_date', 'initial_situation', 'current_situation','caller_id', 'impact', 'last_update', 'next_update','end_date', 'assignment_count', 'workgroup_id','agent_id','action_log','resolution')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('name', 'title', 'org_id', 'type','ticket_status','severity','start_date', 'initial_situation')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'title', 'org_id', 'caller_id','type', 'ticket_status', 'severity','start_date', 'last_update','end_date','agent_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'title', 'org_id','caller_id','type','ticket_status', 'severity','start_date', 'last_update', 'end_date','agent_id')); // Criteria of the advanced search form
+
+		// State machine
+		MetaModel::Init_DefineState("New", array("label"=>"New (Unassigned)", "description"=>"Newly created ticket", "attribute_inherit"=>null,
+												 "attribute_list"=>array('name' => OPT_ATT_READONLY, 'assignment_count' => OPT_ATT_HIDDEN, 'end_date' => OPT_ATT_HIDDEN, 'next_update' => OPT_ATT_HIDDEN, 'last_update' =>  OPT_ATT_HIDDEN,
+												 "title"=>OPT_ATT_MANDATORY, "org_id"=>OPT_ATT_MANDATORY, "caller_id"=>OPT_ATT_MANDATORY, "initial_situation"=>OPT_ATT_MANDATORY, "start_date"=>OPT_ATT_MANDATORY, "workgroup_id"=>OPT_ATT_MANDATORY,
+												 "severity"=>OPT_ATT_MANDATORY, "agent_id"=>OPT_ATT_HIDDEN,"impacted_infra_manual"=>OPT_ATT_MANDATORY, "related_tickets"=>OPT_ATT_MUSTPROMPT,"resolution"=>OPT_ATT_HIDDEN)));
+		MetaModel::Init_DefineState("Assigned", array("label"=>"Assigned", "description"=>"Ticket is assigned to somebody", "attribute_inherit"=>null,
+												"attribute_list"=>array('name' => OPT_ATT_READONLY, "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "initial_situation"=>OPT_ATT_READONLY, "start_date"=>OPT_ATT_READONLY,'assignment_count' => OPT_ATT_READONLY,'end_date' => OPT_ATT_HIDDEN, "workgroup_id"=>OPT_ATT_READONLY, "agent_id"=>OPT_ATT_MUSTCHANGE,"resolution"=>OPT_ATT_HIDDEN)));
+		MetaModel::Init_DefineState("WorkInProgress", array("label"=>"Work In Progress", "description"=>"Work is in progress", "attribute_inherit"=>null, "attribute_list"=>array("title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "initial_situation"=>OPT_ATT_READONLY,'end_date' => OPT_ATT_HIDDEN, "start_date"=>OPT_ATT_READONLY,"workgroup_id"=>OPT_ATT_MANDATORY, "agent_id"=>OPT_ATT_MANDATORY,"action_log"=>OPT_ATT_MANDATORY,"impact"=>OPT_ATT_READONLY,"severity"=>OPT_ATT_READONLY)));
+		MetaModel::Init_DefineState("Resolved", array("label"=>"Resolved", "description"=>"Ticket is resolved", "attribute_inherit"=>null, "attribute_list"=>array('name' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY, "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "initial_situation"=>OPT_ATT_READONLY,"current_situation"=>OPT_ATT_READONLY,'end_date' => OPT_ATT_READONLY,'last_update' => OPT_ATT_READONLY,'next_update' => OPT_ATT_READONLY, "start_date"=>OPT_ATT_READONLY,"workgroup_id"=>OPT_ATT_READONLY, "agent_id"=>OPT_ATT_READONLY,"action_log"=>OPT_ATT_READONLY,"impact"=>OPT_ATT_READONLY,"severity"=>OPT_ATT_READONLY,"resolution"=>OPT_ATT_MUSTCHANGE)));
+		MetaModel::Init_DefineState("Closed", array("label"=>"Closed", "description"=>"Ticket is closed", "attribute_inherit"=>null, "attribute_list"=>array('name' => OPT_ATT_READONLY,'type' => OPT_ATT_READONLY, "title"=>OPT_ATT_READONLY, "org_id"=>OPT_ATT_READONLY, "caller_id"=>OPT_ATT_READONLY, "initial_situation"=>OPT_ATT_READONLY,"current_situation"=>OPT_ATT_READONLY,'end_date' => OPT_ATT_READONLY,'last_update' => OPT_ATT_READONLY,'next_update' => OPT_ATT_READONLY, "start_date"=>OPT_ATT_READONLY,"workgroup_id"=>OPT_ATT_READONLY, "agent_id"=>OPT_ATT_READONLY,"action_log"=>OPT_ATT_READONLY,"impact"=>OPT_ATT_READONLY,"severity"=>OPT_ATT_READONLY,"resolution"=>OPT_ATT_READONLY)));
+
+		MetaModel::Init_DefineStimulus("ev_assign", new StimulusUserAction(array("label"=>"Assign this ticket", "description"=>"Assign this ticket to a group and an agent")));
+		MetaModel::Init_DefineStimulus("ev_reassign", new StimulusUserAction(array("label"=>"Reassign this ticket", "description"=>"Reassign this ticket to a different group and agent")));
+		MetaModel::Init_DefineStimulus("ev_start_working", new StimulusUserAction(array("label"=>"Work on this ticket", "description"=>"Start working on this ticket")));
+		MetaModel::Init_DefineStimulus("ev_resolve", new StimulusUserAction(array("label"=>"Resolve this ticket", "description"=>"Resolve this ticket")));
+		MetaModel::Init_DefineStimulus("ev_close", new StimulusUserAction(array("label"=>"Close this ticket", "description"=>"Close this ticket")));
+
+		MetaModel::Init_DefineTransition("New", "ev_assign", array("target_state"=>"Assigned", "actions"=>array('IncrementAssignmentCount'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Assigned", "ev_reassign", array("target_state"=>"Assigned", "actions"=>array('IncrementAssignmentCount','SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Assigned", "ev_start_working", array("target_state"=>"WorkInProgress", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("WorkInProgress", "ev_reassign", array("target_state"=>"Assigned", "actions"=>array('IncrementAssignmentCount','SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("WorkInProgress", "ev_resolve", array("target_state"=>"Resolved", "actions"=>array('SetLastUpdate'), "user_restriction"=>null));
+		MetaModel::Init_DefineTransition("Resolved", "ev_close", array("target_state"=>"Closed", "actions"=>array('SetClosureDate','SetLastUpdate'), "user_restriction"=>null));
+		
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('org_id', $oGenerator->GetOrganizationId());
+		$this->Set('title', $oGenerator->GenerateString("enum(Site,Server,Line)| |enum(is down,is flip-flopping,is not responding)"));
+		$this->Set('agent_id', $oGenerator->GenerateKey("bizPerson", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_status', $oGenerator->GenerateString("enum(Open,Closed,Closed,Monitored)"));
+		$this->Set('start_date', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+		$this->Set('last_update', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+		$this->Set('end_date', $oGenerator->GenerateString("2007-|number(07-12)|-|number(01-30)| |number(07-12)|:|number(00-59)|:|number(00-59)"));
+	}
+	
+	// State machine actions
+	public function IncrementAssignmentCount($sStimulusCode)
+	{
+		$this->Set('assignment_count', $this->Get('assignment_count') + 1);
+		return true;
+	}
+	
+	public function SetClosureDate($sStimulusCode)
+	{
+		$this->Set('end_date', time());
+		return true;
+	}
+	
+		public function SetLastUpdate($sStimulusCode)
+	{
+		$this->Set('last_update', time());
+		return true;
+	}
+	
+	public function ComputeValues()
+	{
+		$iKey = $this->GetKey();
+		if ($iKey < 0)
+		{
+			// Object not yet in the Database
+			$iKey = MetaModel::GetNextKey(get_class($this));
+		}
+		$sName = sprintf('I-%06d', $iKey);
+		$this->Set('name', $sName);
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Infra and a Incident
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkRelatedTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Related Ticket",
+			"description" => "Ticket related to a ticket",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "impact",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("impact"),  // ????
+			"db_table" => "related_ticket",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("rel_ticket_id", array("targetclass"=>"bizIncidentTicket", "jointype"=> '', "label"=>"Related Ticket", "description"=>"The related ticket", "allowed_values"=>null, "sql"=>"rel_ticket_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("rel_ticket_name", array("label"=>"Related ticket", "description"=>"Name of the related ticket", "allowed_values"=>null, "extkey_attcode"=> 'rel_ticket_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ticket_id", array("targetclass"=>"bizIncidentTicket", "jointype"=> '', "label"=>"Ticket", "description"=>"Ticket number", "allowed_values"=>null, "sql"=>"ticket_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("label"=>"Ticket Name", "description"=>"Name of the ticket", "allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Impact on the related ticket", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("rel_ticket_id");
+		MetaModel::Init_AddFilterFromAttribute("ticket_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('rel_ticket_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('rel_ticket_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('rel_ticket_id', 'ticket_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('rel_ticket_id', 'ticket_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('infra_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('impact', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Infra and a Incident
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkInfraTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Infra Ticket",
+			"description" => "Infra impacted by a ticket",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "impact",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("impact"),  // ????
+			"db_table" => "infra_ticket",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("infra_id", array("targetclass"=>"logInfra", "jointype"=> '', "label"=>"Infrastructure", "description"=>"The infrastructure impacted", "allowed_values"=>null, "sql"=>"infra_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("infra_name", array("label"=>"Infrastructure Name", "description"=>"Name of the impacted infrastructure", "allowed_values"=>null, "extkey_attcode"=> 'infra_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ticket_id", array("targetclass"=>"bizIncidentTicket", "jointype"=> '', "label"=>"Ticket #", "description"=>"Ticket number", "allowed_values"=>null, "sql"=>"ticket_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("label"=>"Ticket Name", "description"=>"Name of the ticket", "allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"Level of impact of the infra by the related ticket", "allowed_values"=>null, "sql"=>"impact", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("infra_id");
+		MetaModel::Init_AddFilterFromAttribute("ticket_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('infra_id', 'ticket_id', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('infra_id', 'ticket_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('infra_id', 'ticket_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('infra_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('impact', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+
+////////////////////////////////////////////////////////////////////////////////////
+/**
+* n-n link between any Contqct and a Incident
+*/
+////////////////////////////////////////////////////////////////////////////////////
+class lnkContactTicket extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Contact Ticket",
+			"description" => "Contacts to be notify for a ticket",
+			"key_type" => "autoincrement",
+			"key_label" => "link_id",
+			"name_attcode" => "role",  // ????
+			"state_attcode" => "",
+			"reconc_keys" => array("role"),  // ????
+			"db_table" => "contact_ticket",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contact_id", array("targetclass"=>"bizContact", "jointype"=> '', "label"=>"Contact", "description"=>"Contact to Notify", "allowed_values"=>null, "sql"=>"contact_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("contact_email", array("label"=>"Contact email", "description"=>"Mail for the contact", "allowed_values"=>null, "extkey_attcode"=> 'contact_id', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("ticket_id", array("targetclass"=>"bizIncidentTicket", "jointype"=> '', "label"=>"Ticket #", "description"=>"Ticket number", "allowed_values"=>null, "sql"=>"ticket_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("ticket_name", array("label"=>"Ticket Name", "description"=>"Name of the ticket", "allowed_values"=>null, "extkey_attcode"=> 'ticket_id', "target_attcode"=>"title")));
+		MetaModel::Init_AddAttribute(new AttributeString("role", array("label"=>"Role", "description"=>"Role of the contact", "allowed_values"=>null, "sql"=>"role", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("contact_id");
+		MetaModel::Init_AddFilterFromAttribute("ticket_id");
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contact_id', 'ticket_id', 'role')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('contact_id', 'ticket_id', 'role')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('contact_id', 'ticket_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('contact_id', 'ticket_id')); // Criteria of the advanced search form
+	}
+
+	public function Generate(cmdbDataGenerator $oGenerator)
+	{
+		$this->Set('infra_id', $oGenerator->GenerateKey("logInfra", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('ticket_id', $oGenerator->GenerateKey("bizIncidentTicket", array('org_id' =>$oGenerator->GetOrganizationId() )));
+		$this->Set('impact', $oGenerator->GenerateString("enum(none,mandatory,partial)"));
+	}
+
+}
+////////////////////////////////////////////////////////////////////////////////////
+//**
+//* A workgroup is a queue in a given call tracking system
+//* It belongs to a team and a given organization
+////////////////////////////////////////////////////////////////////////////////////
+class bizWorkgroup extends logRealObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "bizmodel,searchable",
+			"name" => "Workgroup",
+			"description" => "Call tracking workgroup",
+			"key_type" => "",
+			"key_label" => "id",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array("org_name", "name"), // inherited attributes
+			"db_table" => "workgroups",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "../business/templates/default.html",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("label"=>"Status", "description"=>"Lifecycle status", "allowed_values"=>new ValueSetEnum('production,implementation,obsolete'), "sql"=>"status", "default_value"=>"implementation", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("org_name", array("label"=>"Organization", "description"=>"Company / Department owning this object", "allowed_values"=>null, "extkey_attcode"=> 'org_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("team_id", array("targetclass"=>"bizTeam", "label"=>"Team", "description"=>"Team owning the workgroup", "allowed_values"=>null, "sql"=>"team_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("team_name", array("label"=>"Team Name", "description"=>"name of the team", "allowed_values"=>null, "extkey_attcode"=> 'team_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("role", array("label"=>"Role", "description"=>"Role of this work group", "allowed_values"=>new ValueSetEnum("1st level support,2nd level support,3rd level support"), "sql"=>"role", "default_value"=>"1st level support", "is_null_allowed"=>true, "depends_on"=>array())));
+		
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("org_name");
+		MetaModel::Init_AddFilterFromAttribute("team_id");
+		MetaModel::Init_AddFilterFromAttribute("role");
+		
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'status', 'org_id', 'team_id', 'role')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'team_id','role')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'team_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'team_id','role')); // Criteria of the advanced search form
+
+	}
+}
+
+
+
+?>

business/templates/application.html

@@ -0,0 +1,30 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/software.jpg" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizApplication WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Impacted_Client_Applications">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="server_id" object_id="$pkey$" target_attr="client_id" encoding="text/oql">SELECT lnkClientServer WHERE server_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Application_Server">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="client_id" object_id="$pkey$" target_attr="server_id" encoding="text/oql">SELECT lnkClientServer WHERE client_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Incidents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="ticket_id" encoding="text/sibusql">lnkInfraTicket: infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Changes">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">bizChangeTicket: PKEY IS ticket_id IN (lnkInfraChangeTicket: infra_id = $pkey$)</itopblock>
+	</itoptab>
+
+ 	<itoptab name="Contracts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="contract_id" encoding="text/oql">SELECT lnkInfraContract WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+ 	<itoptab name="Groups">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="infra_group_id" encoding="text/oql">SELECT lnkInfraGrouping WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+
+
+</itoptabs>

business/templates/change.html

@@ -0,0 +1,17 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/imageChange.gif" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Impacted_Infrastructures">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="ticket_id" object_id="$pkey$" target_attr="infra_id" encoding="text/oql">SELECT lnkInfraChangeTicket WHERE ticket_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Contacts_to_Notify">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="change_id" object_id="$pkey$" target_attr="contact_id"  encoding="text/oql">SELECT lnkContactChange WHERE change_id = $pkey$</itopblock>
+	</itoptab>
+
+</itoptabs>
+<br style="clear:both"/>

business/templates/circuit.html

@@ -0,0 +1,21 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/WanLinks.jpg" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/sibusql">$class$: pkey = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+		<itoptab name="Incidents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="ticket_id" encoding="text/oql">SELECT lnkInfraTicket WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Changes">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT bizChangeTicket AS Change JOIN lnkInfraChangeTicket AS Link ON Link.ticket_id = Change.id WHERE Link.infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/contract.html

@@ -0,0 +1,18 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/erwanContracts.jpg" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizContract WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Covered_Infrastructures">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="contract_id" object_id="$pkey$" target_attr="infra_id" encoding="text/oql">SELECT lnkInfraContract WHERE contract_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="contract_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactContract WHERE contract_id = $pkey$</itopblock>
+	</itoptab>	
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="contract_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentContract WHERE contract_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/default.html

@@ -0,0 +1,8 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/tar.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/sibusql">$class$: pkey = $pkey$</itopblock>
+

business/templates/document.html

@@ -0,0 +1,7 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/folder_documents.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $pkey$</itopblock>

business/templates/group.html

@@ -0,0 +1,16 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/tar.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizInfraGroup WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Infrastructures">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_group_id" object_id="$pkey$" target_attr="infra_id"  encoding="text/oql">SELECT lnkInfraGrouping WHERE infra_group_id = $pkey$</itopblock>
+	</itoptab>
+		<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="contact_id"  encoding="text/oql">SELECT lnkContactRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+	
+</itoptabs>

business/templates/interface.html

@@ -0,0 +1,14 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/tar.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizInterface WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Groups">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="infra_group_id" encoding="text/oql">SELECT lnkInfraGrouping WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+
+	
+</itoptabs>

business/templates/knownError.html

@@ -0,0 +1,11 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizKnownError WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Related_Intrastructures">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="error_id" object_id="$pkey$" target_attr="infra_id" encoding="text/oql">SELECT lnkInfraError WHERE error_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/location.html

@@ -0,0 +1,25 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/starthere.png" style="margin-top:-20px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizLocation WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="list" object_id="$pkey$" target_attr="location_id" encoding="text/oql">SELECT bizContact WHERE location_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Servers">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="location_id">SELECT bizServer WHERE location_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="PCs">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="location_id">SELECT bizPC WHERE location_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Network_Devices">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="location_id">SELECT bizNetworkDevice WHERE location_id = $pkey$</itopblock>
+	</itoptab>
+
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/network.device.html

@@ -0,0 +1,28 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizNetworkDevice WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Interfaces">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizInterface WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactInfra WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Incidents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="ticket_id" encoding="text/oql">SELECT lnkInfraTicket WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Changes">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">bizChangeTicket: PKEY IS ticket_id IN (lnkInfraChangeTicket: infra_id = $pkey$)</itopblock>
+	</itoptab>
+	<itoptab name="Groups">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="infra_group_id" encoding="text/oql">SELECT lnkInfraGrouping WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+ </itoptabs>
+

business/templates/pc.html

@@ -0,0 +1,30 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/laptop_pcmcia.png" style="margin-top:-20px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizPC WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Applications">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizApplication WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Patches">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizPatch WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Interfaces">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizInterface WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Incidents">
+			<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="ticket_id" encoding="text/oql">SELECT lnkInfraTicket WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Groups">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="infra_group_id" encoding="text/oql">SELECT lnkInfraGrouping WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/person.html

@@ -0,0 +1,22 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/users2-big.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizPerson WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Teams">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="contact_id" object_id="$pkey$" target_attr="team_id" encoding="text/oql">SELECT lnkContactTeam WHERE contact_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Infrastructure">	
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="contact_id" object_id="$pkey$" target_attr="object_id" encoding="text/oql">SELECT lnkContactRealObject WHERE contact_id = $pkey$</itopblock>	
+	</itoptab>
+	<itoptab name="Service_Calls">	
+		<itopblock blockclass="DisplayBlock"  type="list" encoding="text/oql">SELECT bizServiceCall WHERE caller_id = $pkey$</itopblock>	
+	</itoptab>
+
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/server.html

@@ -0,0 +1,34 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/network-server.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizServer WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Applications">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizApplication WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Patches">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizPatch WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Interfaces">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql" object_id="$pkey$" target_attr="device_id">SELECT bizInterface WHERE device_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Contacts">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+		<itoptab name="Incidents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="ticket_id" encoding="text/oql">SELECT lnkInfraTicket WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Changes">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT bizChangeTicket AS Change JOIN lnkInfraChangeTicket AS Link ON Link.ticket_id = Change.id WHERE Link.infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Groups">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="infra_id" object_id="$pkey$" target_attr="infra_group_id" encoding="text/oql">SELECT lnkInfraGrouping WHERE infra_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+
+</itoptabs>

business/templates/service.html

@@ -0,0 +1,13 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/kservices-big.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT bizService WHERE id=$pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Contracts">
+		<itopblock blockclass="DisplayBlock" asynchronous="false" type="list" encoding="text/oql" object_id="$pkey$" target_attr="service_id">SELECT bizContract WHERE service_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>
+

business/templates/serviceCall.html

@@ -0,0 +1,18 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/messagebox_warning.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Impacted_Infrastructures">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="call_id" object_id="$pkey$" target_attr="infra_id" encoding="text/oql">SELECT lnkInfraCall WHERE call_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Related_Incidents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="call_id" object_id="$pkey$" target_attr="ticket_id" encoding="text/oql">SELECT lnkCallTicket WHERE call_id = $pkey$</itopblock>
+	</itoptab>
+	
+
+</itoptabs>
+<br style="clear:both"/>

business/templates/serviceRequest.html

@@ -0,0 +1,12 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/erwanContracts.jpg" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$  WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Service_Items">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT bizServiceItem WHERE request_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/software.html

@@ -0,0 +1,13 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/software.jpg" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/sibusql">bizSoftware: pkey = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Installed_Instances">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/sibusql">bizApplication: soft_id = $pkey$</itopblock>
+	</itoptab>
+
+</itoptabs>

business/templates/team.html

@@ -0,0 +1,22 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/users2-big.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Members">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="team_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactTeam WHERE team_id=$pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Infrastructures">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="contact_id" object_id="$pkey$" target_attr="infra_id" encoding="text/oql">SELECT lnkContactInfra WHERE contact_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Workgroups">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT bizWorkgroup WHERE team_id = $pkey$</itopblock>
+	</itoptab>
+
+	<itoptab name="Documents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="object_id" object_id="$pkey$" target_attr="doc_id" encoding="text/oql">SELECT lnkDocumentRealObject WHERE object_id = $pkey$</itopblock>
+	</itoptab>
+</itoptabs>

business/templates/ticket.html

@@ -0,0 +1,24 @@
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/sibusql" label="Actions">$class$: pkey = $pkey$</itopblock>
+	<h1>$class_name$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $pkey$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../images/messagebox_warning.png" style="margin-top:-10px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/sibusql">$class$: pkey = $pkey$</itopblock>
+<itoptabs>
+	<itoptab name="Impacted_Infrastructures">
+		<itopblock blockclass="DisplayBlock" type="list" link_attr="ticket_id" object_id="$pkey$" target_attr="infra_id" encoding="text/oql">SELECT lnkInfraTicket WHERE ticket_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Related_Incidents">
+		<itopblock blockclass="DisplayBlock" type="links" link_attr="ticket_id" object_id="$pkey$" target_attr="rel_ticket_id" encoding="text/oql">SELECT lnkRelatedTicket WHERE ticket_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Contacts_to_Notify">
+		<itopblock blockclass="DisplayBlock" type="list" link_attr="ticket_id" object_id="$pkey$" target_attr="contact_id" encoding="text/oql">SELECT lnkContactTicket WHERE ticket_id = $pkey$</itopblock>
+	</itoptab>
+	<itoptab name="Email_Notifications">
+		<itopblock blockclass="DisplayBlock" type="list" parameters="menu:0;" encoding="text/oql">SELECT EventNotificationEmail AS Ev JOIN TriggerOnObject AS T ON Ev.trigger_id = T.id WHERE T.target_class = 'bizIncidentTicket' AND Ev.object_id = $pkey$</itopblock>
+	</itoptab>
+
+
+</itoptabs>
+<br style="clear:both"/>

business/test_farm.class.inc.php

@@ -0,0 +1,272 @@
+<?php
+
+
+/**
+ * test_farm.class.inc.php
+ * User defined objects, for unit testing - SQL generation oriented (complex links) 
+ *
+ * @package     iTopUnitTests
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
+
+///////////////////////////////////////////////////////////////////////////////
+// Business implementation demo
+///////////////////////////////////////////////////////////////////////////////
+
+//todo MetaModel::RegisterRelation("Potes", array("description"=>"ceux dont l'email ressemble au mien", "verb_down"=>"est pote de", "verb_up"=>"est pote de"));
+
+
+//todo MetaModel::RegisterZList("list1", array("description"=>"une premiere list, just for fun", "type"=>"attributes"));
+//todo MetaModel::RegisterZList("list2", array("description"=>"la secunda e meliora", "type"=>"attributes"));
+//todo MetaModel::RegisterZList("list3", array("description"=>"la variante qui tue", "type"=>"filters"));
+
+
+class Animal extends cmdbObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Animal",
+			"description" => "An animal",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(""),
+			"db_table" => "animals",
+			"db_key_field" => "animalid",
+			"db_finalclass_field" => "actualclass",
+		);
+		MetaModel::Init_Params($aParams);
+
+		MetaModel::Init_AddAttribute(new AttributeEnum("sex", array("label"=>"sex", "description"=>"sex", "allowed_values"=>new ValueSetEnum('male, female'), "sql"=>"sex", "default_value"=>"male", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("species", array("label"=>"species", "description"=>"species", "allowed_values"=>null, "sql"=>"species", "default_value"=>"xxx", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("speed", array("label"=>"walk speed", "description"=>"maximum possible speed m.s-1", "allowed_values"=>null, "sql"=>"speed", "default_value"=>4, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("mother", array("label"=>"mother", "description"=>"mother", "allowed_values"=>null, "sql"=>"mother", "targetclass"=>"Animal", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("father", array("label"=>"father", "description"=>"father", "allowed_values"=>null, "sql"=>"father", "targetclass"=>"Animal", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("sex");
+		MetaModel::Init_AddFilterFromAttribute("species");
+		MetaModel::Init_AddFilterFromAttribute("speed");
+		MetaModel::Init_AddFilterFromAttribute("mother");
+		MetaModel::Init_AddFilterFromAttribute("father");
+	}
+}
+
+
+class Mammal extends Animal
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Mammal",
+			"description" => "An animal with some characteristics",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "mammals",
+			"db_key_field" => "mammalid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"name", "description"=>"name", "allowed_values"=>null, "sql"=>"name", "default_value"=>"xxx", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("height", array("label"=>"height", "description"=>"size in centimeters", "allowed_values"=>null, "sql"=>"height", "default_value"=>1, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("birth", array("label"=>"birth date", "description"=>"birth date", "allowed_values"=>null, "sql"=>"birth", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("member", array("label"=>"member", "description"=>"leader", "allowed_values"=>null, "sql"=>"member", "targetclass"=>"Group", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+
+// ?		MetaModel::Init_AddAttribute(new AttributeLinkedSet("a2a", array("label"=>"animal to animal", "description"=>"interanimal relations", "depends_on"=>array(), "linked_class"=>"Animal2animal", "ext_key_to_me"=>"animal1", "count_min"=>0, "count_max"=>10, "allowed_values"=>null)));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("height");
+		MetaModel::Init_AddFilterFromAttribute("birth");
+		MetaModel::Init_AddFilterFromAttribute("member");
+	}
+}
+
+class Bird extends Animal
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Bird",
+			"description" => "Un regroupement de gens",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "birds",
+			"db_key_field" => "birdid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_OverloadAttributeParams("species", array("allowed_values"=>array('geese', 'rooster', 'chicken', 'turckey', 'pie', 'corbeau')));
+
+		MetaModel::Init_InheritFilters();
+	}
+}
+
+class WalkingBird extends Bird
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "WalkingBird",
+			"description" => "A bird which nevers flies",
+			"key_type" => "",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "walkingbirds",
+			"db_key_field" => "walkingbirdid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_OverloadAttributeParams("species", array("allowed_values"=>array('geese', 'rooster', 'chicken', 'turckey')));
+		MetaModel::Init_InheritFilters();
+	}
+}
+
+class FlyingBird extends Bird
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "FlyingBird",
+			"description" => "A bird which nevers flies",
+			"key_type" => "",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "flyingbirds",
+			"db_key_field" => "flyingbirdid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_OverloadAttributeParams("species", array("allowed_values"=>array('pie', 'corbeau')));
+		MetaModel::Init_AddAttribute(new AttributeInteger("flyingspeed", array("label"=>"flying speed", "description"=>"flying at ms.s-1", "allowed_values"=>null, "sql"=>"headcount", "default_value"=>10, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("flyingspeed");
+	}
+}
+
+class AnimalRelation extends cmdbObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "AnimalRelation",
+			"description" => "Link between two animals",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "a2a",
+			"db_key_field" => "linkid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// What makes it being a link...
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("animal1", array("label"=>"source", "description"=>"the animal which does ...", "allowed_values"=>null, "sql"=>"a1", "targetclass"=>"Animal", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("animal2", array("label"=>"target", "description"=>"the animal to which something is done...", "allowed_values"=>null, "sql"=>"a2", "targetclass"=>"Animal", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("animal1");
+		MetaModel::Init_AddFilterFromAttribute("animal2");
+	}
+}
+
+
+class EaterToEaten extends AnimalRelation
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "EaterToEaten",
+			"description" => "Animal 1 eats animal 2",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "eatertoeaten",
+			"db_key_field" => "eatertoeatonid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeEnum("DeadOrAlive", array("label"=>"DeadOrAlive", "description"=>"State in which it is ok for the eater to proceed", "allowed_values"=>new ValueSetEnum('dead, fresh, cooked'), "sql"=>"deadoralive", "default_value"=>"fresh", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("DeadOrAlive");
+	}
+}
+
+class Group extends cmdbObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "blah",
+			"name" => "Group",
+			"description" => "Group of animals",
+			"key_type" => "autoincrement",
+			"key_label" => "",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "groups",
+			"db_key_field" => "groupid",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"name", "description"=>"name", "allowed_values"=>null, "sql"=>"name", "default_value"=>"xxx", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("leader", array("label"=>"leader", "description"=>"leader", "allowed_values"=>null, "sql"=>"leader", "targetclass"=>"Mammal", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("leader_name", array("label"=>"Leader Name", "description"=>"Name of the leader (defined on Mammal)", "allowed_values"=>null, "extkey_attcode"=> 'leader', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("leader_speed", array("label"=>"Leader Name", "description"=>"Speed of the leader (defined on Animal)", "allowed_values"=>null, "extkey_attcode"=> 'leader', "target_attcode"=>"speed")));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("leader");
+		MetaModel::Init_AddFilterFromAttribute("leader_name");
+		MetaModel::Init_AddFilterFromAttribute("leader_speed");
+	}
+}
+
+
+?>

config-dist.php

@@ -0,0 +1,38 @@
+<?php
+
+//
+// phpMyORM configuration file
+//
+// To be manually edited (or generated by the configuration wizard)
+//
+// The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+//
+
+$MySettings = array(
+	'db_host' => 'localhost',
+	'db_user' => 'itop',
+	'db_pwd' => '1T0p',
+	'db_name' => 'itopv06',
+	'db_subname' => '', // use it to differentiate two applications instances running on the same DB
+);
+
+// Modules: file names should be specified as a absolute paths
+
+$MyModules = array(
+	'application' => array (
+		'../application/menunode.class.inc.php',
+		'../application/audit.rule.class.inc.php',
+		// to be continued...
+	),
+	'business' => array (
+		'../business/itop.business.class.inc.php'
+		// to be continued...
+	),
+	'addons' => array (
+		'user rights' => '../addons/userrights/userrightsprofile.class.inc.php', 
+		// other modules to come later
+	)
+);
+
+
+?>

config-test-farm.php

@@ -10,7 +10,7 @@
 
 $MySettings = array(
 	'db_host' => 'localhost',
-	'db_user' => 'root',
+	'db_user' => 'RomainDBLogin',
 	'db_pwd' => '',
 	'db_name' => 'TestFarm',
 	'db_subname' => '', // use it to differentiate two applications instances running on the same DB
@@ -20,9 +20,6 @@ $MySettings = array(
 
 $MyModules = array(
 	'application' => array (
-//		'../core/event.class.inc.php',
-//		'../core/action.class.inc.php',
-//		'../core/trigger.class.inc.php',
 		// to be continued...
 	),
 	'business' => array (

config-test-mymodel.php

@@ -0,0 +1,36 @@
+<?php
+
+//
+// phpMyORM configuration file
+//
+// To be manually edited (or generated by the configuration wizard)
+//
+// The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+//
+
+
+$MySettings = array(
+	'db_host' => 'localhost',
+	'db_user' => 'itop',
+	'db_pwd' => '1T0p',
+	'db_name' => 'TestBizModelGenericItop',
+	'db_subname' => 'tribute2itop', // use it to differentiate two applications instances running on the same DB
+);
+
+// Modules: file names should be specified as a absolute paths
+
+$MyModules = array(
+	'application' => array (
+		// to be continued...
+	),
+	'business' => array (
+		'../business/business_test.class.inc.php'
+		// to be continued...
+	),
+	'addons' => array (
+		// other modules to come later
+	)
+);
+
+
+?>

core/MyHelpers.class.inc.php

@@ -1,35 +1,18 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Various dev/debug helpers
- * TODO: cleanup or at least re-organize
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 /**
  * MyHelpers
+ * various dev/debug helpers, to cleanup or at least re-organize
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
+
 class MyHelpers
 {
 	public static function CheckValueInArray($sDescription, $value, $aData)
@@ -488,7 +471,7 @@ class Str
 	*/
 	protected static function xmlencode($string)
 	{
-		return self::xmlentities(iconv("UTF-8", "UTF-8//IGNORE",$string));
+		return self::xmlentities(iconv("ISO-8859-1", "UTF-8//IGNORE",$string));
 	}
 
 	public static function islowcase($sString)

core/action.class.inc.php

@@ -1,28 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Persistent classes (internal): user defined actions
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 require_once('../core/email.class.inc.php');
 
@@ -30,6 +6,12 @@ require_once('../core/email.class.inc.php');
  * A user defined action, to customize the application  
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 abstract class Action extends cmdbAbstractObject
 {
@@ -38,7 +20,10 @@ abstract class Action extends cmdbAbstractObject
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "action",
+			"description" => "Custom action",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -49,13 +34,17 @@ abstract class Action extends cmdbAbstractObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum(array('test'=>'Being tested' ,'enabled'=>'In production', 'disabled'=>'Inactive')), "sql"=>"status", "default_value"=>"test", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("label"=>"Name", "description"=>"label", "allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("label"=>"Description", "description"=>"one line description", "allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("label"=>"Status", "description"=>"In production or ?", "allowed_values"=>new ValueSetEnum(array('test'=>'Being tested' ,'enabled'=>'In production', 'disabled'=>'Inactive')), "sql"=>"status", "default_value"=>"test", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("related_triggers", array("label"=>"Related Triggers", "description"=>"Triggers linked to this action", "linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("name");
+		MetaModel::Init_AddFilterFromAttribute("description");
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status')); // 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
@@ -94,6 +83,12 @@ abstract class Action extends cmdbAbstractObject
  * A notification  
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 abstract class ActionNotification extends Action
 {
@@ -102,7 +97,10 @@ abstract class ActionNotification extends Action
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "notification",
+			"description" => "Notification (abstract)",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -114,8 +112,10 @@ abstract class ActionNotification extends Action
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
+		MetaModel::Init_InheritFilters();
+
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status')); // 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
@@ -127,6 +127,12 @@ abstract class ActionNotification extends Action
  * An email notification  
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 class ActionEmail extends ActionNotification
 {
@@ -135,7 +141,10 @@ class ActionEmail extends ActionNotification
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "email notification",
+			"description" => "Action: Email notification",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "name",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -147,19 +156,21 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
 
-		MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("label"=>"Test recipient", "description"=>"Detination in case status is set to \"Test\"", "allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
-		MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTemplateText("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("from", array("label"=>"From", "description"=>"Will be sent into the email header", "allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("label"=>"Reply to", "description"=>"Will be sent into the email header", "allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("to", array("label"=>"To", "description"=>"Destination of the email", "allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("label"=>"Cc", "description"=>"Carbon Copy", "allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("label"=>"bcc", "description"=>"Blind Carbon Copy", "allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("label"=>"subject", "description"=>"Title of the email", "allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTemplateText("body", array("label"=>"body", "description"=>"Contents of the email", "allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("label"=>"importance", "description"=>"Importance flag", "allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -183,7 +194,7 @@ class ActionEmail extends ActionNotification
 		{
 			$oSearch = DBObjectSearch::FromOQL($sOQL);
 		}
-		catch (OQLException $e)
+		catch (OqlException $e)
 		{
 			$this->m_aMailErrors[] = "query syntax error for recipient '$sRecipAttCode'";
 			return $e->getMessage();
@@ -236,7 +247,7 @@ class ActionEmail extends ActionNotification
 			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
 			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
 
-			$oEmail = new EMail();
+			$oEmail = new Email();
 
 			if ($this->IsBeingTested())
 			{
@@ -277,9 +288,7 @@ class ActionEmail extends ActionNotification
 				}
 				else
 				{
-					$oKPI = new ExecutionKPI();
 					$this->m_aMailErrors = array_merge($this->m_aMailErrors, $oEmail->Send());
-					$oKPI->ComputeStats('Send mail', $sTo);
 				}
 			}
 		}
@@ -288,55 +297,53 @@ class ActionEmail extends ActionNotification
 			$this->m_aMailErrors[] = $e->getMessage();
 		}
 
-		if (MetaModel::IsLogEnabledNotification())
+		$oLog = new EventNotificationEmail();
+		if (empty($this->m_aMailErrors))
 		{
-			$oLog = new EventNotificationEmail();
-			if (empty($this->m_aMailErrors))
+			if ($this->IsBeingTested())
 			{
-				if ($this->IsBeingTested())
-				{
-					$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
-				}
-				else
-				{
-					$oLog->Set('message', 'Notification sent');
-				}
+				$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
 			}
 			else
 			{
-				if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
-				{
-					$sError = implode(', ', $this->m_aMailErrors);
-				}
-				else
-				{
-					$sError = 'Unknown reason';
-				}
-				if ($this->IsBeingTested())
-				{
-					$oLog->Set('message', 'TEST - Notification was not sent: '.$sError);
-				}
-				else
-				{
-					$oLog->Set('message', 'Notification was not sent: '.$sError);
-				}
+				$oLog->Set('message', 'Notification sent');
 			}
-			$oLog->Set('userinfo', UserRights::GetUser());
-			$oLog->Set('trigger_id', $oTrigger->GetKey());
-			$oLog->Set('action_id', $this->GetKey());
-			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
-
-			// Note: we have to secure this because those values are calculated
-			// inside the try statement, and we would like to keep track of as
-			// many data as we could while some variables may still be undefined
-			if (isset($sTo))       $oLog->Set('to', $sTo);
-			if (isset($sCC))       $oLog->Set('cc', $sCC);
-			if (isset($sBCC))      $oLog->Set('bcc', $sBCC);
-			if (isset($sFrom))     $oLog->Set('from', $sFrom);
-			if (isset($sSubject))  $oLog->Set('subject', $sSubject);
-			if (isset($sBody))     $oLog->Set('body', $sBody);
-			$oLog->DBInsertNoReload();
 		}
+		else
+		{
+			if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
+			{
+				$sError = implode(', ', $this->m_aMailErrors);
+			}
+			else
+			{
+				$sError = 'Unknown reason';
+			}
+			if ($this->IsBeingTested())
+			{
+				$oLog->Set('message', 'TEST - Notification was not sent: '.$sError);
+			}
+			else
+			{
+				$oLog->Set('message', 'Notification was not sent: '.$sError);
+			}
+		}
+
+		$oLog->Set('userinfo', UserRights::GetUser());
+		$oLog->Set('trigger_id', $oTrigger->GetKey());
+		$oLog->Set('action_id', $this->GetKey());
+		$oLog->Set('object_id', $aContextArgs['this->id']);
+
+		// Note: we have to secure this because those values are calculated
+		// inside the try statement, and we would like to keep track of as
+		// many data as we could while some variables may still be undefined
+		if (isset($sTo))       $oLog->Set('to', $sTo);
+		if (isset($sCC))       $oLog->Set('cc', $sCC);
+		if (isset($sBCC))      $oLog->Set('bcc', $sBCC);
+		if (isset($sFrom))     $oLog->Set('from', $sFrom);
+		if (isset($sSubject))  $oLog->Set('subject', $sSubject);
+		if (isset($sBody))     $oLog->Set('body', $sBody);
+		$oLog->DBInsertNoReload();
 	}
 }
 ?>

core/archive.class.inc.php

@@ -1,29 +1,18 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * Utility to import/export the DB from/to a ZIP file
+ * archive.class.inc.php
+ * Utility to import/export the DB from/to a ZIP file 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
-
 /**
  * iTopArchive a class to manipulate (read/write) iTop archives with their catalog
  * Each iTop archive is a zip file that contains (at the root of the archive)

core/bulkchange.class.inc.php

@@ -1,34 +1,16 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Bulk change facility (common to interactive and batch usages)
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 /**
  * BulkChange
  * Interpret a given data set and update the DB accordingly (fake mode avail.) 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 class BulkChangeException extends CoreException
@@ -40,16 +22,19 @@ class BulkChangeException extends CoreException
  * A series of classes, keeping the information about a given cell: could it be changed or not (and why)?  
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 abstract class CellChangeSpec
 {
 	protected $m_proposedValue;
-	protected $m_sOql; // in case of ambiguity
 
-	public function __construct($proposedValue, $sOql = '')
+	public function __construct($proposedValue)
 	{
 		$this->m_proposedValue = $proposedValue;
-		$this->m_sOql = $sOql;
 	}
 
 	static protected function ValueAsHtml($value)
@@ -60,33 +45,51 @@ abstract class CellChangeSpec
 		}
 		else
 		{
-			return htmlentities($value, ENT_QUOTES, 'UTF-8');
+			return htmlentities($value);
 		}
 	}
 
-	public function GetValue()
+	public function GetValue($bHtml = false)
 	{
-		return $this->m_proposedValue;
+		if ($bHtml)
+		{
+			return self::ValueAsHtml($this->m_proposedValue);
+		}
+		else
+		{
+			return $this->m_proposedValue;
+		}
 	}
 
-	public function GetOql()
-	{
-		return $this->m_sOql;
-	}
-
-	abstract public function GetDescription();
+	abstract public function GetDescription($bHtml = false);
 }
 
 
-class CellStatus_Void extends CellChangeSpec
+class CellChangeSpec_Void extends CellChangeSpec
 {
-	public function GetDescription()
+	public function GetDescription($bHtml = false)
 	{
-		return '';
+		return $this->GetValue($bHtml);
 	}
 }
 
-class CellStatus_Modify extends CellChangeSpec
+class CellChangeSpec_Unchanged extends CellChangeSpec
+{
+	public function GetDescription($bHtml = false)
+	{
+		return $this->GetValue($bHtml)." (unchanged)";
+	}
+}
+
+class CellChangeSpec_Init extends CellChangeSpec
+{
+	public function GetDescription($bHtml = false)
+	{
+		return $this->GetValue($bHtml);
+	}
+}
+
+class CellChangeSpec_Modify extends CellChangeSpec
 {
 	protected $m_previousValue;
 
@@ -96,18 +99,13 @@ class CellStatus_Modify extends CellChangeSpec
 		parent::__construct($proposedValue);
 	}
 
-	public function GetDescription()
+	public function GetDescription($bHtml = false)
 	{
-		return 'Modified';
-	}
-
-	public function GetPreviousValue()
-	{
-		return $this->m_previousValue;
+		return $this->GetValue($bHtml)." (previous: ".self::ValueAsHtml($this->m_previousValue).")";
 	}
 }
 
-class CellStatus_Issue extends CellStatus_Modify
+class CellChangeSpec_Issue extends CellChangeSpec_Modify
 {
 	protected $m_sReason;
 
@@ -117,58 +115,13 @@ class CellStatus_Issue extends CellStatus_Modify
 		parent::__construct($proposedValue, $previousValue);
 	}
 
-	public function GetDescription()
+	public function GetDescription($bHtml = false)
 	{
 		if (is_null($this->m_proposedValue))
 		{
 			return 'Could not be changed - reason: '.$this->m_sReason;
 		}
-		return 'Could not be changed to '.$this->m_proposedValue.' - reason: '.$this->m_sReason;
-	}
-}
-
-class CellStatus_SearchIssue extends CellStatus_Issue
-{
-	public function __construct()
-	{
-		parent::__construct(null, null, null);
-	}
-
-	public function GetDescription()
-	{
-		return 'No match';
-	}
-}
-
-class CellStatus_NullIssue extends CellStatus_Issue
-{
-	public function __construct()
-	{
-		parent::__construct(null, null, null);
-	}
-
-	public function GetDescription()
-	{
-		return 'Missing mandatory value';
-	}
-}
-
-
-class CellStatus_Ambiguous extends CellStatus_Issue
-{
-	protected $m_iCount;
-
-	public function __construct($previousValue, $iCount, $sOql)
-	{
-		$this->m_iCount = $iCount;
-		$this->m_sQuery = $sOql;
-		parent::__construct(null, $previousValue, '');
-	}
-
-	public function GetDescription()
-	{
-		$sCount = $this->m_iCount;
-		return "Ambiguous: found $sCount objects";
+		return 'Could not be changed to "'.$this->GetValue($bHtml).'" - reason: '.$this->m_sReason.' (previous: '.$this->m_previousValue.')';
 	}
 }
 
@@ -178,6 +131,11 @@ class CellStatus_Ambiguous extends CellStatus_Issue
  * A series of classes, keeping the information about a given row: could it be changed or not (and why)?  
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 abstract class RowStatus
 {
@@ -185,12 +143,12 @@ abstract class RowStatus
 	{
 	}
 
-	abstract public function GetDescription();
+	abstract public function GetDescription($bHtml = false);
 }
 
 class RowStatus_NoChange extends RowStatus
 {
-	public function GetDescription()
+	public function GetDescription($bHtml = false)
 	{
 		return "unchanged";
 	}
@@ -198,9 +156,32 @@ class RowStatus_NoChange extends RowStatus
 
 class RowStatus_NewObj extends RowStatus
 {
-	public function GetDescription()
+	protected $m_iObjKey;
+
+	public function __construct($sClass = '', $iObjKey = null)
 	{
-		return "created";
+		$this->m_iObjKey = $iObjKey;
+		$this->m_sClass = $sClass;
+	}
+
+	public function GetDescription($bHtml = false)
+	{
+		if (is_null($this->m_iObjKey))
+		{
+			return "Create";
+		}
+		else
+		{
+			if (!empty($this->m_sClass))
+			{
+				$oObj = MetaModel::GetObject($this->m_sClass, $this->m_iObjKey);
+				return 'Created '.$oObj->GetHyperLink();
+			}
+			else
+			{
+				return 'Created (id: '.$this->m_iObjKey.')';
+			}
+		}	
 	}
 }
 
@@ -213,9 +194,9 @@ class RowStatus_Modify extends RowStatus
 		$this->m_iChanged = $iChanged;
 	}
 
-	public function GetDescription()
+	public function GetDescription($bHtml = false)
 	{
-		return "updated ".$this->m_iChanged." cols";
+		return "update ".$this->m_iChanged." cols";
 	}
 }
 
@@ -228,28 +209,31 @@ class RowStatus_Issue extends RowStatus
 		$this->m_sReason = $sReason;
 	}
 
-	public function GetDescription()
+	public function GetDescription($bHtml = false)
 	{
-		return 'Issue: '.$this->m_sReason;
+		return 'Skipped - reason:'.$this->m_sReason;
 	}
 }
 
 
 /**
- * BulkChange
- *
- * @package iTopORM
- */
+ ** BulkChange *
+ ** @package iTopORM
+ ** @author Romain Quetiez <romainquetiez@yahoo.fr>
+ ** @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ ** @link www.itop.com
+ ** @since 1.0
+ ** @version $itopversion$ */
 class BulkChange
 {
 	protected $m_sClass; 
 	protected $m_aData; // Note: hereafter, iCol maybe actually be any acceptable key (string)
 	// #@# todo: rename the variables to sColIndex
 	protected $m_aAttList; // attcode => iCol
+	protected $m_aReconcilKeys;// iCol => attcode (attcode = 'id' for the pkey) 
 	protected $m_aExtKeys; // aExtKeys[sExtKeyAttCode][sExtReconcKeyAttCode] = iCol;
-	protected $m_aReconcilKeys;// attcode (attcode = 'id' for the pkey) 
 
-	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys)
+	public function __construct($sClass, $aData, $aAttList, $aReconcilKeys, $aExtKeys)
 	{
 		$this->m_sClass = $sClass;
 		$this->m_aData = $aData;
@@ -258,35 +242,17 @@ class BulkChange
 		$this->m_aExtKeys = $aExtKeys;
 	}
 
-	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
+	static protected function MakeSpecObject($sClass, $iId)
 	{
-		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-		$oReconFilter = new CMDBSearchFilter($oExtKey->GetTargetClass());
-		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
+		$oObj = MetaModel::GetObject($sClass, $iId);
+		if (is_null($oObj))
 		{
-			// The foreign attribute is one of our reconciliation key
-			$oReconFilter->AddCondition($sForeignAttCode, $aRowData[$iCol], '=');
-			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+			return $iId;
 		}
-
-		$oExtObjects = new CMDBObjectSet($oReconFilter);
-		$aKeys = $oExtObjects->ToArray();
-		return array($oReconFilter->ToOql(), $aKeys);
-	}
-
-	// 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);
-		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
+		else
 		{
-			// The foreign attribute is one of our reconciliation key
-			if (strlen($aRowData[$iCol]) > 0)
-			{
-				return false;
-			}
+			return $oObj;
 		}
-		return true;
 	}
 
 	protected function PrepareObject(&$oTargetObj, $aRowData, &$aErrors)
@@ -298,76 +264,51 @@ class BulkChange
 		//
 		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
 		{
-			// Skip external keys used for the reconciliation process
-			// if (!array_key_exists($sAttCode, $this->m_aAttList)) continue;
-
 			$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
-
-			if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
+			$oReconFilter = new CMDBSearchFilter($oExtKey->GetTargetClass());
+			foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 			{
-				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-				{
-					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
-				}
-				if ($oExtKey->IsNullAllowed())
-				{
-					$oTargetObj->Set($sAttCode, $oExtKey->GetNullValue());
-					$aResults[$sAttCode]= new CellStatus_Void($oExtKey->GetNullValue());
-				}
-				else
-				{
-					$aErrors[$sAttCode] = "Null not allowed";
-					$aResults[$sAttCode]= new CellStatus_Issue(null, $oTargetObj->Get($sAttCode), 'Null not allowed');
-				}
+				// The foreign attribute is one of our reconciliation key
+				$oReconFilter->AddCondition($sForeignAttCode, $aRowData[$iCol], '=');
+				$aResults["col$iCol"] = new CellChangeSpec_Void($aRowData[$iCol]);
 			}
-			else
+			$oExtObjects = new CMDBObjectSet($oReconFilter);
+			switch($oExtObjects->Count())
 			{
-				$oReconFilter = new CMDBSearchFilter($oExtKey->GetTargetClass());
-				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-				{
-					// The foreign attribute is one of our reconciliation key
-					$oReconFilter->AddCondition($sForeignAttCode, $aRowData[$iCol], '=');
-					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
-				}
-				$oExtObjects = new CMDBObjectSet($oReconFilter);
-				switch($oExtObjects->Count())
-				{
-				case 0:
-					$aErrors[$sAttCode] = "Object not found";
-					$aResults[$sAttCode]= new CellStatus_SearchIssue();
-					break;
-				case 1:
-					// Do change the external key attribute
-					$oForeignObj = $oExtObjects->Fetch();
-					$oTargetObj->Set($sAttCode, $oForeignObj->GetKey());
-					break;
-				default:
-					$aErrors[$sAttCode] = "Found ".$oExtObjects->Count()." matches";
-					$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $oExtObjects->Count(), $oReconFilter->ToOql());
-				}
-			}
-
-			// Report
-			if (!array_key_exists($sAttCode, $aResults))
-			{
-				$iForeignObj = $oTargetObj->Get($sAttCode);
+			case 0:
+				$aErrors[$sAttCode] = "Object not found";
+				$aResults[$sAttCode]= new CellChangeSpec_Issue(null, $oTargetObj->Get($sAttCode), 'Object not found - check the spelling (no space before/after)');
+				break;
+			case 1:
+				// Do change the external key attribute
+				$oForeignObj = $oExtObjects->Fetch();
+				$oTargetObj->Set($sAttCode, $oForeignObj->GetKey());
+	
+				// Report it
 				if (array_key_exists($sAttCode, $oTargetObj->ListChanges()))
 				{
+
 					if ($oTargetObj->IsNew())
 					{
-						$aResults[$sAttCode]= new CellStatus_Void($iForeignObj);
+						$aResults[$sAttCode]= new CellChangeSpec_Init($oForeignObj);
 					}
 					else
 					{
-						$aResults[$sAttCode]= new CellStatus_Modify($iForeignObj, $oTargetObj->GetOriginal($sAttCode));
+						$previousValue = self::MakeSpecObject($oExtKey->GetTargetClass(), $oTargetObj->GetOriginal($sAttCode));
+						$aResults[$sAttCode]= new CellChangeSpec_Modify($oForeignObj, $previousValue);
 					}
 				}
 				else
 				{
-					$aResults[$sAttCode]= new CellStatus_Void($iForeignObj);
+					$aResults[$sAttCode]= new CellChangeSpec_Unchanged($oForeignObj);
 				}
+				break;
+			default:
+				$aErrors[$sAttCode] = "Found ".$oExtObjects->Count()." matches";
+				$previousValue = self::MakeSpecObject($oExtKey->GetTargetClass(), $oTargetObj->Get($sAttCode));
+				$aResults[$sAttCode]= new CellChangeSpec_Issue(null, $previousValue, "Found ".$oExtObjects->Count()." matches");
 			}
-		}
+		}	
 	
 		// Set the object attributes
 		//
@@ -376,15 +317,13 @@ class BulkChange
 			// skip the private key, if any
 			if ($sAttCode == 'id') continue;
 
-			$res = $oTargetObj->CheckValue($sAttCode, $aRowData[$iCol]);
-			if ($res === true)
+			if (!$oTargetObj->CheckValue($sAttCode, $aRowData[$iCol]))
 			{
-				$oTargetObj->Set($sAttCode, $aRowData[$iCol]);
+				$aErrors[$sAttCode] = "Unexpected value";
 			}
 			else
 			{
-				// $res is a string with the error description
-				$aErrors[$sAttCode] = "Unexpected value for attribute '$sAttCode': $res";
+				$oTargetObj->Set($sAttCode, $aRowData[$iCol]);
 			}
 		}
 	
@@ -395,37 +334,43 @@ class BulkChange
 		{
 			if ($sAttCode == 'id')
 			{
-				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+				if ($aRowData[$iCol] == $oTargetObj->GetKey())
+				{
+					$aResults["col$iCol"]= new CellChangeSpec_Void($aRowData[$iCol]);
+				}
+				else
+				{
+					$aResults["col$iCol"]= new CellChangeSpec_Init($aRowData[$iCol]);
+				}
+				
 			}
 			if (isset($aErrors[$sAttCode]))
 			{
-				$aResults[$iCol]= new CellStatus_Issue($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode), $aErrors[$sAttCode]);
+				$aResults["col$iCol"]= new CellChangeSpec_Issue($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode), $aErrors[$sAttCode]);
 			}
 			elseif (array_key_exists($sAttCode, $aChangedFields))
 			{
 				if ($oTargetObj->IsNew())
 				{
-					$aResults[$iCol]= new CellStatus_Void($oTargetObj->Get($sAttCode));
+					$aResults["col$iCol"]= new CellChangeSpec_Init($oTargetObj->Get($sAttCode));
 				}
 				else
 				{
-					$aResults[$iCol]= new CellStatus_Modify($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode));
+					$aResults["col$iCol"]= new CellChangeSpec_Modify($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode));
 				}
 			}
 			else
 			{
 				// By default... nothing happens
-				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+				$aResults["col$iCol"]= new CellChangeSpec_Void($aRowData[$iCol]);
 			}
 		}
 	
 		// Checks
 		//
-		$res = $oTargetObj->CheckConsistency();
-		if ($res !== true)
+		if (!$oTargetObj->CheckConsistency())
 		{
-			// $res contains the error description
-			$aErrors["GLOBAL"] = "Attributes not consistent with each others: $res";
+			$aErrors["GLOBAL"] = "Attributes not consistent with each others";
 		}
 		return $aResults;
 	}
@@ -468,15 +413,12 @@ class BulkChange
 		{
 			$newID = $oTargetObj->DBInsertTrackedNoReload($oChange);
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj($this->m_sClass, $newID);
-			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-			$aResult[$iRow]["id"] = new CellStatus_Void($newID);
 		}
 		else
 		{
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
-			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-			$aResult[$iRow]["id"] = new CellStatus_Void(0);
 		}
+	
 	}
 	
 	protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, CMDBChange $oChange = null)
@@ -485,9 +427,6 @@ class BulkChange
 
 		// Reporting
 		//
-		$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-		$aResult[$iRow]["id"] = new CellStatus_Void($oTargetObj->GetKey());
-
 		if (count($aErrors) > 0)
 		{
 			$sErrors = implode(', ', $aErrors);
@@ -516,133 +455,56 @@ class BulkChange
 	public function Process(CMDBChange $oChange = null)
 	{
 		// Note: $oChange can be null, in which case the aim is to check what would be done
-
-		// Debug...
-		//
-		if (false)
-		{
-			echo "<pre>\n";
-			echo "Attributes:\n";
-			print_r($this->m_aAttList);
-			echo "ExtKeys:\n";
-			print_r($this->m_aExtKeys);
-			echo "Reconciliation:\n";
-			print_r($this->m_aReconcilKeys);
-			//echo "Data:\n";
-			//print_r($this->m_aData);
-			echo "</pre>\n";
-			exit;
-		}
-
+	
 		// Compute the results
 		//
 		$aResult = array();
 		foreach($this->m_aData as $iRow => $aRowData)
 		{
 			$oReconciliationFilter = new CMDBSearchFilter($this->m_sClass);
-			$bSkipQuery = false;
 			foreach($this->m_aReconcilKeys as $sAttCode)
 			{
-				$valuecondition = null;
-				if (array_key_exists($sAttCode, $this->m_aExtKeys))
+				$iCol = $this->m_aAttList[$sAttCode];
+				$oReconciliationFilter->AddCondition($sAttCode, $aRowData[$iCol], '=');
+			}
+			$oReconciliationSet = new CMDBObjectSet($oReconciliationFilter);
+			switch($oReconciliationSet->Count())
+			{
+			case 0:
+				$this->CreateObject($aResult, $iRow, $aRowData, $oChange);
+				// $aResult[$iRow]["__STATUS__"]=> set in CreateObject
+				$aResult[$iRow]["__RECONCILIATION__"] = "Object not found";
+				break;
+			case 1:
+				$oTargetObj = $oReconciliationSet->Fetch();
+				$this->UpdateObject($aResult, $iRow, $oTargetObj, $aRowData, $oChange);
+				$aResult[$iRow]["__RECONCILIATION__"] = "Found a match ".$oTargetObj->GetHyperLink();
+				// $aResult[$iRow]["__STATUS__"]=> set in UpdateObject
+				break;
+			default:
+				// Found several matches, ambiguous
+				// Render "void" results on any column
+				foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
 				{
-					if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
+					foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 					{
-						$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-						if ($oExtKey->IsNullAllowed())
-						{
-							$valuecondition = $oExtKey->GetNullValue();
-							$aResult[$iRow][$sAttCode] = new CellStatus_Void($oExtKey->GetNullValue());
-						}
-						else
-						{
-							$aResult[$iRow][$sAttCode] = new CellStatus_NullIssue();
-						}
+						$aResult[$iRow]["col$iCol"] = new CellChangeSpec_Void($aRowData[$iCol]);
 					}
-					else
-					{
-						// The value has to be found or verified
-						list($sQuery, $aMatches) = $this->ResolveExternalKey($aRowData, $sAttCode, $aResult[$iRow]);
-	
-						if (count($aMatches) == 1)
-						{
-							$oRemoteObj = reset($aMatches); // first item
-							$valuecondition = $oRemoteObj->GetKey();
-							$aResult[$iRow][$sAttCode] = new CellStatus_Void($oRemoteObj->GetKey());
-						} 					
-						elseif (count($aMatches) == 0)
-						{
-							$aResult[$iRow][$sAttCode] = new CellStatus_SearchIssue();
-						} 					
-						else
-						{
-							$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $sQuery);
-						}
-					} 					
+					$aResult[$iRow][$sAttCode] = new CellChangeSpec_Void('n/a');
 				}
-				else
+				foreach ($this->m_aAttList as $sAttCode => $iCol)
 				{
-					// The value is given in the data row
-					$iCol = $this->m_aAttList[$sAttCode];
-					$valuecondition = $aRowData[$iCol];
-				}
-				if (is_null($valuecondition))
-				{
-					$bSkipQuery = true;
-				}
-				else
-				{
-					$oReconciliationFilter->AddCondition($sAttCode, $valuecondition, '=');
-				}
-			}
-			if ($bSkipQuery)
-			{
-				$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue("failed to reconcile");
-			}
-			else
-			{
-				$oReconciliationSet = new CMDBObjectSet($oReconciliationFilter);
-				switch($oReconciliationSet->Count())
-				{
-				case 0:
-					$this->CreateObject($aResult, $iRow, $aRowData, $oChange);
-					// $aResult[$iRow]["__STATUS__"]=> set in CreateObject
-					break;
-				case 1:
-					$oTargetObj = $oReconciliationSet->Fetch();
-					$this->UpdateObject($aResult, $iRow, $oTargetObj, $aRowData, $oChange);
-					// $aResult[$iRow]["__STATUS__"]=> set in UpdateObject
-					break;
-				default:
-					// Found several matches, ambiguous
-					$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue("ambiguous reconciliation");
-					$aResult[$iRow]["id"]= new CellStatus_Ambiguous(0, $oReconciliationSet->Count(), $oReconciliationFilter->ToOql());
-					$aResult[$iRow]["finalclass"]= 'n/a';
+					$aResult[$iRow]["col$iCol"]= new CellChangeSpec_Void($aRowData[$iCol]);
 				}
+				$aResult[$iRow]["__RECONCILIATION__"] = "Found ".$oReconciliationSet->Count()." matches";
+				$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue("ambiguous reconciliation");
 			}
 	
 			// Whatever happened, do report the reconciliation values
-			foreach($this->m_aAttList as $iCol)
+			foreach($this->m_aReconcilKeys as $sAttCode)
 			{
-				if (!array_key_exists($iCol, $aResult[$iRow]))
-				{
-					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
-				}
-			}
-			foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts)
-			{
-				if (!array_key_exists($sAttCode, $aResult[$iRow]))
-				{
-					$aResult[$iRow][$sAttCode] = new CellStatus_Void('n/a');
-				}
-				foreach ($aForeignAtts as $sForeignAttCode => $iCol)
-				{
-					if (!array_key_exists($iCol, $aResult[$iRow]))
-					{
-						// The foreign attribute is one of our reconciliation key
-						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
-					}
-				}
+				$iCol = $this->m_aAttList[$sAttCode];
+				$aResult[$iRow]["col$iCol"] = new CellChangeSpec_Void($aRowData[$iCol]);
 			}
 		}
 		return $aResult;

core/cmdbchange.class.inc.php

@@ -1,33 +1,15 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Persistent class (internal) cmdbChange
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 /**
  * A change as requested/validated at once by user, may groups many atomic changes 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 class CMDBChange extends DBObject
 {
@@ -36,7 +18,10 @@ class CMDBChange extends DBObject
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "change",
+			"description" => "Changes tracking",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "date",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -46,9 +31,14 @@ class CMDBChange extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("date", array("label"=>"date", "description"=>"date and time at which the changes have been recorded", "allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("label"=>"misc. info", "description"=>"caller's defined information", "allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("date");
+		MetaModel::Init_AddFilterFromAttribute("userinfo");
 	}
+
 }
 
 ?>

core/cmdbchangeop.class.inc.php

@@ -1,33 +1,15 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Persistent classes (internal) : cmdbChangeOp and derived
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 /**
  * Various atomic change operations, to be tracked 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 class CMDBChangeOp extends DBObject
@@ -37,7 +19,10 @@ class CMDBChangeOp extends DBObject
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "change operation",
+			"description" => "Change operations tracking",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -47,16 +32,20 @@ class CMDBChangeOp extends DBObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("change", array("allowed_values"=>null, "sql"=>"changeid", "targetclass"=>"CMDBChange", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("date", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"date")));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userinfo", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"userinfo")));
-		MetaModel::Init_AddAttribute(new AttributeString("objclass", array("allowed_values"=>null, "sql"=>"objclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("objkey", array("allowed_values"=>null, "sql"=>"objkey", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("change", array("label"=>"change", "description"=>"change", "allowed_values"=>null, "sql"=>"changeid", "targetclass"=>"CMDBChange", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("date", array("label"=>"date", "description"=>"date and time of the change", "allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"date")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userinfo", array("label"=>"user", "description"=>"who made this change", "allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"userinfo")));
+		MetaModel::Init_AddAttribute(new AttributeString("objclass", array("label"=>"object class", "description"=>"object class", "allowed_values"=>null, "sql"=>"objclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("objkey", array("label"=>"object id", "description"=>"object id", "allowed_values"=>null, "sql"=>"objkey", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddFilterFromAttribute("objclass");
+		MetaModel::Init_AddFilterFromAttribute("objkey");
+		MetaModel::Init_AddFilterFromAttribute("date");
+		MetaModel::Init_AddFilterFromAttribute("userinfo");
 
 		MetaModel::Init_SetZListItems('details', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details
 	}
-
 	/**
 	 * Describe (as a text string) the modifications corresponding to this change
 	 */	 
@@ -72,6 +61,11 @@ class CMDBChangeOp extends DBObject
  * Record the creation of an object  
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CMDBChangeOpCreate extends CMDBChangeOp
 {
@@ -80,7 +74,10 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "object creation",
+			"description" => "Object creation tracking",
 			"key_type" => "",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -90,6 +87,8 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_InheritFilters();
 	}
 	
 	/**
@@ -97,7 +96,7 @@ class CMDBChangeOpCreate extends CMDBChangeOp
 	 */	 
 	public function GetDescription()
 	{
-		return Dict::S('Change:ObjectCreated');
+		return 'Object created';
 	}
 }
 
@@ -106,6 +105,11 @@ class CMDBChangeOpCreate extends CMDBChangeOp
  * Record the deletion of an object 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CMDBChangeOpDelete extends CMDBChangeOp
 {
@@ -114,7 +118,10 @@ class CMDBChangeOpDelete extends CMDBChangeOp
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "object deletion",
+			"description" => "Object deletion tracking",
 			"key_type" => "",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -124,13 +131,15 @@ class CMDBChangeOpDelete extends CMDBChangeOp
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_InheritFilters();
 	}
 	/**
 	 * Describe (as a text string) the modifications corresponding to this change
 	 */	 
 	public function GetDescription()
 	{
-		return Dict::S('Change:ObjectDeleted');
+		return 'Object deleted';
 	}
 }
 
@@ -139,6 +148,11 @@ class CMDBChangeOpDelete extends CMDBChangeOp
  * Record the modification of an attribute (abstract)
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CMDBChangeOpSetAttribute extends CMDBChangeOp
 {
@@ -147,7 +161,10 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "object change",
+			"description" => "Object properties change tracking",
 			"key_type" => "",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -157,7 +174,10 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("label"=>"Attribute", "description"=>"code of the modified property", "allowed_values"=>null, "sql"=>"attcode", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("attcode");
 		
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
@@ -169,6 +189,11 @@ class CMDBChangeOpSetAttribute extends CMDBChangeOp
  * Record the modification of a scalar attribute 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 {
@@ -177,7 +202,10 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "property change",
+			"description" => "Object scalar properties change tracking",
 			"key_type" => "",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -187,8 +215,12 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("oldvalue", array("label"=>"Previous value", "description"=>"previous value of the attribute", "allowed_values"=>null, "sql"=>"oldvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("newvalue", array("label"=>"New value", "description"=>"new value of the attribute", "allowed_values"=>null, "sql"=>"newvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("oldvalue");
+		MetaModel::Init_AddFilterFromAttribute("newvalue");
 		
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
@@ -207,7 +239,7 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 		$oTargetObjectClass = $this->Get('objclass');
 		$oTargetObjectKey = $this->Get('objkey');
 		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey);
 
 		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
 		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
@@ -223,16 +255,16 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 				if (substr($sNewValue,0, strlen($sOldValue)) == $sOldValue) // Text added at the end
 				{
 					$sDelta = substr($sNewValue, strlen($sOldValue));
-					$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sAttName);
+					$sResult = "$sDelta appended to $sAttName";
 				}
 				else if (substr($sNewValue, -strlen($sOldValue)) == $sOldValue)   // Text added at the beginning
 				{
 					$sDelta = substr($sNewValue, 0, strlen($sNewValue) - strlen($sOldValue));
-					$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sAttName);
+					$sResult = "$sDelta appended to $sAttName";
 				}
 				else
 				{
-					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+					$sResult = "$sAttName set to $sNewValue (previous value: $sOldValue)";
 				}
 			}
 			elseif($bIsHtml && $oAttDef->IsExternalKey())
@@ -248,7 +280,7 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
 			}
 			else
 			{
-				$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sAttName, $sNewValue, $sOldValue);
+				$sResult = "$sAttName set to $sNewValue (previous value: $sOldValue)";
 			}
 		}
 		return $sResult;
@@ -259,6 +291,11 @@ class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
  * Record the modification of a blob
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 {
@@ -267,7 +304,10 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "data change",
+			"description" => "data change tracking",
 			"key_type" => "",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -277,8 +317,10 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeBlob("prevdata", array("depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBlob("prevdata", array("label"=>"Previous data", "description"=>"previous contents of the attribute", "depends_on"=>array())));
 
+		MetaModel::Init_InheritFilters();
+		
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
@@ -296,7 +338,7 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 		$oTargetObjectClass = $this->Get('objclass');
 		$oTargetObjectKey = $this->Get('objkey');
 		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey);
 
 		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
 		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
@@ -305,114 +347,11 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
 			$sAttName = $oAttDef->GetLabel();
 			$oPrevDoc = $this->Get('prevdata');
 			$sDocView = $oPrevDoc->GetAsHtml();
-			$sDocView .= "<br/>".Dict::Format('UI:OpenDocumentInNewWindow_',$oPrevDoc->GetDisplayLink(get_class($this), $this->GetKey(), 'prevdata')).", \n";
-			$sDocView .= Dict::Format('UI:DownloadDocument_', $oPrevDoc->GetDownloadLink(get_class($this), $this->GetKey(), 'prevdata'))."\n";
+			$sDocView .= "<br/>Open in New Window: ".$oPrevDoc->GetDisplayLink(get_class($this), $this->GetKey(), 'prevdata').", \n";
+			$sDocView .= "Download: ".$oPrevDoc->GetDownloadLink(get_class($this), $this->GetKey(), 'prevdata')."\n";
+
 			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sDocView);
-		}
-		return $sResult;
-	}
-}
-/**
- * Safely record the modification of one way encrypted password
- */
-class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_pwd",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("prev_pwd", array("sql" => 'data', "default_value" => '', "is_null_allowed"=> true, "allowed_values" => null, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-			$sAttName = $oAttDef->GetLabel();
-			$sResult = Dict::Format('Change:AttName_Changed', $sAttName);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Safely record the modification of an encrypted field
- */
-class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_encrypted",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeEncryptedString("prevstring", array("sql" => 'data', "default_value" => '', "is_null_allowed"=> true, "allowed_values" => null, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-			$sAttName = $oAttDef->GetLabel();
-			$sPrevString = $this->Get('prevstring');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevString);
+			$sResult = "$sAttName changed, previous value: $sDocView";
 		}
 		return $sResult;
 	}
@@ -422,6 +361,11 @@ class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
  * Record the modification of a multiline string (text)
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 {
@@ -430,7 +374,10 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 		$aParams = array
 		(
 			"category" => "core/cmdb",
+			"name" => "text change",
+			"description" => "text change tracking",
 			"key_type" => "",
+			"key_label" => "",
 			"name_attcode" => "change",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -440,8 +387,10 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("prevdata", array("label"=>"Previous data", "description"=>"previous contents of the attribute", "allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
+		MetaModel::Init_InheritFilters();
+		
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
 		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
@@ -459,7 +408,7 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 		$oTargetObjectClass = $this->Get('objclass');
 		$oTargetObjectKey = $this->Get('objkey');
 		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey);
 
 		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
 		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
@@ -469,7 +418,7 @@ class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
 			$sTextView = '<div>'.$this->GetAsHtml('prevdata').'</div>';
 
 			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
+			$sResult = "$sAttName changed, previous value: $sTextView";
 		}
 		return $sResult;
 	}

core/cmdbobject.class.inc.php

@@ -1,43 +1,21 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class cmdbObject
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 /**
  * cmdbObjectClass
  * the file to include, then the core is yours
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 require_once('coreexception.class.inc.php');
 
 require_once('config.class.inc.php');
-require_once('log.class.inc.php');
-require_once('kpi.class.inc.php');
-
-require_once('dict.class.inc.php');
 
 require_once('attributedef.class.inc.php');
 require_once('filterdef.class.inc.php');
@@ -75,16 +53,98 @@ require_once('cmdbchangeop.class.inc.php');
 require_once('csvparser.class.inc.php');
 require_once('bulkchange.class.inc.php');
 
+require_once('userrights.class.inc.php');
+
+//
+// Error handling
+// To be finalized... or removed ?
+//
+function cmdbErrorHandler($errno, $errstr, $errfile, $errline)
+{
+//		font-family: Courier-New, Courier, Arial, Helevtica;
+	$sErrorStyle = "
+		background-color: #ffaaaa;
+		color: #000000;
+		border: 1px dashed #000000;
+		padding: 0.25em;
+		margin-top: 1em;
+	";
+	$sCallStackStyle = "
+		font-size: smaller;
+		background-color: #ffcccc;
+		color: #000000;
+		border: 1px dashed #000000;
+		padding: 0.25em;
+		margin-top: 1em;
+	";
+
+	switch ($errno)
+	{
+	case E_USER_ERROR:
+	case E_ERROR:
+		echo "<div style=\"$sErrorStyle\">\n";
+		echo "<b>Error</b> [$errno] $errstr<br />\n";
+		echo "<div style=\"$sCallStackStyle\">\n";
+		MyHelpers::dump_callstack(1);
+		echo "</div>\n";
+		echo "Hereafter the biz model internals:<br />\n";
+		echo "<pre>\n";
+		MetaModel::static_var_dump();
+		echo "</pre>\n";
+		echo "Aborting...<br />\n";
+		echo "</div>\n";
+		exit(1);
+		break;
+	case E_USER_WARNING:
+	case E_WARNING:
+		echo "<div style=\"background-color:#FAA;\">\n";
+		echo "<b>Warning</b> [$errno] $errstr<br />\n";
+		echo "<div style=\"background-color:#FCC;\">\n";
+		MyHelpers::dump_callstack(1);
+		echo "</div>\n";
+		echo "</div>\n";
+		break;
+	case E_USER_NOTICE:
+	case E_NOTICE:
+		echo "<div style=\"background-color:#FAA;\">\n";
+		echo "<b>Notice</b> [$errno] $errstr<br />\n";
+		echo "<div style=\"background-color:#FCC;\">\n";
+		MyHelpers::dump_callstack(1);
+		echo "</div>\n";
+		echo "</div>\n";
+		break;
+	default:
+		echo "Unknown error type: [$errno] $errstr<br />\n";
+		MyHelpers::dump_callstack(1);
+		break;
+	}
+}
+
+error_reporting(E_ALL | E_STRICT);
+//set_error_handler("cmdbErrorHandler");
+
+
+
+//
+//
+//
+
+
 /**
  * A persistent object, which changes are accurately recorded
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 abstract class CMDBObject extends DBObject
 {
 	protected $m_datCreated;
 	protected $m_datUpdated;
-	// Note: this value is static, but that could be changed because it is sometimes a real issue (see update of interfaces / connected_to
 	protected static $m_oCurrChange = null;
 
 
@@ -113,47 +173,7 @@ abstract class CMDBObject extends DBObject
 			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 			if ($oAttDef->IsLinkSet()) continue; // #@# temporary
 
-			if ($oAttDef instanceOf AttributeOneWayPassword)
-			{
-				// One Way encrypted passwords' history is stored -one way- encrypted
-				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeOneWayPassword");
-				$oMyChangeOp->Set("change", $oChange->GetKey());
-				$oMyChangeOp->Set("objclass", get_class($this));
-				$oMyChangeOp->Set("objkey", $this->GetKey());
-				$oMyChangeOp->Set("attcode", $sAttCode);
-
-				if (array_key_exists($sAttCode, $aOrigValues))
-				{
-					$original = $aOrigValues[$sAttCode];
-				}
-				else
-				{
-					$original = '';
-				}
-				$oMyChangeOp->Set("prev_pwd", $original);
-				$iId = $oMyChangeOp->DBInsertNoReload();
-			}
-			elseif ($oAttDef instanceOf AttributeEncryptedString)
-			{
-				// Encrypted string history is stored encrypted
-				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeEncrypted");
-				$oMyChangeOp->Set("change", $oChange->GetKey());
-				$oMyChangeOp->Set("objclass", get_class($this));
-				$oMyChangeOp->Set("objkey", $this->GetKey());
-				$oMyChangeOp->Set("attcode", $sAttCode);
-
-				if (array_key_exists($sAttCode, $aOrigValues))
-				{
-					$original = $aOrigValues[$sAttCode];
-				}
-				else
-				{
-					$original = '';
-				}
-				$oMyChangeOp->Set("prevdata", $original);
-				$iId = $oMyChangeOp->DBInsertNoReload();
-			}
-			elseif ($oAttDef instanceOf AttributeBlob)
+			if ($oAttDef instanceOf AttributeBlob)
 			{
 				// Data blobs
 				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeBlob");
@@ -218,35 +238,6 @@ abstract class CMDBObject extends DBObject
 		}
 	}
 
-	/**
-	 * Helper to ultimately check user rights before writing (Insert, Update or Delete)
-	 * The check should never fail, because the UI should prevent from such a usage
-	 * Anyhow, if the user has found a workaround... the security gets enforced here	 	 
-	 */
-	protected function CheckUserRights($bSkipStrongSecurity, $iActionCode)
-	{
-		if (is_null($bSkipStrongSecurity))
-		{
-			// This is temporary
-			// We have implemented this safety net right before releasing iTop 1.0
-			// and we decided that it was too risky to activate it
-			// Anyhow, users willing to have a very strong security could set
-			// skip_strong_security = 0, in the config file
-			$bSkipStrongSecurity = utils::GetConfig()->Get('skip_strong_security');
-		}
-		if (!$bSkipStrongSecurity)
-		{
-			$sClass = get_class($this);
-			$oSet = DBObjectSet::FromObject($this);
-			if (!UserRights::IsActionAllowed($sClass, $iActionCode, $oSet))
-			{
-				// Intrusion detected
-				throw new SecurityException('You are not allowed to modify objects of class: '.$sClass);
-			}
-		}
-	}
-
-
 	public function DBInsert()
 	{
 		if(!is_object(self::$m_oCurrChange))
@@ -256,20 +247,16 @@ abstract class CMDBObject extends DBObject
 		return $this->DBInsertTracked_Internal();
 	}
 
-	public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	public function DBInsertTracked(CMDBChange $oChange)
 	{
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-
 		self::$m_oCurrChange = $oChange;
 		$ret = $this->DBInsertTracked_Internal();
 		self::$m_oCurrChange = null;
 		return $ret;
 	}
 
-	public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	public function DBInsertTrackedNoReload(CMDBChange $oChange)
 	{
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-
 		self::$m_oCurrChange = $oChange;
 		$ret = $this->DBInsertTracked_Internal(true);
 		self::$m_oCurrChange = null;
@@ -324,10 +311,8 @@ abstract class CMDBObject extends DBObject
 		return $this->DBUpdateTracked_internal();
 	}
 
-	public function DBUpdateTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	public function DBUpdateTracked(CMDBChange $oChange)
 	{
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-
 		self::$m_oCurrChange = $oChange;
 		$this->DBUpdateTracked_Internal();
 		self::$m_oCurrChange = null;
@@ -339,7 +324,7 @@ abstract class CMDBObject extends DBObject
 		$aChanges = $this->ListChanges();
 		if (count($aChanges) == 0)
 		{
-			//throw new CoreWarning("Attempting to update an unchanged object");
+			throw new CoreWarning("Attempting to update an unchanged object");
 			return;
 		}
 		
@@ -359,10 +344,8 @@ abstract class CMDBObject extends DBObject
 		return $this->DBDeleteTracked_Internal();
 	}
 
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	public function DBDeleteTracked(CMDBChange $oChange)
 	{
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE);
-
 		self::$m_oCurrChange = $oChange;
 		$this->DBDeleteTracked_Internal();
 		self::$m_oCurrChange = null;
@@ -398,7 +381,7 @@ abstract class CMDBObject extends DBObject
 
 		// Get the list of objects to delete (and record data before deleting the DB records)
 		$oObjSet = new CMDBObjectSet($oFilter);
-		$aObjAndKeys = array(); // array of id=>object
+		$aObjAndKeys = array(); // array of pkey=>object
 		while ($oItem = $oObjSet->Fetch())
 		{
 			$aObjAndKeys[$oItem->GetKey()] = $oItem;
@@ -467,6 +450,12 @@ abstract class CMDBObject extends DBObject
  * TODO: investigate how to get rid of this class that was made to workaround some language limitation... or a poor design!
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 class CMDBObjectSet extends DBObjectSet
 {
@@ -497,30 +486,18 @@ class CMDBObjectSet extends DBObjectSet
 		return $oRetSet;
 	} 
 	
-	static public function FromArrayAssoc($aClasses, $aObjects)
-	{
-		// In a perfect world, we should create a complete tree of DBObjectSearch,
-		// but as we lack most of the information related to the objects,
-		// let's create one search definition
-		$sClass = reset($aClasses);
-		$sAlias = key($aClasses);
-		$oFilter = new CMDBSearchFilter($sClass, $sAlias);
-
-		$oRetSet = new CMDBObjectSet($oFilter);
-		$oRetSet->m_bLoaded = true; // no DB load
-
-		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
-		{
-			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
-		}
-		return $oRetSet;
-	} 
 }
 
 /**
  * TODO: investigate how to get rid of this class that was made to workaround some language limitation... or a poor design!
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 class CMDBSearchFilter extends DBObjectSearch
 {

core/cmdbsource.class.inc.php

@@ -1,26 +1,16 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * DB Server abstraction
+ * CMDBSource
+ * database access wrapper 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 require_once('MyHelpers.class.inc.php');
@@ -36,12 +26,6 @@ class MySQLException extends CoreException
 }
 
 
-/**
- * CMDBSource
- * database access wrapper 
- *
- * @package     iTopORM
- */
 class CMDBSource
 {
 	protected static $m_sDBHost;
@@ -69,21 +53,6 @@ class CMDBSource
 		}
 	}
 
-	public static function SetCharacterSet($sCharset = 'utf8', $sCollation = 'utf8_general_ci')
-	{
-		if (strlen($sCharset) > 0)
-		{
-			if (strlen($sCollation) > 0)
-			{
-				self::Query("SET NAMES '$sCharset' COLLATE '$sCollation'");
-			}
-			else
-			{
-				self::Query("SET NAMES '$sCharset'");
-			}
-		}
-	}
-
 	public static function ListDB()
 	{
 		$aDBs = self::QueryToCol('SHOW DATABASES', 'Database');
@@ -174,11 +143,6 @@ class CMDBSource
 		// otherwise and if there is a mix of strings and numbers, the clause
 		// would always be false
 
-		if (is_null($value))
-		{
-			return 'NULL';
-		}
-
 		if (is_array($value))
 		{
 			$aRes = array();
@@ -195,7 +159,7 @@ class CMDBSource
 			$value = stripslashes($value);
 		}
 		// Quote if not a number or a numeric string
-		if ($bAlways || is_string($value))
+		if ($bAlways || !is_numeric($value))
 		{
 			$value = $cQuoteStyle . mysql_real_escape_string($value, self::$m_resDBLink) . $cQuoteStyle;
 		}
@@ -210,13 +174,14 @@ class CMDBSource
 		//$aTraceInf['file'] = __FILE__;
 		// $sSQLQuery .= MyHelpers::MakeSQLComment($aTraceInf);
 	  
-		$oKPI = new ExecutionKPI();
+		$mu_t1 = MyHelpers::getmicrotime();
 		$result = mysql_query($sSQLQuery, self::$m_resDBLink);
 		if (!$result) 
 		{
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSQLQuery));
 		}
-		$oKPI->ComputeStats('Query exec (mySQL)', $sSQLQuery);
+		$mu_t2 = MyHelpers::getmicrotime();
+		// #@# todo - query_trace($sSQLQuery, $mu_t2 - $mu_t1);
 	
 		return $result;
 	}
@@ -279,7 +244,19 @@ class CMDBSource
 			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
 		}
 
-		$aNames = self::GetColumns($result);
+		$aNames = array();
+		for ($i = 0; $i < mysql_num_fields($result) ; $i++)
+		{
+		   $meta = mysql_fetch_field($result, $i);
+		   if (!$meta)
+		   {
+				throw new MySQLException('mysql_fetch_field: No information available', array('query'=>$sSql, 'i'=>$i));
+		   }
+		   else
+		   {
+		   		$aNames[] = $meta->name;
+		   }
+		}
 
 		$aData[] = $aNames;
 		while ($aRow = mysql_fetch_array($result, MYSQL_ASSOC))
@@ -312,24 +289,6 @@ class CMDBSource
 		return mysql_fetch_array($result, MYSQL_ASSOC);
 	}
 
-	public static function GetColumns($result)
-	{
-		$aNames = array();
-		for ($i = 0; $i < mysql_num_fields($result) ; $i++)
-		{
-		   $meta = mysql_fetch_field($result, $i);
-		   if (!$meta)
-		   {
-				throw new MySQLException('mysql_fetch_field: No information available', array('query'=>$sSql, 'i'=>$i));
-		   }
-		   else
-		   {
-	   		$aNames[] = $meta->name;
-		   }
-		}
-		return $aNames;
-	}
-
 	public static function Seek($result, $iRow)
 	{
 		return mysql_data_seek($result, $iRow);

core/config.class.inc.php

@@ -1,68 +1,26 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-define('ITOP_VERSION', '$ITOP_VERSION$');
-define('ITOP_REVISION', '$WCREV$');
-define('ITOP_BUILD_DATE', '$WCNOW$');
-
-/**
- * Configuration read/write
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 require_once('coreexception.class.inc.php');
-
+/**
+ * Config
+ * configuration data
+ *
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
 class ConfigException extends CoreException
 {
 }
 
-define ('DEFAULT_CHARACTER_SET', 'utf8');
-define ('DEFAULT_COLLATION', 'utf8_general_ci');
-
-define ('DEFAULT_LOG_GLOBAL', true);
-define ('DEFAULT_LOG_NOTIFICATION', true);
-define ('DEFAULT_LOG_ISSUE', true);
-define ('DEFAULT_LOG_WEB_SERVICE', true);
-define ('DEFAULT_LOG_KPI_DURATION', false);
-define ('DEFAULT_LOG_KPI_MEMORY', false);
-define ('DEFAULT_DEBUG_QUERIES', false);
-
-define ('DEFAULT_QUERY_CACHE_ENABLED', true);
-
-
 define ('DEFAULT_MIN_DISPLAY_LIMIT', 10);
 define ('DEFAULT_MAX_DISPLAY_LIMIT', 15);
 define ('DEFAULT_STANDARD_RELOAD_INTERVAL', 5*60);
 define ('DEFAULT_FAST_RELOAD_INTERVAL', 1*60);
-define ('DEFAULT_SECURE_CONNECTION_REQUIRED', false);
-define ('DEFAULT_HTTPS_HYPERLINKS', false);
-define ('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|basic|external');
-define ('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
-define ('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random value, later...
 
-/**
- * Config
- * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
- *
- * @package     iTopORM
- */
 class Config
 {
 	//protected $m_bIsLoaded = false;
@@ -71,112 +29,12 @@ class Config
 	protected $m_aAppModules;
 	protected $m_aDataModels;
 	protected $m_aAddons;
-	protected $m_aDictionaries;
 
-	protected $m_aModuleSettings;
-
-	// New way to store the settings !
-	//
-	protected $m_aSettings = array(
-		'skip_check_to_write' => array(
-			'type' => 'bool',
-			'description' => 'Disable data format and integrity checks to boost up data load (insert or update)',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'skip_check_ext_keys' => array(
-			'type' => 'bool',
-			'description' => 'Disable external key check when checking the value of attribtutes',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'skip_strong_security' => array(
-			'type' => 'bool',
-			'description' => 'Disable strong security - TEMPORY: this flag should be removed when we are more confident in the recent change in security',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'graphviz_path' => array(
-			'type' => 'string',
-			'description' => 'Path to the Graphviz "dot" executable for graphing objects lifecycle',
-			'default' => '/usr/bin/dot',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'session_name' => array(
-			'type' => 'string',
-			'description' => 'The name of the cookie used to store the PHP session id',
-			'default' => 'iTop',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-	);
-
-	public function IsProperty($sPropCode)
-	{
-		return (array_key_exists($sPropCode, $this->m_aSettings));
-	}
-
-	public function Set($sPropCode, $value, $sSourceDesc = 'unknown')
-	{
-		$sType = $this->m_aSettings[$sPropCode]['type'];
-		switch($sType)
-		{
-		case 'bool':
-			$value = (bool) $value;
-			break;
-		case 'string':
-			$value = (string) $value;
-			break;
-		case 'integer':
-			$value = (integer) $value;
-			break;
-		case 'float':
-			$value = (float) $value;
-			break;
-		default:
-			throw new CoreException('Unknown type for setting', array('property' => $sPropCode, 'type' => $sType));
-		}
-
-		$this->m_aSettings[$sPropCode]['value'] = $value;
-		$this->m_aSettings[$sPropCode]['source_of_value'] = $sSourceDesc;
-
-	}
-
-	public function Get($sPropCode)
-	{
-		return $this->m_aSettings[$sPropCode]['value'];
-	}
-
-	// Those variables will be deprecated later, when the transition to ...Get('my_setting') will be done
 	protected $m_sDBHost;
 	protected $m_sDBUser;
 	protected $m_sDBPwd;
 	protected $m_sDBName;
 	protected $m_sDBSubname;
-	protected $m_sDBCharacterSet;
-	protected $m_sDBCollation;
-
-	/**
-	 * Event log options (see LOG_... definition)
-	 */	 	
-	// Those variables will be deprecated later, when the transition to ...Get('my_setting') will be done
-	protected $m_bLogGlobal;
-	protected $m_bLogNotification;
-	protected $m_bLogIssue;
-	protected $m_bLogWebService;
-	protected $m_bLogKpiDuration; // private setting
-	protected $m_bLogKpiMemory; // private setting
-	protected $m_bDebugQueries; // private setting
-	protected $m_bQueryCacheEnabled; // private setting
 
 	/**
 	 * @var integer Number of elements to be displayed when there are more than m_iMaxDisplayLimit elements
@@ -196,117 +54,22 @@ class Config
 	 */	 	
 	protected $m_iFastReloadInterval;
 	
-	/**
-	 * @var boolean Whether or not a secure connection is required for using the application.
-	 *              If set, any attempt to connect to an iTop page with http:// will be redirected
-	 *              to https://
-	 */	 	
-	protected $m_bSecureConnectionRequired;
-
-	/**
-	 * @var boolean Forces iTop to output hyperlinks starting with https:// even
-	 *              if the current page is not using https. This can be useful when
-	 *              the application runs behind a SSL gateway
-	 */	 	
-	protected $m_bHttpsHyperlinks;
-
-	/**
-	 * @var string Langage code, default if the user language is undefined
-	 */	 	
-	protected $m_sDefaultLanguage;
-	
-	/**
-	 * @var string Type of login process allowed: form|basic|url|external
-	 */
-	 protected $m_sAllowedLoginTypes;
-	 
-	/**
-	 * @var string Name of the PHP variable in which external authentication information is passed by the web server
-	 */
-	 protected $m_sExtAuthVariable;
-
-	/**
-	 * @var string Encryption key used for all attributes of type "encrypted string". Can be set to a random value
-	 *             unless you want to import a database from another iTop instance, in which case you must use
-	 *             the same encryption key in order to properly decode the encrypted fields
-	 */
-	 protected $m_sEncryptionKey;
-
-	/**
-	 * @var array Additional character sets to be supported by the interactive CSV import
-	 *            'iconv_code' => 'display name'
-	 */
-	 protected $m_aCharsets;
-
 	public function __construct($sConfigFile, $bLoadConfig = true)
 	{
 		$this->m_sFile = $sConfigFile;
-		$this->m_aAppModules = array(
-			// Some default modules, always present can be move to an official iTop Module later if needed
-			'../application/transaction.class.inc.php',
-			'../application/menunode.class.inc.php',
-			'../application/user.preferences.class.inc.php',
-			'../application/audit.rule.class.inc.php',
-// Romain - That's dirty, because those 3 classes are in fact part of the core
-//          but I needed those classes to be derived from cmdbAbstractObject
-//          (to be managed via the GUI) and this class in not really known from
-//          the core, PLUS I needed the includes to be there also for the setup
-//          to create the tables.
-			'../core/event.class.inc.php',
-			'../core/action.class.inc.php',
-			'../core/trigger.class.inc.php',
-		);
+		$this->m_aAppModules = array();
 		$this->m_aDataModels = array();
-		$this->m_aAddons = array(
-			// Default AddOn, always present can be moved to an official iTop Module later if needed
-			'user rights' => '../addons/userrights/userrightsprofile.class.inc.php',
-		);
-		$this->m_aDictionaries = array(
-			// Default dictionaries, always present can be moved to an official iTop Module later if needed
-			'../dictionaries/dictionary.itop.core.php',
-			'../dictionaries/dictionary.itop.ui.php',		// Support for English
-			'../dictionaries/fr.dictionary.itop.ui.php',	// Support for French
-			'../dictionaries/fr.dictionary.itop.core.php',	// Support for French
-			'../dictionaries/es_cr.dictionary.itop.ui.php',	// Support for Spanish (from Costa Rica)
-			'../dictionaries/es_cr.dictionary.itop.core.php',	// Support for Spanish (from Costa Rica)
-			'../dictionaries/de.dictionary.itop.ui.php',	// Support for German
-			'../dictionaries/de.dictionary.itop.core.php',	// Support for German
-			'../dictionaries/pt_br.dictionary.itop.ui.php',	// Support for Brazilian Portuguese
-			'../dictionaries/pt_br.dictionary.itop.core.php',	// Support for Brazilian Portuguese
-		);
-
-		foreach($this->m_aSettings as $sPropCode => $aSettingInfo)
-		{
-			$this->m_aSettings[$sPropCode]['value'] = $aSettingInfo['default'];
-		}
+		$this->m_aAddons = array();
 
 		$this->m_sDBHost = '';
 		$this->m_sDBUser = '';
 		$this->m_sDBPwd = '';
 		$this->m_sDBName = '';
 		$this->m_sDBSubname = '';
-		$this->m_sDBCharacterSet = DEFAULT_CHARACTER_SET;
-		$this->m_sDBCollation = DEFAULT_COLLATION;
-		$this->m_bLogGlobal = DEFAULT_LOG_GLOBAL;
-		$this->m_bLogNotification = DEFAULT_LOG_NOTIFICATION;
-		$this->m_bLogIssue = DEFAULT_LOG_ISSUE;
-		$this->m_bLogWebService = DEFAULT_LOG_WEB_SERVICE;
-		$this->m_bLogKPIDuration = DEFAULT_LOG_KPI_DURATION;
-		$this->m_bLogKPIDuration = DEFAULT_LOG_KPI_DURATION;
 		$this->m_iMinDisplayLimit = DEFAULT_MIN_DISPLAY_LIMIT;
 		$this->m_iMaxDisplayLimit = DEFAULT_MAX_DISPLAY_LIMIT;
 		$this->m_iStandardReloadInterval = DEFAULT_STANDARD_RELOAD_INTERVAL;
 		$this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL;
-		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
-		$this->m_bHttpsHyperlinks = DEFAULT_HTTPS_HYPERLINKS;
-		$this->m_sDefaultLanguage = 'EN US';
-		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
-		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
-		$this->m_sEncryptionKey = DEFAULT_ENCRYPTION_KEY;
-		$this->m_aCharsets = array();
-		
-		$this->m_aModuleSettings = array();
-
 		if ($bLoadConfig)
 		{
 			$this->Load($sConfigFile);
@@ -374,23 +137,9 @@ class Config
 		{
 			$MyModules['addons']['user rights'] = '../addons/userrights/userrightsnull.class.inc.php';
 		}
-		if (!array_key_exists('dictionaries', $MyModules))
-		{
-			throw new ConfigException('Missing item in configuration file', array('file' => $sConfigFile, 'expected' => '$MyModules[\'dictionaries\']'));
-		}
 		$this->m_aAppModules = $MyModules['application'];
 		$this->m_aDataModels = $MyModules['business'];
 		$this->m_aAddons = $MyModules['addons'];
-		$this->m_aDictionaries = $MyModules['dictionaries'];
-
-		foreach($MySettings as $sPropCode => $rawvalue)
-		{
-			if ($this->IsProperty($sPropCode))
-			{
-				$value = trim($rawvalue);
-				$this->Set($sPropCode, $value, $sConfigFile);
-			}
-		}
 
 		$this->m_sDBHost = trim($MySettings['db_host']);
 		$this->m_sDBUser = trim($MySettings['db_user']);
@@ -398,32 +147,10 @@ class Config
 		$this->m_sDBName = trim($MySettings['db_name']);
 		$this->m_sDBSubname = trim($MySettings['db_subname']);
 
-		$this->m_sDBCharacterSet = isset($MySettings['db_character_set']) ? trim($MySettings['db_character_set']) : DEFAULT_CHARACTER_SET;
-		$this->m_sDBCollation = isset($MySettings['db_collation']) ? trim($MySettings['db_collation']) : DEFAULT_COLLATION;
-
-		$this->m_bLogGlobal = isset($MySettings['log_global']) ? (bool) trim($MySettings['log_global']) : DEFAULT_LOG_GLOBAL;
-		$this->m_bLogNotification = isset($MySettings['log_notification']) ? (bool) trim($MySettings['log_notification']) : DEFAULT_LOG_NOTIFICATION;
-		$this->m_bLogIssue = isset($MySettings['log_issue']) ? (bool) trim($MySettings['log_issue']) : DEFAULT_LOG_ISSUE;
-		$this->m_bLogWebService = isset($MySettings['log_web_service']) ? (bool) trim($MySettings['log_web_service']) : DEFAULT_LOG_WEB_SERVICE;
-		$this->m_bLogKPIDuration = isset($MySettings['log_kpi_duration']) ? (bool) trim($MySettings['log_kpi_duration']) : DEFAULT_LOG_KPI_DURATION;
-		$this->m_bLogKPIMemory = isset($MySettings['log_kpi_memory']) ? (bool) trim($MySettings['log_kpi_memory']) : DEFAULT_LOG_KPI_MEMORY;
-		$this->m_bDebugQueries = isset($MySettings['debug_queries']) ? (bool) trim($MySettings['debug_queries']) : DEFAULT_DEBUG_QUERIES;
-		$this->m_bQueryCacheEnabled = isset($MySettings['query_cache_enabled']) ? (bool) trim($MySettings['query_cache_enabled']) : DEFAULT_QUERY_CACHE_ENABLED;
-
 		$this->m_iMinDisplayLimit = isset($MySettings['min_display_limit']) ? trim($MySettings['min_display_limit']) : DEFAULT_MIN_DISPLAY_LIMIT;
 		$this->m_iMaxDisplayLimit = isset($MySettings['max_display_limit']) ? trim($MySettings['max_display_limit']) : DEFAULT_MAX_DISPLAY_LIMIT;
 		$this->m_iStandardReloadInterval = isset($MySettings['standard_reload_interval']) ? trim($MySettings['standard_reload_interval']) : DEFAULT_STANDARD_RELOAD_INTERVAL;
 		$this->m_iFastReloadInterval = isset($MySettings['fast_reload_interval']) ? trim($MySettings['fast_reload_interval']) : DEFAULT_FAST_RELOAD_INTERVAL;
-		$this->m_bSecureConnectionRequired = isset($MySettings['secure_connection_required']) ? (bool) trim($MySettings['secure_connection_required']) : DEFAULT_SECURE_CONNECTION_REQUIRED;
-		$this->m_bHttpsHyperlinks = isset($MySettings['https_hyperlinks']) ? (bool) trim($MySettings['https_hyperlinks']) : DEFAULT_HTTPS_HYPERLINKS;
-
-		$this->m_aModuleSettings = isset($MyModuleSettings) ?  $MyModuleSettings : array();
-
-		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
-		$this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES;
-		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
-		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : DEFAULT_ENCRYPTION_KEY;
-		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
 	}
 
 	protected function Verify()
@@ -440,61 +167,22 @@ class Config
 		{
 			$this->CheckFile('addon module', $sToInclude);
 		}
-		foreach ($this->m_aDictionaries as $sModule => $sToInclude)
-		{
-			$this->CheckFile('dictionary', $sToInclude);
-		}
-	}
-
-	public function GetModuleSetting($sModule, $sProperty, $defaultvalue = null)
-	{
-		if (isset($this->m_aModuleSettings[$sModule][$sProperty]))
-		{
-			return $this->m_aModuleSettings[$sModule][$sProperty];
-		}
-		return $defaultvalue;
-	}
-
-	public function SetModuleSetting($sModule, $sProperty, $value)
-	{
-		$this->m_aModuleSettings[$sModule][$sProperty] = $value;
 	}
 
 	public function GetAppModules()
 	{
 		return $this->m_aAppModules;
 	}
-	public function SetAppModules($aAppModules)
-	{
-		$this->m_aAppModules = $aAppModules;
-	}
 
 	public function GetDataModels()
 	{
 		return $this->m_aDataModels;
 	}
-	public function SetDataModels($aDataModels)
-	{
-		$this->m_aDataModels = $aDataModels;
-	}
 
 	public function GetAddons()
 	{
 		return $this->m_aAddons;
 	}
-	public function SetAddons($aAddons)
-	{
-		$this->m_aAddons = $aAddons;
-	}
-
-	public function GetDictionaries()
-	{
-		return $this->m_aDictionaries;
-	}
-	public function SetDictionaries($aDictionaries)
-	{
-		$this->m_aDictionaries = $aDictionaries;
-	}
 
 	public function GetDBHost()
 	{
@@ -511,16 +199,6 @@ class Config
 		return $this->m_sDBSubname;
 	}
 
-	public function GetDBCharacterSet()
-	{
-		return $this->m_sDBCharacterSet;
-	}
-
-	public function GetDBCollation()
-	{
-		return $this->m_sDBCollation;
-	}
-
 	public function GetDBUser()
 	{
 		return $this->m_sDBUser;
@@ -531,46 +209,6 @@ class Config
 		return $this->m_sDBPwd;
 	}
 
-	public function GetLogGlobal()
-	{
-		return $this->m_bLogGlobal;
-	}
-
-	public function GetLogNotification()
-	{
-		return $this->m_bLogNotification;
-	}
-
-	public function GetLogIssue()
-	{
-		return $this->m_bLogIssue;
-	}
-
-	public function GetLogWebService()
-	{
-		return $this->m_bLogWebService;
-	}
-
-	public function GetLogKPIDuration()
-	{
-		return $this->m_bLogKPIDuration;
-	}
-
-	public function GetLogKPIMemory()
-	{
-		return $this->m_bLogKPIMemory;
-	}
-
-	public function GetDebugQueries()
-	{
-		return $this->m_bDebugQueries;
-	}
-
-	public function GetQueryCacheEnabled()
-	{
-		return $this->m_bQueryCacheEnabled;
-	}
-
 	public function GetMinDisplayLimit()
 	{
 		return $this->m_iMinDisplayLimit;
@@ -591,41 +229,6 @@ class Config
 		return $this->m_iFastReloadInterval;
 	}
 
-	public function GetSecureConnectionRequired()
-	{
-		return $this->m_bSecureConnectionRequired;
-	}
-
-	public function GetHttpsHyperlinks()
-	{
-		return $this->m_bHttpsHyperlinks;
-	}
-
-	public function GetDefaultLanguage()
-	{
-		return $this->m_sDefaultLanguage;
-	}
-
-	public function GetEncryptionKey()
-	{
-		return $this->m_sEncryptionKey;
-	}
-
-	public function GetAllowedLoginTypes()
-	{
-		return explode('|', $this->m_sAllowedLoginTypes);
-	}
-
-	public function GetExternalAuthenticationVariable()
-	{
-		return $this->m_sExtAuthVariable;
-	}
-
-	public function GetCSVImportCharsets()
-	{
-		return $this->m_aCharsets;
-	}
-	
 	public function SetDBHost($sDBHost)
 	{
 		$this->m_sDBHost = $sDBHost;
@@ -641,16 +244,6 @@ class Config
 		$this->m_sDBSubname = $sDBSubName;
 	}
 
-	public function SetDBCharacterSet($sDBCharacterSet)
-	{
-		$this->m_sDBCharacterSet = $sDBCharacterSet;
-	}
-
-	public function SetDBCollation($sDBCollation)
-	{
-		$this->m_sDBCollation = $sDBCollation;
-	}
-
 	public function SetDBUser($sUser)
 	{
 		$this->m_sDBUser = $sUser;
@@ -661,26 +254,6 @@ class Config
 		$this->m_sDBPwd = $sPwd;
 	}
 
-	public function SetLogGlobal($iLogGlobal)
-	{
-		$this->m_iLogGlobal = $iLogGlobal;
-	}
-
-	public function SetLogNotification($iLogNotification)
-	{
-		$this->m_iLogNotification = $iLogNotification;
-	}
-
-	public function SetLogIssue($iLogIssue)
-	{
-		$this->m_iLogIssue = $iLogIssue;
-	}
-
-	public function SetLogWebService($iLogWebService)
-	{
-		$this->m_iLogWebService = $iLogWebService;
-	}
-
 	public function SetMinDisplayLimit($iMinDisplayLimit)
 	{
 		$this->m_iMinDisplayLimit = $iMinDisplayLimit;
@@ -701,45 +274,6 @@ class Config
 		$this->m_iFastReloadInterval = $iFastReloadInterval;
 	}
 
-	public function SetSecureConnectionRequired($bSecureConnectionRequired)
-	{
-		$this->m_bSecureConnectionRequired = $bSecureConnectionRequired;
-	}
-
-	public function SetHttpsHyperlinks($bHttpsHyperlinks)
-	{
-		$this->m_bHttpsHyperlinks = $bHttpsHyperlinks;
-	}
-
-	public function SetDefaultLanguage($sLanguageCode)
-	{
-		$this->m_sDefaultLanguage = $sLanguageCode;
-	}
-
-	public function SetAllowedLoginTypes($aAllowedLoginTypes)
-	{
-		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
-	}
-
-	public function SetExternalAuthenticationVariable($sExtAuthVariable)
-	{
-		$this->m_sExtAuthVariable = $sExtAuthVariable;
-	}
-
-	public function SetEncryptionKey($sKey)
-	{
-		$this->m_sEncryptionKey = $sKey;
-	}
-
-	public function SetCSVImportCharsets($aCharsets)
-	{
-		$this->m_aCharsets = $aCharsets;
-	}
-
-	public function AddCSVImportCharset($sIconvCode, $sDisplayName)
-	{
-		$this->m_aCharsets[$sIconvCode] = $sDisplayName;
-	}	
 	public function FileIsWritable()
 	{
 		return is_writable($this->m_sFile);
@@ -771,60 +305,16 @@ class Config
 			fwrite($hFile, "\n");
 			
 			fwrite($hFile, "\$MySettings = array(\n");
-			foreach($this->m_aSettings as $sPropCode => $aSettingInfo)
-			{
-				if ($aSettingInfo['show_in_conf_sample'])
-				{
-					$sType = $this->m_aSettings[$sPropCode]['type'];
-					switch($sType)
-					{
-					case 'bool':
-						$sSeenAs = $aSettingInfo['value'] ? '1' : '0';
-						break;
-					default:
-						$sSeenAs = "'".$aSettingInfo['value']."'";
-					}
-					fwrite($hFile, "\t'$sPropCode' => $sSeenAs,\n");
-				}
-			}
 			fwrite($hFile, "\t'db_host' => '{$this->m_sDBHost}',\n");
 			fwrite($hFile, "\t'db_user' => '{$this->m_sDBUser}',\n");
 			fwrite($hFile, "\t'db_pwd' => '".addslashes($this->m_sDBPwd)."',\n");
 			fwrite($hFile, "\t'db_name' => '{$this->m_sDBName}',\n");
 			fwrite($hFile, "\t'db_subname' => '{$this->m_sDBSubname}',\n");
-			fwrite($hFile, "\t'db_character_set' => '{$this->m_sDBCharacterSet}',\n");
-			fwrite($hFile, "\t'db_collation' => '{$this->m_sDBCollation}',\n");
 			fwrite($hFile, "\n");
-			fwrite($hFile, "\t'log_global' => {$this->m_bLogGlobal},\n");
-			fwrite($hFile, "\t'log_notification' => {$this->m_bLogNotification},\n");
-			fwrite($hFile, "\t'log_issue' => {$this->m_bLogIssue},\n");
-			fwrite($hFile, "\t'log_web_service' => {$this->m_bLogWebService},\n");
 			fwrite($hFile, "\t'min_display_limit' => {$this->m_iMinDisplayLimit},\n");
 			fwrite($hFile, "\t'max_display_limit' => {$this->m_iMaxDisplayLimit},\n");
 			fwrite($hFile, "\t'standard_reload_interval' => {$this->m_iStandardReloadInterval},\n");
 			fwrite($hFile, "\t'fast_reload_interval' => {$this->m_iFastReloadInterval},\n");
-			fwrite($hFile, "\t'secure_connection_required' => ".($this->m_bSecureConnectionRequired ? 'true' : 'false').",\n");
-			fwrite($hFile, "\t'https_hyperlinks' => ".($this->m_bHttpsHyperlinks ? 'true' : 'false').",\n");
-			fwrite($hFile, "\t'default_language' => '{$this->m_sDefaultLanguage}',\n");
-			fwrite($hFile, "\t'allowed_login_types' => '{$this->m_sAllowedLoginTypes}',\n");
-			fwrite($hFile, "\t'encryption_key' => '{$this->m_sEncryptionKey}',\n");
-			$sExport = var_export($this->m_aCharsets, true);
-			fwrite($hFile, "\t'csv_import_charsets' => $sExport,\n");
-
-			fwrite($hFile, ");\n");
-
-			fwrite($hFile, "\n");
-			fwrite($hFile, "\$MyModuleSettings = array(\n");
-			foreach ($this->m_aModuleSettings as $sModule => $aProperties)
-			{
-				fwrite($hFile, "\t'$sModule' => array (\n");
-				foreach ($aProperties as $sProperty => $value)
-				{
-					$sExport = var_export($value, true);
-					fwrite($hFile, "\t\t'$sProperty' => $sExport,\n");
-				}
-				fwrite($hFile, "\t),\n");
-			}
 			fwrite($hFile, ");\n");
 			
 			fwrite($hFile, "\n/**\n");
@@ -834,29 +324,26 @@ class Config
 			fwrite($hFile, " */\n");
 			fwrite($hFile, "\$MyModules = array(\n");
 			fwrite($hFile, "\t'application' => array (\n");
-			foreach($this->m_aAppModules as $sFile)
-			{
-				fwrite($hFile, "\t\t'$sFile',\n");
-			}
+			fwrite($hFile, "\t\t'../application/menunode.class.inc.php',\n");
+			fwrite($hFile, "\t\t'../application/audit.rule.class.inc.php',\n");
+// Romain - That's dirty, because those 3 classes are in fact part of the core
+//          but I needed those classes to be derived from cmdbAbstractObject
+//          (to be managed via the GUI) and this class in not really known from
+//          the core, PLUS I needed the includes to be there also for the setup
+//          to create the tables.
+			fwrite($hFile, "\t\t'../core/event.class.inc.php',\n");
+			fwrite($hFile, "\t\t'../core/action.class.inc.php',\n");
+			fwrite($hFile, "\t\t'../core/trigger.class.inc.php',\n");
+			fwrite($hFile, "\t\t// to be continued...\n");
 			fwrite($hFile, "\t),\n");
 			fwrite($hFile, "\t'business' => array (\n");
-			foreach($this->m_aDataModels as $sFile)
-			{
-				fwrite($hFile, "\t\t'$sFile',\n");
-			}
+			fwrite($hFile, "\t\t'../business/itop.business.class.inc.php'\n");
+			fwrite($hFile, "\t\t// to be continued...\n");
 			fwrite($hFile, "\t),\n");
 			fwrite($hFile, "\t'addons' => array (\n");
-			foreach($this->m_aAddons as $sKey => $sFile)
-			{
-				fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
-			}
-			fwrite($hFile, "\t),\n");
-			fwrite($hFile, "\t'dictionaries' => array (\n");
-			foreach($this->m_aDictionaries as $sFile)
-			{
-				fwrite($hFile, "\t\t'$sFile',\n");
-			}
-			fwrite($hFile, "\t),\n");
+			fwrite($hFile, "\t\t'user rights' => '../addons/userrights/userrightsprofile.class.inc.php',\n");
+			fwrite($hFile, "\t\t// other modules to come later\n");
+			fwrite($hFile, "\t)\n");
 			fwrite($hFile, ");\n");
 			fwrite($hFile, '?'.'>'); // Avoid perturbing the syntax highlighting !
 			return fclose($hFile);

core/coreexception.class.inc.php

@@ -1,29 +1,9 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Exception management
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
 
 
+class SecurityException extends CoreException
+{
+}
 
 class CoreException extends Exception
 {
@@ -84,31 +64,10 @@ class CoreException extends Exception
 	{
 		$this->m_aContextData[$sKey] = $value;
 	}
-
-	public function getIssue()
-	{
-		return $this->m_sIssue;
-	}
-	public function getImpact()
-	{
-		return $this->m_sImpact;
-	}
-	public function getContextData()
-	{
-		return $this->m_aContextData;
-	}
 }
 
 class CoreWarning extends CoreException
 {
 }
 
-class CoreUnexpectedValue extends CoreException
-{
-}
-
-class SecurityException extends CoreException
-{
-}
-
 ?>

core/csvparser.class.inc.php

@@ -1,241 +1,190 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * CSV parser
+ * CSVParser
+ * CSV interpreter helper, optionaly tries to guess column mapping and the separator, check the consistency 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
-
 class CSVParserException extends CoreException
 {
 }
 
-define('stSTARTING', 1); //grey zone: the type is undetermined
-define('stRAW', 2); //building a non-qualified string
-define('stQUALIFIED', 3); //building qualified string
-define('stESCAPED', 4); //just encountered an escape char
 
-define('evBLANK', 0);
-define('evSEPARATOR', 1);
-define('evNEWLINE', 2);
-define('evTEXTQUAL', 3); // used for escaping as well
-define('evOTHERCHAR', 4);
-define('evEND', 5);
 
 
 /**
  * CSVParser
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class CSVParser
 {
 	private $m_sCSVData;
 	private $m_sSep;
-	private $m_sTextQualifier;
+	private $m_iSkip;
 
-	public function __construct($sTxt, $sSep = ',', $sTextQualifier = '"')
+	public function __construct($sTxt)
+	{
+		$this->m_sCSVData = $sTxt;
+	}
+
+	public function SetSeparator($sSep)
 	{
-		$this->m_sCSVData = str_replace("\r\n", "\n", $sTxt);
 		$this->m_sSep = $sSep;
-		$this->m_sTextQualifier = $sTextQualifier;
+	}
+	public function GetSeparator()
+	{
+		return $this->m_sSep;
 	}
 
-	protected $m_sCurrCell = '';
-	protected $m_aCurrRow = array();
-	protected $m_iToSkip = 0;
-	protected $m_aDataSet = array();
-
-	protected function __AddChar($c)
+	public function SetSkipLines($iSkip)
 	{
-		$this->m_sCurrCell .= $c;
+		$this->m_iSkip = $iSkip;
 	}
-	protected function __ClearCell()
+	public function GetSkipLines()
 	{
-		$this->m_sCurrCell = '';
+		return $this->m_iSkip;
 	}
-	protected function __AddCell($c = null, $aFieldMap = null, $bTrimSpaces = false)
-	{
-		if ($bTrimSpaces)
-		{
-			$sCell = trim($this->m_sCurrCell);
-		}
-		else
-		{
-			$sCell = $this->m_sCurrCell;
-		}
 
-		if (!is_null($aFieldMap))
-		{
-			$iNextCol = count($this->m_aCurrRow);
-			$iNextName = $aFieldMap[$iNextCol];
-			$this->m_aCurrRow[$iNextName] = $sCell;
-		}
-		else
-		{
-			$this->m_aCurrRow[] = $sCell;
-		}
-		$this->m_sCurrCell = '';
-	}
-	protected function __AddRow($c = null, $aFieldMap = null, $bTrimSpaces = false)
+	public function GuessSeparator()
 	{
-		$this->__AddCell($c, $aFieldMap, $bTrimSpaces);
-
-		if ($this->m_iToSkip > 0)
+		// Note: skip the first line anyway
+	
+		$aKnownSeps = array(';', ',', "\t"); // Use double quote for special chars!!!
+		$aStatsBySeparator = array();
+		foreach ($aKnownSeps as $sSep)
 		{
-			$this->m_iToSkip--;
+			$aStatsBySeparator[$sSep] = array();
 		}
-		elseif (count($this->m_aCurrRow) > 1)
+	
+		foreach(explode("\n", $this->m_sCSVData) as $sLine)
 		{
-			$this->m_aDataSet[] = $this->m_aCurrRow;
-		}
-		elseif (count($this->m_aCurrRow) == 1)
-		{
-			// Get the unique value
-			$aValues = array_values($this->m_aCurrRow);
-			$sValue = $aValues[0]; 
-			if (strlen($sValue) > 0)
+			$sLine = trim($sLine);
+			if (substr($sLine, 0, 1) == '#') continue;
+			if (empty($sLine)) continue;
+	
+			$aLineCharsCount = count_chars($sLine, 0);
+			foreach ($aKnownSeps as $sSep)
 			{
-				$this->m_aDataSet[] = $this->m_aCurrRow;
+				$aStatsBySeparator[$sSep][] = $aLineCharsCount[ord($sSep)];
 			}
 		}
-		else
+	
+		// Default to ','
+		$this->SetSeparator(",");
+
+		foreach ($aKnownSeps as $sSep)
 		{
-			// blank line, skip silently
+			// Note: this function is NOT available :-( 
+			// stats_variance($aStatsBySeparator[$sSep]);
+			$iMin = min($aStatsBySeparator[$sSep]);
+			$iMax = max($aStatsBySeparator[$sSep]);
+			if (($iMin == $iMax) && ($iMax > 0))
+			{
+				$this->SetSeparator($sSep);
+				break;
+			}
 		}
-		$this->m_aCurrRow = array();
-	}
-	protected function __AddCellTrimmed($c = null, $aFieldMap = null)
-	{
-		$this->__AddCell($c, $aFieldMap, true);
+		return $this->GetSeparator();
 	}
 
-	protected function __AddRowTrimmed($c = null, $aFieldMap = null)
+	public function GuessSkipLines()
 	{
-		$this->__AddRow($c, $aFieldMap, true);
-	}
-
-	function ToArray($iToSkip = 1, $aFieldMap = null, $iMax = 0)
-	{
-		$aTransitions = array();
-
-		$aTransitions[stSTARTING][evBLANK] = array('', stSTARTING);
-		$aTransitions[stSTARTING][evSEPARATOR] = array('__AddCell', stSTARTING);
-		$aTransitions[stSTARTING][evNEWLINE] = array('__AddRow', stSTARTING);
-		$aTransitions[stSTARTING][evTEXTQUAL] = array('', stQUALIFIED);
-		$aTransitions[stSTARTING][evOTHERCHAR] = array('__AddChar', stRAW);
-		$aTransitions[stSTARTING][evEND] = array('__AddRow', stSTARTING);
-
-		$aTransitions[stRAW][evBLANK] = array('__AddChar', stRAW);
-		$aTransitions[stRAW][evSEPARATOR] = array('__AddCellTrimmed', stSTARTING);
-		$aTransitions[stRAW][evNEWLINE] = array('__AddRowTrimmed', stSTARTING);
-		$aTransitions[stRAW][evTEXTQUAL] = array('__AddChar', stRAW);
-		$aTransitions[stRAW][evOTHERCHAR] = array('__AddChar', stRAW);
-		$aTransitions[stRAW][evEND] = array('__AddRowTrimmed', stSTARTING);
-
-		$aTransitions[stQUALIFIED][evBLANK] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evSEPARATOR] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evNEWLINE] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evTEXTQUAL] = array('', stESCAPED);
-		$aTransitions[stQUALIFIED][evOTHERCHAR] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evEND] = array('__AddRow', stSTARTING);
-
-		$aTransitions[stESCAPED][evBLANK] = array('', stESCAPED);
-		$aTransitions[stESCAPED][evSEPARATOR] = array('__AddCell', stSTARTING);
-		$aTransitions[stESCAPED][evNEWLINE] = array('__AddRow', stSTARTING);
-		$aTransitions[stESCAPED][evTEXTQUAL] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stESCAPED][evOTHERCHAR] = array('__AddChar', stSTARTING);
-		$aTransitions[stESCAPED][evEND] = array('__AddRow', stSTARTING);
-
-		// Reset parser variables
-		$this->m_sCurrCell = '';
-		$this->m_aCurrRow = array();
-		$this->m_iToSkip = $iToSkip;
-		$this->m_aDataSet = array();
-
-		$iDataLength = strlen($this->m_sCSVData);
-
-		$iState = stSTARTING;
-		for($i = 0; $i <= $iDataLength ; $i++)
+		// Take the FIRST -valuable- LINE ONLY
+		// If there is a number, then for sure this is not a header line
+		// Otherwise, we may consider that there is one line to skip
+		foreach(explode("\n", $this->m_sCSVData) as $sLine)
 		{
-			if ($i == $iDataLength)
+			$sLine = trim($sLine);
+			if (substr($sLine, 0, 1) == '#') continue;
+			if (empty($sLine)) continue;
+	
+			foreach (explode($this->m_sSep, $sLine) as $value)
 			{
-				$iEvent = evEND;
-			}
-			else
-			{
-				$c = $this->m_sCSVData[$i];
-
-				if ($c == $this->m_sSep)
+				if (is_numeric($value))
 				{
-					$iEvent = evSEPARATOR;
-				}
-				elseif ($c == ' ')
-				{
-					$iEvent = evBLANK;
-				}
-				elseif ($c == "\t")
-				{
-					$iEvent = evBLANK;
-				}
-				elseif ($c == "\n")
-				{
-					$iEvent = evNEWLINE;
-				}
-				elseif ($c == $this->m_sTextQualifier)
-				{
-					$iEvent = evTEXTQUAL;
-				}
-				else
-				{
-					$iEvent = evOTHERCHAR;
+					$this->SetSkipLines(0);
+					return 0;
 				}
 			}
-
-			$sAction = $aTransitions[$iState][$iEvent][0];
-			$iState = $aTransitions[$iState][$iEvent][1];
-
-			if (!empty($sAction))
-			{
-				$aCallSpec = array($this, $sAction);
-				if (is_callable($aCallSpec))
-				{
-					call_user_func($aCallSpec, $c, $aFieldMap);
-				}
-				else
-				{
-					throw new CSVParserException("CSVParser: unknown verb '$sAction'");
-				}
-			}
-
-			$iLineCount = count($this->m_aDataSet);
-			if (($iMax > 0) && ($iLineCount >= $iMax)) break;
+			$this->SetSkipLines(1);
+			return 1;
 		}
-		return $this->m_aDataSet;
+	}
+
+	function ToArray($aFieldMap = null, $iMax = 0)
+	{
+		// $aFieldMap is an array of col_index=>col_name
+		// $iMax is to limit the count of rows computed
+		$aRes = array();
+	
+		$iCount = 0;
+		$iSkipped = 0;
+		foreach(explode("\n", $this->m_sCSVData) as $sLine)
+		{
+			$sLine = trim($sLine);
+			if (substr($sLine, 0, 1) == '#') continue;
+			if (empty($sLine)) continue;
+	
+			if ($iSkipped < $this->m_iSkip)
+			{
+				$iSkipped++;
+				continue;
+			}
+	
+			foreach (explode($this->m_sSep, $sLine) as $iCol=>$sValue)
+			{
+				if (is_array($aFieldMap)) $sColRef = $aFieldMap[$iCol];
+				else                      $sColRef = $iCol;
+				$aRes[$iCount][$sColRef] = $sValue;
+			}
+	
+			$iCount++;
+			if (($iMax > 0) && ($iCount >= $iMax)) break;
+		}
+		return $aRes;
 	}
 
 	public function ListFields()
 	{
-		$aHeader = $this->ToArray(0, null, 1);
-		return $aHeader[0];
+		// Take the first valuable line
+		foreach(explode("\n", $this->m_sCSVData) as $sLine)
+		{
+			$sLine = trim($sLine);
+			if (substr($sLine, 0, 1) == '#') continue;
+			if (empty($sLine)) continue;
+			// We've got the first valuable line, that's it!
+			break;
+		}
+
+		$aRet = array();
+		foreach (explode($this->m_sSep, $sLine) as $iCol=>$value)
+		{
+			if ($this->m_iSkip == 0)
+			{
+				// No header to help us
+				$sLabel = "field $iCol";
+			}
+			else
+			{
+				$sLabel = "$value";
+			}
+			$aRet[] = $sLabel;
+		}
+		return $aRet;
 	}
 }
 

core/data.generator.class.inc.php

@@ -1,27 +1,16 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
  * data generator
  * helps the consultants in creating dummy data sets, for various test purposes (validation, usability, scalability) 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     tbd
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 /**
@@ -361,7 +350,7 @@ class cmdbDataGenerator
 	{
 		$oOrg = null;
 		$oFilter = new CMDBSearchFilter('bizOrganization');
-		$oFilter->AddCondition('id', $sId, '=');
+		$oFilter->AddCondition('pkey', $sId, '=');
 		$oSet = new CMDBObjectSet($oFilter);
 		if ($oSet->Count() > 0)
 		{

core/dbobject.class.php

@@ -1,34 +1,30 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * Class dbObject: the root of persistent classes
+ * ???
+ * the class a persistent object must be derived from 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 require_once('metamodel.class.php');
 
+
 /**
  * A persistent object, as defined by the metamodel 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 abstract class DBObject
 {
@@ -39,22 +35,16 @@ abstract class DBObject
 	private $m_aCurrValues = array();
 	protected $m_aOrigValues = array();
 
-	private $m_bDirty = false; // Means: "a modification is ongoing"
-										// The object may have incorrect external keys, then any attempt of reload must be avoided
-	private $m_bCheckStatus = null; // Means: the object has been verified and is consistent with integrity rules
-													//        if null, then the check has to be performed again to know the status
-	protected $m_aCheckIssues = null;
-	protected $m_aAsArgs = null; // The current object as a standard argument (cache)
-
+	private $m_bDirty = false; // The object may have incorrect external keys, then any attempt of reload must be avoided
 	private $m_bFullyLoaded = false; // Compound objects can be partially loaded
 	private $m_aLoadedAtt = array(); // Compound objects can be partially loaded, array of sAttCode
 
 	// Use the MetaModel::NewObject to build an object (do we have to force it?)
-	public function __construct($aRow = null, $sClassAlias = '')
+	public function __construct($aRow = null)
 	{
 		if (!empty($aRow))
 		{
-			$this->FromRow($aRow, $sClassAlias);
+			$this->FromRow($aRow);
 			$this->m_bFullyLoaded = $this->IsFullyLoaded();
 			return;
 		}
@@ -82,7 +72,6 @@ abstract class DBObject
 		}
 	}
 
-	// Read-only <=> Written once (archive)
 	public function RegisterAsDirty()
 	{
 		// While the object may be written to the DB, it is NOT possible to reload it
@@ -181,24 +170,17 @@ abstract class DBObject
 		$this->m_bFullyLoaded = true;
 	}
 
-	protected function FromRow($aRow, $sClassAlias = '')
+	protected function FromRow($aRow)
 	{
-		if (strlen($sClassAlias) == 0)
-		{
-			// Default to the current class
-			$sClassAlias = get_class($this);
-		}
-
 		$this->m_iKey = null;
 		$this->m_bIsInDB = true;
 		$this->m_aCurrValues = array();
 		$this->m_aOrigValues = array();
 		$this->m_aLoadedAtt = array();
-		$this->m_bCheckStatus = true;
 
 		// Get the key
 		//
-		$sKeyField = $sClassAlias."id";
+		$sKeyField = "id";
 		if (!array_key_exists($sKeyField, $aRow))
 		{
 			// #@# Bug ?
@@ -229,10 +211,9 @@ abstract class DBObject
 			// then one column will be found with an empty suffix, the others have a suffix
 			// Take care: the function isset will return false in case the value is null,
 			// which is something that could happen on open joins
-			$sAttRef = $sClassAlias.$sAttCode;
-			if (array_key_exists($sAttRef, $aRow))
+			if (array_key_exists($sAttCode, $aRow))
 			{
-				$value = $oAttDef->FromSQLToValue($aRow, $sAttRef);
+				$value = $oAttDef->FromSQLToValue($aRow, $sAttCode);
 
 				$this->m_aCurrValues[$sAttCode] = $value;
 				$this->m_aOrigValues[$sAttCode] = $value;
@@ -252,8 +233,13 @@ abstract class DBObject
 		if ($sAttCode == 'finalclass')
 		{
 			// Ignore it - this attribute is set upon object creation and that's it
+			//throw new CoreWarning('Attempting to set the value for the internal attribute \"finalclass\"', array('current value'=>$this->Get('finalclass'), 'new value'=>$value));
 			return;
 		}
+		if (!array_key_exists($sAttCode, MetaModel::ListAttributeDefs(get_class($this))))
+		{
+			throw new CoreException("Unknown attribute code '$sAttCode' for the class ".get_class($this));
+		}
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 		if ($this->m_bIsInDB && !$this->m_bFullyLoaded && !$this->m_bDirty)
 		{
@@ -262,7 +248,12 @@ abstract class DBObject
 			//           + consistency does not make sense !
 			$this->Reload();
 		}
-
+		if($oAttDef->IsScalar() && !$oAttDef->IsNullAllowed() && is_null($value))
+		{
+			throw new CoreWarning("null not allowed for attribute '$sAttCode', setting default value");
+			$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue();
+			return;
+		}
 		if ($oAttDef->IsExternalKey() && is_object($value))
 		{
 			// Setting an external key with a whole object (instead of just an ID)
@@ -270,14 +261,11 @@ abstract class DBObject
 			// (useful when building objects in memory and not from a query)
 			if ( (get_class($value) != $oAttDef->GetTargetClass()) && (!is_subclass_of($value, $oAttDef->GetTargetClass())))
 			{
-				throw new CoreUnexpectedValue("Trying to set the value of '$sAttCode', to an object of class '".get_class($value)."', whereas it's an ExtKey to '".$oAttDef->GetTargetClass()."'. Ignored");
+				throw new CoreWarning("Trying to set the value of '$sAttCode', to an object of class '".get_class($value)."', whereas it's an ExtKey to '".$oAttDef->GetTargetClass()."'. Ignored");
+				$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue();
 			}
 			else
 			{
-				// The object has changed, reset caches
-				$this->m_bCheckStatus = null;
-				$this->m_aAsArgs = null;
-
 				$this->m_aCurrValues[$sAttCode] = $value->GetKey();
 				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
 				{
@@ -291,13 +279,17 @@ abstract class DBObject
 		}
 		if(!$oAttDef->IsScalar() && !is_object($value))
 		{
-			throw new CoreUnexpectedValue("scalar not allowed for attribute '$sAttCode', setting default value (empty list)");
+			throw new CoreWarning("scalar not allowed for attribute '$sAttCode', setting default value (empty list)");
+			$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue();
+			return;
 		}
 		if($oAttDef->IsLinkSet())
 		{
 			if((get_class($value) != 'DBObjectSet') && !is_subclass_of($value, 'DBObjectSet'))
 			{
-				throw new CoreUnexpectedValue("expecting a set of persistent objects (found a '".get_class($value)."'), setting default value (empty list)");
+				throw new CoreWarning("expecting a set of persistent objects (found a '".get_class($value)."'), setting default value (empty list)");
+				$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue();
+				return;
 			}
 
 			$oObjectSet = $value;
@@ -306,21 +298,15 @@ abstract class DBObject
 			// not working fine :-(   if (!is_subclass_of($sSetClass, $sLinkClass))
 			if ($sSetClass != $sLinkClass)
 			{
-				throw new CoreUnexpectedValue("expecting a set of '$sLinkClass' objects (found a set of '$sSetClass'), setting default value (empty list)");
+				throw new CoreWarning("expecting a set of '$sLinkClass' objects (found a set of '$sSetClass'), setting default value (empty list)");
+				$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue();
+				return;
 			}
 		}
-
-		$realvalue = $oAttDef->MakeRealValue($value);
-		$this->m_aCurrValues[$sAttCode] = $realvalue;
-
-		// The object has changed, reset caches
-		$this->m_bCheckStatus = null;
-		$this->m_aAsArgs = null;
-
-		// Make sure we do not reload it anymore... before saving it
-		$this->RegisterAsDirty();
+		$this->m_aCurrValues[$sAttCode] = $oAttDef->MakeRealValue($value);
+		$this->RegisterAsDirty(); // Make sure we do not reload it anymore... before saving it
 	}
-
+	
 	public function Get($sAttCode)
 	{
 		if (!array_key_exists($sAttCode, MetaModel::ListAttributeDefs(get_class($this))))
@@ -329,9 +315,10 @@ abstract class DBObject
 		}
 		if ($this->m_bIsInDB && !$this->m_aLoadedAtt[$sAttCode] && !$this->m_bDirty)
 		{
-			// #@# non-scalar attributes.... handle that differently
+			// #@# non-scalar attributes.... handle that differentely
 			$this->Reload();
 		}
+		$this->ComputeFields();
 		return $this->m_aCurrValues[$sAttCode];
 	}
 
@@ -344,30 +331,7 @@ abstract class DBObject
 		return $this->m_aOrigValues[$sAttCode];
 	}
 
-	/**
-	 * Updates the value of an external field by (re)loading the object
-	 * corresponding to the external key and getting the value from it
-	 * @param string $sAttCode Attribute code of the external field to update
-	 * @return void
-	 */
-	protected function UpdateExternalField($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if ($oAttDef->IsExternalField())
-		{
-			$sTargetClass = $oAttDef->GetTargetClass();
-			$objkey = $this->Get($oAttDef->GetKeyAttCode());
-			$oObj = MetaModel::GetObject($sTargetClass, $objkey);
-			if (is_object($oObj))
-			{
-				$value = $oObj->Get($oAttDef->GetExtAttCode());
-				$this->Set($sAttCode, $value);
-			}
-		}
-	}
-	
-	// Compute scalar attributes that depend on any other type of attribute
-	public function DoComputeValues()
+	public function ComputeFields()
 	{
 		if (is_callable(array($this, 'ComputeValues')))
 		{
@@ -400,8 +364,7 @@ abstract class DBObject
 			$aAvailableFields = array();
 			foreach ($aExtKeyFriends as $sDispAttCode => $oExtField)
 			{
-//				$aAvailableFields[$oExtField->GetExtAttCode()] = $oExtField->GetAsHTML($this->Get($oExtField->GetCode()));
-				$aAvailableFields[$oExtField->GetExtAttCode()] = $this->Get($oExtField->GetCode());
+				$aAvailableFields[$oExtField->GetExtAttCode()] = $oExtField->GetAsHTML($this->Get($oExtField->GetCode()));
 			}
 
 			$sTargetClass = $oAtt->GetTargetClass(EXTKEY_ABSOLUTE);
@@ -412,67 +375,16 @@ abstract class DBObject
 		return $oAtt->GetAsHTML($this->Get($sAttCode));
 	}
 
-	public function GetEditValue($sAttCode)
-	{
-		$sClass = get_class($this);
-		$oAtt = MetaModel::GetAttributeDef($sClass, $sAttCode);
-
-		if ($oAtt->IsExternalKey())
-		{
-			$sTargetClass = $oAtt->GetTargetClass();
-			if ($this->IsNew())
-			{
-				// The current object exists only in memory, don't try to query it in the DB !
-				// instead let's query for the object pointed by the external key, and get its name
-				$targetObjId = $this->Get($sAttCode);
-				$oTargetObj = MetaModel::GetObject($sTargetClass, $targetObjId, false); // false => not sure it exists
-				if (is_object($oTargetObj))
-				{
-					$sEditValue = $oTargetObj->GetName();
-				}
-				else
-				{
-					$sEditValue = 0;
-				}					
-			}
-			else
-			{
-				$aAvailableFields = array();
-				// retrieve the "external fields" linked to this external key
-				foreach (MetaModel::GetExternalFields(get_class($this), $sAttCode) as $oExtField)
-				{
-					$aAvailableFields[$oExtField->GetExtAttCode()] = $oExtField->GetAsHTML($this->Get($oExtField->GetCode()));
-				}
-				// Use the "name" of the target class as the label of the hyperlink
-				// unless it's not available in the external fields...
-				$sExtClassNameAtt = MetaModel::GetNameAttributeCode($sTargetClass);
-				if (isset($aAvailableFields[$sExtClassNameAtt]))
-				{
-					$sEditValue = $aAvailableFields[$sExtClassNameAtt];
-				}
-				else
-				{
-					$sEditValue = implode(' / ', $aAvailableFields);
-				}
-			}
-		}
-		else
-		{
-			$sEditValue = $oAtt->GetEditValue($this->Get($sAttCode));
-		}
-		return $sEditValue;
-	}
-
 	public function GetAsXML($sAttCode)
 	{
 		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
 		return $oAtt->GetAsXML($this->Get($sAttCode));
 	}
 
-	public function GetAsCSV($sAttCode, $sSeparator = ',', $sTextQualifier = '"')
+	public function GetAsCSV($sAttCode, $sSeparator = ';', $sSepEscape = ',')
 	{
 		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAtt->GetAsCSV($this->Get($sAttCode), $sSeparator, $sTextQualifier);
+		return $oAtt->GetAsCSV($this->Get($sAttCode), $sSeparator, $sSepEscape);
 	}
 
 	protected static function MakeHyperLink($sObjClass, $sObjKey, $aAvailableFields)
@@ -512,15 +424,6 @@ abstract class DBObject
 		}
 		$this->m_iKey = $iNewKey;
 	}
-	/**
-	 * Get the icon representing this object
-	 * @param boolean $bImgTag If true the result is a full IMG tag (or an emtpy string if no icon is defined)
-	 * @return string Either the full IMG tag ($bImgTag == true) or just the path to the icon file
-	 */
-	public function GetIcon($bImgTag = true)
-	{
-		return MetaModel::GetClassIcon(get_class($this), $bImgTag);
-	}
 
 	public function GetName()
 	{
@@ -544,37 +447,11 @@ abstract class DBObject
 		}
 		else
 		{
-			return $this->Get($sStateAttCode);
+			$aStates = MetaModel::EnumStates(get_class($this));
+			return $aStates[$this->Get($sStateAttCode)]['label'];
 		}
 	}
 
-	public function GetStateLabel()
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode))
-		{
-			return '';
-		}
-		else
-		{
-			$sStateValue = $this->Get($sStateAttCode);
-			return MetaModel::GetStateLabel(get_class($this), $sStateValue);
-		}
-	}
-
-	public function GetStateDescription()
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode))
-		{
-			return '';
-		}
-		else
-		{
-			$sStateValue = $this->Get($sStateAttCode);
-			return MetaModel::GetStateDescription(get_class($this), $sStateValue);
-		}
-	}
 	/**
 	 * 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
@@ -593,8 +470,6 @@ abstract class DBObject
 	}
 
 	// check if the given (or current) value is suitable for the attribute
-	// return true if successfull
-	// return the error desciption otherwise
 	public function CheckValue($sAttCode, $value = null)
 	{
 		if (!is_null($value))
@@ -607,55 +482,31 @@ abstract class DBObject
 		}
 
 		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if (!$oAtt->IsWritable())
+		if ($oAtt->IsExternalKey())
 		{
-			return true;
-		}
-		elseif ($oAtt->IsNull($toCheck))
-		{
-			if ($oAtt->IsNullAllowed())
+			if (!$oAtt->IsNullAllowed() || ($toCheck != 0) )
 			{
-				return true;
-			}
-			else
-			{
-				return "Null not allowed";
-			}
-		}
-		elseif ($oAtt->IsExternalKey())
-		{
-			if (!MetaModel::SkipCheckExtKeys())
-			{
-				$sTargetClass = $oAtt->GetTargetClass();
-				$oTargetObj = MetaModel::GetObject($sTargetClass, $toCheck, false /*must be found*/, true /*allow all data*/);
-				if (is_null($oTargetObj))
+				try
 				{
-					return "Target object not found ($sTargetClass::$toCheck)";
+					$oTargetObj = MetaModel::GetObject($oAtt->GetTargetClass(), $toCheck);
+					return true;
+				}
+				catch (CoreException $e)
+				{
+					return false;
 				}
 			}
 		}
-		elseif ($oAtt->IsScalar())
+		elseif ($oAtt->IsWritable() && $oAtt->IsScalar())
 		{
-			$aValues = $oAtt->GetAllowedValues($this->ToArgs());
+			$aValues = $oAtt->GetAllowedValues();
 			if (count($aValues) > 0)
 			{
 				if (!array_key_exists($toCheck, $aValues))
 				{
-					return "Value not allowed [$toCheck]";
+					return false;
 				}
 			}
-			if (!is_null($iMaxSize = $oAtt->GetMaxSize()))
-			{
-				$iLen = strlen($toCheck);
-				if ($iLen > $iMaxSize)
-				{
-					return "String too long (found $iLen, limited to $iMaxSize)";
-				}
-			}
-			if (!$oAtt->CheckFormat($toCheck))
-			{
-				return "Wrong format [$toCheck]";
-			}
 		}
 		return true;
 	}
@@ -666,60 +517,45 @@ abstract class DBObject
 		return true;
 	}
 	
-	// check integrity rules (before inserting or updating the object)
+	// check if it is allowed to record the new object into the database
 	// a displayable error is returned
-	public function DoCheckToWrite()
+	// Note: checks the values and consistency
+	public function CheckToInsert()
 	{
-		$this->DoComputeValues();
-
-		$this->m_aCheckIssues = array();
-
+		$aIssues = array();
 		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
 		{
-			$res = $this->CheckValue($sAttCode);
-			if ($res !== true)
+			if (!$this->CheckValue($sAttCode))
 			{
-				// $res contains the error description
-				$this->m_aCheckIssues[] = "Unexpected value for attribute '$sAttCode': $res";
+				$aIssues[$sAttCode] = array(
+					'issue' => 'unexpected value'
+				);
 			}
 		}
-		if (count($this->m_aCheckIssues) > 0)
+		if (count($aIssues) > 0)
 		{
-			// No need to check consistency between attributes if any of them has
-			// an unexpected value
-			return;
+			return array(false, $aIssues);
 		}
-		$res = $this->CheckConsistency();
-		if ($res !== true)
+		if (!$this->CheckConsistency())
 		{
-			// $res contains the error description
-			$this->m_aCheckIssues[] = "Consistency rules not followed: $res";
+			return array(false, $aIssues);
 		}
+		return array(true, $aIssues);
 	}
 
-	final public function CheckToWrite()
+	// check if it is allowed to update the existing object into the database
+	// a displayable error is returned
+	// Note: checks the values and consistency
+	public function CheckToUpdate()
 	{
-		if (MetaModel::SkipCheckToWrite())
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
 		{
-			return array(true, array());
+			if (!$this->CheckValue($sAttCode)) return false;
 		}
-		if (is_null($this->m_bCheckStatus))
-		{
-			$oKPI = new ExecutionKPI();
-			$this->DoCheckToWrite();
-			$oKPI->ComputeStats('CheckToWrite', get_class($this));
-			if (count($this->m_aCheckIssues) == 0)
-			{
-				$this->m_bCheckStatus = true;
-			}
-			else
-			{
-				$this->m_bCheckStatus = false;
-			}
-		}
-		return array($this->m_bCheckStatus, $this->m_aCheckIssues);
+		if (!$this->CheckConsistency()) return false;
+		return true;
 	}
-
+	
 	// check if it is allowed to delete the existing object from the database
 	// a displayable error is returned
 	public function CheckToDelete()
@@ -732,32 +568,10 @@ abstract class DBObject
 		$aDelta = array();
 		foreach ($aProposal as $sAtt => $proposedValue)
 		{
-			if (!array_key_exists($sAtt, $this->m_aOrigValues))
+			if (!array_key_exists($sAtt, $this->m_aOrigValues) || ($this->m_aOrigValues[$sAtt] != $proposedValue))
 			{
-				// The value was not set
 				$aDelta[$sAtt] = $proposedValue;
 			}
-			elseif(is_object($proposedValue))
-			{
-				// The value is an object, the comparison is not strict
-				// #@# todo - should be even less strict => add verb on AttributeDefinition: Compare($a, $b)
-				if ($this->m_aOrigValues[$sAtt] != $proposedValue)
-				{
-					$aDelta[$sAtt] = $proposedValue;
-				}
-			}
-			else
-			{
-				// The value is a scalar, the comparison must be 100% strict
-				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-				{	
-					//echo "$sAtt:<pre>\n";
-					//var_dump($this->m_aOrigValues[$sAtt]);
-					//var_dump($proposedValue);
-					//echo "</pre>\n";
-					$aDelta[$sAtt] = $proposedValue;
-				}
-			}
 		}
 		return $aDelta;
 	} 
@@ -801,14 +615,10 @@ abstract class DBObject
 			{
 				$aOriginalList = $oOriginalSet->ToArray();
 				$aNewSet = $oLinks->ToArray();
-				
-				foreach($aOriginalList as $iId => $oObject)
+				$aToDelete = array_diff($aOriginalList, $aNewSet);
+				foreach ($aToDelete as $iKey => $oObject)
 				{
-					if (!array_key_exists($iId, $aNewSet))
-					{
-						// It disappeared from the list
-						$oObject->DBDelete();
-					}
+					$oObject->DBDelete();
 				}
 			}
 		}
@@ -816,10 +626,6 @@ abstract class DBObject
 
 	private function DBInsertSingleTable($sTableClass)
 	{
-		$sTable = MetaModel::DBGetTable($sTableClass);
-		// Abstract classes or classes having no specific attribute do not have an associated table
-		if ($sTable == '') return;
-
 		$sClass = get_class($this);
 
 		// fields in first array, values in the second
@@ -847,7 +653,8 @@ abstract class DBObject
 
 		if (count($aValuesToWrite) == 0) return false;
 
-		$sInsertSQL = "INSERT INTO `$sTable` (".join(",", $aFieldsToWrite).") VALUES (".join(", ", $aValuesToWrite).")";
+		$sTable = MetaModel::DBGetTable($sTableClass);
+		$sInsertSQL = "INSERT INTO $sTable (".join(",", $aFieldsToWrite).") VALUES (".join(", ", $aValuesToWrite).")";
 
 		$iNewKey = CMDBSource::InsertInto($sInsertSQL);
 		// Note that it is possible to have a key defined here, and the autoincrement expected, this is acceptable in a non root class
@@ -858,7 +665,7 @@ abstract class DBObject
 		}
 		return $this->m_iKey;
 	}
-
+	
 	// Insert of record for the new object into the database
 	// Returns the key of the newly created object
 	public function DBInsertNoReload()
@@ -872,8 +679,7 @@ abstract class DBObject
 		$sRootClass = MetaModel::GetRootClass($sClass);
 
 		// Ensure the update of the values (we are accessing the data directly)
-		$this->DoComputeValues();
-		$this->OnInsert();
+		$this->ComputeFields();
 
 		if ($this->m_iKey < 0)
 		{
@@ -886,17 +692,10 @@ abstract class DBObject
 		{
 			if (empty($this->m_iKey))
 			{
-				throw new CoreWarning("Missing key for the object to write - This class is supposed to have a user defined key, not an autonumber", array('class' => $sRootClass));
+				throw new CoreWarning("Missing key for the object to write - This class is supposed to have a user defined key, not an autonumber");
 			}
 		}
 
-		// Ultimate check - ensure DB integrity
-		list($bRes, $aIssues) = $this->CheckToWrite();
-		if (!$bRes)
-		{
-			throw new CoreException("Object not following integrity rules - it will not be written into the DB", array('class' => $sClass, 'id' => $this->GetKey(), 'issues' => $aIssues));
-		}
-
 		// First query built upon on the root class, because the ID must be created first
 		$this->m_iKey = $this->DBInsertSingleTable($sRootClass);
 
@@ -910,17 +709,12 @@ abstract class DBObject
 		foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
 		{
 			if ($sParentClass == $sRootClass) continue;
+			if (MetaModel::DBGetTable($sParentClass) == "") continue;
 			$this->DBInsertSingleTable($sParentClass);
 		}
 
 		$this->DBWriteLinks();
 		$this->m_bIsInDB = true;
-		$this->m_bDirty = false;
-		
-		// Arg cache invalidated (in particular, it needs the object key -could be improved later)
-		$this->m_aAsArgs = null;
-
-		$this->AfterInsert();
 
 		// Activate any existing trigger 
 		$sClass = get_class($this);
@@ -939,6 +733,7 @@ abstract class DBObject
 	public function DBInsert()
 	{
 		$this->DBInsertNoReload();
+		$this->m_bDirty = false;
 		$this->Reload();
 		return $this->m_iKey;
 	}
@@ -951,18 +746,6 @@ abstract class DBObject
 		$this->m_iKey = $iNewKey;
 		return $this->DBInsert();
 	}
-	
-	/**
-	 * This function is automatically called after cloning an object with the "clone" PHP language construct
-	 * The purpose of this method is to reset the appropriate attributes of the object in
-	 * order to make sure that the newly cloned object is really distinct from its clone
-	 */
-	public function __clone()
-	{
-		$this->m_bIsInDB = false;
-		$this->m_bDirty = true;
-		$this->m_iKey = self::GetNextTempId(get_class($this));
-	}
 
 	// Update a record
 	public function DBUpdate()
@@ -971,24 +754,12 @@ abstract class DBObject
 		{
 			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
 		}
-
-		$this->DoComputeValues();
-		$this->OnUpdate();
-
 		$aChanges = $this->ListChanges();
 		if (count($aChanges) == 0)
 		{
-			//throw new CoreWarning("Attempting to update an unchanged object");
+			throw new CoreWarning("Attempting to update an unchanged object");
 			return;
 		}
-
-		// Ultimate check - ensure DB integrity
-		list($bRes, $aIssues) = $this->CheckToWrite();
-		if (!$bRes)
-		{
-			throw new CoreException("Object not following integrity rules - it will not be written into the DB", array('class' => get_class($this), 'id' => $this->GetKey(), 'issues' => $aIssues));
-		}
-
 		$bHasANewExternalKeyValue = false;
 		foreach($aChanges as $sAttCode => $valuecurr)
 		{
@@ -1010,8 +781,6 @@ abstract class DBObject
 		$this->DBWriteLinks();
 		$this->m_bDirty = false;
 
-		$this->AfterUpdate();
-
 		// Reload to get the external attributes
 		if ($bHasANewExternalKeyValue)
 		{
@@ -1033,20 +802,16 @@ abstract class DBObject
 			return $this->DBInsert();
 		}
 	}
-
+	
 	// Delete a record
 	public function DBDelete()
 	{
 		$oFilter = new DBObjectSearch(get_class($this));
 		$oFilter->AddCondition('id', $this->m_iKey, '=');
 
-		$this->OnDelete();
-
 		$sSQL = MetaModel::MakeDeleteQuery($oFilter);
 		CMDBSource::Query($sSQL);
 
-		$this->AfterDelete();
-
 		$this->m_bIsInDB = false;
 		$this->m_iKey = null;
 	}
@@ -1097,14 +862,13 @@ abstract class DBObject
 
 		// Change state triggers...
 		$sClass = get_class($this);
-		$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class IN ('$sClassList') AND t.state='$sPreviousState'"));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class='$sClass' AND t.state='$sPreviousState'"));
 		while ($oTrigger = $oSet->Fetch())
 		{
 			$oTrigger->DoActivate($this->ToArgs('this'));
 		}
 
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN ('$sClassList') AND t.state='$sNewState'"));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class='$sClass' AND t.state='$sNewState'"));
 		while ($oTrigger = $oSet->Fetch())
 		{
 			$oTrigger->DoActivate($this->ToArgs('this'));
@@ -1114,72 +878,22 @@ abstract class DBObject
 	}
 
 	// Make standard context arguments
-	// Note: Needs to be reviewed because it is currently called once per attribute when an object is written (CheckToWrite / CheckValue)
-	//       Several options here:
-	//       1) cache the result
-	//       2) set only the object ref and resolve the values iif needed from contextual templates and queries (easy for the queries, not for the templates)
-	public function ToArgs($sArgName = 'this')
+	public function ToArgs($sArgName)
 	{
-		if (is_null($this->m_aAsArgs))
-		{
-			$oKPI = new ExecutionKPI();
-			$aScalarArgs = array();
-			$aScalarArgs[$sArgName] = $this->GetKey();
-			$aScalarArgs[$sArgName.'->id'] = $this->GetKey();
-			$aScalarArgs[$sArgName.'->object()'] = $this;
-			$aScalarArgs[$sArgName.'->hyperlink()'] = $this->GetHyperlink();
-			// #@# Prototype for a user portal - to be dehardcoded later
-			$sToPortal = utils::GetAbsoluteUrlPath().'../portal/index.php?operation=details&id='.$this->GetKey();
-			$aScalarArgs[$sArgName.'->hyperlink(portal)'] = '<a href="'.$sToPortal.'">'.$this->GetName().'</a>';
-			$aScalarArgs[$sArgName.'->name()'] = $this->GetName();
-		
-			$sClass = get_class($this);
-			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-			{
-				$aScalarArgs[$sArgName.'->'.$sAttCode] = $this->Get($sAttCode);
-				if ($oAttDef->IsScalar())
-				{
-					// #@# Note: This has been proven to be quite slow, this can slow down bulk load
-					$sAsHtml = $this->GetAsHtml($sAttCode);
-					$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = $sAsHtml;
-					$aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = strip_tags($sAsHtml);
-				}
-			}
-			$this->m_aAsArgs = $aScalarArgs;
-			$oKPI->ComputeStats('ToArgs', get_class($this));
-		}
-		return $this->m_aAsArgs;
-	}
-
-	// To be optionaly overloaded
-	protected function OnInsert()
-	{
-	}
+		$aScalarArgs = array();
+		$aScalarArgs[$sArgName] = $this->GetKey();
+		$aScalarArgs[$sArgName.'->id'] = $this->GetKey();
+		$aScalarArgs[$sArgName.'->hyperlink()'] = $this->GetHyperlink();
+		$aScalarArgs[$sArgName.'->name()'] = $this->GetName();
 	
-	// To be optionaly overloaded
-	protected function AfterInsert()
-	{
+		$sClass = get_class($this);
+		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+		{
+			$aScalarArgs[$sArgName.'->'.$sAttCode] = $this->Get($sAttCode);
+		}
+		return $aScalarArgs;
 	}
 
-	// To be optionaly overloaded
-	protected function OnUpdate()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function AfterUpdate()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function OnDelete()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function AfterDelete()
-	{
-	}
 
 	// Return an empty set for the parent of all
 	public static function GetRelationQueries($sRelCode)
@@ -1198,8 +912,8 @@ abstract class DBObject
 
 			$iDepth = $bPropagate ? $iMaxDepth - 1 : 0;
 
-			$oFlt = DBObjectSearch::FromOQL($sQuery);
-			$oObjSet = new DBObjectSet($oFlt, array(), $this->ToArgs());
+			$oFlt = DBObjectSearch::FromSibusQL($sQuery, array(), $this);
+			$oObjSet = new DBObjectSet($oFlt);
 			while ($oObj = $oObjSet->Fetch())
 			{
 				$sRootClass = MetaModel::GetRootClass(get_class($oObj));
@@ -1234,7 +948,7 @@ abstract class DBObject
 				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) continue;
 
 				$oSearch = new DBObjectSearch($sRemoteClass);
-				$oSearch->AddCondition($sExtKeyAttCode, $this->GetKey(), '=');
+				$oSearch->AddCondition($sExtKeyAttCode, $this->GetKey());
 				$oSet = new CMDBObjectSet($oSearch);
 				if ($oSet->Count() > 0)
 				{
@@ -1248,22 +962,11 @@ abstract class DBObject
 		return $aDependentObjects;
 	}
 
-	/**
-	 *		$aDeletedObjs = array(); // [class][key] => structure
-	 *		$aResetedObjs = array(); // [class][key] => object
-	 */	 	
-	public function GetDeletionScheme(&$aDeletedObjs, &$aResetedObjs, $aVisited = array())
+	public function GetDeletionScheme()
 	{
-		if (array_key_exists(get_class($this), $aVisited))
-		{
-			if (in_array($this->GetKey(), $aVisited[get_class($this)]))
-			{
-				return;
-			}
-		}
-		$aVisited[get_class($this)] = $this->GetKey();
-
 		$aDependentObjects = $this->GetReferencingObjects();
+		$aDeletedObjs = array(); // [class][key] => structure
+		$aResetedObjs = array(); // [class][key] => object
 		foreach ($aDependentObjects as $sRemoteClass => $aPotentialDeletes)
 		{
 			foreach ($aPotentialDeletes as $sRemoteExtKey => $aData)
@@ -1306,17 +1009,13 @@ abstract class DBObject
 							// First time we find the given object in the list
 							// (and most likely case is that no other occurence will be found)
 							$aDeletedObjs[$sRemoteClass][$iId]['to_delete'] = $oDependentObj;
-							$aDeletedObjs[$sRemoteClass][$iId]['auto_delete'] = ($iDeletePropagationOption == DEL_AUTO);
-							// Recursively inspect this object
-							if ($iDeletePropagationOption == DEL_AUTO)
-							{
-								$oDependentObj->GetDeletionScheme($aDeletedObjs, $aResetedObjs, $aVisited);
-							} 
+							$aDeletedObjs[$sRemoteClass][$iId]['auto_delete'] = ($iDeletePropagationOption == DEL_AUTO); 
 						}
 					}
 				}
 			}
 		}
+		return array($aDeletedObjs, $aResetedObjs);
 	}
 }
 

core/dbobjectsearch.class.php

@@ -1,32 +1,51 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
  * Define filters for a given class of objects (formerly named "filter") 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
+
+/**
+ * Sibusql - value set start 
+ * @package     iTopORM
+ */
+define('VS_START', '{');
+/**
+ * Sibusql - value set end 
+ * @package     iTopORM
+ */
+define('VS_END', '}');
+
+
+define('SIBUSQLPARAMREGEXP', "/\\$\\[(.*)\\:(.*)\\:(.*)\\]/U");
+define('SIBUSQLTHISREGEXP', "/this\\.(.*)/U");
+
+
+/**
+ * Define filters for a given class of objects (formerly named "filter") 
+ *
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @mytagrom    youpi
+ * @since       1.0
+ * @version     1.1.1.1 $
+ */
 class DBObjectSearch
 {
-	private $m_aClasses; // queried classes (alias => class name), the first item is the class corresponding to this filter (the rest is coming from subfilters)
-	private $m_aSelectedClasses; // selected for the output (alias => class name)
+	private $m_sClass;
+	private $m_sClassAlias;
+	private $m_aClasses; // queried classes (alias => class name)
 	private $m_oSearchCondition;
 	private $m_aParams;
 	private $m_aFullText;
@@ -34,18 +53,15 @@ class DBObjectSearch
 	private $m_aReferencedBy;
 	private $m_aRelatedTo;
 
-	// By default, some information may be hidden to the current user
-	// But it may happen that we need to disable that feature
-	private $m_bAllowAllData = false;
-
-	public function __construct($sClass, $sClassAlias = null)
+	public function __construct($sClass, $sClassAlias = '')
 	{
-		if (is_null($sClassAlias)) $sClassAlias = $sClass;
+		if (empty($sClassAlias)) $sClassAlias = $sClass;
 		assert('is_string($sClass)');
 		assert('MetaModel::IsValidClass($sClass)'); // #@# could do better than an assert, or at least give the caller's reference
 		// => idee d'un assert avec call stack (autre utilisation = echec sur query SQL)
-
-		$this->m_aSelectedClasses = array($sClassAlias => $sClass);
+		if (empty($sClassAlias)) $sClassAlias = $sClass;
+		$this->m_sClass = $sClass;
+		$this->m_sClassAlias = $sClassAlias;
 		$this->m_aClasses = array($sClassAlias => $sClass);
 		$this->m_oSearchCondition = new TrueExpression;
 		$this->m_aParams = array();
@@ -55,51 +71,6 @@ class DBObjectSearch
 		$this->m_aRelatedTo = array();
 	}
 
-	public function AllowAllData() {$this->m_bAllowAllData = true;}
-	public function IsAllDataAllowed() {return $this->m_bAllowAllData;}
-
-	public function GetClassName($sAlias) {return $this->m_aClasses[$sAlias];}
-	public function GetJoinedClasses() {return $this->m_aClasses;}
-
-	public function GetClass()
-	{
-		return reset($this->m_aSelectedClasses);
-	}
-	public function GetClassAlias()
-	{
-		reset($this->m_aSelectedClasses);
-		return key($this->m_aSelectedClasses);
-	}
-
-	public function GetFirstJoinedClass()
-	{
-		return reset($this->m_aClasses);
-	}
-	public function GetFirstJoinedClassAlias()
-	{
-		reset($this->m_aClasses);
-		return key($this->m_aClasses);
-	}
-
-	public function SetSelectedClasses($aNewSet)
-	{
-		$this->m_aSelectedClasses = array();
-		foreach ($aNewSet as $sAlias => $sClass)
-		{
-			if (!array_key_exists($sAlias, $this->m_aClasses))
-			{
-				throw new CoreException('Unexpected class alias', array('alias'=>$sAlias, 'expected'=>$this->m_aClasses));
-			}
-			$this->m_aSelectedClasses[$sAlias] = $sClass;
-		}
-	}
-
-	public function GetSelectedClasses()
-	{
-		return $this->m_aSelectedClasses;
-	}
-
-
 	public function IsAny()
 	{
 		// #@# todo - if (!$this->m_oSearchCondition->IsTrue()) return false;
@@ -202,9 +173,9 @@ class DBObjectSearch
 		}
 		if (!empty($sConditionDesc))
 		{
-			return "Objects of class '".$this->GetClass()."', $sConditionDesc";
+			return "Objects of class '$this->m_sClass', $sConditionDesc";
 		}
-		return "Any object of class '".$this->GetClass()."'";
+		return "Any object of class '$this->m_sClass'";
 	}
 
 	protected function TransferConditionExpression($oFilter, $aTranslation)
@@ -219,6 +190,7 @@ class DBObjectSearch
 	{
 		$this->m_oSearchCondition = new TrueExpression();
 		// ? is that usefull/enough, do I need to rebuild the list after the subqueries ?
+		// $this->m_aClasses = array($this->m_sClassAlias => $this->m_sClass);
 	}
 
 	public function AddConditionExpression($oExpression)
@@ -228,28 +200,23 @@ class DBObjectSearch
 
 	public function AddCondition($sFilterCode, $value, $sOpCode = null)
 	{
-		MyHelpers::CheckKeyInArray('filter code', $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
-		$oFilterDef = MetaModel::GetClassFilterDef($this->GetClass(), $sFilterCode);
+	// #@# backward compatibility for pkey/id
+	if (strtolower(trim($sFilterCode)) == 'pkey') $sFilterCode = 'id';
+// #@# todo - obsolete smoothly, first send exceptions
+//		throw new CoreException('SibusQL has been obsoleted, please update your queries', array('sibusql'=>$sQuery, 'oql'=>$oFilter->ToOQL()));
+
+		MyHelpers::CheckKeyInArray('filter code', $sFilterCode, MetaModel::GetClassFilterDefs($this->m_sClass));
+		$oFilterDef = MetaModel::GetClassFilterDef($this->m_sClass, $sFilterCode);
 
-		$oField = new FieldExpression($sFilterCode, $this->GetClassAlias());
 		if (empty($sOpCode))
 		{
-			if ($sFilterCode == 'id')
-			{
-				$sOpCode = '=';
-			}
-			else
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
-				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
-				$this->AddConditionExpression($oNewCondition);
-				return;
-			}
+			$sOpCode = $oFilterDef->GetLooseOperator();
 		}
 		MyHelpers::CheckKeyInArray('operator', $sOpCode, $oFilterDef->GetOperators());
 
 		// Preserve backward compatibility - quick n'dirty way to change that API semantic
 		//
+		$oField = new FieldExpression($sFilterCode, $this->m_sClassAlias);
 		switch($sOpCode)
 		{
 		case 'SameDay':
@@ -319,20 +286,14 @@ class DBObjectSearch
 
 	protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation)
 	{
-		$sOrigAlias = $this->GetClassAlias();
+		$sOrigAlias = $this->m_sClassAlias;
 		if (array_key_exists($sOrigAlias, $aClassAliases))
 		{
-			$sNewAlias = MetaModel::GenerateUniqueAlias($aClassAliases, $sOrigAlias, $this->GetClass());
-			$this->m_aSelectedClasses[$sNewAlias] = $this->GetClass();
-			unset($this->m_aSelectedClasses[$sOrigAlias]);
-
+			$this->m_sClassAlias = MetaModel::GenerateUniqueAlias($aClassAliases, $sOrigAlias, $this->m_sClass);
 			// Translate the condition expression with the new alias
-			$aAliasTranslation[$sOrigAlias]['*'] = $sNewAlias;
+			$aAliasTranslation[$sOrigAlias]['*'] = $this->m_sClassAlias;
 		}
 
-		// add the alias into the filter aliases list
-		$aClassAliases[$this->GetClassAlias()] = $this->GetClass();
-		
 		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$oFilter)
 		{
 			$oFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
@@ -468,6 +429,12 @@ class DBObjectSearch
 		}
 	}
 
+
+	public function GetClassName($sAlias) {return $this->m_aClasses[$sAlias];}
+	public function GetClasses() {return $this->m_aClasses;}
+
+	public function GetClass() {return $this->m_sClass;}
+	public function GetClassAlias() {return $this->m_sClassAlias;}
 	public function GetCriteria() {return $this->m_oSearchCondition;}
 	public function GetCriteria_FullText() {return $this->m_aFullText;}
 	public function GetCriteria_PointingTo($sKeyAttCode = "")
@@ -507,21 +474,110 @@ class DBObjectSearch
 		return $this->m_oSearchCondition->Render($this->m_aParams, false);
 	}
 
-	public function serialize($bDevelopParams = false, $aContextParams = null)
+	public function serialize()
 	{
-		$sOql = $this->ToOql($bDevelopParams, $aContextParams);
-		return base64_encode(serialize(array($sOql, $this->m_aParams)));
+		// Efficient but resulting in long strings:
+		// -> return (base64_encode(serialize($this)));
+
+		$sValue = $this->GetClass()."\n";
+		$sValue .= $this->GetClassAlias()."\n";
+
+		foreach($this->m_aClasses as $sClassAlias => $sClass)
+		{
+			// A stands for "Aliases"
+			$sValue .= "A:$sClassAlias:$sClass\n";
+		}
+		foreach($this->m_aFullText as $sFullText)
+		{
+			// F stands for "Full text"
+			$sValue .= "F:".$sFullText."\n";
+		}
+		$sValue .= "C:".$this->m_oSearchCondition->serialize()."\n";
+
+		foreach($this->m_aPointingTo as $sExtKey=>$oFilter)
+		{
+			// P stands for "Pointing to"
+			$sValue .= "P:".$sExtKey.":".$oFilter->serialize()."\n";
+		}
+		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode=>$oForeignFilter)
+			{
+				// R stands for "Referenced by"
+				$sValue .= "R:".$sForeignExtKeyAttCode.":".$oForeignFilter->serialize()."\n";
+			}
+		}
+		foreach($this->m_aRelatedTo as $aRelatedTo)
+		{
+			$oFilter = $aRelatedTo['flt'];
+			$sRelCode = $aRelatedTo['relcode'];
+			$iMaxDepth = $aRelatedTo['maxdepth'];
+			
+			$sValue .= "T:".$oFilter->serialize().":$sRelCode:$iMaxDepth\n";
+		}
+		if (count($this->m_aParams) > 0)
+		{
+			foreach($this->m_aParams as $sName => $sArgValue)
+			{
+				// G stands for arGument
+				$sValue .= "G:$sName:$sArgValue\n";
+			}
+		}
+		return base64_encode($sValue);
 	}
 	
 	static public function unserialize($sValue)
 	{
-		$aData = unserialize(base64_decode($sValue));
-		$sOql = $aData[0];
-		$aParams = $aData[1];
-		// We've tried to use gzcompress/gzuncompress, but for some specific queries
-		// it was not working at all (See Trac #193)
-		// gzuncompress was issuing a warning "data error" and the return object was null
-		return self::FromOQL($sOql, $aParams);
+		// See comment above...
+		// -> return (unserialize(base64_decode($sValue)));
+
+		$sClearText = base64_decode($sValue);
+		$aValues = explode("\n", $sClearText);
+		$i = 0;
+		$sClass = $aValues[$i++];
+		$sClassAlias = $aValues[$i++];
+		$oFilter = new DBObjectSearch($sClass, $sClassAlias);
+		while($i < count($aValues) && !empty($aValues[$i]))
+		{
+			$aCondition = explode(":", $aValues[$i++]);
+			switch ($aCondition[0])
+			{
+			case "A":
+				$oFilter->m_aClasses[$aCondition[1]] = $aCondition[2];
+				break;
+			case "F":
+				$oFilter->AddCondition_FullText($aCondition[1]);
+				break;
+			case "C":
+				$oFilter->m_oSearchCondition = Expression::unserialize($aCondition[1]);
+				break;
+			case "P":
+				//$oAtt = DBObject::GetAttributeDef($sClass, $aCondition[1]);
+				//$sRemoteClass = $oAtt->GetTargetClass();
+				$oSubFilter = self::unserialize($aCondition[2]);
+				$sExtKeyAttCode = $aCondition[1];
+				$oFilter->AddCondition_PointingTo($oSubFilter, $sExtKeyAttCode);
+				break;
+			case "R":
+				$oRemoteFilter = self::unserialize($aCondition[2]);
+				$sExtKeyAttCodeToMe = $aCondition[1];
+				$oFilter->AddCondition_ReferencedBy($oRemoteFilter, $sExtKeyAttCodeToMe);
+				break;
+			case "T":
+				$oSubFilter = self::unserialize($aCondition[1]);
+				$sRelCode = $aCondition[2];
+				$iMaxDepth = $aCondition[3];
+				$oFilter->AddCondition_RelatedTo($oSubFilter, $sRelCode, $iMaxDepth);
+				break;
+			case "G":
+				$oFilter->m_aParams[$aCondition[1]] = $aCondition[2];
+				break;
+
+			default:
+				throw new CoreException("invalid filter definition (cannot unserialize the data, clear text = '$sClearText')");
+			}
+		}
+		return $oFilter;
 	}
 
 	// SImple BUt Structured Query Languag - SubuSQL
@@ -560,74 +616,27 @@ class DBObjectSearch
 		return $retValue;
 	}
 
-	// Alternative to object mapping: the data are transfered directly into an array
-	// This is 10 times faster than creating a set of objects, and makes sense when optimization is required
-	public function ToDataArray($aColumns = array(), $aOrderBy = array(), $aArgs = array())
+	public function ToOQL(&$aParams = null)
 	{
-		$sSQL = MetaModel::MakeSelectQuery($this, $aOrderBy, $aArgs);
-		$resQuery = CMDBSource::Query($sSQL);
-		if (!$resQuery) return;
-
-		if (count($aColumns) == 0)
+		$bRetrofitParams = (!is_null($aParams));
+		if (is_null($aParams))
 		{
-			$aColumns = array_keys(MetaModel::ListAttributeDefs($this->GetClass()));
-			// Add the standard id (as first column)
-			array_unshift($aColumns, 'id');
-		}
-
-		$aQueryCols = CMDBSource::GetColumns($resQuery);
-
-		$sClassAlias = $this->GetClassAlias();
-		$aColMap = array();
-		foreach ($aColumns as $sAttCode)
-		{
-			$sColName = $sClassAlias.$sAttCode;
-			if (in_array($sColName, $aQueryCols))
+			if (count($this->m_aParams) > 0)
 			{
-				$aColMap[$sAttCode] = $sColName;
-			}
-		}
-
-		$aRes = array();
-		while ($aRow = CMDBSource::FetchArray($resQuery))
-		{
-			$aMappedRow = array();
-			foreach ($aColMap as $sAttCode => $sColName)
-			{
-				$aMappedRow[$sAttCode] = $aRow[$sColName];
-			}
-			$aRes[] = $aMappedRow;
-		}
-		CMDBSource::FreeResult($resQuery);
-		return $aRes;
-	}
-
-	public function ToOQL($bDevelopParams = false, $aContextParams = null)
-	{
-		// Currently unused, but could be useful later
-		$bRetrofitParams = false;
-
-		if ($bDevelopParams)
-		{
-			if (is_null($aContextParams))
-			{
-				$aParams = array_merge($this->m_aParams);
-			}
-			else
-			{
-				$aParams = array_merge($aContextParams, $this->m_aParams);
+				$aParams = $this->m_aParams;
 			}
+			$bRetrofitParams = false;
 		}
 		else
 		{
-			// Leave it as is, the rendering will be made with parameters in clear
-			$aParams = null;
+			if (count($this->m_aParams) > 0)
+			{
+				$aParams = array_merge($aParams, $this->m_aParams);
+			}
+			$bRetrofitParams = true;
 		}
-	
-		$sSelectedClasses = implode(', ', array_keys($this->m_aSelectedClasses));
-		$sRes = 'SELECT '.$sSelectedClasses.' FROM';
 
-		$sRes .= ' '.$this->GetClass().' AS '.$this->GetClassAlias();
+		$sRes = "SELECT ".$this->GetClass().' AS '.$this->GetClassAlias();
 		$sRes .= $this->ToOQL_Joins();
 		$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
 
@@ -658,6 +667,77 @@ class DBObjectSearch
 		return $sRes;
 	}
 
+	public function ToSibusQL()
+	{
+		return "NONONO";
+	}
+
+	static private function privProcessParams($sQuery, array $aParams, $oDbObject)
+	{
+		$iPlaceHoldersCount = preg_match_all(SIBUSQLPARAMREGEXP, $sQuery, $aMatches, PREG_SET_ORDER);
+		if ($iPlaceHoldersCount > 0)
+		{
+			foreach($aMatches as $aMatch)
+			{
+				$sStringToSearch = $aMatch[0];
+				$sParameterName = $aMatch[1];
+				$sDefaultValue = $aMatch[2];
+				$sDescription = $aMatch[3];
+				
+				$sValue = $sDefaultValue;
+				if (array_key_exists($sParameterName, $aParams))
+				{
+					$sValue = $aParams[$sParameterName];
+					unset($aParams[$sParameterName]);
+				}
+				else if (is_object($oDbObject))
+				{
+					if (strpos($sParameterName, "this.") === 0)
+					{
+						$sAttCode = substr($sParameterName, strlen("this."));
+						if ($sAttCode == 'id')
+						{
+							$sValue = $oDbObject->GetKey();
+						}
+						else if ($sAttCode == 'class')
+						{
+							$sValue = get_class($oDbObject);
+						}
+						else if (MetaModel::IsValidAttCode(get_class($oDbObject), $sAttCode))
+						{
+							$sValue = $oDbObject->Get($sAttCode);
+						}
+					}
+				}
+				$sQuery = str_replace($sStringToSearch, $sValue, $sQuery);
+			}
+		}
+		if (count($aParams) > 0)
+		{
+//			throw new CoreException("Unused parameter(s) for this SibusQL expression: (".implode(', ', array_keys($aParams)).")");
+		}
+		return $sQuery;
+	}
+
+	static public function ListSibusQLParams($sQuery)
+	{
+		$aRet = array();
+		$iPlaceHoldersCount = preg_match_all(SIBUSQLPARAMREGEXP, $sQuery, $aMatches, PREG_SET_ORDER);
+		if ($iPlaceHoldersCount > 0)
+		{
+			foreach($aMatches as $aMatch)
+			{
+				$sStringToSearch = $aMatch[0];
+				$sParameterName = $aMatch[1];
+				$sDefaultValue = $aMatch[2];
+				$sDescription = $aMatch[3];
+				$aRet[$sParameterName]["description"] = $sDescription;
+				$aRet[$sParameterName]["default"] = $sDefaultValue;
+			}
+		}
+		return $aRet;
+	}
+
 	protected function OQLExpressionToCondition($sQuery, $oExpression, $aClassAliases)
 	{
 		if ($oExpression instanceof BinaryOqlExpression)
@@ -722,25 +802,11 @@ class DBObjectSearch
 		}
 		elseif ($oExpression instanceof ListOqlExpression)
 		{
-			$aItems = array();
-			foreach ($oExpression->GetItems() as $oItemExpression)
-			{
-				$aItems[] = $this->OQLExpressionToCondition($sQuery, $oItemExpression, $aClassAliases);
-			}
-			return new ListExpression($aItems);
+			return new ListExpression($oExpression->GetItems());
 		}
 		elseif ($oExpression instanceof FunctionOqlExpression)
 		{
-			$aArgs = array();
-			foreach ($oExpression->GetArgs() as $oArgExpression)
-			{
-				$aArgs[] = $this->OQLExpressionToCondition($sQuery, $oArgExpression, $aClassAliases);
-			}
-			return new FunctionExpression($oExpression->GetVerb(), $aArgs);
-		}
-		elseif ($oExpression instanceof IntervalOqlExpression)
-		{
-			return new IntervalExpression($oExpression->GetValue(), $oExpression->GetUnit());
+			return new FunctionExpression($oExpression->GetVerb(), $oExpression->GetArgs());
 		}
 		else
 		{
@@ -748,26 +814,9 @@ class DBObjectSearch
 		}
 	}
 
-	// Create a search definition that leads to 0 result, still a valid search object
-	static public function FromEmptySet($sClass)
-	{
-		$oResultFilter = new DBObjectSearch($sClass);
-		$oResultFilter->m_oSearchCondition = new FalseExpression;
-		return $oResultFilter;
-	}
-
 	static protected $m_aOQLQueries = array();
 
-	// Do not filter out depending on user rights
-	// In particular when we are currently in the process of evaluating the user rights...
-	static public function FromOQL_AllData($sQuery, $aParams = null)
-	{
-		$oRes = self::FromOQL($sQuery, $aParams);
-		$oRes->AllowAllData();
-		return $oRes;
-	}
-
-	static public function FromOQL($sQuery, $aParams = null)
+	static public function FromOQL($sQuery)
 	{
 		if (empty($sQuery)) return null;
 
@@ -863,31 +912,12 @@ class DBObjectSearch
 			}
 		}
 
-		// Check and prepare the select information
-		$aSelected = array();
-		foreach ($oOqlQuery->GetSelectedClasses() as $oClassDetails)
-		{
-			$sClassToSelect = $oClassDetails->GetValue();
-			if (!array_key_exists($sClassToSelect, $aAliases))
-			{
-				throw new OqlNormalizeException('Unknown class [alias]', $sQuery, $oClassDetails, array_keys($aAliases));
-			}
-			$aSelected[$sClassToSelect] = $aAliases[$sClassToSelect];
-		}
-		$oResultFilter->m_aClasses = $aAliases;
-		$oResultFilter->SetSelectedClasses($aSelected);
-
 		$oConditionTree = $oOqlQuery->GetCondition();
 		if ($oConditionTree instanceof Expression)
 		{
 			$oResultFilter->m_oSearchCondition = $oResultFilter->OQLExpressionToCondition($sQuery, $oConditionTree, $aAliases);
 		}
 
-		if (!is_null($aParams))
-		{
-			$oResultFilter->m_aParams = $aParams;
-		}
-
 		if ($bOQLCacheEnabled)
 		{
 			self::$m_aOQLQueries[$sQuery] = clone $oResultFilter;
@@ -896,6 +926,111 @@ class DBObjectSearch
 		return $oResultFilter;
 	}
 
+	static public function FromSibusQL($sQuery, array $aParams = array(), $oObject = null)
+	{
+		if (empty($sQuery)) return null;
+		$sQuery = self::privProcessParams($sQuery, $aParams, $oObject);
+
+		if (preg_match('@^\\s*SELECT@', $sQuery))
+		{
+			return self::FromOQL($sQuery, $aParams, $oObject);
+		}
+
+		$iSepPos = strpos($sQuery, ":");
+		if ($iSepPos === false)
+		{
+			// Only the class was specified -> all rows are required
+			$sClass = trim($sQuery);
+			$oFilter = new DBObjectSearch($sClass);
+		}
+		else
+		{
+			$sClass = trim(substr($sQuery, 0, $iSepPos));
+			$sConds = trim(substr($sQuery, $iSepPos + 1));
+			$aValues = explode(" AND ", $sConds);
+	
+			$oFilter = new DBObjectSearch($sClass);
+	
+			foreach ($aValues as $sCond)
+			{
+				$sCond = trim($sCond);
+				
+				if (strpos($sCond, "* HAS ") === 0)
+				{
+					$sValue = self::Expression2Value(substr($sCond, strlen("* HAS ")));
+					$oFilter->AddCondition_FullText($sValue);
+				}
+				else if (preg_match("@^(\S+) IN \\((.+)\\)$@", $sCond, $aMatches))
+				{
+					$sExtKeyAttCode = $aMatches[1];
+					$sFilterExp = $aMatches[2];
+
+					$oSubFilter = self::FromSibuSQL($sFilterExp);
+					$oFilter->AddCondition_PointingTo($oSubFilter, $sExtKeyAttCode);
+				}
+				else if (strpos($sCond, "PKEY IS ") === 0)
+				{
+					if (preg_match("@^PKEY IS (\S+) IN \\((.+)\\)$@", $sCond, $aMatches))
+					{
+						$sExtKeyAttCodeToMe = $aMatches[1];
+						$sFilterExp = $aMatches[2];
+						$oRemoteFilter = self::FromSibuSQL($sFilterExp);
+						$oFilter->AddCondition_ReferencedBy($oRemoteFilter, $sExtKeyAttCodeToMe);
+					}
+				}
+				else if (strpos($sCond, "RELATED") === 0)
+				{
+					if (preg_match("@^RELATED\s*\\((.+)\\)\s*TO\s*\\((.+)\\)@", trim($sCond), $aMatches))
+					{
+						$aRelation = explode(',', trim($aMatches[1]));
+						$sRelCode = trim($aRelation[0]);
+						$iMaxDepth = intval(trim($aRelation[1]));
+						$sFilterExp = trim($aMatches[2]);
+
+						$oSubFilter = self::FromSibuSQL($sFilterExp);
+						$oFilter->AddCondition_RelatedTo($oSubFilter, $sRelCode, $iMaxDepth);
+					}
+				}
+				else
+				{
+					$sOperandExpr = "'.*'|\d+|-\d+|".VS_START.".+".VS_END;
+					if (preg_match("@^(\S+)\s+(.*)\s+($sOperandExpr)$@", $sCond, $aMatches))
+					{
+						$sFltCode = trim($aMatches[1]);
+						$sOpCode = trim($aMatches[2]);
+						$value = self::Expression2Value($aMatches[3]);
+						$oFilter->AddCondition($sFltCode, $value, $sOpCode);
+					}
+					else
+					{
+						throw new CoreException("Wrong format for filter definition: '$sQuery'");
+					}
+				}
+			}
+		}
+
+// #@# todo - obsolete smoothly, first give the OQL version !
+//		throw new CoreException('SibusQL has been obsoleted, please update your queries', array('sibusql'=>$sQuery, 'oql'=>$oFilter->ToOQL()));
+
+		return $oFilter;
+	}
+
+	// Sexy display of a SibuSQL expression
+	static public function SibuSQLAsHtml($sQuery)
+	{
+		$sQuery = htmlentities($sQuery);
+		$aParams = self::ListSibusQLParams($sQuery);
+		$aParamValues = array();
+		foreach ($aParams as $sParamName => $aParamInfo)
+		{
+			$sDescription = $aParamInfo["description"];
+			$sDefaultValue = $aParamInfo["default"];
+			$aParamValues[$sParamName] = "<span style=\"background-color:#aaa;\" title\"$sDescription (default to '$sDefaultValue')\">$sParamName</span>";
+		}
+		$sQuery = self::privProcessParams($sQuery, $aParamValues, null);
+		return $sQuery;
+	}
+
 	public function toxpath()
 	{
 		// #@# a voir...

core/dbobjectset.class.php

@@ -1,34 +1,17 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Object set management
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 /**
  * A set of persistent objects, could be heterogeneous 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
+
 class DBObjectSet
 {
 	private $m_oFilter;
@@ -38,16 +21,14 @@ class DBObjectSet
 	private $m_aId2Row;
 	private $m_iCurrRow;
 
-	public function __construct(DBObjectSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0)
+	public function __construct(DBObjectSearch $oFilter, $aOrderBy = array(), $aArgs = array())
 	{
 		$this->m_oFilter = $oFilter;
 		$this->m_aOrderBy = $aOrderBy;
 		$this->m_aArgs = $aArgs;
-		$this->m_iLimitCount = $iLimitCount;
-		$this->m_iLimitStart = $iLimitStart;
 
 		$this->m_bLoaded = false;
-		$this->m_aData = array(); // array of (row => array of (classalias) => object)
+		$this->m_aData = array();
 		$this->m_aId2Row = array();
 		$this->m_iCurrRow = 0;
 	}
@@ -60,7 +41,7 @@ class DBObjectSet
 	{
 		$sRet = '';
 		$this->Rewind();
-		$sRet .= "Set (".$this->m_oFilter->ToOQL().")<br/>\n";
+		$sRet .= "Set (".$this->m_oFilter->ToSibuSQL().")<br/>\n";
 		$sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".MetaModel::MakeSelectQuery($this->m_oFilter, array()).")</pre>\n";
 		
 		$sRet .= $this->Count()." records<br/>\n";
@@ -91,55 +72,15 @@ class DBObjectSet
 		return $oRetSet;
 	} 
 
-	// create an object set ex nihilo
-	// input = array of objects
 	static public function FromArray($sClass, $aObjects)
 	{
 		$oFilter = new CMDBSearchFilter($sClass);
 		$oRetSet = new self($oFilter);
 		$oRetSet->m_bLoaded = true; // no DB load
-		$oRetSet->AddObjectArray($aObjects, $sClass);
+		$oRetSet->AddObjectArray($aObjects);
 		return $oRetSet;
 	} 
 
-	// create an object set ex nihilo
-	// aClasses = array of (alias => class)
-	// input = array of (array of (classalias => object))
-	static public function FromArrayAssoc($aClasses, $aObjects)
-	{
-		// In a perfect world, we should create a complete tree of DBObjectSearch,
-		// but as we lack most of the information related to the objects,
-		// let's create one search definition
-		$sClass = reset($aClasses);
-		$sAlias = key($aClasses);
-		$oFilter = new CMDBSearchFilter($sClass, $sAlias);
-
-		$oRetSet = new self($oFilter);
-		$oRetSet->m_bLoaded = true; // no DB load
-
-		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
-		{
-			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
-		}
-		return $oRetSet;
-	} 
-
-	static public function FromLinkSet($oObject, $sLinkSetAttCode, $sExtKeyToRemote)
-	{
-		$oLinkAttCode = MetaModel::GetAttributeDef(get_class($oObject), $sLinkSetAttCode);
-		$oExtKeyAttDef = MetaModel::GetAttributeDef($oLinkAttCode->GetLinkedClass(), $sExtKeyToRemote);
-		$sTargetClass = $oExtKeyAttDef->GetTargetClass();
-
-		$oLinkSet = $oObject->Get($sLinkSetAttCode);
-		$aTargets = array();
-		while ($oLink = $oLinkSet->Fetch())
-		{
-			$aTargets[] = MetaModel::GetObject($sTargetClass, $oLink->Get($sExtKeyToRemote));
-		}
-
-		return self::FromArray($sTargetClass, $aTargets);
-	} 
-
 	public function ToArray($bWithId = true)
 	{
 		$aRet = array();
@@ -186,56 +127,24 @@ class DBObjectSet
 		return $this->m_oFilter->GetClass();
 	}
 
-	public function GetSelectedClasses()
-	{
-		return $this->m_oFilter->GetSelectedClasses();
-	}
-
 	public function GetRootClass()
 	{
 		return MetaModel::GetRootClass($this->GetClass());
 	}
 
-	public function SetLimit($iLimitCount, $iLimitStart = 0)
-	{
-		$this->m_iLimitCount = $iLimitCount;
-		$this->m_iLimitStart = $iLimitStart;
-	}
-
-	public function GetLimitCount()
-	{
-		return $this->m_iLimitCount;
-	}
-
-	public function GetLimitStart()
-	{
-		return $this->m_iLimitStart;
-	}
-
 	public function Load()
 	{
 		if ($this->m_bLoaded) return;
-		if ($this->m_iLimitCount > 0)
-		{
-			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs, $this->m_iLimitCount, $this->m_iLimitStart);
-		}
-		else
-		{
-			$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs);
-		}
+
+		$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs);
 		$resQuery = CMDBSource::Query($sSQL);
 		if (!$resQuery) return;
 
-		$sClass = $this->m_oFilter->GetClass();
 		while ($aRow = CMDBSource::FetchArray($resQuery))
 		{
-			$aObjects = array();
-			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				$oObject = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias);
-				$aObjects[$sClassAlias] = $oObject;
-			}
-			$this->AddObjectExtended($aObjects);
+			$sClass = $this->m_oFilter->GetClass();
+			$oObject = MetaModel::GetObjectByRow($sClass, $aRow);
+			$this->AddObject($oObject);
 		}
 		CMDBSource::FreeResult($resQuery);
 
@@ -244,16 +153,11 @@ class DBObjectSet
 
 	public function Count()
 	{
-		$sSQL = MetaModel::MakeSelectQuery($this->m_oFilter, $this->m_aOrderBy, $this->m_aArgs, 0, 0, true);
-		$resQuery = CMDBSource::Query($sSQL);
-		if (!$resQuery) return 0;
-
-		$aRow = CMDBSource::FetchArray($resQuery);
-		CMDBSource::FreeResult($resQuery);
-		return $aRow['COUNT'];
+		if (!$this->m_bLoaded) $this->Load();
+		return count($this->m_aData);
 	}
 
-	public function Fetch($sClassAlias = '')
+	public function Fetch()
 	{
 		if (!$this->m_bLoaded) $this->Load();
 
@@ -261,32 +165,11 @@ class DBObjectSet
 		{
 			return null;
 		}
-	
-		if (strlen($sClassAlias) == 0)
-		{
-			$sClassAlias = $this->m_oFilter->GetClassAlias();
-		}
-		$oRetObj = $this->m_aData[$this->m_iCurrRow][$sClassAlias];
+		$oRetObj = $this->m_aData[$this->m_iCurrRow];
 		$this->m_iCurrRow++;
 		return $oRetObj;
 	}
 
-	// Return the whole line if several classes have been specified in the query
-	//
-	public function FetchAssoc()
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		if ($this->m_iCurrRow >= count($this->m_aData))
-		{
-			return null;
-		}
-	
-		$aRetObjects = $this->m_aData[$this->m_iCurrRow];
-		$this->m_iCurrRow++;
-		return $aRetObjects;
-	}
-
 	public function Rewind()
 	{
 		$this->Seek(0);
@@ -300,35 +183,24 @@ class DBObjectSet
 		return $this->m_iCurrRow;
 	}
 
-	public function AddObject($oObject, $sClassAlias = '')
+	public function AddObject($oObject)
 	{
-		if (strlen($sClassAlias) == 0)
-		{
-			$sClassAlias = $this->m_oFilter->GetClassAlias();
-		}
+		// ?usefull? if ($oObject->GetClass() != $this->GetClass()) return;
 
+		// it is mandatory to avoid duplicates
+		if (array_key_exists($oObject->GetKey(), $this->m_aId2Row)) return;
+
+		// Do not load here, because the load uses that method too
 		$iNextPos = count($this->m_aData);
-		$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
-		$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
+		$this->m_aData[$iNextPos] = $oObject;
+		$this->m_aId2Row[$oObject->GetKey()] = $iNextPos;
 	}
 
-	protected function AddObjectExtended($aObjectArray)
+	public function AddObjectArray($aObjects)
 	{
-		$iNextPos = count($this->m_aData);
-
-		foreach ($aObjectArray as $sClassAlias => $oObject)
-		{
-			$this->m_aData[$iNextPos][$sClassAlias] = $oObject;
-			$this->m_aId2Row[$sClassAlias][$oObject->GetKey()] = $iNextPos;
-		}
-	}
-
-	public function AddObjectArray($aObjects, $sClassAlias = '')
-	{
-		// #@# todo - add a check on the object class ?
 		foreach ($aObjects as $oObj)
 		{
-			$this->AddObject($oObj, $sClassAlias);
+			$this->AddObject($oObj);
 		}
 	}
 
@@ -357,11 +229,10 @@ class DBObjectSet
 
 		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
 
-		$sClassAlias = $this->m_oFilter->GetClassAlias();
 		$oObjectSet->Seek(0);
 		while ($oObject = $oObjectSet->Fetch())
 		{
-			if (array_key_exists($oObject->GetKey(), $this->m_aId2Row[$sClassAlias]))
+			if (array_key_exists($oObject->GetKey(), $this->m_aId2Row))
 			{
 				$oNewSet->AddObject($oObject);
 			}
@@ -379,11 +250,10 @@ class DBObjectSet
 
 		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
 
-		$sClassAlias = $this->m_oFilter->GetClassAlias();
 		$oObjectSet->Seek(0);
 		while ($oObject = $oObjectSet->Fetch())
 		{
-			if (!array_key_exists($oObject->GetKey(), $this->m_aId2Row[$sClassAlias]))
+			if (!array_key_exists($oObject->GetKey(), $this->m_aId2Row))
 			{
 				$oNewSet->AddObject($oObject);
 			}
@@ -393,23 +263,11 @@ class DBObjectSet
 
 	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
 	{
-		$aRelatedObjs = array();
-
 		$aVisited = array(); // optimization for consecutive calls of MetaModel::GetRelatedObjects
 		$this->Seek(0);
 		while ($oObject = $this->Fetch())
 		{
-			$aMore = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
-			foreach ($aMore as $sClass => $aRelated)
-			{
-				foreach ($aRelated as $iObj => $oObj)
-				{
-					if (!isset($aRelatedObjs[$sClass][$iObj]))
-					{
-						$aRelatedObjs[$sClass][$iObj] = $oObj;
-					}
-				}
-			}
+			$aRelatedObjs = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
 		}
 		return $aRelatedObjs;
 	}

core/dict.class.inc.php

@@ -1,235 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Class Dict
- * Management of localizable strings 
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-class DictException extends CoreException
-{
-}
-
-class DictExceptionUnknownLanguage extends DictException
-{
-	public function __construct($sLanguageCode)
-	{
-		$aContext = array();
-		$aContext['language_code'] = $sLanguageCode;
-		parent::__construct('Unknown localization language', $aContext);
-	}
-}
-
-class DictExceptionMissingString extends DictException
-{
-	public function __construct($sLanguageCode, $sStringCode)
-	{
-		$aContext = array();
-		$aContext['language_code'] = $sLanguageCode;
-		$aContext['string_code'] = $sStringCode;
-		parent::__construct('Missing localized string', $aContext);
-	}
-}
-
-
-define('DICT_ERR_STRING', 1); // when a string is missing, return the identifier
-define('DICT_ERR_EXCEPTION', 2); // when a string is missing, throw an exception
-//define('DICT_ERR_LOG', 3); // when a string is missing, log an error
-
-
-class Dict
-{
-	protected static $m_iErrorMode = DICT_ERR_STRING;
-	protected static $m_sDefaultLanguage = 'EN US';
-	protected static $m_sCurrentLanguage = null; // No language selected by default
-
-	protected static $m_aLanguages = array(); // array( code => array( 'description' => '...', 'localized_description' => '...') ...)
-	protected static $m_aData = array();
-
-
-	public static function SetDefaultLanguage($sLanguageCode)
-	{
-		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
-		{
-			throw new DictExceptionUnknownLanguage($sLanguageCode);
-		}
-		self::$m_sDefaultLanguage = $sLanguageCode;
-	}
-
-	public static function SetUserLanguage($sLanguageCode)
-	{
-		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
-		{
-			throw new DictExceptionUnknownLanguage($sLanguageCode);
-		}
-		self::$m_sCurrentLanguage = $sLanguageCode;
-	}
-
-
-	public static function GetCurrentLanguage()
-	{
-		if (self::$m_sCurrentLanguage == null) // May happen when no user is logged in (i.e login screen, non authentifed page)
-		{
-			// In which case let's use the default language
-			return self::$m_sDefaultLanguage;
-		}
-		return self::$m_sCurrentLanguage;
-	}
-
-	//returns a hash array( code => array( 'description' => '...', 'localized_description' => '...') ...)
-	public static function GetLanguages()
-	{
-		return self::$m_aLanguages;
-	}
-
-	// iErrorMode from {DICT_ERR_STRING, DICT_ERR_EXCEPTION}
-	public static function SetErrorMode($iErrorMode)
-	{
-		self::$m_iErrorMode = $iErrorMode;
-	}
-
-
-	public static function S($sStringCode, $sDefault = null)
-	{
-		// Attempt to find the string in the user language
-		//
-		if (!array_key_exists(self::GetCurrentLanguage(), self::$m_aData))
-		{
-			// It may happen, when something happens before the dictionnaries get loaded
-			return $sStringCode;
-		}
-		$aCurrentDictionary = self::$m_aData[self::GetCurrentLanguage()];
-		if (array_key_exists($sStringCode, $aCurrentDictionary))
-		{
-			return $aCurrentDictionary[$sStringCode];
-		}
-		// Attempt to find the string in the default language
-		//
-		$aDefaultDictionary = self::$m_aData[self::$m_sDefaultLanguage];
-		if (array_key_exists($sStringCode, $aDefaultDictionary))
-		{
-			return $aDefaultDictionary[$sStringCode];
-		}
-		// Attempt to find the string in english
-		//
-		$aDefaultDictionary = self::$m_aData['EN US'];
-		if (array_key_exists($sStringCode, $aDefaultDictionary))
-		{
-			return $aDefaultDictionary[$sStringCode];
-		}
-		// Could not find the string...
-		//
-		switch (self::$m_iErrorMode)
-		{
-			case DICT_ERR_STRING:
-				if (is_null($sDefault))
-				{
-					return $sStringCode;
-				}
-				else
-				{
-					return $sDefault;
-				}
-				break;
-
-			case DICT_ERR_EXCEPTION:
-			default:
-				throw new DictExceptionMissingString(self::$m_sCurrentLanguage, $sStringCode);
-				break;
-		}
-		return 'bug!';
-	}
-
-
-	public static function Format($sFormatCode /*, ... arguments ....*/)
-	{
-		$sLocalizedFormat = self::S($sFormatCode);
-		$aArguments = func_get_args();
-		
-		if ($sLocalizedFormat == $sFormatCode)
-		{
-			// Make sure the information will be displayed (ex: an error occuring before the dictionary gets loaded)
-			return $sFormatCode.' - '.implode(', ', $aArguments);
-		}
-
-		array_shift($aArguments);
-		return vsprintf($sLocalizedFormat, $aArguments);
-	}
-
-
-	// sLanguageCode: Code identifying the language i.e. FR-FR
-	// sEnglishLanguageDesc: Description of the language code, in English. i.e. French (France)
-	// sLocalizedLanguageDesc: Description of the language code, in its own language. i.e. Français (France)
-	// aEntries: Hash array of dictionnary entries
-	public static function Add($sLanguageCode, $sEnglishLanguageDesc, $sLocalizedLanguageDesc, $aEntries)
-	{
-		if (!array_key_exists($sLanguageCode, self::$m_aLanguages))
-		{
-			self::$m_aLanguages[$sLanguageCode] = array('description' => $sEnglishLanguageDesc, 'localized_description' => $sLocalizedLanguageDesc);
-			self::$m_aData[$sLanguageCode] = array();
-		}
-		self::$m_aData[$sLanguageCode] = array_merge(self::$m_aData[$sLanguageCode], $aEntries);
-	}
-
-	public static function MakeStats($sLanguageCode, $sLanguageRef = 'EN US')
-	{
-		$aMissing = array(); // Strings missing for the target language
-		$aUnexpected = array(); // Strings defined for the target language, but not found in the reference dictionary
-		$aNotTranslated = array(); // Strings having the same value in both dictionaries
-		$aOK = array(); // Strings having different values in both dictionaries
-
-		foreach (self::$m_aData[$sLanguageRef] as $sStringCode => $sValue)
-		{
-			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageCode]))
-			{
-				$aMissing[$sStringCode] = $sValue;
-			}
-		}
-
-		foreach (self::$m_aData[$sLanguageCode] as $sStringCode => $sValue)
-		{
-			if (!array_key_exists($sStringCode, self::$m_aData[$sLanguageRef]))
-			{
-				$aUnexpected[$sStringCode] = $sValue;
-			}
-			else
-			{
-				// The value exists in the reference
-				$sRefValue = self::$m_aData[$sLanguageRef][$sStringCode];
-				if ($sValue == $sRefValue)
-				{
-					$aNotTranslated[$sStringCode] = $sValue;
-				}
-				else
-				{
-					$aOK[$sStringCode] = $sValue;
-				}
-			}
-		}
-		return array($aMissing, $aUnexpected, $aNotTranslated, $aOK);
-	}
-	
-	public static function Dump()
-	{
-		MyHelpers::var_dump_html(self::$m_aData);
-	}
-}
-?>

core/email.class.inc.php

@@ -1,29 +1,17 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
  * Send an mail (for notification, testing,... purposes)
  * #@# TODO - replace by a more sophisticated mean (and update the prototype) 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
-
 class EMail
 {
 	protected $m_sBody;

core/event.class.inc.php

@@ -1,38 +1,27 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
- * Persistent class Event and derived
- * Application internal events
- * There is also a file log 
+ * An application internal event
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
-
 class Event extends cmdbAbstractObject
 {
 	public static function Init()
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb",
+			"name" => "Log Event",
+			"description" => "An application internal event",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -43,9 +32,13 @@ class Event extends cmdbAbstractObject
 		);
 		MetaModel::Init_Params($aParams);
 		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("message", array("label"=>"message", "description"=>"short description of the event", "allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDate("date", array("label"=>"date", "description"=>"date and time at which the changes have been recorded", "allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("label"=>"user info", "description"=>"identification of the user that was doing the action that triggered this event", "allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		//MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("message");
+		MetaModel::Init_AddFilterFromAttribute("date");
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('message', 'date', 'userinfo')); // Attributes to be displayed for the complete details
@@ -62,8 +55,11 @@ class EventNotification extends Event
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb",
+			"name" => "Notification event",
+			"description" => "Trace of a notification that has been sent",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -74,9 +70,14 @@ class EventNotification extends Event
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> "", "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> "", "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> "", "label"=>"Trigger", "description"=>"user account", "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> "", "label"=>"user", "description"=>"user account", "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("label"=>"Object id", "description"=>"object id (class defined by the trigger ?)", "allowed_values"=>null, "sql"=>"object_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("trigger_id");
+		MetaModel::Init_AddFilterFromAttribute("action_id");
+		MetaModel::Init_AddFilterFromAttribute("object_id");
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
@@ -94,8 +95,11 @@ class EventNotificationEmail extends EventNotification
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb",
+			"name" => "Email emission event",
+			"description" => "Trace of an email that has been sent",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -106,16 +110,17 @@ class EventNotificationEmail extends EventNotification
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("to", array("label"=>"TO", "description"=>"TO", "allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("cc", array("label"=>"CC", "description"=>"CC", "allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("bcc", array("label"=>"BCC", "description"=>"BCC", "allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("from", array("label"=>"From", "description"=>"Sender of the message", "allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("subject", array("label"=>"Subject", "description"=>"Subject", "allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("body", array("label"=>"Body", "description"=>"Body", "allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_InheritFilters();
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'message', 'to', 'subject')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'message', 'subject')); // Attributes to be displayed for a list
 
 		// Search criteria
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -130,8 +135,11 @@ class EventIssue extends Event
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb",
+			"name" => "Issue event",
+			"description" => "Trace of an issue (warning, error, etc.)",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -142,13 +150,17 @@ class EventIssue extends Event
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("issue", array("allowed_values"=>null, "sql"=>"issue", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("page", array("allowed_values"=>null, "sql"=>"page", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("arguments_post", array("allowed_values"=>null, "sql"=>"arguments_post", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("arguments_get", array("allowed_values"=>null, "sql"=>"arguments_get", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTable("callstack", array("allowed_values"=>null, "sql"=>"callstack", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("issue", array("label"=>"Issue", "description"=>"What happened", "allowed_values"=>null, "sql"=>"issue", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("label"=>"Impact", "description"=>"What are the consequences", "allowed_values"=>null, "sql"=>"impact", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("page", array("label"=>"Page", "description"=>"HTTP entry point", "allowed_values"=>null, "sql"=>"page", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("arguments_post", array("label"=>"Posted arguments", "description"=>"HTTP POST arguments", "allowed_values"=>null, "sql"=>"arguments_post", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("arguments_get", array("label"=>"URL arguments", "description"=>"HTTP GET arguments", "allowed_values"=>null, "sql"=>"arguments_get", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("callstack", array("label"=>"Callstack", "description"=>"Call stack", "allowed_values"=>null, "sql"=>"callstack", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBlob("data", array("label"=>"Data", "description"=>"More information", "allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
+		MetaModel::Init_AddFilterFromAttribute("issue");
+		MetaModel::Init_AddFilterFromAttribute("impact");
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'issue', 'impact', 'page', 'arguments_post', 'arguments_get', 'callstack', 'data')); // Attributes to be displayed for the complete details
@@ -157,69 +169,6 @@ class EventIssue extends Event
 //		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
 //		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
 	}
-
-	protected function OnInsert()
-	{
-		// Init page information: name, arguments
-		//
-		$this->Set('page', @$GLOBALS['_SERVER']['SCRIPT_NAME']);
-
-		if (array_key_exists('_GET', $GLOBALS) && is_array($GLOBALS['_GET']))
-		{
-			$this->Set('arguments_get', $GLOBALS['_GET']);
-		}
-		else
-		{
-			$this->Set('arguments_get', array());
-		}
-
-		if (array_key_exists('_POST', $GLOBALS) && is_array($GLOBALS['_POST']))
-		{
-			$aPost = array();
-			foreach($GLOBALS['_POST'] as $sKey => $sValue)
-			{
-				if (is_string($sValue))
-				{
-					if (strlen($sValue) < 256)
-					{
-						$aPost[$sKey] = $sValue;
-					}
-					else
-					{
-						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
-					}
-				}
-				else
-				{
-					// Not a string
-					$aPost[$sKey] = (string) $sValue;
-				}
-			}
-			$this->Set('arguments_post', $aPost);
-		}
-		else
-		{
-			$this->Set('arguments_post', array());
-		}
-
-		$sLength = strlen($this->Get('issue'));
-		if ($sLength > 255)
-		{
-			$this->Set('issue', substr($this->Get('issue'), 0, 200)." -truncated ($sLength chars)");
-		}
-
-		$sLength = strlen($this->Get('impact'));
-		if ($sLength > 255)
-		{
-			$this->Set('impact', substr($this->Get('impact'), 0, 200)." -truncated ($sLength chars)");
-		}
-
-		$sLength = strlen($this->Get('page'));
-		if ($sLength > 255)
-		{
-			$this->Set('page', substr($this->Get('page'), 0, 200)." -truncated ($sLength chars)");
-		}
-	}
 }
 
 
@@ -229,8 +178,11 @@ class EventWebService extends Event
 	{
 		$aParams = array
 		(
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb",
+			"name" => "Web service event",
+			"description" => "Trace of an web service call",
 			"key_type" => "autoincrement",
+			"key_label" => "",
 			"name_attcode" => "",
 			"state_attcode" => "",
 			"reconc_keys" => array(),
@@ -241,13 +193,15 @@ class EventWebService extends Event
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("verb", array("allowed_values"=>null, "sql"=>"verb", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		//MetaModel::Init_AddAttribute(new AttributeStructure("arguments", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeBoolean("result", array("allowed_values"=>null, "sql"=>"result", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("log_info", array("allowed_values"=>null, "sql"=>"log_info", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("log_warning", array("allowed_values"=>null, "sql"=>"log_warning", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("log_error", array("allowed_values"=>null, "sql"=>"log_error", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("verb", array("label"=>"Verb", "description"=>"Name of the operation", "allowed_values"=>null, "sql"=>"verb", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		//MetaModel::Init_AddAttribute(new AttributeStructure("arguments", array("label"=>"Arguments", "description"=>"Operation arguments", "allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBoolean("result", array("label"=>"Result", "description"=>"Overall success/failure", "allowed_values"=>null, "sql"=>"result", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("log_info", array("label"=>"Info log", "description"=>"Result info log", "allowed_values"=>null, "sql"=>"log_info", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("log_warning", array("label"=>"Warning log", "description"=>"Result warning log", "allowed_values"=>null, "sql"=>"log_warning", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("log_error", array("label"=>"Error log", "description"=>"Result error log", "allowed_values"=>null, "sql"=>"log_error", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("data", array("label"=>"Data", "description"=>"Result data", "allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_InheritFilters();
 
 		// Display lists
 		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'verb', 'result', 'log_info', 'log_warning', 'log_error', 'data')); // Attributes to be displayed for the complete details

core/expression.class.inc.php

@@ -1,26 +1,15 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 /**
  * General definition of an expression tree (could be OQL, SQL or whatever) 
  *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
+ * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 
 class MissingQueryArgument extends CoreException
@@ -230,19 +219,6 @@ class TrueExpression extends ScalarExpression
 	}
 }
 
-class FalseExpression extends ScalarExpression
-{
-	public function __construct()
-	{
-		parent::__construct(0);
-	}
-
-	public function IsTrue()
-	{
-		return false;
-	}
-}
-
 class FieldExpression extends UnaryExpression
 {
 	protected $m_sParent;
@@ -361,16 +337,6 @@ class ListExpression extends Expression
 		$this->m_aExpressions = $aExpressions;
 	}
 
-	public static function FromScalars($aScalars)
-	{
-		$aExpressions = array();
-		foreach($aScalars as $value)
-		{
-			$aExpressions[] = new ScalarExpression($value);
-		}
-		return new ListExpression($aExpressions);
-	}
-
 	public function IsTrue()
 	{
 		// return true if we are certain that it will be true

core/filterdef.class.inc.php

@@ -1,29 +1,4 @@
 <?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Definition of a filter
- * Most of the time, a filter corresponds to an attribute, but we could imagine other search criteria
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 
 
 require_once('MyHelpers.class.inc.php');
@@ -33,6 +8,12 @@ require_once('MyHelpers.class.inc.php');
  * Definition of a filter (could be made out of an existing attribute, or from an expression) 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @author      Denis Flaven <denisflave@free.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     1.1.1.1 $
  */
 abstract class FilterDefinition
 {
@@ -115,6 +96,11 @@ abstract class FilterDefinition
  * Match against the object unique identifier 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class FilterPrivateKey extends FilterDefinition
 {
@@ -162,6 +148,11 @@ class FilterPrivateKey extends FilterDefinition
  * Match against an existing attribute (the attribute type will determine the available operators) 
  *
  * @package     iTopORM
+ * @author      Romain Quetiez <romainquetiez@yahoo.fr>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.itop.com
+ * @since       1.0
+ * @version     $itopversion$
  */
 class FilterFromAttribute extends FilterDefinition
 {

core/kpi.class.inc.php

@@ -1,196 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * Measures operations duration, memory usage, etc. (and some other KPIs)
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-class ExecutionKPI
-{
-	static protected $m_bEnabled_Duration = false;
-	static protected $m_bEnabled_Memory = false;
-
-	static protected $m_aStats = array();
-
-	protected $m_fStarted = null;
-	protected $m_iInitialMemory = null;
-
-	static public function EnableDuration()
-	{
-		self::$m_bEnabled_Duration = true;
-	}
-
-	static public function EnableMemory()
-	{
-		self::$m_bEnabled_Memory = true;
-	}
-
-	static public function ReportStats()
-	{
-		foreach (self::$m_aStats as $sOperation => $aOpStats)
-		{
-			echo "<h2>KPIs for $sOperation</h2>\n";
-			$fTotalOp = 0;
-			$iTotalOp = 0;
-			$fMinOp = null;
-			$fMaxOp = 0;
-			echo "<ul>\n";
-			foreach ($aOpStats as $sArguments => $aEvents)
-			{
-				$fTotalInter = 0;
-				$fMinInter = null;
-				$fMaxInter = 0;
-				foreach ($aEvents as $fDuration)
-				{
-					$fTotalInter += $fDuration;
-					$fMinInter = is_null($fMinInter) ? $fDuration : min($fMinInter, $fDuration);
-					$fMaxInter = max($fMaxInter, $fDuration);
-
-					$fMinOp = is_null($fMinOp) ? $fDuration : min($fMinOp, $fDuration);
-					$fMaxOp = max($fMaxOp, $fDuration);
-				}
-				$fTotalOp += $fTotalInter;
-				$iTotalOp++;
-
-				$iCountInter = count($aEvents);
-				$sTotalInter = round($fTotalInter, 3)."s";
-				if ($iCountInter > 1)
-				{
-					$sMinInter = round($fMinInter, 3)."s";
-					$sMaxInter = round($fMaxInter, 3)."s";
-					$sTimeDesc = "$sTotalInter (from $sMinInter to $sMaxInter) in $iCountInter times";
-				}
-				else
-				{
-					$sTimeDesc = "$sTotalInter";
-				}
-				echo "<li>Spent $sTimeDesc, on: <span style=\"font-size:60%\">$sArguments</span></li>\n";
-			}
-			echo "</ul>\n";
-			echo "<ul>Sumary for $sOperation\n";
-			echo "<li>Total: $iTotalOp (".round($fTotalOp, 3).")</li>\n";
-			echo "<li>Min: ".round($fMinOp, 3)."</li>\n";
-			echo "<li>Max: ".round($fMaxOp, 3)."</li>\n";
-			echo "<li>Avg: ".round($fTotalOp / $iTotalOp, 3)."</li>\n";
-			echo "</ul>\n";
-		}
-	}
-
-
-	public function __construct()
-	{
-		$this->ResetCounters();
-	}
-
-	// Get the duration since startup, and reset the counter for the next measure
-	//
-	public function ComputeAndReport($sOperationDesc)
-	{
-		if (self::$m_bEnabled_Duration)
-		{
-			$fStopped = MyHelpers::getmicrotime();
-			$fDuration = $fStopped - $this->m_fStarted;
-			$this->Report($sOperationDesc.' / duration: '.round($fDuration, 3));
-		}
-
-		if (self::$m_bEnabled_Memory)
-		{
-			$iMemory = self::memory_get_usage();
-			$iMemoryUsed = $iMemory - $this->m_iInitialMemory;
-			$this->Report($sOperationDesc.' / memory: '.self::MemStr($iMemoryUsed).' (Total: '.self::MemStr($iMemory).')');
-			if (function_exists('memory_get_peak_usage'))
-			{
-				$iMemoryPeak = memory_get_peak_usage();
-				$this->Report($sOperationDesc.' / memory peak: '.self::MemStr($iMemoryPeak));
-			}
-		}
-
-		$this->ResetCounters();
-	}
-
-	public function ComputeStats($sOperation, $sArguments)
-	{
-		if (self::$m_bEnabled_Duration)
-		{
-			$fStopped = MyHelpers::getmicrotime();
-			$fDuration = $fStopped - $this->m_fStarted;
-			self::$m_aStats[$sOperation][$sArguments][] = $fDuration;
-		}
-	}
-
-	protected function ResetCounters()
-	{
-		if (self::$m_bEnabled_Duration)
-		{
-			$this->m_fStarted = MyHelpers::getmicrotime();
-		}
-
-		if (self::$m_bEnabled_Memory)
-		{
-			$this->m_iInitialMemory = self::memory_get_usage();
-		}
-	}
-
-	protected function Report($sText)
-	{
-		echo "$sText<br/>\n";
-	}
-
-	static protected function MemStr($iMemory)
-	{
-		return round($iMemory / 1024).' Kb';
-	}
-
-	static protected function memory_get_usage()
-	{
-		if (function_exists('memory_get_usage'))
-		{
-			return memory_get_usage(true);
-		}
-
-		// Copied from the PHP manual
-		//
-		//If its Windows
-		//Tested on Win XP Pro SP2. Should work on Win 2003 Server too
-		//Doesn't work for 2000
-		//If you need it to work for 2000 look at http://us2.php.net/manual/en/function.memory-get-usage.php#54642
-		if (substr(PHP_OS,0,3) == 'WIN') 
-		{
-			$output = array();
-			exec('tasklist /FI "PID eq ' . getmypid() . '" /FO LIST', $output);
-
-			return preg_replace( '/[\D]/', '', $output[5] ) * 1024;
-		}
-		else
-		{
-			//We now assume the OS is UNIX
-			//Tested on Mac OS X 10.4.6 and Linux Red Hat Enterprise 4
-			//This should work on most UNIX systems
-			$pid = getmypid();
-			exec("ps -eo%mem,rss,pid | grep $pid", $output);
-			$output = explode("  ", $output[0]);
-			//rss is given in 1024 byte units
-			return $output[1] * 1024;
-		}
-	}
-}
-
-?>

core/log.class.inc.php

@@ -1,120 +0,0 @@
-<?php
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * File logging
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
-class FileLog
-{
-	protected $m_sFile = ''; // log is disabled if this is empty
-
-	public function __construct($sFileName = '')
-	{
-		$this->m_sFile = $sFileName;
-	}
-
-	public function Error($sText)
-	{
-		self::Write("Error | ".$sText);
-	}
-
-	public function Warning($sText)
-	{
-		self::Write("Warning | ".$sText);
-	}
-
-	public function Info($sText)
-	{
-		self::Write("Info | ".$sText);
-	}
-
-	public function Ok($sText)
-	{
-		self::Write("Ok | ".$sText);
-	}
-
-	protected function Write($sText)
-	{
-		if (strlen($this->m_sFile) == 0) return;
-
-		$hLogFile = @fopen($this->m_sFile, 'a');
-		if ($hLogFile !== false)
-		{
-			$sDate = date('Y-m-d H:i:s');
-			fwrite($hLogFile, "$sDate | $sText\n");
-			fclose($hLogFile);
-		}
-	}
-}
-
-class SetupLog
-{
-	protected static $m_oFileLog; 
-
-	public static function Enable($sTargetFile)
-	{
-		self::$m_oFileLog = new FileLog($sTargetFile);
-	}
-	public static function Error($sText)
-	{
-		self::$m_oFileLog->Error($sText);
-	}
-	public static function Warning($sText)
-	{
-		self::$m_oFileLog->Warning($sText);
-	}
-	public static function Info($sText)
-	{
-		self::$m_oFileLog->Info($sText);
-	}
-	public static function Ok($sText)
-	{
-		self::$m_oFileLog->Ok($sText);
-	}
-}
-
-class IssueLog
-{
-	protected static $m_oFileLog; 
-
-	public static function Enable($sTargetFile)
-	{
-		self::$m_oFileLog = new FileLog($sTargetFile);
-	}
-	public static function Error($sText)
-	{
-		self::$m_oFileLog->Error($sText);
-	}
-	public static function Warning($sText)
-	{
-		self::$m_oFileLog->Warning($sText);
-	}
-	public static function Info($sText)
-	{
-		self::$m_oFileLog->Info($sText);
-	}
-	public static function Ok($sText)
-	{
-		self::$m_oFileLog->Ok($sText);
-	}
-}
-?>

core/oql/exclude.txt

@@ -1,7 +0,0 @@
-#
-# The following source files are not re-distributed with the "build" of the application
-# since they are used solely for constructing other files during the build process
-#
-build.cmd
-oql-lexer.plex
-oql-parser.y

core/oql/oql-lexer.plex

@@ -1,29 +1,5 @@
 <?php
 
-// Copyright (C) 2010 Combodo SARL
-//
-//   This program is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU General Public License as published by
-//   the Free Software Foundation; version 3 of the License.
-//
-//   This program is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program; if not, write to the Free Software
-//   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-/**
- * OQL syntax analyzer, to be used prior to run the lexical analyzer
- *
- * @author      Erwan Taloc <erwan.taloc@combodo.com>
- * @author      Romain Quetiez <romain.quetiez@combodo.com>
- * @author      Denis Flaven <denis.flaven@combodo.com>
- * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
- */
-
 // Notes (from the source file: oql-lexer.plex) - Romain
 //
 // The strval rule is a little bit cryptic.