Update version number for 2.5.3 beta

Could not upload images in HTML field anymore

.gitignore

@@ -0,0 +1,123 @@
+
+# no slash at the end to handle also symlinks
+/toolkit
+/conf
+/env-*
+
+# composer reserver directory, from sources, populate/update using "composer install"
+vendor/*
+test/vendor/*
+
+# all datas but listing prevention
+/data/**
+!/data/.htaccess
+!/data/index.php
+!/data/web.config
+
+# iTop extensions
+/extensions/**
+!/extensions/readme.txt
+
+# all logs but listing prevention
+/log/**
+!/log/.htaccess
+!/log/index.php
+!/log/web.config
+
+
+# Jetbrains
+/.idea/**
+!/.idea/encodings.xml
+!/.idea/codeStyles
+!/.idea/codeStyles/*
+!/.idea/inspectionProfiles
+!/.idea/inspectionProfiles/*
+
+
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+### Eclipse template
+
+.metadata
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet

.idea/codeStyles/Project.xml

@@ -0,0 +1,45 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <PHPCodeStyleSettings>
+      <option name="CONCAT_SPACES" value="false" />
+      <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
+      <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
+      <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
+      <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
+      <option name="LOWER_CASE_NULL_CONST" value="true" />
+      <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
+      <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
+      <option name="PHPDOC_USE_FQCN" value="true" />
+    </PHPCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="PHP">
+      <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
+      <option name="BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="3" />
+      <option name="WHILE_BRACE_FORCE" value="3" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+        <option name="SMART_TABS" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Combodo" />
+  </state>
+</component>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,154 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="BladeControlDirectives" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckEmptyScriptTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckImageSize" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckNodeTest" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckTagEmptyBody" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CheckValidXmlInScriptTagBody" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptArgumentsOutsideFunction" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptFunctionSignatures" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptInfiniteLoop" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptLiteralNotFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptSillyAssignment" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptSwitchStatementWithNoDefaultBranch" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CoffeeScriptUnusedLocalSymbols" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ComposeFileStructure" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssFloatPxLength" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidAtRule" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidCharsetRule" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidElement" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidFunction" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidHtmlTagReference" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidMediaFeature" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPropertyValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssInvalidPseudoSelector" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssMissingComma" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssNegativeValue" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssNoGenericFontName" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOptimizeSimilarProperties" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssOverwrittenProperties" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssRedundantUnit" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnitlessNumber" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CssUnknownProperty" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myCustomPropertiesEnabled" value="false" />
+      <option name="myIgnoreVendorSpecificProperties" value="false" />
+      <option name="myCustomPropertiesList">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="CssUnknownTarget" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedClass" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomProperty" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnresolvedCustomPropertySet" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CssUnusedSymbol" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CucumberExamplesColon" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CucumberMissedExamples" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="CucumberTableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CucumberUndefinedStep" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DockerFileArgumentCount" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="DuplicateKeyInSection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DuplicateSectionInFile" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EmptyEventHandler" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="FileHeaderInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="GherkinBrokenTableInspection" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="GherkinMisplacedBackground" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="HamlNestedTagContent" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HardwiredNamespacePrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlDeprecatedTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlExtraClosingTag" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlFormInputWithoutLabel" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlMissingClosingTag" enabled="false" level="INFORMATION" enabled_by_default="false" />
+    <inspection_tool class="HtmlPresentationalElement" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAnchorTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownAttribute" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="0" />
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownBooleanAttribute" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HtmlUnknownTag" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myValues">
+        <value>
+          <list size="6">
+            <item index="0" class="java.lang.String" itemvalue="nobr" />
+            <item index="1" class="java.lang.String" itemvalue="noembed" />
+            <item index="2" class="java.lang.String" itemvalue="comment" />
+            <item index="3" class="java.lang.String" itemvalue="noscript" />
+            <item index="4" class="java.lang.String" itemvalue="embed" />
+            <item index="5" class="java.lang.String" itemvalue="script" />
+          </list>
+        </value>
+      </option>
+      <option name="myCustomValuesEnabled" value="true" />
+    </inspection_tool>
+    <inspection_tool class="HtmlUnknownTarget" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="ImplicitTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="BITS" value="1720" />
+      <option name="FLAG_EXPLICIT_CONVERSION" value="true" />
+      <option name="IGNORE_NODESET_TO_BOOLEAN_VIA_STRING" value="true" />
+    </inspection_tool>
+    <inspection_tool class="IndexZeroUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInArrayLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSLastCommaInObjectLiteral" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedFunction" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="JSUnresolvedVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="LossyEncoding" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="MissingSinceTagDocInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="MysqlParsingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="NonAsciiCharacters" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocMissingReturnTagInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpDocMissingThrowsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpIncludeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpRedundantClosingTagInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedClassConstantInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedClassInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedConstantInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedFieldInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedFunctionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedGotoLabelInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedMethodInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUndefinedNamespaceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUnusedParameterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RedundantTypeConversion" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="CHECK_ANY" value="false" />
+    </inspection_tool>
+    <inspection_tool class="RequiredAttributes" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="myAdditionalRequiredHtmlAttributes" value="" />
+    </inspection_tool>
+    <inspection_tool class="SqlAddNotNullColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlAmbiguousColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlAutoIncrementDuplicateInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlCheckUsingColumnsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlConstantConditionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDeprecateTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDerivedTableAliasInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlDropIndexedColumnInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlIdentifierInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlInsertValuesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlNullComparisonInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlPostgresqlSelectFromProcedureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlResolveInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlShouldBeInGroupByInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlSignatureInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlStorageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlTypeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SqlUnusedVariableInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="TaskProblemsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="TypeScriptPreferShortImport" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlDefaultAttributeValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlUnboundNsPrefix" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XmlUnusedNamespaceDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XsltUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="XsltVariableShadowing" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

.jenkins/bin/init/append_files.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -x
+
+# create target dirs
+mkdir -p var
+mkdir -p toolkit
+
+# cleanup target dirs
+rm -rf toolkit/*
+
+# fill target dirs
+curl http://www.combodo.com/documentation/iTopDataModelToolkit-2.3.zip | tar xvz --directory toolkit
+cp -r .jenkins/configuration/default-environment/unattended_install/* toolkit

.jenkins/bin/init/composer_install.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -x
+
+# on the root dir
+composer install
+
+
+# under the test dir
+cd test
+composer install

.jenkins/bin/init/debug.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -x
+
+whoami
+pwd
+ls
+
+echo "$BRANCH_NAME:${BRANCH_NAME}"
+
+echo "printenv :"
+printenv
+

.jenkins/bin/tests/phpunit.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -x
+
+cd test
+
+export DEBUG_UNIT_TEST="0"
+
+php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity

.jenkins/bin/unattended_install/default_env.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -x
+
+cd toolkit
+php unattended_install.php default-params.xml

.jenkins/configuration/default-environment/unattended_install/default-config-itop.php

@@ -0,0 +1,285 @@
+<?php
+
+/**
+ *
+ * Configuration file, generated by the iTop configuration wizard
+ *
+ * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+ *
+ */
+$MySettings = array(
+
+	// access_message: Message displayed to the users when there is any access restriction
+	//	default: 'iTop is temporarily frozen, please wait... (the admin team)'
+	'access_message' => 'iTop is temporarily frozen, please wait... (the admin team)',
+
+	// access_mode: Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3
+	//	default: 3
+	'access_mode' => 3,
+
+	'allowed_login_types' => 'form|basic|external',
+
+	// apc_cache.enabled: If set, the APC cache is allowed (the PHP extension must also be active)
+	//	default: true
+	'apc_cache.enabled' => true,
+
+	// apc_cache.query_ttl: Time to live set in APC for the prepared queries (seconds - 0 means no timeout)
+	//	default: 3600
+	'apc_cache.query_ttl' => 3600,
+
+	// app_root_url: Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server's name)
+	//	default: ''
+	'app_root_url' => 'http://127.0.0.1/itop/svn/trunk/',
+
+	// buttons_position: Position of the forms buttons: bottom | top | both
+	//	default: 'both'
+	'buttons_position' => 'both',
+
+	// cas_include_path: The path where to find the phpCAS library
+	//	default: '/usr/share/php'
+	'cas_include_path' => '/usr/share/php',
+
+	// cron_max_execution_time: Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout
+	//	default: 600
+	'cron_max_execution_time' => 600,
+
+	// csv_file_default_charset: Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).
+	//	default: 'ISO-8859-1'
+	'csv_file_default_charset' => 'ISO-8859-1',
+
+	'csv_import_charsets' => array (
+	),
+
+	// csv_import_history_display: Display the history tab in the import wizard
+	//	default: false
+	'csv_import_history_display' => false,
+
+	// date_and_time_format: Format for date and time display (per language)
+	//	default: array (
+	//		  'default' =>
+	//		  array (
+	//		    'date' => 'Y-m-d',
+	//		    'time' => 'H:i:s',
+	//		    'date_time' => '$date $time',
+	//		  ),
+	//		)
+	'date_and_time_format' => array (
+		'default' =>
+			array (
+				'date' => 'Y-m-d',
+				'time' => 'H:i:s',
+				'date_time' => '$date $time',
+			),
+		'FR FR' =>
+			array (
+				'date' => 'd/m/Y',
+				'time' => 'H:i:s',
+				'date_time' => '$date $time',
+			),
+	),
+
+	'db_host' => '',
+
+	'db_name' => 'itop_ci_main',
+
+	'db_pwd' => 'IKnowYouSeeMeInJenkinsConf',
+
+	'db_subname' => '',
+
+	'db_user' => 'jenkins_itop',
+
+	// deadline_format: The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$
+	//	default: '$difference$'
+	'deadline_format' => '$difference$',
+
+	'default_language' => 'EN US',
+
+	// disable_attachments_download_legacy_portal: Disable attachments download from legacy portal
+	//	default: true
+	'disable_attachments_download_legacy_portal' => true,
+
+	// draft_attachments_lifetime: Lifetime (in seconds) of drafts' attachments and inline images: after this duration, the garbage collector will delete them.
+	//	default: 3600
+	'draft_attachments_lifetime' => 3600,
+
+	// email_asynchronous: If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode
+	//	default: false
+	'email_asynchronous' => false,
+
+	// email_default_sender_address: Default address provided in the email from header field.
+	//	default: ''
+	'email_default_sender_address' => '',
+
+	// email_default_sender_label: Default label provided in the email from header field.
+	//	default: ''
+	'email_default_sender_label' => '',
+
+	// email_transport: Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocole)
+	//	default: 'PHPMail'
+	'email_transport' => 'SMTP',
+
+	// email_transport_smtp.host: host name or IP address (optional)
+	//	default: 'localhost'
+	'email_transport_smtp.host' => 'smtp.combodo.com',
+
+	// email_transport_smtp.password: Authentication password (optional)
+	//	default: ''
+	'email_transport_smtp.password' => 'IDoNotWork',
+
+	// email_transport_smtp.port: port number (optional)
+	//	default: 25
+	'email_transport_smtp.port' => 25,
+
+	// email_transport_smtp.username: Authentication user (optional)
+	//	default: ''
+	'email_transport_smtp.username' => 'test2@combodo.com',
+
+	// email_validation_pattern: Regular expression to validate/detect the format of an eMail address
+	//	default: '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}'
+	'email_validation_pattern' => '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}',
+
+	'encryption_key' => '@iT0pEncr1pti0n!',
+
+	'ext_auth_variable' => '$_SERVER[\'REMOTE_USER\']',
+
+	'fast_reload_interval' => '60',
+
+	// graphviz_path: Path to the Graphviz "dot" executable for graphing objects lifecycle
+	//	default: '/usr/bin/dot'
+	'graphviz_path' => '/usr/bin/dot',
+
+	// inline_image_max_display_width: The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.
+	//	default: '250'
+	'inline_image_max_display_width' => 250,
+
+	// inline_image_max_storage_width: The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.
+	//	default: '1600'
+	'inline_image_max_storage_width' => 1600,
+
+	// link_set_attribute_qualifier: Link set from string: attribute qualifier (encloses both the attcode and the value)
+	//	default: '\''
+	'link_set_attribute_qualifier' => '\'',
+
+	// link_set_attribute_separator: Link set from string: attribute separator
+	//	default: ';'
+	'link_set_attribute_separator' => ';',
+
+	// link_set_item_separator: Link set from string: line separator
+	//	default: '|'
+	'link_set_item_separator' => '|',
+
+	// link_set_value_separator: Link set from string: value separator (between the attcode and the value itself
+	//	default: ':'
+	'link_set_value_separator' => ':',
+
+	'log_global' => true,
+
+	'log_issue' => true,
+
+	'log_notification' => true,
+
+	'log_web_service' => true,
+
+	// max_combo_length: The maximum number of elements in a drop-down list. If more then an autocomplete will be used
+	//	default: 50
+	'max_combo_length' => 50,
+
+	'max_display_limit' => '15',
+
+	// max_linkset_output: Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.
+	//	default: 100
+	'max_linkset_output' => 100,
+
+	'min_display_limit' => '10',
+
+	// online_help: Hyperlink to the online-help web page
+	//	default: 'http://www.combodo.com/itop-help'
+	'online_help' => 'http://www.combodo.com/itop-help',
+
+	// php_path: Path to the php executable in CLI mode
+	//	default: 'php'
+	'php_path' => 'php',
+
+	// portal_tickets: CSV list of classes supported in the portal
+	//	default: 'UserRequest'
+	'portal_tickets' => 'UserRequest',
+
+	'query_cache_enabled' => true,
+
+	// search_manual_submit: Force manual submit of search requests (class => true)
+	//	default: false
+	'search_manual_submit' => array (
+		'Person' => true,
+	),
+
+	'secure_connection_required' => false,
+
+	// session_name: The name of the cookie used to store the PHP session id
+	//	default: 'iTop'
+	'session_name' => 'iTop',
+
+	// shortcut_actions: Actions that are available as direct buttons next to the "Actions" menu
+	//	default: 'UI:Menu:Modify,UI:Menu:New'
+	'shortcut_actions' => 'UI:Menu:Modify,UI:Menu:New',
+
+	// source_dir: Source directory for the datamodel files. (which gets compiled to env-production).
+	//	default: ''
+	'source_dir' => 'datamodels/2.x/',
+
+	'standard_reload_interval' => '300',
+
+	// synchro_trace: Synchronization details: none, display, save (includes 'display')
+	//	default: 'none'
+	'synchro_trace' => 'none',
+
+	// timezone: Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitely configured in PHP
+	//	default: 'Europe/Paris'
+	'timezone' => 'Europe/Paris',
+
+	// tracking_level_linked_set_default: Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)
+	//	default: 1
+	'tracking_level_linked_set_default' => 0,
+
+	// url_validation_pattern: Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)
+	//	default: '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?'
+	'url_validation_pattern' => '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?',
+);
+
+/**
+ *
+ * Modules specific settings
+ *
+ */
+$MyModuleSettings = array(
+	'itop-attachments' => array (
+		'allowed_classes' => array (
+			0 => 'Ticket',
+		),
+		'position' => 'relations',
+		'preview_max_width' => 290,
+	),
+	'itop-backup' => array (
+		'mysql_bindir' => '',
+		'week_days' => 'monday, tuesday, wednesday, thursday, friday',
+		'time' => '23:30',
+		'retention_count' => 5,
+		'enabled' => true,
+		'debug' => false,
+	),
+	'molkobain-console-tooltips' => array (
+		'decoration_class' => 'fas fa-question',
+		'enabled' => true,
+	),
+);
+
+/**
+ *
+ * Data model modules to be loaded. Names are specified as relative paths
+ *
+ */
+$MyModules = array(
+	'addons' => array (
+		'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+	),
+);
+?>

.jenkins/configuration/default-environment/unattended_install/default-params.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<installation>
+<!-- On manual installs, this file is generated in setup/install-*.xml -->
+    <mode>upgrade</mode>
+    <preinstall>
+        <copies type="array"/>
+    </preinstall>
+    <source_dir>datamodels/2.x/</source_dir>
+    <datamodel_version>2.5.0</datamodel_version>
+    <previous_configuration_file>/var/lib/jenkins/workspace/iTop-CI/unattended_install/default-config-itop.php</previous_configuration_file>
+    <extensions_dir>extensions</extensions_dir>
+    <target_env>production</target_env>
+    <workspace_dir></workspace_dir>
+    <database>
+        <server></server>
+        <user>jenkins_itop</user>
+        <pwd>IKnowYouSeeMeInJenkinsConf</pwd>
+        <name>itop_ci</name>
+        <db_tls_enabled></db_tls_enabled>
+        <db_tls_ca></db_tls_ca>
+        <prefix></prefix>
+    </database>
+    <url>http://127.0.0.1/itop/svn/trunk/</url>
+    <graphviz_path>/usr/bin/dot</graphviz_path>
+    <admin_account>
+        <user>admin</user>
+        <pwd>admin</pwd>
+        <language>EN US</language>
+    </admin_account>
+    <language>EN US</language>
+    <selected_modules type="array">
+      <item>authent-external</item>
+      <item>authent-local</item>
+      <item>itop-backup</item>
+      <item>itop-config</item>
+      <item>itop-profiles-itil</item>
+      <item>itop-sla-computation</item>
+      <item>itop-tickets</item>
+      <item>itop-welcome-itil</item>
+      <item>itop-config-mgmt</item>
+      <item>itop-attachments</item>
+      <item>itop-datacenter-mgmt</item>
+      <item>itop-endusers-devices</item>
+      <item>itop-storage-mgmt</item>
+      <item>itop-virtualization-mgmt</item>
+      <item>itop-bridge-virtualization-storage</item>
+      <item>itop-service-mgmt</item>
+      <item>itop-request-mgmt</item>
+      <item>itop-portal</item>
+      <item>itop-portal-base</item>
+      <item>itop-change-mgmt</item>
+      <item>itop-knownerror-mgmt</item>
+    </selected_modules>
+    <selected_extensions type="array">
+      <item>itop-config-mgmt-core</item>
+      <item>itop-config-mgmt-datacenter</item>
+      <item>itop-config-mgmt-end-user</item>
+      <item>itop-config-mgmt-storage</item>
+      <item>itop-config-mgmt-virtualization</item>
+      <item>itop-service-mgmt-enterprise</item>
+      <item>itop-ticket-mgmt-simple-ticket</item>
+      <item>itop-ticket-mgmt-simple-ticket-enhanced-portal</item>
+      <item>itop-change-mgmt-simple</item>
+      <item>itop-kown-error-mgmt</item>
+    </selected_extensions>
+    <sample_data>1</sample_data>
+    <old_addon></old_addon>
+    <options>
+        <generate_config>1</generate_config>
+    </options>
+    <mysql_bindir></mysql_bindir>
+</installation>

.jenkins/configuration/default-environment/unattended_install/unattended_install.php

@@ -0,0 +1,190 @@
+<?php
+//this scrit will be run under the ./toolkit directory, relatively to the document root
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/application/clipage.class.inc.php');
+require_once(APPROOT.'/core/config.class.inc.php');
+require_once(APPROOT.'/core/log.class.inc.php');
+require_once(APPROOT.'/core/kpi.class.inc.php');
+require_once(APPROOT.'/core/cmdbsource.class.inc.php');
+require_once(APPROOT.'/setup/setuppage.class.inc.php');
+require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
+require_once(APPROOT.'/setup/wizardsteps.class.inc.php');
+require_once(APPROOT.'/setup/applicationinstaller.class.inc.php');
+
+
+
+/////////////////////////////////////////////////
+$sParamFile = utils::ReadParam('response_file', 'default-params.xml', true /* CLI allowed */, 'raw_data');
+$bCheckConsistency = (utils::ReadParam('check_consistency', '0', true /* CLI allowed */) == '1');
+
+$oParams = new XMLParameters($sParamFile);
+$sMode = $oParams->Get('mode');
+
+if ($sMode == 'install')
+{
+	echo "Installation mode detected.\n";
+	$bClean = utils::ReadParam('clean', false, true /* CLI allowed */);
+	if ($bClean)
+	{
+		echo "Cleanup mode detected.\n";
+		$sTargetEnvironment = $oParams->Get('target_env', '');
+		if ($sTargetEnvironment == '')
+		{
+			$sTargetEnvironment = 'production';
+		}
+		$sTargetDir = APPROOT.'env-'.$sTargetEnvironment;
+
+		// Configuration file
+		$sConfigFile = APPCONF.$sTargetEnvironment.'/'.ITOP_CONFIG_FILE;
+		if (file_exists($sConfigFile))
+		{
+			echo "Trying to delete the configuration file: '$sConfigFile'.\n";
+			@chmod($sConfigFile, 0770); // RWX for owner and group, nothing for others
+			unlink($sConfigFile);
+		}
+		else
+		{
+			echo "No config file to delete ($sConfigFile does not exist).\n";
+		}
+
+		// env-xxx directory
+		if (file_exists($sTargetDir))
+		{
+			if (is_dir($sTargetDir))
+			{
+				echo "Emptying the target directory '$sTargetDir'.\n";
+				SetupUtils::tidydir($sTargetDir);
+			}
+			else
+			{
+				die("ERROR the target dir '$sTargetDir' exists, but is NOT a directory !!!\nExiting.\n");
+			}
+		}
+		else
+		{
+			echo "No target directory to delete ($sTargetDir does not exist).\n";
+		}
+
+		// Database
+		$aDBSettings = $oParams->Get('database', array());
+		$sDBServer = $aDBSettings['server'];
+		$sDBUser = $aDBSettings['user'];
+		$sDBPwd = $aDBSettings['pwd'];
+		$sDBName = $aDBSettings['name'];
+		$sDBPrefix = $aDBSettings['prefix'];
+
+		if ($sDBPrefix != '')
+		{
+			die("Cleanup not implemented for a partial database (prefix= '$sDBPrefix')\nExiting.");
+		}
+
+		$oMysqli = new mysqli($sDBServer, $sDBUser, $sDBPwd);
+		if ($oMysqli->connect_errno)
+		{
+			die("Cannot connect to the MySQL server (".$mysqli->connect_errno . ") ".$mysqli->connect_error."\nExiting");
+		}
+		else
+		{
+			if ($oMysqli->select_db($sDBName))
+			{
+				echo "Deleting database '$sDBName'\n";
+				$oMysqli->query("DROP DATABASE `$sDBName`");
+			}
+			else
+			{
+				echo "The database '$sDBName' does not seem to exist. Nothing to cleanup.\n";
+			}
+		}
+	}
+}
+
+$bHasErrors = false;
+$aChecks = SetupUtils::CheckBackupPrerequisites(APPROOT.'data'); // mmm should be the backup destination dir
+
+$aSelectedModules = $oParams->Get('selected_modules');
+$sSourceDir = $oParams->Get('source_dir', 'datamodels/latest');
+$sExtensionDir = $oParams->Get('extensions_dir', 'extensions');
+$aChecks = array_merge($aChecks, SetupUtils::CheckSelectedModules($sSourceDir, $sExtensionDir, $aSelectedModules));
+
+
+foreach($aChecks as $oCheckResult)
+{
+	switch($oCheckResult->iSeverity)
+	{
+		case CheckResult::ERROR:
+			$bHasErrors = true;
+			$sHeader = "Error";
+			break;
+
+		case CheckResult::WARNING:
+			$sHeader = "Warning";
+			break;
+
+		case CheckResult::INFO:
+		default:
+			$sHeader = "Info";
+			break;
+	}
+	echo $sHeader.": ".$oCheckResult->sLabel;
+	if (strlen($oCheckResult->sDescription))
+	{
+		echo ' - '.$oCheckResult->sDescription;
+	}
+	echo "\n";
+}
+
+if ($bHasErrors)
+{
+	echo "Encountered stopper issues. Aborting...\n";
+	die;
+}
+
+$bFoundIssues = false;
+
+$bInstall = utils::ReadParam('install', true, true /* CLI allowed */);
+if ($bInstall)
+{
+	echo "Starting the unattended installation...\n";
+	$oWizard = new ApplicationInstaller($oParams);
+	$bRes = $oWizard->ExecuteAllSteps();
+	if (!$bRes)
+	{
+		echo "\nencountered installation issues!";
+		$bFoundIssues = true;
+	}
+}
+else
+{
+	echo "No installation requested.\n";
+}
+if (!$bFoundIssues && $bCheckConsistency)
+{
+	echo "Checking data model consistency.\n";
+	ob_start();
+	$sCheckRes = '';
+	try
+	{
+		MetaModel::CheckDefinitions(false);
+		$sCheckRes = ob_get_clean();
+	}
+	catch(Exception $e)
+	{
+		$sCheckRes = ob_get_clean()."\nException: ".$e->getMessage();
+	}
+	if (strlen($sCheckRes) > 0)
+	{
+		echo $sCheckRes;
+		echo "\nfound consistency issues!";
+		$bFoundIssues = true;
+	}
+}
+
+if (!$bFoundIssues)
+{
+	// last line: used to check the install
+	// the only way to track issues in case of Fatal error or even parsing error!
+	echo "\ninstalled!";
+	exit;
+}

Jenkinsfile

@@ -0,0 +1,65 @@
+pipeline {
+  agent any
+  stages {
+
+    stage('init') {
+      parallel {
+        stage('debug') {
+          steps {
+            sh './.jenkins/bin/init/debug.sh'
+          }
+        }
+        stage('append files to project') {
+          steps {
+            sh './.jenkins/bin/init/append_files.sh'
+          }
+        }
+        stage('composer install') {
+          steps {
+            sh './.jenkins/bin/init/composer_install.sh'
+          }
+        }
+      }
+    }
+
+    stage('unattended_install') {
+      parallel {
+        stage('unattended_install default env') {
+          steps {
+            sh './.jenkins/bin/unattended_install/default_env.sh'
+          }
+        }
+      }
+    }
+
+    stage('test') {
+      parallel {
+        stage('phpunit') {
+          steps {
+            sh './.jenkins/bin/tests/phpunit.sh'
+          }
+        }
+      }
+    }
+
+  }
+
+  post {
+    always {
+      junit 'var/test/phpunit-log.junit.xml'
+    }
+    failure {
+      slackSend(channel: "#jenkins-itop", color: '#FF0000', message: "Ho no! Build failed! (${currentBuild.result}), Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
+    }
+    fixed {
+      slackSend(channel: "#jenkins-itop", color: '#FFa500', message: "Yes! Build repaired! (${currentBuild.result}), Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
+    }
+  }
+
+  environment {
+    DEBUG_UNIT_TEST = '0'
+  }
+  options {
+    timeout(time: 20, unit: 'MINUTES')
+  }
+}

addons/userrights/userrightsmatrix.class.inc.php

@@ -1,368 +1,368 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsMatrix (User management Module)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class UserRightsMatrixClassGrant extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_ur_matrixclasses",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		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("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())));
-	}
-}
-
-class UserRightsMatrixClassStimulusGrant extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_ur_matrixclassesstimulus",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		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("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())));
-	}
-}
-
-class UserRightsMatrixAttributeGrant extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_ur_matrixattributes",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		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 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())));
-	}
-}
-
-
-
-
-class UserRightsMatrix extends UserRightsAddOnAPI
-{
-	static public $m_aActionCodes = array(
-		UR_ACTION_READ => 'read',
-		UR_ACTION_MODIFY => 'modify',
-		UR_ACTION_DELETE => 'delete',
-		UR_ACTION_BULK_READ => 'bulk read',
-		UR_ACTION_BULK_MODIFY => 'bulk modify',
-		UR_ACTION_BULK_DELETE => 'bulk delete',
-	);
-
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		// Maybe we should check that no other user with userid == 0 exists
-		$oUser = new UserLocal();
-		$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
-
-		// Create a change to record the history of the User object
-		$oChange = MetaModel::NewObject("CMDBChange");
-		$oChange->Set("date", time());
-		$oChange->Set("userinfo", "Initialization");
-		$iChangeId = $oChange->DBInsert();
-
-		// Now record the admin user object
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		$this->SetupUser($iUserId, true);
-		return true;
-	}
-
-	public function IsAdministrator($oUser)
-	{
-		return ($oUser->GetKey() == 1);
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		return ($oUser->GetKey() == 1);
-	}
-
-	// Deprecated - create a new module !
-	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"));
-		while ($oUser = $oUserSet->Fetch())
-		{
-			$this->SetupUser($oUser->GetKey());
-		}
-		return true;
-	}
-
-	protected function SetupUser($iUserId, $bNewUser = false)
-	{
-		foreach(array('bizmodel', 'application', 'gui', 'core/cmdb') as $sCategory)
-		{
-			foreach (MetaModel::GetClasses($sCategory) as $sClass)
-			{
-				foreach (self::$m_aActionCodes as $iActionCode => $sAction)
-				{
-					if ($bNewUser)
-					{
-						$bAddCell = true;
-					}
-					else
-					{
-						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = $iUserId"));
-						$bAddCell = ($oSet->Count() < 1);
-					}
-					if ($bAddCell)
-					{
-						// Create a new entry
-						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassGrant");
-						$oMyClassGrant->Set("userid", $iUserId);
-						$oMyClassGrant->Set("class", $sClass);
-						$oMyClassGrant->Set("action", $sAction);
-						$oMyClassGrant->Set("permission", "yes");
-						$iId = $oMyClassGrant->DBInsertNoReload();
-					}
-				}
-				foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
-				{
-					if ($bNewUser)
-					{
-						$bAddCell = true;
-					}
-					else
-					{
-						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = $iUserId"));
-						$bAddCell = ($oSet->Count() < 1);
-					}
-					if ($bAddCell)
-					{
-						// Create a new entry
-						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassStimulusGrant");
-						$oMyClassGrant->Set("userid", $iUserId);
-						$oMyClassGrant->Set("class", $sClass);
-						$oMyClassGrant->Set("stimulus", $sStimulusCode);
-						$oMyClassGrant->Set("permission", "yes");
-						$iId = $oMyClassGrant->DBInsertNoReload();
-					}
-				}
-				foreach (MetaModel::GetAttributesList($sClass) as $sAttCode)
-				{
-					if ($bNewUser)
-					{
-						$bAddCell = true;
-					}
-					else
-					{
-						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND userid = $iUserId"));
-						$bAddCell = ($oSet->Count() < 1);
-					}
-					if ($bAddCell)
-					{
-						foreach (array('read', 'modify') as $sAction)
-						{
-							// Create a new entry
-							$oMyAttGrant = MetaModel::NewObject("UserRightsMatrixAttributeGrant");
-							$oMyAttGrant->Set("userid", $iUserId);
-							$oMyAttGrant->Set("class", $sClass);
-							$oMyAttGrant->Set("attcode", $sAttCode);
-							$oMyAttGrant->Set("action", $sAction);
-							$oMyAttGrant->Set("permission", "yes");
-							$iId = $oMyAttGrant->DBInsertNoReload();
-						}
-					}
-				}
-			}
-		}
-		/*
-		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
-		if ($bNewUser)
-		{
-			$bAddMenu = true;
-		}
-		else
-		{
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT menuNode WHERE type = 'user' AND parent_id = 0 AND user_id = $iUserId"));
-			$bAddMenu = ($oSet->Count() < 1);
-		}
-		if ($bAddMenu)
-		{
-			$oMenu = MetaModel::NewObject('menuNode');
-			$oMenu->Set('type', 'user');
-			$oMenu->Set('parent_id', 0);	// It's a toplevel entry
-			$oMenu->Set('rank', 6);			// Located just above the Admin Tools section (=7)
-			$oMenu->Set('name', 'My Bookmarks');
-			$oMenu->Set('label', 'My Favorite Items');
-			$oMenu->Set('hyperlink', 'UI.php');
-			$oMenu->Set('template', '<p></p><p></p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:32px;">My bookmarks</p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:14px;"><i>This section contains my most favorite search results</i></p>');
-			$oMenu->Set('user_id', $iUserId);
-			$oMenu->DBInsert();
-		}
-		*/
-	}
-
-
-	public function Init()
-	{
-		// Could be loaded in a shared memory (?)
-		return true;
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$oNullFilter  = new DBObjectSearch($sClass);
-		return $oNullFilter;
-	}
-
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
-		{
-			return UR_ALLOWED_NO;
-		}
-		$sAction = self::$m_aActionCodes[$iActionCode];
-
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
-		if ($oSet->Count() < 1)
-		{
-			return UR_ALLOWED_NO;
-		}
-
-		$oGrantRecord = $oSet->Fetch();
-		switch ($oGrantRecord->Get('permission'))
-		{
-			case 'yes':
-				$iRetCode = UR_ALLOWED_YES;
-				break;
-			case 'no':
-			default:
-				$iRetCode = UR_ALLOWED_NO;
-				break;
-		}
-		return $iRetCode;
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
-		{
-			return UR_ALLOWED_NO;
-		}
-		$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()}'"));
-		if ($oSet->Count() < 1)
-		{
-			return UR_ALLOWED_NO;
-		}
-
-		$oGrantRecord = $oSet->Fetch();
-		switch ($oGrantRecord->Get('permission'))
-		{
-			case 'yes':
-				$iRetCode = UR_ALLOWED_YES;
-				break;
-			case 'no':
-			default:
-				$iRetCode = UR_ALLOWED_NO;
-				break;
-		}
-		return $iRetCode;
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
-		if ($oSet->Count() < 1)
-		{
-			return UR_ALLOWED_NO;
-		}
-
-		$oGrantRecord = $oSet->Fetch();
-		switch ($oGrantRecord->Get('permission'))
-		{
-			case 'yes':
-				$iRetCode = UR_ALLOWED_YES;
-				break;
-			case 'no':
-			default:
-				$iRetCode = UR_ALLOWED_NO;
-				break;
-		}
-		return $iRetCode;
-	}
-
-	public function FlushPrivileges()
-	{
-	}
-}
-
-UserRights::SelectModule('UserRightsMatrix');
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsMatrix (User management Module)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserRightsMatrixClassGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclasses",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		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("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())));
+	}
+}
+
+class UserRightsMatrixClassStimulusGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclassesstimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		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("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())));
+	}
+}
+
+class UserRightsMatrixAttributeGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixattributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		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 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())));
+	}
+}
+
+
+
+
+class UserRightsMatrix extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'read',
+		UR_ACTION_MODIFY => 'modify',
+		UR_ACTION_DELETE => 'delete',
+		UR_ACTION_BULK_READ => 'bulk read',
+		UR_ACTION_BULK_MODIFY => 'bulk modify',
+		UR_ACTION_BULK_DELETE => 'bulk delete',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		// Maybe we should check that no other user with userid == 0 exists
+		$oUser = new UserLocal();
+		$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
+
+		// Create a change to record the history of the User object
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
+
+		// Now record the admin user object
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$this->SetupUser($iUserId, true);
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	// Deprecated - create a new module !
+	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"));
+		while ($oUser = $oUserSet->Fetch())
+		{
+			$this->SetupUser($oUser->GetKey());
+		}
+		return true;
+	}
+
+	protected function SetupUser($iUserId, $bNewUser = false)
+	{
+		foreach(array('bizmodel', 'application', 'gui', 'core/cmdb') as $sCategory)
+		{
+			foreach (MetaModel::GetClasses($sCategory) as $sClass)
+			{
+				foreach (self::$m_aActionCodes as $iActionCode => $sAction)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("action", $sAction);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassStimulusGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("stimulus", $sStimulusCode);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::GetAttributesList($sClass) as $sAttCode)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						foreach (array('read', 'modify') as $sAction)
+						{
+							// Create a new entry
+							$oMyAttGrant = MetaModel::NewObject("UserRightsMatrixAttributeGrant");
+							$oMyAttGrant->Set("userid", $iUserId);
+							$oMyAttGrant->Set("class", $sClass);
+							$oMyAttGrant->Set("attcode", $sAttCode);
+							$oMyAttGrant->Set("action", $sAction);
+							$oMyAttGrant->Set("permission", "yes");
+							$iId = $oMyAttGrant->DBInsertNoReload();
+						}
+					}
+				}
+			}
+		}
+		/*
+		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
+		if ($bNewUser)
+		{
+			$bAddMenu = true;
+		}
+		else
+		{
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT menuNode WHERE type = 'user' AND parent_id = 0 AND user_id = $iUserId"));
+			$bAddMenu = ($oSet->Count() < 1);
+		}
+		if ($bAddMenu)
+		{
+			$oMenu = MetaModel::NewObject('menuNode');
+			$oMenu->Set('type', 'user');
+			$oMenu->Set('parent_id', 0);	// It's a toplevel entry
+			$oMenu->Set('rank', 6);			// Located just above the Admin Tools section (=7)
+			$oMenu->Set('name', 'My Bookmarks');
+			$oMenu->Set('label', 'My Favorite Items');
+			$oMenu->Set('hyperlink', 'UI.php');
+			$oMenu->Set('template', '<p></p><p></p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:32px;">My bookmarks</p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:14px;"><i>This section contains my most favorite search results</i></p>');
+			$oMenu->Set('user_id', $iUserId);
+			$oMenu->DBInsert();
+		}
+		*/
+	}
+
+
+	public function Init()
+	{
+		// Could be loaded in a shared memory (?)
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$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()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsMatrix');
+
+?>

addons/userrights/userrightsnull.class.inc.php

@@ -1,78 +1,78 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsNull
- * User management Module - say Yeah! to everything
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class UserRightsNull extends UserRightsAddOnAPI
-{
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		return true;
-	}
-
-	public function IsAdministrator($oUser)
-	{
-		return true;
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		return true;
-	}
-
-	public function Init()
-	{
-		return true;
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$oNullFilter  = new DBObjectSearch($sClass);
-		return $oNullFilter;
-	}
-
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		return UR_ALLOWED_YES;
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		return UR_ALLOWED_YES;
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		return UR_ALLOWED_YES;
-	}
-
-	public function FlushPrivileges()
-	{
-	}
-}
-
-UserRights::SelectModule('UserRightsNull');
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsNull
+ * User management Module - say Yeah! to everything
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UserRightsNull extends UserRightsAddOnAPI
+{
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return true;
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return true;
+	}
+
+	public function Init()
+	{
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsNull');
+
+?>

application/ajaxwebpage.class.inc.php

@@ -1,382 +1,401 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Simple web page with no includes, header or fancy formatting, useful to
- * generate HTML fragments when called by an AJAX method
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
- 
-class ajax_page extends WebPage implements iTabbedPage
-{
-    /**
-     * Jquery style ready script
-     * @var Hash     
-     */	  
-	protected $m_sReadyScript;
-	protected $m_oTabs;
-	private $m_sMenu; // If set, then the menu will be updated
-	
-    /**
-     * constructor for the web page
-     * @param string $s_title Not used
-     */	  
-	function __construct($s_title)
-    {
-		$sPrintable = utils::ReadParam('printable', '0');
-		$bPrintable = ($sPrintable == '1');
-
-        parent::__construct($s_title, $bPrintable);
-        $this->m_sReadyScript = "";
-		//$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
-		$this->m_oTabs = new TabManager();
-		$this->sContentType = 'text/html';
-		$this->sContentDisposition = 'inline';
-		$this->m_sMenu = "";
-
-		utils::InitArchiveMode();
-    }
-
-	public function AddTabContainer($sTabContainer, $sPrefix = '')
-	{
-		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
-	}
-
-	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
-	{
-		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
-	}
-
-	public function SetCurrentTabContainer($sTabContainer = '')
-	{
-		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
-	}
-
-	public function SetCurrentTab($sTabLabel = '')
-	{
-		return $this->m_oTabs->SetCurrentTab($sTabLabel);
-	}
-	
-	/**
-	 * Add a tab which content will be loaded asynchronously via the supplied URL
-	 * 
-	 * Limitations:
-	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
-	 * Static content cannot be added inside such tabs.
-	 * 
-	 * @param string $sTabLabel The (localised) label of the tab
-	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
-	 * @since 2.0.3
-	 */
-	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
-	{
-		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
-	}
-	
-	public function GetCurrentTab()
-	{
-		return $this->m_oTabs->GetCurrentTab();
-	}
-
-	public function RemoveTab($sTabLabel, $sTabContainer = null)
-	{
-		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
-	}
-
-	/**
-	 * Finds the tab whose title matches a given pattern
-	 * @return mixed The name of the tab as a string or false if not found
-	 */
-	public function FindTab($sPattern, $sTabContainer = null)
-	{
-		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
-	}
-
-	/**
-	 * Make the given tab the active one, as if it were clicked
-	 * DOES NOT WORK: apparently in the *old* version of jquery
-	 * that we are using this is not supported... TO DO upgrade
-	 * the whole jquery bundle...
-	 */
-	public function SelectTab($sTabContainer, $sTabLabel)
-	{
-		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
-	}
-	
-	public function AddToMenu($sHtml)
-	{
-		$this->m_sMenu .= $sHtml;
-	}
-
-    /**
-     * Echoes the content of the whole page
-     * @return void
-     */	  
-    public function output()
-    {
-    	if (!empty($this->sContentType))
-    	{
-			$this->add_header('Content-type: '.$this->sContentType);
-    	}
-    	if (!empty($this->sContentDisposition))
-    	{
-			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
-    	}
-        foreach($this->a_headers as $s_header)
-        {
-            header($s_header);
-        }
-		if ($this->m_oTabs->TabsContainerCount() > 0)
-		{
-			$this->add_ready_script(
-<<<EOF
-			// The "tab widgets" to handle.
-			var tabs = $('div[id^=tabbedContent]');
-			  
-			// Ugly patch for a change in the behavior of jQuery UI:
-			// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
-			// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
-			// is taken into account and causes "local" tabs to be considered as Ajax
-			// unless their URL is equal to the URL of the page...
-			if ($('base').length > 0)
-			{
-				$('div[id^=tabbedContent] > ul > li > a').each(function() {
-					var sHash = location.hash;
-					var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
-		    		$(this).attr("href", sCleanLocation+$(this).attr("href"));
-				});
-			}
-			if ($.bbq)
-			{
-				// 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 );
-				});
-			}
-			else
-			{
-				tabs.tabs();
-			}
-EOF
-);
-		}
-		// Render the tabs in the page (if any)
-		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
-		
-		// Additional UI widgets to be activated inside the ajax fragment
-		// Important: Testing the content type is not enough because some ajax handlers have not correctly positionned the flag (e.g json response corrupted by the script)
-		if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content)) )
-		{
-			$this->add_ready_script(
-<<<EOF
-PrepareWidgets();
-EOF
-			);
-		}
-        $s_captured_output = $this->ob_get_clean_safe();
-		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
-        {
-        	// inline content != attachment && html => filter all scripts for malicious XSS scripts
-        	echo self::FilterXSS($this->s_content);
-        }
-        else
-        {
-        	echo $this->s_content;
-        }
-        if (!empty($this->m_sMenu))
-        {
-           $uid = time();
-           echo "<div id=\"accordion_temp_$uid\">\n";
-           echo "<div id=\"accordion\">\n";
-           echo "<!-- Beginning of the accordion menu -->\n";
-           echo self::FilterXSS($this->m_sMenu);
-           echo "<!-- End of the accordion menu-->\n";
-           echo "</div>\n";
-           echo "</div>\n";
-
-	        echo "<script type=\"text/javascript\">\n";
-	        echo "$('#inner_menu').html($('#accordion_temp_$uid').html());\n";
-	        echo "$('#accordion_temp_$uid').remove();\n";
-	        echo "\n</script>\n";
-        }
-
-        //echo $this->s_deferred_content;
-        if (count($this->a_scripts) > 0)
-        {
-            echo "<script type=\"text/javascript\">\n";
-            echo implode("\n", $this->a_scripts);
-            echo "\n</script>\n";
-        }
-        if (!empty($this->s_deferred_content))
-        {
-            echo "<script type=\"text/javascript\">\n";
-            echo "\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');\n";
-            echo "\n</script>\n";
-        }
-        if (!empty($this->m_sReadyScript))
-        {
-	        echo "<script type=\"text/javascript\">\n";
-	        echo $this->m_sReadyScript; // Ready Scripts are output as simple scripts
-	        echo "\n</script>\n";
-        }
-        
-		if (trim($s_captured_output) != "")
-        {
-        	echo self::FilterXSS($s_captured_output);
-        }
-
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-    }
-
-    /**
-     * Adds a paragraph with a smaller font into the page
-     * NOT implemented (i.e does nothing)
-     * @param string $sText Content of the (small) paragraph     
-     * @return void
-     */	 	      
-    public function small_p($sText)
-    {
-	}
-
-    public function add($sHtml)
-    {
-        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
-        {
-            $this->m_oTabs->AddToTab($this->m_oTabs->GetCurrentTabContainer(), $this->m_oTabs->GetCurrentTab(), $sHtml);
-        }
-        else
-        {
-            parent::add($sHtml);
-        }
-    }
-
-	/**
-	 * Records the current state of the 'html' part of the page output
-	 * @return mixed The current state of the 'html' output
-	 */    
-    public function start_capture()
-    {
-    	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
-		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
-		
-		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
-		{
-			$iOffset = $this->m_oTabs->GetCurrentTabLength();
-			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
-		}
-		else
-		{
-			return parent::start_capture();
-		}
-    }
-
-    /**
-     * Returns the part of the html output that occurred since the call to start_capture
-     * and removes this part from the current html output
-     * @param $offset mixed The value returned by start_capture
-     * @return string The part of the html output that was added since the call to start_capture
-     */    
-    public function end_capture($offset)
-    {
-		if (is_array($offset))
-		{
-			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
-			{
-				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
-			}
-			else
-			{
-				$sCaptured = '';
-			}
-		}
-		else
-		{
-			$sCaptured = parent::end_capture($offset);
-		}
-		return $sCaptured;
-    }
-
-	/**
-	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
-	 * This is useful to add hidden content, DIVs or FORMs that should not
-	 * be embedded into each other.	 	 
-	 */
-    public function add_at_the_end($s_html, $sId = '')
-    {
-    	if ($sId != '')
-    	{
-	    	$this->add_script("$('#{$sId}').remove();"); // Remove any previous instance of the same Id
-    	}
-        $this->s_deferred_content .= $s_html;
-    }
-	
-	/**
-	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
-	 * NOT implemented in this version of the class.
-	 * @return void	 
-	 */	 	 	
-	public function add_ready_script($sScript)
-	{
-		$this->m_sReadyScript .= $sScript."\n";
-	}
-	
-	/**
-	 * Cannot be called in this context, since Ajax pages do not share
-	 * any context with the calling page !!
-	 */
-	public function GetUniqueId()
-	{
-		assert(false);
-		return 0;
-	}
-	
-	public static function FilterXSS($sHTML)
-	{
-		return str_ireplace(array('<script', '</script>'), array('<!-- <removed-script', '</removed-script> -->'), $sHTML);
-	}
-}
-
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Simple web page with no includes, header or fancy formatting, useful to
+ * generate HTML fragments when called by an AJAX method
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+ 
+class ajax_page extends WebPage implements iTabbedPage
+{
+    /**
+     * Jquery style ready script
+     * @var Hash     
+     */	  
+	protected $m_sReadyScript;
+	protected $m_oTabs;
+	private $m_sMenu; // If set, then the menu will be updated
+	
+    /**
+     * constructor for the web page
+     * @param string $s_title Not used
+     */	  
+	function __construct($s_title)
+    {
+		$sPrintable = utils::ReadParam('printable', '0');
+		$bPrintable = ($sPrintable == '1');
+
+        parent::__construct($s_title, $bPrintable);
+        $this->m_sReadyScript = "";
+		//$this->add_header("Content-type: text/html; charset=utf-8");
+		$this->add_header("Cache-control: no-cache");
+		$this->m_oTabs = new TabManager();
+		$this->sContentType = 'text/html';
+		$this->sContentDisposition = 'inline';
+		$this->m_sMenu = "";
+
+		utils::InitArchiveMode();
+    }
+
+	public function AddTabContainer($sTabContainer, $sPrefix = '')
+	{
+		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
+	}
+
+	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+	{
+		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
+	}
+
+	public function SetCurrentTabContainer($sTabContainer = '')
+	{
+		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
+	}
+
+	public function SetCurrentTab($sTabLabel = '')
+	{
+		return $this->m_oTabs->SetCurrentTab($sTabLabel);
+	}
+	
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 * 
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+	 * Static content cannot be added inside such tabs.
+	 * 
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	{
+		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
+	}
+	
+	public function GetCurrentTab()
+	{
+		return $this->m_oTabs->GetCurrentTab();
+	}
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	{
+		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
+	}
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 * @return mixed The name of the tab as a string or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null)
+	{
+		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
+	}
+
+	/**
+	 * Make the given tab the active one, as if it were clicked
+	 * DOES NOT WORK: apparently in the *old* version of jquery
+	 * that we are using this is not supported... TO DO upgrade
+	 * the whole jquery bundle...
+	 */
+	public function SelectTab($sTabContainer, $sTabLabel)
+	{
+		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
+	}
+	
+	public function AddToMenu($sHtml)
+	{
+		$this->m_sMenu .= $sHtml;
+	}
+
+    /**
+     * Echoes the content of the whole page
+     * @return void
+     */	  
+    public function output()
+    {
+    	if (!empty($this->sContentType))
+    	{
+			$this->add_header('Content-type: '.$this->sContentType);
+    	}
+    	if (!empty($this->sContentDisposition))
+    	{
+			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
+    	}
+        foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+		if ($this->m_oTabs->TabsContainerCount() > 0)
+		{
+			$this->add_ready_script(
+<<<EOF
+			// The "tab widgets" to handle.
+			var tabs = $('div[id^=tabbedContent]');
+			  
+			// Ugly patch for a change in the behavior of jQuery UI:
+			// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
+			// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
+			// is taken into account and causes "local" tabs to be considered as Ajax
+			// unless their URL is equal to the URL of the page...
+			if ($('base').length > 0)
+			{
+				$('div[id^=tabbedContent] > ul > li > a').each(function() {
+					var sHash = location.hash;
+					var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
+		    		$(this).attr("href", sCleanLocation+$(this).attr("href"));
+				});
+			}
+			if ($.bbq)
+			{
+				// 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 );
+				});
+			}
+			else
+			{
+				tabs.tabs();
+			}
+EOF
+);
+		}
+		// Render the tabs in the page (if any)
+		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
+		
+		// Additional UI widgets to be activated inside the ajax fragment
+		// Important: Testing the content type is not enough because some ajax handlers have not correctly positionned the flag (e.g json response corrupted by the script)
+		if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content)) )
+		{
+			$this->add_ready_script(
+<<<EOF
+PrepareWidgets();
+EOF
+			);
+		}
+        $s_captured_output = $this->ob_get_clean_safe();
+		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
+        {
+        	// inline content != attachment && html => filter all scripts for malicious XSS scripts
+        	echo self::FilterXSS($this->s_content);
+        }
+        else
+        {
+        	echo $this->s_content;
+        }
+        if (!empty($this->m_sMenu))
+        {
+           $uid = time();
+           echo "<div id=\"accordion_temp_$uid\">\n";
+           echo "<div id=\"accordion\">\n";
+           echo "<!-- Beginning of the accordion menu -->\n";
+           echo self::FilterXSS($this->m_sMenu);
+           echo "<!-- End of the accordion menu-->\n";
+           echo "</div>\n";
+           echo "</div>\n";
+
+	        echo "<script type=\"text/javascript\">\n";
+	        echo "$('#inner_menu').html($('#accordion_temp_$uid').html());\n";
+	        echo "$('#accordion_temp_$uid').remove();\n";
+	        echo "\n</script>\n";
+        }
+
+        //echo $this->s_deferred_content;
+        if (count($this->a_scripts) > 0)
+        {
+        	echo "<script type=\"text/javascript\">\n";
+        	echo implode("\n", $this->a_scripts);
+        	echo "\n</script>\n";
+        }
+        if (count($this->a_linked_scripts) > 0)
+        {
+        	echo "<script type=\"text/javascript\">\n";
+        	foreach($this->a_linked_scripts as $sScriptUrl)
+        	{
+        		echo '$.getScript('.json_encode($sScriptUrl).");\n";
+        	}
+        	echo "\n</script>\n";
+        }
+        if (!empty($this->s_deferred_content))
+        {
+            echo "<script type=\"text/javascript\">\n";
+            echo "\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');\n";
+            echo "\n</script>\n";
+        }
+        if (!empty($this->m_sReadyScript))
+        {
+	        echo "<script type=\"text/javascript\">\n";
+	        echo $this->m_sReadyScript; // Ready Scripts are output as simple scripts
+	        echo "\n</script>\n";
+        }
+        if(count($this->a_linked_stylesheets) > 0)
+        {
+        	echo "<script type=\"text/javascript\">";
+        	foreach($this->a_linked_stylesheets as $aStylesheet)
+	        {
+		        $sStylesheetUrl = $aStylesheet['link'];
+	        	echo "if (!$('link[href=\"{$sStylesheetUrl}\"]').length) $('<link href=\"{$sStylesheetUrl}\" rel=\"stylesheet\">').appendTo('head');\n";
+	        }
+        	echo "\n</script>\n";
+        }
+        
+		if (trim($s_captured_output) != "")
+        {
+        	echo self::FilterXSS($s_captured_output);
+        }
+
+        if (class_exists('DBSearch'))
+        {
+            DBSearch::RecordQueryTrace();
+        }
+    }
+
+    /**
+     * Adds a paragraph with a smaller font into the page
+     * NOT implemented (i.e does nothing)
+     * @param string $sText Content of the (small) paragraph     
+     * @return void
+     */	 	      
+    public function small_p($sText)
+    {
+	}
+
+    public function add($sHtml)
+    {
+        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
+        {
+            $this->m_oTabs->AddToTab($this->m_oTabs->GetCurrentTabContainer(), $this->m_oTabs->GetCurrentTab(), $sHtml);
+        }
+        else
+        {
+            parent::add($sHtml);
+        }
+    }
+
+	/**
+	 * Records the current state of the 'html' part of the page output
+	 * @return mixed The current state of the 'html' output
+	 */    
+    public function start_capture()
+    {
+    	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
+		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
+		
+		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
+		{
+			$iOffset = $this->m_oTabs->GetCurrentTabLength();
+			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
+		}
+		else
+		{
+			return parent::start_capture();
+		}
+    }
+
+    /**
+     * Returns the part of the html output that occurred since the call to start_capture
+     * and removes this part from the current html output
+     * @param $offset mixed The value returned by start_capture
+     * @return string The part of the html output that was added since the call to start_capture
+     */    
+    public function end_capture($offset)
+    {
+		if (is_array($offset))
+		{
+			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
+			{
+				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
+			}
+			else
+			{
+				$sCaptured = '';
+			}
+		}
+		else
+		{
+			$sCaptured = parent::end_capture($offset);
+		}
+		return $sCaptured;
+    }
+
+	/**
+	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
+	 * This is useful to add hidden content, DIVs or FORMs that should not
+	 * be embedded into each other.	 	 
+	 */
+    public function add_at_the_end($s_html, $sId = '')
+    {
+    	if ($sId != '')
+    	{
+	    	$this->add_script("$('#{$sId}').remove();"); // Remove any previous instance of the same Id
+    	}
+        $this->s_deferred_content .= $s_html;
+    }
+	
+	/**
+	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
+	 * NOT implemented in this version of the class.
+	 * @return void	 
+	 */	 	 	
+	public function add_ready_script($sScript)
+	{
+		$this->m_sReadyScript .= $sScript."\n";
+	}
+	
+	/**
+	 * Cannot be called in this context, since Ajax pages do not share
+	 * any context with the calling page !!
+	 */
+	public function GetUniqueId()
+	{
+		assert(false);
+		return 0;
+	}
+	
+	public static function FilterXSS($sHTML)
+	{
+		return str_ireplace(array('<script', '</script>'), array('<!-- <removed-script', '</removed-script> -->'), $sHTML);
+	}
+}
+

application/application.inc.php

@@ -1,40 +1,40 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Includes all the classes to have the application up and running
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/applicationcontext.class.inc.php');
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-require_once(APPROOT.'/application/displayblock.class.inc.php');
-require_once(APPROOT.'/application/audit.category.class.inc.php');
-require_once(APPROOT.'/application/audit.rule.class.inc.php');
-require_once(APPROOT.'/application/query.class.inc.php');
-require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
-//require_once(APPROOT.'/application/menunode.class.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-
-class ApplicationException extends CoreException
-{
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Includes all the classes to have the application up and running
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/applicationcontext.class.inc.php');
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+require_once(APPROOT.'/application/audit.category.class.inc.php');
+require_once(APPROOT.'/application/audit.rule.class.inc.php');
+require_once(APPROOT.'/application/query.class.inc.php');
+require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
+//require_once(APPROOT.'/application/menunode.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+
+class ApplicationException extends CoreException
+{
+}
+?>

application/applicationcontext.class.inc.php

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

application/audit.category.class.inc.php

@@ -1,60 +1,60 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * 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 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-
-class AuditCategory extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_auditcategory",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		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(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
-
-		// 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
-		// 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
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * 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 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+
+class AuditCategory extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditcategory",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		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(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
+
+		// 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
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+	}
+}
+?>

application/audit.rule.class.inc.php

@@ -1,64 +1,64 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * 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
- * 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
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/audit.category.class.inc.php');
-
-class AuditRule extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_auditrule",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		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")));
-
-		// 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
-		// 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
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * 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
+ * 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
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/audit.category.class.inc.php');
+
+class AuditRule extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditrule",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		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")));
+
+		// 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
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
+	}
+}
+?>

application/capturewebpage.class.inc.php

@@ -1,84 +1,84 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Adapter class: when an API requires WebPage and you want to produce something else
- *
- * @copyright   Copyright (C) 2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CaptureWebPage extends WebPage
-{
-	protected $aReadyScripts;
-
-	function __construct()
-	{
-		parent::__construct('capture web page');
-		$this->aReadyScripts = array();
-	}
-
-	public function GetHtml()
-	{
-		$trash = $this->ob_get_clean_safe();
-		return $this->s_content;
-	}
-
-	public function GetJS()
-	{
-		$sRet = implode("\n", $this->a_scripts);
-		if (!empty($this->s_deferred_content))
-		{
-			$sRet .= "\n\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');";
-		}
-		return $sRet;
-	}
-
-	public function GetReadyJS()
-	{
-		return "\$(document).ready(function() {\n".implode("\n", $this->aReadyScripts)."\n});";
-	}
-
-	public function GetCSS()
-	{
-		return $this->a_styles;
-	}
-
-	public function GetJSFiles()
-	{
-		return $this->a_linked_scripts;
-	}
-
-	public function GetCSSFiles()
-	{
-		return $this->a_linked_stylesheets;
-	}
-
-	public function output()
-	{
-		throw new Exception(__method__.' should not be called');
-	}
-
-	public function add_ready_script($sScript)
-	{
-		$this->aReadyScripts[] = $sScript;
-	}
-}
-
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Adapter class: when an API requires WebPage and you want to produce something else
+ *
+ * @copyright   Copyright (C) 2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+
+class CaptureWebPage extends WebPage
+{
+	protected $aReadyScripts;
+
+	function __construct()
+	{
+		parent::__construct('capture web page');
+		$this->aReadyScripts = array();
+	}
+
+	public function GetHtml()
+	{
+		$trash = $this->ob_get_clean_safe();
+		return $this->s_content;
+	}
+
+	public function GetJS()
+	{
+		$sRet = implode("\n", $this->a_scripts);
+		if (!empty($this->s_deferred_content))
+		{
+			$sRet .= "\n\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');";
+		}
+		return $sRet;
+	}
+
+	public function GetReadyJS()
+	{
+		return "\$(document).ready(function() {\n".implode("\n", $this->aReadyScripts)."\n});";
+	}
+
+	public function GetCSS()
+	{
+		return $this->a_styles;
+	}
+
+	public function GetJSFiles()
+	{
+		return $this->a_linked_scripts;
+	}
+
+	public function GetCSSFiles()
+	{
+		return $this->a_linked_stylesheets;
+	}
+
+	public function output()
+	{
+		throw new Exception(__method__.' should not be called');
+	}
+
+	public function add_ready_script($sScript)
+	{
+		$this->aReadyScripts[] = $sScript;
+	}
+}
+

application/clipage.class.inc.php

@@ -1,97 +1,97 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * CLI page 
- * The page adds the content-type text/XML and the encoding into the headers
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CLIPage implements Page
-{
-    function __construct($s_title)
-    {
-    }	
-
-    public function output()
-    {
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-        if (class_exists('ExecutionKPI'))
-        {
-            ExecutionKPI::ReportStats();
-        }
-    }
-
-	public function add($sText)
-	{
-		echo $sText;
-	}	
-
-	public function p($sText)
-	{
-		echo $sText."\n";
-	}	
-
-	public function pre($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";
-		}
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * CLI page 
+ * The page adds the content-type text/XML and the encoding into the headers
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+
+class CLIPage implements Page
+{
+    function __construct($s_title)
+    {
+    }	
+
+    public function output()
+    {
+        if (class_exists('DBSearch'))
+        {
+            DBSearch::RecordQueryTrace();
+        }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
+    }
+
+	public function add($sText)
+	{
+		echo $sText;
+	}	
+
+	public function p($sText)
+	{
+		echo $sText."\n";
+	}	
+
+	public function pre($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,111 +1,111 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * 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
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CSVPage extends WebPage
-{
-    function __construct($s_title)
-    {
-        parent::__construct($s_title);
-		$this->add_header("Content-type: text/plain; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
-		//$this->add_header("Content-Transfer-Encoding: binary");
-    }	
-
-    public function output()
-    {
-			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
-
-			// Get the unexpected output but do nothing with it
-			$sTrash = $this->ob_get_clean_safe();
-
-        foreach($this->a_headers as $s_header)
-        {
-            header($s_header);
-        }
-        echo trim($this->s_content);
-        echo "\n";
-
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-        if (class_exists('ExecutionKPI'))
-        {
-            ExecutionKPI::ReportStats();
-        }
-    }
-
-	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";
-		}
-	}
-}
-
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * 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
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+
+class CSVPage extends WebPage
+{
+    function __construct($s_title)
+    {
+        parent::__construct($s_title);
+		$this->add_header("Content-type: text/plain; charset=utf-8");
+		$this->add_header("Cache-control: no-cache");
+		//$this->add_header("Content-Transfer-Encoding: binary");
+    }	
+
+    public function output()
+    {
+			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
+
+			// Get the unexpected output but do nothing with it
+			$sTrash = $this->ob_get_clean_safe();
+
+        foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+        echo trim($this->s_content);
+        echo "\n";
+
+        if (class_exists('DBSearch'))
+        {
+            DBSearch::RecordQueryTrace();
+        }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
+    }
+
+	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/dashboard.class.inc.php

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

application/datamodel.application.xml

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

application/datatable.class.inc.php

@@ -174,6 +174,7 @@ class DataTable
 		}
 		$sJSOptions = json_encode($aOptions);
 		$oPage->add_ready_script("$('#datatable_{$this->iListId}').datatable($sJSOptions);");
+
 		return $sHtml;
 	}
 	
@@ -297,7 +298,7 @@ EOF;
 		if (!$oPage->IsPrintableVersion())
 		{
 			$sMenuTitle = Dict::S('UI:ConfigureThisList');
-			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><img src="../images/toolkit_menu.png?itopversion='.ITOP_VERSION.'"><ul>';
+			$sHtml = '<div class="itop_popup toolkit_menu" id="tk_'.$this->iListId.'"><ul><li><img src="../images/toolkit_menu.png?t='.utils::GetCacheBusterTimestamp().'"><ul>';
 	
 			$oMenuItem1 = new JSPopupMenuItem('iTop::ConfigureList', $sMenuTitle, "$('#datatable_dlg_".$this->iListId."').dialog('open');");
 			$aActions = array(
@@ -430,7 +431,7 @@ EOF;
 						}
 						else
 						{
-							$aRow['form::select'] = "<input type=\"checkBox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+							$aRow['form::select'] = "<input type=\"checkbox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
 						}
 					}
 					foreach($aColumns[$sAlias] as $sAttCode => $aData)
@@ -564,40 +565,13 @@ EOF;
 <<<EOF
 var oTable = $('#{$this->iListId} table.listResults');
 oTable.tableHover();
-oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
+oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, table_id: '{$this->iListId}', columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
 EOF
 		);
 		if ($sFakeSortList != '')
 		{
 			$oPage->add_ready_script("oTable.trigger(\"fakesorton\", [$sFakeSortList]);");
 		}
-		//if ($iNbPages == 1)
-		if (false)
-		{
-			if (isset($aExtraParams['cssCount']))
-			{
-				$sCssCount = $aExtraParams['cssCount'];
-				if ($sSelectMode == 'single')
-				{
-					$sSelectSelector = ":radio[name^=selectObj]";
-				}
-				else if ($sSelectMode == 'multiple')
-				{
-					$sSelectSelector = ":checkbox[name^=selectObj]";
-				}
-				$oPage->add_ready_script(
-<<<EOF
-	$('#{$this->iListId} table.listResults $sSelectSelector').change(function() {
-		var c = $('{$sCssCount}');							
-		var v = $('#{$this->iListId} table.listResults $sSelectSelector:checked').length;
-		c.val(v);
-		$('#{$this->iListId} .selectedCount').text(v);
-		c.trigger('change');	
-	});
-EOF
-				);
-			}
-		}
 		return $sHtml;
 	}
 	
@@ -606,7 +580,7 @@ EOF
 		$iPageSize = ($iDefaultPageSize < 1) ? 1 : $iDefaultPageSize;
 		$iPageIndex = 1 + floor($iStart / $iPageSize);
 		$sHtml = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
-		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".str_replace("\n", ' ', addslashes($sHtml))."');");
+		$oPage->add_ready_script("$('#pager{$this->iListId}').html('".json_encode($sHtml)."');");
 		if ($iDefaultPageSize < 1)
 		{
 			$oPage->add_ready_script("$('#pager{$this->iListId}').parent().hide()");

application/displayblock.class.inc.php

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

application/excelexporter.class.inc.php

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

application/forms.class.inc.php

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

application/iotask.class.inc.php

@@ -1,69 +1,69 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class InputOutputTask
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-
-/**
- * This class manages the input/output tasks
- * for synchronizing information with external data sources 
- */
-class InputOutputTask extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_iotask",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		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())));
-
-		// 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
-		// 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
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class InputOutputTask
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+
+/**
+ * This class manages the input/output tasks
+ * for synchronizing information with external data sources 
+ */
+class InputOutputTask extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_iotask",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		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())));
+
+		// 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
+		// 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/itopwizardwebpage.class.inc.php

@@ -1,57 +1,57 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class iTopWizardWebPage
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('itopwebpage.class.inc.php');
-/**
- * Web page to display a wizard in the iTop framework
- */
-class iTopWizardWebPage extends iTopWebPage
-{
-	var $m_iCurrentStep;
-	var $m_aSteps;
-    public function __construct($sTitle, $currentOrganization, $iCurrentStep, $aSteps)
-    {
-    	parent::__construct($sTitle." - step $iCurrentStep of ".count($aSteps)." - ".$aSteps[$iCurrentStep - 1], $currentOrganization);
-		$this->m_iCurrentStep = $iCurrentStep;
-		$this->m_aSteps = $aSteps;
-    }
-    
-    public function output()
-    {
-    	$aSteps = array();
-    	$iIndex = 0;
-    	foreach($this->m_aSteps as $sStepTitle)
-    	{
-    		$iIndex++;
-    		$sStyle = ($iIndex == $this->m_iCurrentStep) ? 'wizActiveStep' : 'wizStep';
-    		$aSteps[] = "<div class=\"$sStyle\"><span>$sStepTitle</span></div>";
-    	}
-    	$sWizardHeader = "<div class=\"wizHeader\"><h1>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
-    	$this->s_content = "$sWizardHeader<div class=\"wizContainer\">".$this->s_content."</div>";
-    	parent::output();
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class iTopWizardWebPage
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('itopwebpage.class.inc.php');
+/**
+ * Web page to display a wizard in the iTop framework
+ */
+class iTopWizardWebPage extends iTopWebPage
+{
+	var $m_iCurrentStep;
+	var $m_aSteps;
+    public function __construct($sTitle, $currentOrganization, $iCurrentStep, $aSteps)
+    {
+    	parent::__construct($sTitle." - step $iCurrentStep of ".count($aSteps)." - ".$aSteps[$iCurrentStep - 1], $currentOrganization);
+		$this->m_iCurrentStep = $iCurrentStep;
+		$this->m_aSteps = $aSteps;
+    }
+    
+    public function output()
+    {
+    	$aSteps = array();
+    	$iIndex = 0;
+    	foreach($this->m_aSteps as $sStepTitle)
+    	{
+    		$iIndex++;
+    		$sStyle = ($iIndex == $this->m_iCurrentStep) ? 'wizActiveStep' : 'wizStep';
+    		$aSteps[] = "<div class=\"$sStyle\"><span>$sStepTitle</span></div>";
+    	}
+    	$sWizardHeader = "<div class=\"wizHeader\"><h1>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
+    	$this->s_content = "$sWizardHeader<div class=\"wizContainer\">".$this->s_content."</div>";
+    	parent::output();
+	}
+}
+?>

application/nicewebpage.class.inc.php

@@ -1,231 +1,250 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class NiceWebPage
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-/**
- * Web page with some associated CSS and scripts (jquery) for a fancier display
- */
-class NiceWebPage extends WebPage
-{
-	var $m_aReadyScripts;
-	var $m_sRootUrl;
-	
-    public function __construct($s_title, $bPrintable = false)
-    {
-        parent::__construct($s_title, $bPrintable);
-		$this->m_aReadyScripts = array();
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.10.0.min.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.2.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.10.3.custom.min.css');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.10.3.custom.min.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
-		// table sorting
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
-		$this->add_ready_script(
-<<< EOF
-	//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');
-			// 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');
-		} 
-	});
-	$("table.listResults").tableHover(); // hover tables
-EOF
-		);
-		$this->add_saas("css/light-grey.scss");
-
-		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
-     	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
-    	$sAbsURLModulesRoot = addslashes($this->GetAbsoluteUrlModulesRoot());
-    	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
-
-		$sAppContext = addslashes($this->GetApplicationContext());
-
-		$this->add_script(
-<<<EOF
-function GetAbsoluteUrlAppRoot()
-{
-	return '$sAbsURLAppRoot';
-}
-
-function GetAbsoluteUrlModulesRoot()
-{
-	return '$sAbsURLModulesRoot';
-}
-
-function GetAbsoluteUrlModulePage(sModule, sPage, aArguments)
-{
-	// aArguments is optional, it default to an empty hash
-	aArguments = typeof aArguments !== 'undefined' ? aArguments : {};
-
-	var sUrl = '$sAbsURLAppRoot'+'pages/exec.php?exec_module='+sModule+'&exec_page='+sPage+'&exec_env='+'$sEnvironment';
-	for (var sArgName in aArguments)
-	{
-		if (aArguments.hasOwnProperty(sArgName))
-		{
-			sUrl = sUrl + '&'+sArgName+'='+aArguments[sArgname];
-		}
-	}
-	return sUrl;
-}
-
-function AddAppContext(sURL)
-{
-	var sContext = '$sAppContext';
-	if (sContext.length > 0)
-	{
-		if (sURL.indexOf('?') == -1)
-		{
-			return sURL+'?'+sContext;
-		}				
-		return sURL+'&'+sContext;
-	}
-	return sURL;
-}
-EOF
-		);
-	}
-	
-    public function SetRootUrl($sRootUrl)
-    {
-    	$this->m_sRootUrl = $sRootUrl;
-    }
-    
-	public function small_p($sText)
-	{
-		$this->add("<p style=\"font-size:smaller\">$sText</p>\n");
-	}
-
-	public function GetAbsoluteUrlAppRoot()
-	{
-		return utils::GetAbsoluteUrlAppRoot();
-	}
-
-	public function GetAbsoluteUrlModulesRoot()
-	{
-		return utils::GetAbsoluteUrlModulesRoot();
-	}
-
-	function GetApplicationContext()
-	{
-		$oAppContext = new ApplicationContext();
-		return $oAppContext->GetForLink();
-	}
-
-	// By Rom, used by CSVImport and Advanced search
-	public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
-	{
-		// $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>";
-			}
-		}
-		ksort($aValidClasses);
-		$this->add(implode("\n", $aValidClasses));
-		
-		$this->add("</select>");
-	}
-
-	// By Rom, used by Advanced search
-	public function add_select($aChoices, $sName, $sDefaultValue, $iWidthPx)
-	{
-		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
-		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("</select>");
-	}
-	
-	public function add_ready_script($sScript)
-	{
-		$this->m_aReadyScripts[] = $sScript;
-	}
-	
-		/**
-	 * Outputs (via some echo) the complete HTML page by assembling all its elements
-	 */
-    public function output()
-    {
-		//$this->set_base($this->m_sRootUrl.'pages/');
-        if (count($this->m_aReadyScripts)>0)
-        {
-			$this->add_script("\$(document).ready(function() {\n".implode("\n", $this->m_aReadyScripts)."\n});");
-		}
-		parent::output();
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class NiceWebPage
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+/**
+ * Web page with some associated CSS and scripts (jquery) for a fancier display
+ */
+class NiceWebPage extends WebPage
+{
+	var $m_aReadyScripts;
+	var $m_sRootUrl;
+	
+    public function __construct($s_title, $bPrintable = false)
+    {
+        parent::__construct($s_title, $bPrintable);
+		$this->m_aReadyScripts = array();
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.12.4.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
+		// table sorting
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/latinise/latinise.min.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
+
+	    $this->add_dict_entries('UI:Combo');
+
+	    $this->add_ready_script(
+<<< EOF
+	//add new widget called TruncatedList to properly display truncated lists when they are sorted
+	$.tablesorter.addWidget({ 
+		// 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');
+			// 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');
+		} 
+	});
+	$("table.listResults").tableHover(); // hover tables
+EOF
+		);
+		$this->add_saas("css/light-grey.scss");
+
+		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
+     	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
+    	$sAbsURLModulesRoot = addslashes($this->GetAbsoluteUrlModulesRoot());
+    	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
+
+		$sAppContext = addslashes($this->GetApplicationContext());
+
+		$this->add_script(
+<<<EOF
+function GetAbsoluteUrlAppRoot()
+{
+	return '$sAbsURLAppRoot';
+}
+
+function GetAbsoluteUrlModulesRoot()
+{
+	return '$sAbsURLModulesRoot';
+}
+
+function GetAbsoluteUrlModulePage(sModule, sPage, aArguments)
+{
+	// aArguments is optional, it default to an empty hash
+	aArguments = typeof aArguments !== 'undefined' ? aArguments : {};
+
+	var sUrl = '$sAbsURLAppRoot'+'pages/exec.php?exec_module='+sModule+'&exec_page='+sPage+'&exec_env='+'$sEnvironment';
+	for (var sArgName in aArguments)
+	{
+		if (aArguments.hasOwnProperty(sArgName))
+		{
+			sUrl = sUrl + '&'+sArgName+'='+aArguments[sArgname];
+		}
+	}
+	return sUrl;
+}
+
+function AddAppContext(sURL)
+{
+	var sContext = '$sAppContext';
+	if (sContext.length > 0)
+	{
+		if (sURL.indexOf('?') == -1)
+		{
+			return sURL+'?'+sContext;
+		}				
+		return sURL+'&'+sContext;
+	}
+	return sURL;
+}
+EOF
+		);
+	}
+	
+    public function SetRootUrl($sRootUrl)
+    {
+    	$this->m_sRootUrl = $sRootUrl;
+    }
+    
+	public function small_p($sText)
+	{
+		$this->add("<p style=\"font-size:smaller\">$sText</p>\n");
+	}
+
+	public function GetAbsoluteUrlAppRoot()
+	{
+		return utils::GetAbsoluteUrlAppRoot();
+	}
+
+	public function GetAbsoluteUrlModulesRoot()
+	{
+		return utils::GetAbsoluteUrlModulesRoot();
+	}
+
+	function GetApplicationContext()
+	{
+		$oAppContext = new ApplicationContext();
+		return $oAppContext->GetForLink();
+	}
+
+	// By Rom, used by CSVImport and Advanced search
+	public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
+	{
+		// $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>";
+			}
+		}
+		ksort($aValidClasses);
+		$this->add(implode("\n", $aValidClasses));
+		
+		$this->add("</select>");
+	}
+
+	// By Rom, used by Advanced search
+	public function add_select($aChoices, $sName, $sDefaultValue, $iWidthPx)
+	{
+		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
+		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("</select>");
+	}
+	
+	public function add_ready_script($sScript)
+	{
+		$this->m_aReadyScripts[] = $sScript;
+	}
+	
+		/**
+	 * Outputs (via some echo) the complete HTML page by assembling all its elements
+	 */
+    public function output()
+    {
+		//$this->set_base($this->m_sRootUrl.'pages/');
+        if (count($this->m_aReadyScripts)>0)
+        {
+			$this->add_script("\$(document).ready(function() {\n".implode("\n", $this->m_aReadyScripts)."\n});");
+		}
+		parent::output();
+	}
+}
+
+?>

application/portalwebpage.class.inc.php

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

application/query.class.inc.php

@@ -1,141 +1,141 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Event and derived
- * Application internal events
- * There is also a file log 
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-abstract class Query extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_query",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class QueryOQL extends Query
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_query_oql",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
-		
-		if (!$bEditMode)
-		{
-			$sFields = trim($this->Get('fields'));
-			$bExportV1Recommended = ($sFields == '');
-			if ($bExportV1Recommended)
-			{
-				$oFieldAttDef = MetaModel::GetAttributeDef('QueryOQL', 'fields');
-				$oPage->add('<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:Query:UrlV1', $oFieldAttDef->GetLabel()).'</div></div>');
-				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
-			}
-			else 
-			{
-				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
-			}
-			$sOql = $this->Get('oql');
-			$sMessage = null;
-			try
-			{
-				$oSearch = DBObjectSearch::FromOQL($sOql);
-				$aParameters = $oSearch->GetQueryParams();
-				foreach($aParameters as $sParam => $val)
-				{
-					$sUrl .= '&arg_'.$sParam.'=["'.$sParam.'"]';
-				}
-
-				$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');
-
-				if (count($aParameters) == 0)
-				{
-					$oBlock = new DisplayBlock($oSearch, 'list');
-					$aExtraParams = array(
-						//'menu' => $sShowMenu,
-						'table_id' => 'query_preview_'.$this->getKey(),
-					);
-					$sBlockId = 'block_query_preview_'.$this->GetKey(); // make a unique id (edition occuring in the same DOM)
-					$oBlock->Display($oPage, $sBlockId, $aExtraParams);
-				}
-			}
-			catch (OQLException $e)
-			{
-				$sMessage = '<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</div></div>';
-				$oPage->p($sMessage);
-			}
-		}
-		return $aFieldsMap;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Event and derived
+ * Application internal events
+ * There is also a file log 
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+abstract class Query extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_query",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class QueryOQL extends Query
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_query_oql",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
+	}
+
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		
+		if (!$bEditMode)
+		{
+			$sFields = trim($this->Get('fields'));
+			$bExportV1Recommended = ($sFields == '');
+			if ($bExportV1Recommended)
+			{
+				$oFieldAttDef = MetaModel::GetAttributeDef('QueryOQL', 'fields');
+				$oPage->add('<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:Query:UrlV1', $oFieldAttDef->GetLabel()).'</div></div>');
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			}
+			else 
+			{
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
+			}
+			$sOql = $this->Get('oql');
+			$sMessage = null;
+			try
+			{
+				$oSearch = DBObjectSearch::FromOQL($sOql);
+				$aParameters = $oSearch->GetQueryParams();
+				foreach($aParameters as $sParam => $val)
+				{
+					$sUrl .= '&arg_'.$sParam.'=["'.$sParam.'"]';
+				}
+
+				$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');
+
+				if (count($aParameters) == 0)
+				{
+					$oBlock = new DisplayBlock($oSearch, 'list');
+					$aExtraParams = array(
+						//'menu' => $sShowMenu,
+						'table_id' => 'query_preview_'.$this->getKey(),
+					);
+					$sBlockId = 'block_query_preview_'.$this->GetKey(); // make a unique id (edition occuring in the same DOM)
+					$oBlock->Display($oPage, $sBlockId, $aExtraParams);
+				}
+			}
+			catch (OQLException $e)
+			{
+				$sMessage = '<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</div></div>';
+				$oPage->p($sMessage);
+			}
+		}
+		return $aFieldsMap;
+	}
+}
+
+?>

application/shortcut.class.inc.php

@@ -1,338 +1,338 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Shortcut and derived
- * Shortcuts of any kind
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-abstract class Shortcut extends DBObject implements iDisplay
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "gui,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_shortcut",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("context", array("allowed_values"=>null, "sql"=>"context", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'context')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	abstract public function RenderContent(WebPage $oPage, $aExtraParams = array());
-
-	protected function OnInsert()
-	{
-		$this->Set('user_id', UserRights::GetUserId());
-	}
-
-	public function StartRenameDialog($oPage)
-	{
-		$oPage->add('<div id="shortcut_rename_dlg">');
-
-		$oForm = new DesignerForm();
-		$sDefault = $this->Get('name');
-		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
-		$oField->SetMandatory(true);
-		$oForm->AddField($oField);
-		$oForm->Render($oPage);
-		$oPage->add('</div>');
-		
-		$sDialogTitle = Dict::S('UI:ShortcutRenameDlg:Title');
-		$sOkButtonLabel = Dict::S('UI:Button:Ok');
-		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-		$iShortcut = $this->GetKey();
-		
-		$oPage->add_ready_script(
-<<<EOF
-function ShortcutRenameOK() 
-{
-	var oForm = $(this).find('form');
-	var sFormId = oForm.attr('id');
-	var oParams = null;
-	var aErrors = ValidateForm(sFormId, false);
-	if (aErrors.length == 0)
-	{
-		oParams = ReadFormParams(sFormId);
-	}
-	oParams.operation = 'shortcut_rename_go';
-	oParams.id = $iShortcut;
-	var me = $(this);
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
-		me.dialog( "close" );
-		me.remove();
-		$('body').append(data);
-	});
-}
-
-$('#shortcut_rename_dlg form').bind('submit', function() { return false; });
-
-$('#shortcut_rename_dlg').dialog({
-	width: 400,
-	modal: true,
-	title: '$sDialogTitle',
-	buttons: [
-	{ text: "$sOkButtonLabel", click: ShortcutRenameOK},
-	{ text: "$sCancelButtonLabel", click: function() {
-		$(this).dialog( "close" ); $(this).remove();
-	} },
-	],
-	close: function() { $(this).remove(); }
-});
-EOF
-		);
-	}
-
-	// Minimual implementation of iDisplay: to make the shortcut be listable
-	//
-	public static function MapContextParam($sContextParam)
-	{
-		return (($sContextParam == 'menu') ? null : $sContextParam);
-	}
-
-	public function GetHilightClass()
-	{
-		return HILIGHT_CLASS_NONE;
-	}
-
-	public static function GetUIPage()
-	{
-		return '';
-	}
-
-	function DisplayDetails(WebPage $oPage, $bEditMode = false)
-	{
-	}
-
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		return array();
-	}
-	// End of the minimal implementation of iDisplay
-}
-
-class ShortcutOQL extends Shortcut
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "gui,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_shortcut_oql",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("auto_reload", array("allowed_values"=>new ValueSetEnum('none,custom'), "sql"=>"auto_reload", "default_value"=>"none", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("auto_reload_sec", array("allowed_values"=>null, "sql"=>"auto_reload_sec", "default_value"=>60, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'context', 'oql')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		$oPage->set_title($this->Get('name'));
-
-		switch($this->Get('auto_reload'))
-		{
-		case 'custom':
-			$iRate = (int)$this->Get('auto_reload_sec');
-			if ($iRate > 0)
-			{
-				// Must a string otherwise it can be evaluated to 'true' and defaults to "standard" refresh rate!
-				$aExtraParams['auto_reload'] = (string)$iRate;
-			}
-			break;
-
-		default:
-		case 'none':
-		}
-
-		$bSearchPane = true;
-		$bSearchOpen = false;
-		try
-		{
-			OQLMenuNode::RenderOQLSearch($this->Get('oql'), $this->Get('name'), 'shortcut_'.$this->GetKey(), $bSearchPane, $bSearchOpen, $oPage, $aExtraParams, true);
-		}
-		catch (Exception $e)
-		{
-			throw new Exception("The OQL shortcut '".$this->Get('name')."' (id: ".$this->GetKey().") could not be displayed: ".$e->getMessage());
-		}
-			
-	}
-
-	public function CloneTableSettings($sTableSettings)
-	{
-		$aTableSettings = json_decode($sTableSettings, true);
-
-		$oFilter = DBObjectSearch::FromOQL($this->Get('oql'));
-		$oCustomSettings = new DataTableSettings($oFilter->GetSelectedClasses());
-		$oCustomSettings->iDefaultPageSize = $aTableSettings['iPageSize'];
-		$oCustomSettings->aColumns = $aTableSettings['oColumns'];
-		$oCustomSettings->Save('shortcut_'.$this->GetKey());
-	}
-
-	public static function GetCreationForm($sOQL = null, $sTableSettings = null)
-	{
-		$oForm = new DesignerForm();
-
-		// Find a unique default name
-		// -> The class of the query + an index if necessary
-		if ($sOQL == null)
-		{
-			$sDefault = '';
-		}
-		else
-		{
-			$oBMSearch = new DBObjectSearch('Shortcut');
-			$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-			$oBMSet = new DBObjectSet($oBMSearch);
-			$aNames = $oBMSet->GetColumnAsArray('name');
-	 		$oSearch = DBObjectSearch::FromOQL($sOQL);
-			$sDefault = utils::MakeUniqueName($oSearch->GetClass(), $aNames);
-		}
-
-		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
-		$oField->SetMandatory(true);
-		$oForm->AddField($oField);
-
-		/*
-		$oField = new DesignerComboField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), 'none');
-		$oAttDef = MetaModel::GetAttributeDef(__class__, 'auto_reload');
-		$oField->SetAllowedValues($oAttDef->GetAllowedValues());
-		$oField->SetMandatory(true);
-		$oForm->AddField($oField);
-		*/
-		$oField = new DesignerBooleanField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), false);
-		$oForm->AddField($oField);
-
-		$oField = new DesignerIntegerField('auto_reload_sec', Dict::S('Class:ShortcutOQL/Attribute:auto_reload_sec'), MetaModel::GetConfig()->GetStandardReloadInterval());
-		$oField->SetBoundaries(MetaModel::GetConfig()->Get('min_reload_interval'), null); // no upper limit
-		$oField->SetMandatory(false);
-		$oForm->AddField($oField);
-
-		$oField = new DesignerHiddenField('oql', '', $sOQL);
-		$oForm->AddField($oField);
-
-		$oField = new DesignerHiddenField('table_settings', '', $sTableSettings);
-		$oForm->AddField($oField);
-
-		return $oForm;
-	}
-
-	public static function GetCreationDlgFromOQL($oPage, $sOQL, $sTableSettings)
-	{
-		$oPage->add('<div id="shortcut_creation_dlg">');
-
-		$oForm = self::GetCreationForm($sOQL, $sTableSettings);
-
-		$oForm->Render($oPage);
-		$oPage->add('</div>');
-		
-		$sDialogTitle = Dict::S('UI:ShortcutListDlg:Title');
-		$sOkButtonLabel = Dict::S('UI:Button:Ok');
-		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-		
-		$oAppContext = new ApplicationContext();
-		$sContext = $oAppContext->GetForLink();
-
-		$sRateTitle = addslashes(Dict::Format('Class:ShortcutOQL/Attribute:auto_reload_sec/tip', MetaModel::GetConfig()->Get('min_reload_interval')));
-
-		$oPage->add_ready_script(
-<<<EOF
-
-// Note: the title gets deleted by the validation mechanism
-$("#attr_auto_reload_sec").tooltip({items: 'input', content: '$sRateTitle'});
-$("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
-
-$('#attr_auto_reload').change( function(ev) {
-	$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
-} );
-
-function ShortcutCreationOK() 
-{
-	var oForm = $('#shortcut_creation_dlg form');
-	var sFormId = oForm.attr('id');
-	var oParams = null;
-	var aErrors = ValidateForm(sFormId, false);
-	if (aErrors.length == 0)
-	{
-		oParams = ReadFormParams(sFormId);
-	}
-	oParams.operation = 'shortcut_list_create';
-	var me = $('#shortcut_creation_dlg');
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?$sContext', oParams, function(data) {
-		me.dialog( "close" );
-		me.remove();
-		$('body').append(data);
-	});
-}
-
-$('#shortcut_creation_dlg form').bind('submit', function() { ShortcutCreationOK(); return false; });
-
-$('#shortcut_creation_dlg').dialog({
-	width: 400,
-	modal: true,
-	title: '$sDialogTitle',
-	buttons: [
-	{ text: "$sOkButtonLabel", click: ShortcutCreationOK },
-	{ text: "$sCancelButtonLabel", click: function() {
-		$(this).dialog( "close" ); $(this).remove();
-	} },
-	],
-	close: function() { $(this).remove(); }
-});
-EOF
-		);
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Shortcut and derived
+ * Shortcuts of any kind
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+abstract class Shortcut extends DBObject implements iDisplay
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "gui,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_shortcut",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("context", array("allowed_values"=>null, "sql"=>"context", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'context')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	abstract public function RenderContent(WebPage $oPage, $aExtraParams = array());
+
+	protected function OnInsert()
+	{
+		$this->Set('user_id', UserRights::GetUserId());
+	}
+
+	public function StartRenameDialog($oPage)
+	{
+		$oPage->add('<div id="shortcut_rename_dlg">');
+
+		$oForm = new DesignerForm();
+		$sDefault = $this->Get('name');
+		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
+		$oField->SetMandatory(true);
+		$oForm->AddField($oField);
+		$oForm->Render($oPage);
+		$oPage->add('</div>');
+		
+		$sDialogTitle = Dict::S('UI:ShortcutRenameDlg:Title');
+		$sOkButtonLabel = Dict::S('UI:Button:Ok');
+		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
+		$iShortcut = $this->GetKey();
+		
+		$oPage->add_ready_script(
+<<<EOF
+function ShortcutRenameOK() 
+{
+	var oForm = $(this).find('form');
+	var sFormId = oForm.attr('id');
+	var oParams = null;
+	var aErrors = ValidateForm(sFormId, false);
+	if (aErrors.length == 0)
+	{
+		oParams = ReadFormParams(sFormId);
+	}
+	oParams.operation = 'shortcut_rename_go';
+	oParams.id = $iShortcut;
+	var me = $(this);
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
+		me.dialog( "close" );
+		me.remove();
+		$('body').append(data);
+	});
+}
+
+$('#shortcut_rename_dlg form').bind('submit', function() { return false; });
+
+$('#shortcut_rename_dlg').dialog({
+	width: 400,
+	modal: true,
+	title: '$sDialogTitle',
+	buttons: [
+	{ text: "$sOkButtonLabel", click: ShortcutRenameOK},
+	{ text: "$sCancelButtonLabel", click: function() {
+		$(this).dialog( "close" ); $(this).remove();
+	} },
+	],
+	close: function() { $(this).remove(); }
+});
+EOF
+		);
+	}
+
+	// Minimual implementation of iDisplay: to make the shortcut be listable
+	//
+	public static function MapContextParam($sContextParam)
+	{
+		return (($sContextParam == 'menu') ? null : $sContextParam);
+	}
+
+	public function GetHilightClass()
+	{
+		return HILIGHT_CLASS_NONE;
+	}
+
+	public static function GetUIPage()
+	{
+		return '';
+	}
+
+	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+	}
+
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		return array();
+	}
+	// End of the minimal implementation of iDisplay
+}
+
+class ShortcutOQL extends Shortcut
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "gui,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_shortcut_oql",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("auto_reload", array("allowed_values"=>new ValueSetEnum('none,custom'), "sql"=>"auto_reload", "default_value"=>"none", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("auto_reload_sec", array("allowed_values"=>null, "sql"=>"auto_reload_sec", "default_value"=>60, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'context', 'oql')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		$oPage->set_title($this->Get('name'));
+
+		switch($this->Get('auto_reload'))
+		{
+		case 'custom':
+			$iRate = (int)$this->Get('auto_reload_sec');
+			if ($iRate > 0)
+			{
+				// Must a string otherwise it can be evaluated to 'true' and defaults to "standard" refresh rate!
+				$aExtraParams['auto_reload'] = (string)$iRate;
+			}
+			break;
+
+		default:
+		case 'none':
+		}
+
+		$bSearchPane = true;
+		$bSearchOpen = true;
+		try
+		{
+			OQLMenuNode::RenderOQLSearch($this->Get('oql'), $this->Get('name'), 'shortcut_'.$this->GetKey(), $bSearchPane, $bSearchOpen, $oPage, $aExtraParams, true);
+		}
+		catch (Exception $e)
+		{
+			throw new Exception("The OQL shortcut '".$this->Get('name')."' (id: ".$this->GetKey().") could not be displayed: ".$e->getMessage());
+		}
+			
+	}
+
+	public function CloneTableSettings($sTableSettings)
+	{
+		$aTableSettings = json_decode($sTableSettings, true);
+
+		$oFilter = DBObjectSearch::FromOQL($this->Get('oql'));
+		$oCustomSettings = new DataTableSettings($oFilter->GetSelectedClasses());
+		$oCustomSettings->iDefaultPageSize = $aTableSettings['iPageSize'];
+		$oCustomSettings->aColumns = $aTableSettings['oColumns'];
+		$oCustomSettings->Save('shortcut_'.$this->GetKey());
+	}
+
+	public static function GetCreationForm($sOQL = null, $sTableSettings = null)
+	{
+		$oForm = new DesignerForm();
+
+		// Find a unique default name
+		// -> The class of the query + an index if necessary
+		if ($sOQL == null)
+		{
+			$sDefault = '';
+		}
+		else
+		{
+			$oBMSearch = new DBObjectSearch('Shortcut');
+			$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+			$oBMSet = new DBObjectSet($oBMSearch);
+			$aNames = $oBMSet->GetColumnAsArray('name');
+	 		$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$sDefault = utils::MakeUniqueName($oSearch->GetClass(), $aNames);
+		}
+
+		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
+		$oField->SetMandatory(true);
+		$oForm->AddField($oField);
+
+		/*
+		$oField = new DesignerComboField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), 'none');
+		$oAttDef = MetaModel::GetAttributeDef(__class__, 'auto_reload');
+		$oField->SetAllowedValues($oAttDef->GetAllowedValues());
+		$oField->SetMandatory(true);
+		$oForm->AddField($oField);
+		*/
+		$oField = new DesignerBooleanField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), false);
+		$oForm->AddField($oField);
+
+		$oField = new DesignerIntegerField('auto_reload_sec', Dict::S('Class:ShortcutOQL/Attribute:auto_reload_sec'), MetaModel::GetConfig()->GetStandardReloadInterval());
+		$oField->SetBoundaries(MetaModel::GetConfig()->Get('min_reload_interval'), null); // no upper limit
+		$oField->SetMandatory(false);
+		$oForm->AddField($oField);
+
+		$oField = new DesignerHiddenField('oql', '', $sOQL);
+		$oForm->AddField($oField);
+
+		$oField = new DesignerHiddenField('table_settings', '', $sTableSettings);
+		$oForm->AddField($oField);
+
+		return $oForm;
+	}
+
+	public static function GetCreationDlgFromOQL($oPage, $sOQL, $sTableSettings)
+	{
+		$oPage->add('<div id="shortcut_creation_dlg">');
+
+		$oForm = self::GetCreationForm($sOQL, $sTableSettings);
+
+		$oForm->Render($oPage);
+		$oPage->add('</div>');
+		
+		$sDialogTitle = Dict::S('UI:ShortcutListDlg:Title');
+		$sOkButtonLabel = Dict::S('UI:Button:Ok');
+		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
+		
+		$oAppContext = new ApplicationContext();
+		$sContext = $oAppContext->GetForLink();
+
+		$sRateTitle = addslashes(Dict::Format('Class:ShortcutOQL/Attribute:auto_reload_sec/tip', MetaModel::GetConfig()->Get('min_reload_interval')));
+
+		$oPage->add_ready_script(
+<<<EOF
+
+// Note: the title gets deleted by the validation mechanism
+$("#attr_auto_reload_sec").tooltip({items: 'input', content: '$sRateTitle'});
+$("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
+
+$('#attr_auto_reload').change( function(ev) {
+	$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
+} );
+
+function ShortcutCreationOK() 
+{
+	var oForm = $('#shortcut_creation_dlg form');
+	var sFormId = oForm.attr('id');
+	var oParams = null;
+	var aErrors = ValidateForm(sFormId, false);
+	if (aErrors.length == 0)
+	{
+		oParams = ReadFormParams(sFormId);
+	}
+	oParams.operation = 'shortcut_list_create';
+	var me = $('#shortcut_creation_dlg');
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?$sContext', oParams, function(data) {
+		me.dialog( "close" );
+		me.remove();
+		$('body').append(data);
+	});
+}
+
+$('#shortcut_creation_dlg form').bind('submit', function() { ShortcutCreationOK(); return false; });
+
+$('#shortcut_creation_dlg').dialog({
+	width: 400,
+	modal: true,
+	title: '$sDialogTitle',
+	buttons: [
+	{ text: "$sOkButtonLabel", click: ShortcutCreationOK },
+	{ text: "$sCancelButtonLabel", click: function() {
+		$(this).dialog( "close" ); $(this).remove();
+	} },
+	],
+	close: function() { $(this).remove(); }
+});
+EOF
+		);
+	}
+}
+
+?>

application/startup.inc.php

@@ -1,49 +1,62 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * File to include to initialize the datamodel in memory
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/core/cmdbobject.class.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/core/contexttag.class.inc.php');
-session_name('itop-'.md5(APPROOT));
-session_start();
-$sSwitchEnv = utils::ReadParam('switch_env', null);
-if (($sSwitchEnv != null) && (file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE)))
-{
-	$_SESSION['itop_env'] = $sSwitchEnv;
-	$sEnv = $sSwitchEnv;
-	// TODO: reset the credentials as well ??
-}
-else if (isset($_SESSION['itop_env']))
-{
-	$sEnv = $_SESSION['itop_env'];
-}
-else
-{
-	$sEnv = ITOP_DEFAULT_ENV;
-	$_SESSION['itop_env'] = ITOP_DEFAULT_ENV;
-}
-$sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
-MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv);
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * File to include to initialize the datamodel in memory
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/core/cmdbobject.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/core/contexttag.class.inc.php');
+session_name('itop-'.md5(APPROOT));
+session_start();
+$sSwitchEnv = utils::ReadParam('switch_env', null);
+$bAllowCache = true;
+if (($sSwitchEnv != null) && (file_exists(APPCONF.$sSwitchEnv.'/'.ITOP_CONFIG_FILE)) && isset($_SESSION['itop_env']) && ($_SESSION['itop_env'] !== $sSwitchEnv))
+{
+	$_SESSION['itop_env'] = $sSwitchEnv;
+	$sEnv = $sSwitchEnv;
+    $bAllowCache = false;
+    // Reset the opcache since otherwise the PHP "model" files may still be cached !!
+    if (function_exists('opcache_reset'))
+    {
+        // Zend opcode cache
+        opcache_reset();
+    }
+    if (function_exists('apc_clear_cache'))
+    {
+        // APC(u) cache
+        apc_clear_cache();
+    }
+	// TODO: reset the credentials as well ??
+}
+else if (isset($_SESSION['itop_env']))
+{
+	$sEnv = $_SESSION['itop_env'];
+}
+else
+{
+	$sEnv = ITOP_DEFAULT_ENV;
+	$_SESSION['itop_env'] = ITOP_DEFAULT_ENV;
+}
+$sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
+MetaModel::Startup($sConfigFile, false /* $bModelOnly */, $bAllowCache, false /* $bTraceSourceFiles */, $sEnv);

application/template.class.inc.php

@@ -1,427 +1,427 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class DisplayTemplate
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/displayblock.class.inc.php');
-/**
- * This class manages the special template format used internally to build the iTop web pages
- */
-class DisplayTemplate
-{
-	protected $m_sTemplate;
-	protected $m_aTags;
-	static protected $iBlockCount = 0;
-	
-	public function __construct($sTemplate)
-	{
-		$this->m_aTags = array (
-			'itopblock',
-			'itopcheck',
-			'itoptabs',
-			'itoptab',
-			'itoptoggle',
-			'itopstring',
-			'sqlblock'
-		);
-		$this->m_sTemplate = $sTemplate;
-	}
-	
-	public function Render(WebPage $oPage, $aParams = array())
-	{
-		$this->m_sTemplate = MetaModel::ApplyParams($this->m_sTemplate, $aParams);
-		$iStart = 0;
-		$iEnd = strlen($this->m_sTemplate);
-		$iCount = 0;
-		$iBeforeTagPos = $iStart;
-		$iAfterTagPos = $iStart;
-		while($sTag = $this->GetNextTag($iStart, $iEnd))
-		{
-			$sContent = $this->GetTagContent($sTag, $iStart, $iEnd);
-			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
-			$sOuterTag = substr($this->m_sTemplate, $iStart, $iAfterTagPos - $iStart);
-			$oPage->add(substr($this->m_sTemplate, $iBeforeTagPos, $iStart - $iBeforeTagPos));
-			if ($sTag == DisplayBlock::TAG_BLOCK)
-			{
-				try
-				{
-					$oBlock = DisplayBlock::FromTemplate($sOuterTag);
-					if (is_object($oBlock))
-					{
-						$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
-			{
-				$aAttributes = $this->GetTagAttributes($sTag, $iStart, $iEnd);
-				//$oPage->p("Tag: $sTag - ($iStart, $iEnd)");
-				$this->RenderTag($oPage, $sTag, $aAttributes, $sContent);
-	
-			}
-			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
-			$iBeforeTagPos = $iAfterTagPos;
-			$iStart = $iEnd;
-			$iEnd = strlen($this->m_sTemplate); 
-			$iCount++;
-		}
-		$oPage->add(substr($this->m_sTemplate, $iAfterTagPos));
-	}
-	
-	public function GetNextTag(&$iStartPos, &$iEndPos)
-	{
-		$iChunkStartPos = $iStartPos;
-		$sNextTag = null;
-		$iStartPos = $iEndPos;
-		foreach($this->m_aTags as $sTag)
-		{
-			// Search for the opening tag
-			$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.' ', $iChunkStartPos);
-			if ($iOpeningPos === false)
-			{
-				$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.'>', $iChunkStartPos);
-			}
-			if ($iOpeningPos !== false)
-			{
-				$iClosingPos = stripos($this->m_sTemplate, '</'.$sTag.'>', $iOpeningPos);
-			}
-			if ( ($iOpeningPos !== false) && ($iClosingPos !== false))
-			{
-				if ($iOpeningPos < $iStartPos)
-				{
-					// This is the next tag
-					$iStartPos = $iOpeningPos;
-					$iEndPos = $iClosingPos;
-					$sNextTag = $sTag;
-				}
-			}
-		}
-		return $sNextTag;
-	}
-	
-	public function GetTagContent($sTag, $iStartPos, $iEndPos)
-	{
-		$sContent  = "";
-		$iContentStart = strpos($this->m_sTemplate, '>', $iStartPos); // Content of tag start immediatly after the first closing bracket
-		if ($iContentStart !== false)
-		{
-			$sContent = substr($this->m_sTemplate, 1+$iContentStart, $iEndPos - $iContentStart - 1);
-		}
-		return $sContent;
-	}
-
-	public function GetTagAttributes($sTag, $iStartPos, $iEndPos)
-	{
-		$aAttr  = array();
-		$iAttrStart = strpos($this->m_sTemplate, ' ', $iStartPos); // Attributes start just after the first space
-		$iAttrEnd = strpos($this->m_sTemplate, '>', $iStartPos); // Attributes end just before the first closing bracket
-		if ( ($iAttrStart !== false) && ($iAttrEnd !== false) && ($iAttrEnd > $iAttrStart))
-		{
-			$sAttributes = substr($this->m_sTemplate, 1+$iAttrStart, $iAttrEnd - $iAttrStart - 1);
-			$aAttributes = explode(' ', $sAttributes);
-			foreach($aAttributes as $sAttr)
-			{
-				if ( preg_match('/(.+) *= *"(.+)"$/', $sAttr, $aMatches) )
-				{
-					$aAttr[strtolower($aMatches[1])] = $aMatches[2];
-				}
-			}
-		}
-		return $aAttr;
-	}
-	
-	protected function RenderTag($oPage, $sTag, $aAttributes, $sContent)
-	{
-		static $iTabContainerCount = 0;
-		switch($sTag)
-		{
-			case 'itoptabs':
-				$oPage->AddTabContainer('Tabs_'.$iTabContainerCount);
-				$oPage->SetCurrentTabContainer('Tabs_'.$iTabContainerCount);
-				$iTabContainerCount++;
-				//$oPage->p('Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
-				$oTemplate = new DisplayTemplate($sContent);
-				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				$oPage->SetCurrentTabContainer('');
-			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'])));
-				$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, ENT_QUOTES, 'UTF-8').'</pre>');
-				$oPage->SetCurrentTab('');
-			break;
-			
-			case 'itoptoggle':
-				$sName = isset($aAttributes['name']) ? $aAttributes['name'] : 'Tagada';
-				$bOpen = isset($aAttributes['open']) ? $aAttributes['open'] : true;
-				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
-				$oTemplate = new DisplayTemplate($sContent);
-				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
-				$oPage->EndCollapsibleSection();
-			break;
-			
-			case 'itopstring':
-				$oPage->add(Dict::S($sContent));
-			break;
-			
-			case 'sqlblock':
-				$oBlock = SqlBlock::FromTemplate($sContent);
-				$oBlock->RenderContent($oPage);
-			break;
-			
-			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
-				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
-			break;
-			
-			default:
-				// Unknown tag, just ignore it or now -- output an HTML comment
-				$oPage->add("<!-- unsupported tag: $sTag -->");
-		}
-	}
-	
-	/**
-	 * Unit test
-	 */
-	static public function UnitTest()
-	{
-		require_once(APPROOT.'/application/startup.inc.php');
-		require_once(APPROOT."/application/itopwebpage.class.inc.php");
-		
-		$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>
-		</div>
-		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
-		<itoptabs>
-			<itoptab name="Interfaces">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</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>
-			</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>
-			</itoptab>
-		</itoptabs>';
-		
-		$oPage = new iTopWebPage('Unit Test');
-		//$oPage->add("Template content: <pre>".htmlentities($sTemplate, ENT_QUOTES, 'UTF-8')."</pre>\n");
-		$oTemplate = new DisplayTemplate($sTemplate);
-		$oTemplate->Render($oPage, array('class'=>'Network device','pkey'=> 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3));
-		$oPage->output();
-	}
-}
-
-/**
- * Special type of template for displaying the details of an object
- * On top of the defaut 'blocks' managed by the parent class, the following placeholders
- * are available in such a template:
- * $attribute_code$ An attribute of the object (in edit mode this is the input for the attribute)
- * $attribute_code->label()$ The label of an attribute
- * $PlugIn:plugInClass->properties()$ The ouput of OnDisplayProperties of the specified plugInClass
- */
-class ObjectDetailsTemplate extends DisplayTemplate
-{
-	public function __construct($sTemplate, $oObj, $sFormPrefix = '')
-	{
-		parent::__construct($sTemplate);
-		$this->m_oObj = $oObj;
-		$this->m_sPrefix = $sFormPrefix;
-	}
-	
-	public function Render(WebPage $oPage, $aParams = array(), $bEditMode = false)
-	{
-		$sStateAttCode = MetaModel :: GetStateAttributeCode(get_class($this->m_oObj));
-		$aTemplateFields = array();
-		preg_match_all('/\\$this->([a-z0-9_]+)\\$/', $this->m_sTemplate, $aMatches);
-		foreach ($aMatches[1] as $sAttCode)
-		{
-			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
-			{
-				$aTemplateFields[] = $sAttCode;
-			}
-			else
-			{
-				$aParams['this->'.$sAttCode] = "<!--Unknown attribute: $sAttCode-->";					
-			}
-		}
-		preg_match_all('/\\$this->field\\(([a-z0-9_]+)\\)\\$/', $this->m_sTemplate, $aMatches);
-		foreach ($aMatches[1] as $sAttCode)
-		{
-			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
-			{
-				$aTemplateFields[] = $sAttCode;
-			}
-			else
-			{
-				$aParams['this->field('.$sAttCode.')'] = "<!--Unknown attribute: $sAttCode-->";
-			}
-		}
-		$aFieldsComments = (isset($aParams['fieldsComments'])) ? $aParams['fieldsComments'] : array();
-		$aFieldsMap = array();
-
-		$sClass = get_class($this->m_oObj);
-		// Renders the fields used in the template
-		foreach(MetaModel::ListAttributeDefs(get_class($this->m_oObj)) as $sAttCode => $oAttDef)
-		{
-			$aParams['this->label('.$sAttCode.')'] = $oAttDef->GetLabel();
-			$aParams['this->comments('.$sAttCode.')'] = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
-			$iInputId = '2_'.$sAttCode; // TODO: generate a real/unique prefix...
-			if (in_array($sAttCode, $aTemplateFields))
-			{
-				if ($this->m_oObj->IsNew())
-				{
-					$iFlags = $this->m_oObj->GetInitialStateAttributeFlags($sAttCode);
-				}
-				else
-				{
-				$iFlags = $this->m_oObj->GetAttributeFlags($sAttCode);
-				}
-				if (($iFlags & OPT_ATT_MANDATORY) && $this->m_oObj->IsNew())
-				{
-					$iFlags = $iFlags & ~OPT_ATT_READONLY; // Mandatory fields cannot be read-only when creating an object
-				}
-				
-				if ((!$oAttDef->IsWritable()) || ($sStateAttCode == $sAttCode))
-				{
-					$iFlags = $iFlags | OPT_ATT_READONLY;
-				}
-
-				if ($iFlags & OPT_ATT_HIDDEN)
-				{
-					$aParams['this->label('.$sAttCode.')'] = '';
-					$aParams['this->field('.$sAttCode.')'] = '';
-					$aParams['this->comments('.$sAttCode.')'] = '';
-					$aParams['this->'.$sAttCode] = '';
-				}
-				else
-				{
-					if ($bEditMode && ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE)))
-					{
-						// Check if the attribute is not read-only because of a synchro...
-						$aReasons = array();
-						$sSynchroIcon = '';
-						if ($iFlags & OPT_ATT_SLAVE)
-						{
-							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
-							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
-							$sTip = '';
-							foreach($aReasons as $aRow)
-							{
-								$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
-								$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
-								$sTip .= "<div class='synchro-source'>";
-								$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
-								$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
-							}
-							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
-						}
-	
-						// Attribute is read-only
-						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
-						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.htmlentities($this->m_oObj->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/></span>';
-						$aFieldsMap[$sAttCode] = $iInputId;
-						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
-					}
-	
-					if ($bEditMode && !($iFlags & OPT_ATT_READONLY)) //TODO: check the data synchro status...
-					{
-						$aParams['this->field('.$sAttCode.')'] = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
-						$this->m_oObj->Get($sAttCode),
-						$this->m_oObj->GetEditValue($sAttCode),
-						$iInputId, // InputID
-						'',
-						$iFlags,
-						array('this' => $this->m_oObj) // aArgs
-					).'</span>';
-					$aFieldsMap[$sAttCode] = $iInputId;
-				}
-				else 
-				{
-						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
-					}
-					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
-				}
-			}
-		}
-		
-		// Renders the PlugIns used in the template
-		preg_match_all('/\\$PlugIn:([A-Za-z0-9_]+)->properties\\(\\)\\$/', $this->m_sTemplate, $aMatches);
-		$aPlugInProperties = $aMatches[1];
-		foreach($aPlugInProperties as $sPlugInClass)
-		{
-			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
-			if ($oInstance != null) // Safety check...
-			{
-				$offset = $oPage->start_capture();
-				$oInstance->OnDisplayProperties($this->m_oObj, $oPage, $bEditMode);
-				$sContent = $oPage->end_capture($offset);
-				$aParams["PlugIn:{$sPlugInClass}->properties()"]= $sContent;			
-			}
-			else
-			{
-				$aParams["PlugIn:{$sPlugInClass}->properties()"]= "Missing PlugIn: $sPlugInClass";				
-			}			
-		}
-
-		$offset = $oPage->start_capture();
-		parent::Render($oPage, $aParams);
-		$sContent = $oPage->end_capture($offset);
-		// Remove empty table rows in case some attributes are hidden...
-		$sContent = preg_replace('/<tr[^>]*>\s*(<td[^>]*>\s*<\\/td>)+\s*<\\/tr>/im', '', $sContent);
-		$oPage->add($sContent);
-		return $aFieldsMap;
-	}
-}
-
-//DisplayTemplate::UnitTest();
-?>
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class DisplayTemplate
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+/**
+ * This class manages the special template format used internally to build the iTop web pages
+ */
+class DisplayTemplate
+{
+	protected $m_sTemplate;
+	protected $m_aTags;
+	static protected $iBlockCount = 0;
+	
+	public function __construct($sTemplate)
+	{
+		$this->m_aTags = array (
+			'itopblock',
+			'itopcheck',
+			'itoptabs',
+			'itoptab',
+			'itoptoggle',
+			'itopstring',
+			'sqlblock'
+		);
+		$this->m_sTemplate = $sTemplate;
+	}
+	
+	public function Render(WebPage $oPage, $aParams = array())
+	{
+		$this->m_sTemplate = MetaModel::ApplyParams($this->m_sTemplate, $aParams);
+		$iStart = 0;
+		$iEnd = strlen($this->m_sTemplate);
+		$iCount = 0;
+		$iBeforeTagPos = $iStart;
+		$iAfterTagPos = $iStart;
+		while($sTag = $this->GetNextTag($iStart, $iEnd))
+		{
+			$sContent = $this->GetTagContent($sTag, $iStart, $iEnd);
+			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
+			$sOuterTag = substr($this->m_sTemplate, $iStart, $iAfterTagPos - $iStart);
+			$oPage->add(substr($this->m_sTemplate, $iBeforeTagPos, $iStart - $iBeforeTagPos));
+			if ($sTag == DisplayBlock::TAG_BLOCK)
+			{
+				try
+				{
+					$oBlock = DisplayBlock::FromTemplate($sOuterTag);
+					if (is_object($oBlock))
+					{
+						$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
+			{
+				$aAttributes = $this->GetTagAttributes($sTag, $iStart, $iEnd);
+				//$oPage->p("Tag: $sTag - ($iStart, $iEnd)");
+				$this->RenderTag($oPage, $sTag, $aAttributes, $sContent);
+	
+			}
+			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
+			$iBeforeTagPos = $iAfterTagPos;
+			$iStart = $iEnd;
+			$iEnd = strlen($this->m_sTemplate); 
+			$iCount++;
+		}
+		$oPage->add(substr($this->m_sTemplate, $iAfterTagPos));
+	}
+	
+	public function GetNextTag(&$iStartPos, &$iEndPos)
+	{
+		$iChunkStartPos = $iStartPos;
+		$sNextTag = null;
+		$iStartPos = $iEndPos;
+		foreach($this->m_aTags as $sTag)
+		{
+			// Search for the opening tag
+			$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.' ', $iChunkStartPos);
+			if ($iOpeningPos === false)
+			{
+				$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.'>', $iChunkStartPos);
+			}
+			if ($iOpeningPos !== false)
+			{
+				$iClosingPos = stripos($this->m_sTemplate, '</'.$sTag.'>', $iOpeningPos);
+			}
+			if ( ($iOpeningPos !== false) && ($iClosingPos !== false))
+			{
+				if ($iOpeningPos < $iStartPos)
+				{
+					// This is the next tag
+					$iStartPos = $iOpeningPos;
+					$iEndPos = $iClosingPos;
+					$sNextTag = $sTag;
+				}
+			}
+		}
+		return $sNextTag;
+	}
+	
+	public function GetTagContent($sTag, $iStartPos, $iEndPos)
+	{
+		$sContent  = "";
+		$iContentStart = strpos($this->m_sTemplate, '>', $iStartPos); // Content of tag start immediatly after the first closing bracket
+		if ($iContentStart !== false)
+		{
+			$sContent = substr($this->m_sTemplate, 1+$iContentStart, $iEndPos - $iContentStart - 1);
+		}
+		return $sContent;
+	}
+
+	public function GetTagAttributes($sTag, $iStartPos, $iEndPos)
+	{
+		$aAttr  = array();
+		$iAttrStart = strpos($this->m_sTemplate, ' ', $iStartPos); // Attributes start just after the first space
+		$iAttrEnd = strpos($this->m_sTemplate, '>', $iStartPos); // Attributes end just before the first closing bracket
+		if ( ($iAttrStart !== false) && ($iAttrEnd !== false) && ($iAttrEnd > $iAttrStart))
+		{
+			$sAttributes = substr($this->m_sTemplate, 1+$iAttrStart, $iAttrEnd - $iAttrStart - 1);
+			$aAttributes = explode(' ', $sAttributes);
+			foreach($aAttributes as $sAttr)
+			{
+				if ( preg_match('/(.+) *= *"(.+)"$/', $sAttr, $aMatches) )
+				{
+					$aAttr[strtolower($aMatches[1])] = $aMatches[2];
+				}
+			}
+		}
+		return $aAttr;
+	}
+	
+	protected function RenderTag($oPage, $sTag, $aAttributes, $sContent)
+	{
+		static $iTabContainerCount = 0;
+		switch($sTag)
+		{
+			case 'itoptabs':
+				$oPage->AddTabContainer('Tabs_'.$iTabContainerCount);
+				$oPage->SetCurrentTabContainer('Tabs_'.$iTabContainerCount);
+				$iTabContainerCount++;
+				//$oPage->p('Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
+				$oPage->SetCurrentTabContainer('');
+			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'])));
+				$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, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oPage->SetCurrentTab('');
+			break;
+			
+			case 'itoptoggle':
+				$sName = isset($aAttributes['name']) ? $aAttributes['name'] : 'Tagada';
+				$bOpen = isset($aAttributes['open']) ? $aAttributes['open'] : true;
+				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oPage->EndCollapsibleSection();
+			break;
+			
+			case 'itopstring':
+				$oPage->add(Dict::S($sContent));
+			break;
+			
+			case 'sqlblock':
+				$oBlock = SqlBlock::FromTemplate($sContent);
+				$oBlock->RenderContent($oPage);
+			break;
+			
+			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
+				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
+			break;
+			
+			default:
+				// Unknown tag, just ignore it or now -- output an HTML comment
+				$oPage->add("<!-- unsupported tag: $sTag -->");
+		}
+	}
+	
+	/**
+	 * Unit test
+	 */
+	static public function UnitTest()
+	{
+		require_once(APPROOT.'/application/startup.inc.php');
+		require_once(APPROOT."/application/itopwebpage.class.inc.php");
+		
+		$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>
+		</div>
+		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
+		<itoptabs>
+			<itoptab name="Interfaces">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</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>
+			</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>
+			</itoptab>
+		</itoptabs>';
+		
+		$oPage = new iTopWebPage('Unit Test');
+		//$oPage->add("Template content: <pre>".htmlentities($sTemplate, ENT_QUOTES, 'UTF-8')."</pre>\n");
+		$oTemplate = new DisplayTemplate($sTemplate);
+		$oTemplate->Render($oPage, array('class'=>'Network device','pkey'=> 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3));
+		$oPage->output();
+	}
+}
+
+/**
+ * Special type of template for displaying the details of an object
+ * On top of the defaut 'blocks' managed by the parent class, the following placeholders
+ * are available in such a template:
+ * $attribute_code$ An attribute of the object (in edit mode this is the input for the attribute)
+ * $attribute_code->label()$ The label of an attribute
+ * $PlugIn:plugInClass->properties()$ The ouput of OnDisplayProperties of the specified plugInClass
+ */
+class ObjectDetailsTemplate extends DisplayTemplate
+{
+	public function __construct($sTemplate, $oObj, $sFormPrefix = '')
+	{
+		parent::__construct($sTemplate);
+		$this->m_oObj = $oObj;
+		$this->m_sPrefix = $sFormPrefix;
+	}
+	
+	public function Render(WebPage $oPage, $aParams = array(), $bEditMode = false)
+	{
+		$sStateAttCode = MetaModel :: GetStateAttributeCode(get_class($this->m_oObj));
+		$aTemplateFields = array();
+		preg_match_all('/\\$this->([a-z0-9_]+)\\$/', $this->m_sTemplate, $aMatches);
+		foreach ($aMatches[1] as $sAttCode)
+		{
+			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
+			{
+				$aTemplateFields[] = $sAttCode;
+			}
+			else
+			{
+				$aParams['this->'.$sAttCode] = "<!--Unknown attribute: $sAttCode-->";					
+			}
+		}
+		preg_match_all('/\\$this->field\\(([a-z0-9_]+)\\)\\$/', $this->m_sTemplate, $aMatches);
+		foreach ($aMatches[1] as $sAttCode)
+		{
+			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
+			{
+				$aTemplateFields[] = $sAttCode;
+			}
+			else
+			{
+				$aParams['this->field('.$sAttCode.')'] = "<!--Unknown attribute: $sAttCode-->";
+			}
+		}
+		$aFieldsComments = (isset($aParams['fieldsComments'])) ? $aParams['fieldsComments'] : array();
+		$aFieldsMap = array();
+
+		$sClass = get_class($this->m_oObj);
+		// Renders the fields used in the template
+		foreach(MetaModel::ListAttributeDefs(get_class($this->m_oObj)) as $sAttCode => $oAttDef)
+		{
+			$aParams['this->label('.$sAttCode.')'] = $oAttDef->GetLabel();
+			$aParams['this->comments('.$sAttCode.')'] = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
+			$iInputId = '2_'.$sAttCode; // TODO: generate a real/unique prefix...
+			if (in_array($sAttCode, $aTemplateFields))
+			{
+				if ($this->m_oObj->IsNew())
+				{
+					$iFlags = $this->m_oObj->GetInitialStateAttributeFlags($sAttCode);
+				}
+				else
+				{
+				$iFlags = $this->m_oObj->GetAttributeFlags($sAttCode);
+				}
+				if (($iFlags & OPT_ATT_MANDATORY) && $this->m_oObj->IsNew())
+				{
+					$iFlags = $iFlags & ~OPT_ATT_READONLY; // Mandatory fields cannot be read-only when creating an object
+				}
+				
+				if ((!$oAttDef->IsWritable()) || ($sStateAttCode == $sAttCode))
+				{
+					$iFlags = $iFlags | OPT_ATT_READONLY;
+				}
+
+				if ($iFlags & OPT_ATT_HIDDEN)
+				{
+					$aParams['this->label('.$sAttCode.')'] = '';
+					$aParams['this->field('.$sAttCode.')'] = '';
+					$aParams['this->comments('.$sAttCode.')'] = '';
+					$aParams['this->'.$sAttCode] = '';
+				}
+				else
+				{
+					if ($bEditMode && ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE)))
+					{
+						// Check if the attribute is not read-only because of a synchro...
+						$aReasons = array();
+						$sSynchroIcon = '';
+						if ($iFlags & OPT_ATT_SLAVE)
+						{
+							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
+							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
+							$sTip = '';
+							foreach($aReasons as $aRow)
+							{
+								$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
+								$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
+								$sTip .= "<div class='synchro-source'>";
+								$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
+								$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
+							}
+							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+						}
+	
+						// Attribute is read-only
+						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
+						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.htmlentities($this->m_oObj->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/></span>';
+						$aFieldsMap[$sAttCode] = $iInputId;
+						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
+					}
+	
+					if ($bEditMode && !($iFlags & OPT_ATT_READONLY)) //TODO: check the data synchro status...
+					{
+						$aParams['this->field('.$sAttCode.')'] = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
+						$this->m_oObj->Get($sAttCode),
+						$this->m_oObj->GetEditValue($sAttCode),
+						$iInputId, // InputID
+						'',
+						$iFlags,
+						array('this' => $this->m_oObj) // aArgs
+					).'</span>';
+					$aFieldsMap[$sAttCode] = $iInputId;
+				}
+				else 
+				{
+						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
+					}
+					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
+				}
+			}
+		}
+		
+		// Renders the PlugIns used in the template
+		preg_match_all('/\\$PlugIn:([A-Za-z0-9_]+)->properties\\(\\)\\$/', $this->m_sTemplate, $aMatches);
+		$aPlugInProperties = $aMatches[1];
+		foreach($aPlugInProperties as $sPlugInClass)
+		{
+			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
+			if ($oInstance != null) // Safety check...
+			{
+				$offset = $oPage->start_capture();
+				$oInstance->OnDisplayProperties($this->m_oObj, $oPage, $bEditMode);
+				$sContent = $oPage->end_capture($offset);
+				$aParams["PlugIn:{$sPlugInClass}->properties()"]= $sContent;			
+			}
+			else
+			{
+				$aParams["PlugIn:{$sPlugInClass}->properties()"]= "Missing PlugIn: $sPlugInClass";				
+			}			
+		}
+
+		$offset = $oPage->start_capture();
+		parent::Render($oPage, $aParams);
+		$sContent = $oPage->end_capture($offset);
+		// Remove empty table rows in case some attributes are hidden...
+		$sContent = preg_replace('/<tr[^>]*>\s*(<td[^>]*>\s*<\\/td>)+\s*<\\/tr>/im', '', $sContent);
+		$oPage->add($sContent);
+		return $aFieldsMap;
+	}
+}
+
+//DisplayTemplate::UnitTest();
+?>

application/templates/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>
-	<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>
-</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>
-<itoptabs>
-	<itoptab name="Rules">
-		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT AuditRule WHERE category_id = $id$</itopblock>
-	</itoptab>
-</itoptabs>
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $id$</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>
+</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>
+<itoptabs>
+	<itoptab name="Rules">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT AuditRule WHERE category_id = $id$</itopblock>
+	</itoptab>
+</itoptabs>

application/ui.extkeywidget.class.inc.php

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

application/ui.linksdirectwidget.class.inc.php

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

application/ui.searchformforeignkeys.class.inc.php

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

application/uiwizard.class.inc.php

@@ -1,331 +1,331 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class UIWizard
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class UIWizard
-{
-	protected $m_oPage;
-	protected $m_sClass;
-	protected $m_sTargetState;
-	protected $m_aWizardSteps;
-	
-	public function __construct($oPage, $sClass, $sTargetState = '')
-	{
-		$this->m_oPage = $oPage;
-		$this->m_sClass = $sClass;
-		if (empty($sTargetState))
-		{
-			$sTargetState = MetaModel::GetDefaultState($sClass);
-		}
-		$this->m_sTargetState = $sTargetState;
-		$this->m_aWizardSteps = $this->ComputeWizardStructure();
-	}
-	
-	public function GetObjectClass() { return $this->m_sClass; }
-	public function GetTargetState() { return $this->m_sTargetState; }
-	public function GetWizardStructure() { return $this->m_aWizardSteps; }
-	
-	/**
-	 * Displays one step of the wizard
-	 */	 
-	public function DisplayWizardStep($aStep, $iStepIndex, &$iMaxInputId, &$aFieldsMap, $bFinishEnabled = false, $aArgs = array())
-	{
-		if ($iStepIndex == 1) // one big form that contains everything, to make sure that the uploaded files are posted too
-		{
-			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php\">\n");
-		}
-		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
-		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
-		$aStates = MetaModel::EnumStates($this->m_sClass);
-		$aDetails = array();
-		$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())
-			{
-				$sAttLabel = $oAttDef->GetLabel();
-				$iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
-		
-				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
-				{
-					$aFields[$sAttCode] = array();
-					foreach($aPrerequisites as $sCode)
-					{
-						$aFields[$sAttCode][$sCode] = '';
-					}
-				}
-				if (count($aPrerequisites) > 0)
-				{
-					$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
-				$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>");
-				if ($oAttDef->GetValuesDef() != null)
-				{
-					$sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
-				}
-				if ($oAttDef->GetDefaultValue() != null)
-				{
-					$sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
-				}
-				if ($oAttDef->IsLinkSet())
-				{
-					$sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
-				}
-				$iMaxInputId++;
-			}
-		}
-		//$aDetails[] = array('label' => '', 'value' => '<input type="button" value="Next &gt;&gt;">');
-		$this->m_oPage->details($aDetails);
-		$sBackButtonDisabled = ($iStepIndex <= 1) ? 'disabled' : '';
-		$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)\" />
-		</div>\n");
-		$this->m_oPage->add_script("
-function OnEnterStep{$iStepIndex}()
-{
-	oWizardHelper.ResetQuery();
-	oWizardHelper.UpdateWizard();
-	
-$sJSHandlerCode
-
-	oWizardHelper.AjaxQueryServer();
-}
-");
-		$this->m_oPage->add("</div>\n\n");
-	}	
-
-	/**
-	 * Display the final step of the wizard: a confirmation screen
-	 */	 	
-	public function DisplayFinalStep($iStepIndex, $aFieldsMap)
-	{
-		$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->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");
-		$sScript = "function OnEnterStep$iStepIndex() {\n";
-		foreach($aFieldsMap as $iInputId => $sAttCode)
-		{
-			$sScript .= "\toWizardHelper.UpdateCurrentValue('$sAttCode');\n";		
-		}
-		$sScript .= "\toWizardHelper.Preview('object_preview');\n";		
-		$sScript .= "\t$('#wizard_json_obj').val(oWizardHelper.ToJSON());\n";		
-		$sScript .= "}\n";
-		$this->m_oPage->add_script($sScript);
-		$this->m_oPage->add("<div id=\"object_preview\">\n");
-		$this->m_oPage->add("</div>\n");
-		$this->m_oPage->add($oAppContext->GetForForm());		
-		$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");
-	}	
-	/**
-	 * Compute the order of the fields & pages in the wizard
-	 * @param $oPage iTopWebPage The current page (used to display error messages) 
-	 * @param $sClass string Name of the class
-	 * @param $sStateCode string Code of the target state of the object
-	 * @return hash Two dimensional array: each element represents the list of fields for a given page   
-	 */
-	protected function ComputeWizardStructure()
-	{
-		$aWizardSteps = array( 'mandatory' => array(), 'optional' => array());
-		$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) )
-            {
-                $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) )
-		{
-			// 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 
-		$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);
-				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				$aFields[$sAttCode] = array();
-				foreach($aPrerequisites as $sCode)
-				{
-					$aFields[$sAttCode][$sCode] = '';
-				}
-			}
-		}
-			
-		// Now use the dependencies between the fields to order them
-		// Start from the order of the 'details'
-		$aList = MetaModel::FlattenZlist(MetaModel::GetZListItems($this->m_sClass, 'details'));
-		$index = 0;
-		$aOrder = array();
-		foreach($aFields as $sAttCode => $void)
-		{
-				$aOrder[$sAttCode] = 999; // At the end of the list...
-		}
-		foreach($aList as $sAttCode)
-		{
-			if (array_key_exists($sAttCode, $aFields))
-			{
-				$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)
-				{
-					// position the current field after the ones it depends on
-					$iMaxPos = max($iMaxPos, 1+$aOrder[$sDependentAttCode]);
-				}
-			}
-		}
-		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
-		$aFields = array(); // reset
-		foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
-		{
-			$iOptions = (isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode])) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;				
-			if ( ($sStateAttCode != $sAttCode) &&
-				 (!$oAttDef->IsExternalField()) &&
-				 (($iOptions & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)) == 0) &&
-				 (!isset($aFieldsDone[$sAttCode])) )
-				 
-			{
-				// 'State', external fields, read-only and hidden fields
-				// and fields that are already listed in the wizard
-				// are removed from the 'optional' part of the wizard
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				$aFields[$sAttCode] = array();
-				foreach($aPrerequisites as $sCode)
-				{
-					if (!isset($aFieldsDone[$sCode]))
-					{
-						// retain only the dependencies that were not covered
-						// in the 'mandatory' part of the wizard
-						$aFields[$sAttCode][$sCode] = '';
-					}
-				}
-			}
-		}
-		// Now use the dependencies between the fields to order them
-		while(count($aFields) > 0)
-		{
-			$aCurrentStep = array();
-			foreach($aFields as $sAttCode => $aDependencies)
-			{
-				// All fields with no remaining dependencies can be entered at this
-				// step of the wizard
-				if (count($aDependencies) == 0)
-				{
-					$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 !
-				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
-				print_r($aFields);
-				break;
-			}
-			$aWizardSteps['optional'][] = $aCurrentStep;
-		}
-		return $aWizardSteps;
-	
-	} 
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class UIWizard
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UIWizard
+{
+	protected $m_oPage;
+	protected $m_sClass;
+	protected $m_sTargetState;
+	protected $m_aWizardSteps;
+	
+	public function __construct($oPage, $sClass, $sTargetState = '')
+	{
+		$this->m_oPage = $oPage;
+		$this->m_sClass = $sClass;
+		if (empty($sTargetState))
+		{
+			$sTargetState = MetaModel::GetDefaultState($sClass);
+		}
+		$this->m_sTargetState = $sTargetState;
+		$this->m_aWizardSteps = $this->ComputeWizardStructure();
+	}
+	
+	public function GetObjectClass() { return $this->m_sClass; }
+	public function GetTargetState() { return $this->m_sTargetState; }
+	public function GetWizardStructure() { return $this->m_aWizardSteps; }
+	
+	/**
+	 * Displays one step of the wizard
+	 */	 
+	public function DisplayWizardStep($aStep, $iStepIndex, &$iMaxInputId, &$aFieldsMap, $bFinishEnabled = false, $aArgs = array())
+	{
+		if ($iStepIndex == 1) // one big form that contains everything, to make sure that the uploaded files are posted too
+		{
+			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php\">\n");
+		}
+		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
+		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
+		$aStates = MetaModel::EnumStates($this->m_sClass);
+		$aDetails = array();
+		$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())
+			{
+				$sAttLabel = $oAttDef->GetLabel();
+				$iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
+		
+				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+				if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
+				{
+					$aFields[$sAttCode] = array();
+					foreach($aPrerequisites as $sCode)
+					{
+						$aFields[$sAttCode][$sCode] = '';
+					}
+				}
+				if (count($aPrerequisites) > 0)
+				{
+					$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
+				$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>");
+				if ($oAttDef->GetValuesDef() != null)
+				{
+					$sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
+				}
+				if ($oAttDef->GetDefaultValue() != null)
+				{
+					$sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
+				}
+				if ($oAttDef->IsLinkSet())
+				{
+					$sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
+				}
+				$iMaxInputId++;
+			}
+		}
+		//$aDetails[] = array('label' => '', 'value' => '<input type="button" value="Next &gt;&gt;">');
+		$this->m_oPage->details($aDetails);
+		$sBackButtonDisabled = ($iStepIndex <= 1) ? 'disabled' : '';
+		$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)\" />
+		</div>\n");
+		$this->m_oPage->add_script("
+function OnEnterStep{$iStepIndex}()
+{
+	oWizardHelper.ResetQuery();
+	oWizardHelper.UpdateWizard();
+	
+$sJSHandlerCode
+
+	oWizardHelper.AjaxQueryServer();
+}
+");
+		$this->m_oPage->add("</div>\n\n");
+	}	
+
+	/**
+	 * Display the final step of the wizard: a confirmation screen
+	 */	 	
+	public function DisplayFinalStep($iStepIndex, $aFieldsMap)
+	{
+		$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->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");
+		$sScript = "function OnEnterStep$iStepIndex() {\n";
+		foreach($aFieldsMap as $iInputId => $sAttCode)
+		{
+			$sScript .= "\toWizardHelper.UpdateCurrentValue('$sAttCode');\n";		
+		}
+		$sScript .= "\toWizardHelper.Preview('object_preview');\n";		
+		$sScript .= "\t$('#wizard_json_obj').val(oWizardHelper.ToJSON());\n";		
+		$sScript .= "}\n";
+		$this->m_oPage->add_script($sScript);
+		$this->m_oPage->add("<div id=\"object_preview\">\n");
+		$this->m_oPage->add("</div>\n");
+		$this->m_oPage->add($oAppContext->GetForForm());		
+		$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");
+	}	
+	/**
+	 * Compute the order of the fields & pages in the wizard
+	 * @param $oPage iTopWebPage The current page (used to display error messages) 
+	 * @param $sClass string Name of the class
+	 * @param $sStateCode string Code of the target state of the object
+	 * @return hash Two dimensional array: each element represents the list of fields for a given page   
+	 */
+	protected function ComputeWizardStructure()
+	{
+		$aWizardSteps = array( 'mandatory' => array(), 'optional' => array());
+		$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) )
+            {
+                $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) )
+		{
+			// 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 
+		$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);
+				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+				$aFields[$sAttCode] = array();
+				foreach($aPrerequisites as $sCode)
+				{
+					$aFields[$sAttCode][$sCode] = '';
+				}
+			}
+		}
+			
+		// Now use the dependencies between the fields to order them
+		// Start from the order of the 'details'
+		$aList = MetaModel::FlattenZlist(MetaModel::GetZListItems($this->m_sClass, 'details'));
+		$index = 0;
+		$aOrder = array();
+		foreach($aFields as $sAttCode => $void)
+		{
+				$aOrder[$sAttCode] = 999; // At the end of the list...
+		}
+		foreach($aList as $sAttCode)
+		{
+			if (array_key_exists($sAttCode, $aFields))
+			{
+				$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)
+				{
+					// position the current field after the ones it depends on
+					$iMaxPos = max($iMaxPos, 1+$aOrder[$sDependentAttCode]);
+				}
+			}
+		}
+		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
+		$aFields = array(); // reset
+		foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
+		{
+			$iOptions = (isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode])) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;				
+			if ( ($sStateAttCode != $sAttCode) &&
+				 (!$oAttDef->IsExternalField()) &&
+				 (($iOptions & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)) == 0) &&
+				 (!isset($aFieldsDone[$sAttCode])) )
+				 
+			{
+				// 'State', external fields, read-only and hidden fields
+				// and fields that are already listed in the wizard
+				// are removed from the 'optional' part of the wizard
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+				$aFields[$sAttCode] = array();
+				foreach($aPrerequisites as $sCode)
+				{
+					if (!isset($aFieldsDone[$sCode]))
+					{
+						// retain only the dependencies that were not covered
+						// in the 'mandatory' part of the wizard
+						$aFields[$sAttCode][$sCode] = '';
+					}
+				}
+			}
+		}
+		// Now use the dependencies between the fields to order them
+		while(count($aFields) > 0)
+		{
+			$aCurrentStep = array();
+			foreach($aFields as $sAttCode => $aDependencies)
+			{
+				// All fields with no remaining dependencies can be entered at this
+				// step of the wizard
+				if (count($aDependencies) == 0)
+				{
+					$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 !
+				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
+				print_r($aFields);
+				break;
+			}
+			$aWizardSteps['optional'][] = $aCurrentStep;
+		}
+		return $aWizardSteps;
+	
+	} 
+}
+?>

application/wizardhelper.class.inc.php

@@ -1,338 +1,346 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class WizardHelper
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/uiwizard.class.inc.php');
-
-class WizardHelper
-{
-	protected $m_aData;
-	
-	public function __construct()
-	{
-	}
-	/**
-	 * Constructs the PHP target object from the parameters sent to the web page by the wizard
-	 * @param boolean $bReadUploadedFiles True to also read any uploaded file (for blob/document fields)
-	 * @return object
-	 */	 	 	 	
-	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)
-		{
-			// Because this is stored in a Javascript array, unused indexes
-			// are filled with null values and unused keys (stored as strings) contain $$NULL$$
-			if ( ($sAttCode !='id') && ($value !== '$$NULL$$'))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
-				if (($oAttDef->IsLinkSet()) && ($value != '') )
-				{
-					// special handling for lists
-					// assumes this is handled as an array of objects
-					// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
-					$aData = json_decode($value, true); // true means decode as a hash array (not an object)
-					// Check what are the meaningful attributes
-					$aFields = $this->GetLinkedWizardStructure($oAttDef);
-					$sLinkedClass = $oAttDef->GetLinkedClass();
-					$aLinkedObjectsArray = array();
-					if (!is_array($aData))
-					{
-						echo ("aData: '$aData' (value: '$value')\n");
-					}
-					foreach($aData as $aLinkedObject)
-					{
-						$oLinkedObj = MetaModel::NewObject($sLinkedClass);
-						foreach($aFields as $sLinkedAttCode)
-						{
-							if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) )
-							{
-								$sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode);
-								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] > 0) )
-								{
-									// For external keys: load the target object so that external fields
-									// get filled too
-									$oTargetObj = MetaModel::GetObject($sLinkedAttDef->GetTargetClass(), $aLinkedObject[$sLinkedAttCode]);
-									$oLinkedObj->Set($sLinkedAttCode, $oTargetObj);
-								}
-								elseif($sLinkedAttDef instanceof AttributeDateTime)
-                                {
-                                    $sDate = $aLinkedObject[$sLinkedAttCode];
-                                    if($sDate !== null && $sDate !== '')
-                                    {
-                                        $oDateTimeFormat = AttributeDateTime::GetFormat();
-                                        $oDate = $oDateTimeFormat->Parse($sDate);
-                                        $sDate = $oDate->format('Y-m-d H:i:s');
-                                    }
-
-                                    $oLinkedObj->Set($sLinkedAttCode, $sDate);
-                                }
-								else
-								{
-									$oLinkedObj->Set($sLinkedAttCode, $aLinkedObject[$sLinkedAttCode]);
-								}
-							}
-						}
-						$aLinkedObjectsArray[] = $oLinkedObj;
-					}
-					$oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
-					$oObj->Set($sAttCode, $oSet);
-				}
-				else if ( $oAttDef->GetEditClass() == 'Document' )
-				{
-					if ($bReadUploadedFiles)
-					{
-						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
-						$oObj->Set($sAttCode, $oDocument);
-					}
-					else
-					{
-						// Create a new empty document, just for displaying the file name
-						$oDocument = new ormDocument(null, '', $value);
-						$oObj->Set($sAttCode, $oDocument);
-					}
-				}
-				else if ( $oAttDef->GetEditClass() == 'Image' )
-				{
-					if ($bReadUploadedFiles)
-					{
-						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
-						$oObj->Set($sAttCode, $oDocument);
-					}
-					else
-					{
-						// Create a new empty document, just for displaying the file name
-						$oDocument = new ormDocument(null, '', $value);
-						$oObj->Set($sAttCode, $oDocument);
-					}
-				}
-				else if (($oAttDef->IsExternalKey()) && (!empty($value)) && ($value > 0) )
-				{
-					// For external keys: load the target object so that external fields
-					// get filled too
-					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value, false);
-					if ($oTargetObj)
-					{
-						$oObj->Set($sAttCode, $oTargetObj);
-					}
-					else
-					{
-						// May happen for security reasons (portal, see ticket #1074)
-						$oObj->Set($sAttCode, $value);
-					}
-				}
-				else if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
-				{
-					if ($value != null)
-					{
-						$oDate = $oAttDef->GetFormat()->Parse($value);
-						if ($oDate instanceof DateTime)
-						{
-							$value = $oDate->format($oAttDef->GetInternalFormat());
-						}
-						else
-						{
-							$value = null;
-						}
-					}
-					$oObj->Set($sAttCode, $value);
-				}
-				else
-				{
-					$oObj->Set($sAttCode, $value);
-				}	
-			}
-		}
-		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
-		{
-			$oObj->Set(MetaModel::GetStateAttributeCode($this->m_aData['m_sClass']), $this->m_aData['m_sState']);
-		}
-		$oObj->DoComputeValues();
-		return $oObj;
-	}
-	
-	public function GetFieldsForDefaultValue()
-	{
-		return $this->m_aData['m_aDefaultValueRequested'];
-	}
-	
-	public function SetDefaultValue($sAttCode, $value)
-	{
-		// Protect against a request for a non existing field
-		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
-			if ($oAttDef->GetEditClass() == 'List')
-			{
-				// special handling for lists
-				// this as to be handled as an array of objects
-				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
-				// NOT YET IMPLEMENTED !!
-				$sLinkedClass = $oAttDef->GetLinkedClass();
-				$oSet = $value;
-				$aData = array();
-				$aFields = $this->GetLinkedWizardStructure($oAttDef);
-				while($oSet->fetch())
-				{
-					foreach($aFields as $sLinkedAttCode)
-					{
-						$aRow[$sAttCode] = $oLinkedObj->Get($sLinkedAttCode);
-					}
-					$aData[] = $aRow;
-				}
-				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
-				
-			}
-			else
-			{
-				// Normal handling for all other scalar attributes
-				$this->m_aData['m_oDefaultValue'][$sAttCode] = $value;
-			}
-		}
-	}
-	
-	public function GetFieldsForAllowedValues()
-	{
-		return $this->m_aData['m_aAllowedValuesRequested'];
-	}
-	
-	public function SetAllowedValuesHtml($sAttCode, $sHtml)
-	{
-		// Protect against a request for a non existing field
-		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
-		{
-			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
-		}
-	}
-	
-	public function ToJSON()
-	{
-		return json_encode($this->m_aData);
-	}
-	
-	static public function FromJSON($sJSON)
-	{
-		$oWizHelper = new WizardHelper();
-		if (get_magic_quotes_gpc())
-		{
-			$sJSON = stripslashes($sJSON);
-		}
-		$aData = json_decode($sJSON, true); // true means hash array instead of object
-		$oWizHelper->m_aData = $aData;
-		return $oWizHelper;
-	}
-	
-	protected function GetLinkedWizardStructure($oAttDef)
-	{
-		$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
-		$aWizardSteps = $oWizard->GetWizardStructure();
-		$aFields = array();
-		$sExtKeyToMeCode = $oAttDef->GetExtKeyToMe();
-		// Retrieve as a flat list, all the attributes that are needed to create
-		// an object of the linked class and put them into a flat array, except
-		// the attribute 'ext_key_to_me' which is a constant in our case
-		foreach($aWizardSteps as $sDummy => $aMainSteps)
-		{
-			// 2 entries: 'mandatory' and 'optional'
-			foreach($aMainSteps as $aSteps)
-			{
-				// One entry for each step of the wizard
-				foreach($aSteps as $sAttCode)
-				{
-					if ($sAttCode != $sExtKeyToMeCode)
-					{
-						$aFields[] = $sAttCode;
-					}
-				}
-			}
-		}
-		return $aFields;
-	}
-	
-	public function GetTargetClass()
-	{
-		return $this->m_aData['m_sClass'];
-	}
-
-    public function GetFormPrefix()
-    {
-        return $this->m_aData['m_sFormPrefix'];
-    }
-
-    public function GetInitialState()
-    {
-        return isset($this->m_aData['m_sInitialState']) ? $this->m_aData['m_sInitialState'] : null;
-    }
-
-    public function GetStimulus()
-    {
-        return isset($this->m_aData['m_sStimulus']) ? $this->m_aData['m_sStimulus'] : null;
-    }
-	
-	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;
-	}
-	
-	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
-	{
-		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
-		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
-		foreach($aSet as $aLinkObj)
-		{
-			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach($aLinkObj as $sAttCode => $value)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
-				if (($oAttDef->IsExternalKey()) && ($value != '')  && ($value > 0))
-				{
-					// For external keys: load the target object so that external fields
-					// get filled too
-					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
-					$oLink->Set($sAttCode, $oTargetObj);
-				}
-				$oLink->Set($sAttCode, $value);
-			}
-			$oLink->Set($sExtKeyToMe, $oMe->GetKey());
-			$oSet->AddObject($oLink);
-		}
-		return $oSet;
-	}
-}
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class WizardHelper
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/uiwizard.class.inc.php');
+
+class WizardHelper
+{
+	protected $m_aData;
+	
+	public function __construct()
+	{
+	}
+	/**
+	 * Constructs the PHP target object from the parameters sent to the web page by the wizard
+	 * @param boolean $bReadUploadedFiles True to also read any uploaded file (for blob/document fields)
+	 * @return object
+	 */	 	 	 	
+	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)
+		{
+			// Because this is stored in a Javascript array, unused indexes
+			// are filled with null values and unused keys (stored as strings) contain $$NULL$$
+			if ( ($sAttCode !='id') && ($value !== '$$NULL$$'))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
+				if (($oAttDef->IsLinkSet()) && ($value != '') )
+				{
+					// special handling for lists
+					// assumes this is handled as an array of objects
+					// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
+					$aData = json_decode($value, true); // true means decode as a hash array (not an object)
+					// Check what are the meaningful attributes
+					$aFields = $this->GetLinkedWizardStructure($oAttDef);
+					$sLinkedClass = $oAttDef->GetLinkedClass();
+					$aLinkedObjectsArray = array();
+					if (!is_array($aData))
+					{
+						echo ("aData: '$aData' (value: '$value')\n");
+					}
+					foreach($aData as $aLinkedObject)
+					{
+						$oLinkedObj = MetaModel::NewObject($sLinkedClass);
+						foreach($aFields as $sLinkedAttCode)
+						{
+							if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) )
+							{
+								$sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode);
+								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] > 0) )
+								{
+									// For external keys: load the target object so that external fields
+									// get filled too
+									$oTargetObj = MetaModel::GetObject($sLinkedAttDef->GetTargetClass(), $aLinkedObject[$sLinkedAttCode]);
+									$oLinkedObj->Set($sLinkedAttCode, $oTargetObj);
+								}
+								elseif($sLinkedAttDef instanceof AttributeDateTime)
+                                {
+                                    $sDateClass = get_class($sLinkedAttDef);
+                                    $sDate = $aLinkedObject[$sLinkedAttCode];
+                                    if($sDate !== null && $sDate !== '')
+                                    {
+                                        $oDateTimeFormat = $sDateClass::GetFormat();
+                                        $oDate = $oDateTimeFormat->Parse($sDate);
+                                        if ($sDateClass == "AttributeDate")
+                                        {
+                                            $sDate = $oDate->format('Y-m-d');
+                                        }
+                                        else
+                                        {
+                                            $sDate = $oDate->format('Y-m-d H:i:s');
+                                        }
+                                    }
+
+                                    $oLinkedObj->Set($sLinkedAttCode, $sDate);
+                                }
+								else
+								{
+									$oLinkedObj->Set($sLinkedAttCode, $aLinkedObject[$sLinkedAttCode]);
+								}
+							}
+						}
+						$aLinkedObjectsArray[] = $oLinkedObj;
+					}
+					$oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
+					$oObj->Set($sAttCode, $oSet);
+				}
+				else if ( $oAttDef->GetEditClass() == 'Document' )
+				{
+					if ($bReadUploadedFiles)
+					{
+						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
+						$oObj->Set($sAttCode, $oDocument);
+					}
+					else
+					{
+						// Create a new empty document, just for displaying the file name
+						$oDocument = new ormDocument(null, '', $value);
+						$oObj->Set($sAttCode, $oDocument);
+					}
+				}
+				else if ( $oAttDef->GetEditClass() == 'Image' )
+				{
+					if ($bReadUploadedFiles)
+					{
+						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
+						$oObj->Set($sAttCode, $oDocument);
+					}
+					else
+					{
+						// Create a new empty document, just for displaying the file name
+						$oDocument = new ormDocument(null, '', $value);
+						$oObj->Set($sAttCode, $oDocument);
+					}
+				}
+				else if (($oAttDef->IsExternalKey()) && (!empty($value)) && ($value > 0) )
+				{
+					// For external keys: load the target object so that external fields
+					// get filled too
+					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value, false);
+					if ($oTargetObj)
+					{
+						$oObj->Set($sAttCode, $oTargetObj);
+					}
+					else
+					{
+						// May happen for security reasons (portal, see ticket #1074)
+						$oObj->Set($sAttCode, $value);
+					}
+				}
+				else if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
+				{
+					if ($value != null)
+					{
+						$oDate = $oAttDef->GetFormat()->Parse($value);
+						if ($oDate instanceof DateTime)
+						{
+							$value = $oDate->format($oAttDef->GetInternalFormat());
+						}
+						else
+						{
+							$value = null;
+						}
+					}
+					$oObj->Set($sAttCode, $value);
+				}
+				else
+				{
+					$oObj->Set($sAttCode, $value);
+				}	
+			}
+		}
+		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
+		{
+			$oObj->Set(MetaModel::GetStateAttributeCode($this->m_aData['m_sClass']), $this->m_aData['m_sState']);
+		}
+		$oObj->DoComputeValues();
+		return $oObj;
+	}
+	
+	public function GetFieldsForDefaultValue()
+	{
+		return $this->m_aData['m_aDefaultValueRequested'];
+	}
+	
+	public function SetDefaultValue($sAttCode, $value)
+	{
+		// Protect against a request for a non existing field
+		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
+			if ($oAttDef->GetEditClass() == 'List')
+			{
+				// special handling for lists
+				// this as to be handled as an array of objects
+				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
+				// NOT YET IMPLEMENTED !!
+				$sLinkedClass = $oAttDef->GetLinkedClass();
+				$oSet = $value;
+				$aData = array();
+				$aFields = $this->GetLinkedWizardStructure($oAttDef);
+				while($oSet->fetch())
+				{
+					foreach($aFields as $sLinkedAttCode)
+					{
+						$aRow[$sAttCode] = $oLinkedObj->Get($sLinkedAttCode);
+					}
+					$aData[] = $aRow;
+				}
+				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
+				
+			}
+			else
+			{
+				// Normal handling for all other scalar attributes
+				$this->m_aData['m_oDefaultValue'][$sAttCode] = $value;
+			}
+		}
+	}
+	
+	public function GetFieldsForAllowedValues()
+	{
+		return $this->m_aData['m_aAllowedValuesRequested'];
+	}
+	
+	public function SetAllowedValuesHtml($sAttCode, $sHtml)
+	{
+		// Protect against a request for a non existing field
+		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
+		{
+			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
+		}
+	}
+	
+	public function ToJSON()
+	{
+		return json_encode($this->m_aData);
+	}
+	
+	static public function FromJSON($sJSON)
+	{
+		$oWizHelper = new WizardHelper();
+		if (get_magic_quotes_gpc())
+		{
+			$sJSON = stripslashes($sJSON);
+		}
+		$aData = json_decode($sJSON, true); // true means hash array instead of object
+		$oWizHelper->m_aData = $aData;
+		return $oWizHelper;
+	}
+	
+	protected function GetLinkedWizardStructure($oAttDef)
+	{
+		$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
+		$aWizardSteps = $oWizard->GetWizardStructure();
+		$aFields = array();
+		$sExtKeyToMeCode = $oAttDef->GetExtKeyToMe();
+		// Retrieve as a flat list, all the attributes that are needed to create
+		// an object of the linked class and put them into a flat array, except
+		// the attribute 'ext_key_to_me' which is a constant in our case
+		foreach($aWizardSteps as $sDummy => $aMainSteps)
+		{
+			// 2 entries: 'mandatory' and 'optional'
+			foreach($aMainSteps as $aSteps)
+			{
+				// One entry for each step of the wizard
+				foreach($aSteps as $sAttCode)
+				{
+					if ($sAttCode != $sExtKeyToMeCode)
+					{
+						$aFields[] = $sAttCode;
+					}
+				}
+			}
+		}
+		return $aFields;
+	}
+	
+	public function GetTargetClass()
+	{
+		return $this->m_aData['m_sClass'];
+	}
+
+    public function GetFormPrefix()
+    {
+        return $this->m_aData['m_sFormPrefix'];
+    }
+
+    public function GetInitialState()
+    {
+        return isset($this->m_aData['m_sInitialState']) ? $this->m_aData['m_sInitialState'] : null;
+    }
+
+    public function GetStimulus()
+    {
+        return isset($this->m_aData['m_sStimulus']) ? $this->m_aData['m_sStimulus'] : null;
+    }
+	
+	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;
+	}
+	
+	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
+	{
+		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
+		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
+		foreach($aSet as $aLinkObj)
+		{
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach($aLinkObj as $sAttCode => $value)
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
+				if (($oAttDef->IsExternalKey()) && ($value != '')  && ($value > 0))
+				{
+					// For external keys: load the target object so that external fields
+					// get filled too
+					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
+					$oLink->Set($sAttCode, $oTargetObj);
+				}
+				$oLink->Set($sAttCode, $value);
+			}
+			$oLink->Set($sExtKeyToMe, $oMe->GetKey());
+			$oSet->AddObject($oLink);
+		}
+		return $oSet;
+	}
+}

application/xmlpage.class.inc.php

@@ -1,106 +1,106 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class XMLPage
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/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
- */
-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)
-	{
-		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("Cache-control: no-cache");
-		$this->add_header("Content-location: export.xml");
-	}	
-
-	public function output()
-	{
-		if (!$this->m_bPassThrough)
-		{
-			// Get the unexpected output but do nothing with it
-			$sTrash = $this->ob_get_clean_safe();
-					
-			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
-			$this->add_header("Content-Length: ".strlen($this->s_content));
-			foreach($this->a_headers as $s_header)
-			{
-				header($s_header);
-			}
-			echo $this->s_content;
-		}
-		if (class_exists('DBSearch'))
-		{
-			DBSearch::RecordQueryTrace();
-		}
-	}
-
-	public function add($sText)
-	{
-		if (!$this->m_bPassThrough)
-		{
-			parent::add($sText);
-		}
-		else
-		{
-			if ($this->m_bHeaderSent)
-			{
-				echo $sText;
-			}
-			else
-			{
-				$s_captured_output = $this->ob_get_clean_safe();
-				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;
-			}
-		}
-	}
-
-	public function small_p($sText)
-	{
-	}
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-	}
-}
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class XMLPage
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/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
+ */
+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)
+	{
+		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("Cache-control: no-cache");
+		$this->add_header("Content-location: export.xml");
+	}	
+
+	public function output()
+	{
+		if (!$this->m_bPassThrough)
+		{
+			// Get the unexpected output but do nothing with it
+			$sTrash = $this->ob_get_clean_safe();
+					
+			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
+			$this->add_header("Content-Length: ".strlen($this->s_content));
+			foreach($this->a_headers as $s_header)
+			{
+				header($s_header);
+			}
+			echo $this->s_content;
+		}
+		if (class_exists('DBSearch'))
+		{
+			DBSearch::RecordQueryTrace();
+		}
+	}
+
+	public function add($sText)
+	{
+		if (!$this->m_bPassThrough)
+		{
+			parent::add($sText);
+		}
+		else
+		{
+			if ($this->m_bHeaderSent)
+			{
+				echo $sText;
+			}
+			else
+			{
+				$s_captured_output = $this->ob_get_clean_safe();
+				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;
+			}
+		}
+	}
+
+	public function small_p($sText)
+	{
+	}
+
+	public function table($aConfig, $aData, $aParams = array())
+	{
+	}
+}

composer.json

@@ -0,0 +1,19 @@
+{
+  "require": {
+    "php": ">=5.6.0",
+    "ext-mysql": "*",
+    "ext-ldap": "*",
+    "ext-mcrypt": "*",
+    "ext-cli": "*",
+    "ext-soap": "*",
+    "ext-json": "*",
+    "ext-zip": "*",
+    "ext-mysqli": "*",
+    "ext-gd": "*"
+  },
+  "config": {
+    "platform": {
+      "php": "5.6.0"
+    }
+  }
+}

core/action.class.inc.php

@@ -1,415 +1,427 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent classes (internal): user defined actions
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-require_once(APPROOT.'/core/asynctask.class.inc.php');
-require_once(APPROOT.'/core/email.class.inc.php');
-
-/**
- * A user defined action, to customize the application  
- *
- * @package     iTopORM
- */
-abstract class Action extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new 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())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	abstract public function DoExecute($oTrigger, $aContextArgs);
-
-	public function IsActive()
-	{
-		switch($this->Get('status'))
-		{
-			case 'enabled':
-			case 'test':
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
-	public function IsBeingTested()
-	{
-		switch($this->Get('status'))
-		{
-			case 'test':
-				return true;
-
-			default:
-				return false;
-		}
-	}
-}
-
-/**
- * A notification  
- *
- * @package     iTopORM
- */
-abstract class ActionNotification extends Action
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action_notification",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-/**
- * An email notification  
- *
- * @package     iTopORM
- */
-class ActionEmail extends ActionNotification
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action_email",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		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 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 AttributeTemplateHTML("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())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	// count the recipients found
-	protected $m_iRecipients;
-
-	// Errors management : not that simple because we need that function to be
-	// executed in the background, while making sure that any issue would be reported clearly
-	protected $m_aMailErrors; //array of strings explaining the issue
-
-	// returns a the list of emails as a string, or a detailed error description
-	protected function FindRecipients($sRecipAttCode, $aArgs)
-	{
-		$sOQL = $this->Get($sRecipAttCode);
-		if (strlen($sOQL) == '') return '';
-
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			$oSearch->AllowAllData();
-		}
-		catch (OQLException $e)
-		{
-			$this->m_aMailErrors[] = "query syntax error for recipient '$sRecipAttCode'";
-			return $e->getMessage();
-		}
-
-		$sClass = $oSearch->GetClass();
-		// Determine the email attribute (the first one will be our choice)
-		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeEmailAddress)
-			{
-				$sEmailAttCode = $sAttCode;
-				// we've got one, exit the loop
-				break;
-			}
-		}
-		if (!isset($sEmailAttCode))
-		{
-			$this->m_aMailErrors[] = "wrong target for recipient '$sRecipAttCode'";
-			return "The objects of the class '$sClass' do not have any email attribute";
-		}
-
-		$oSet = new DBObjectSet($oSearch, array() /* order */, $aArgs);
-		$aRecipients = array();
-		while ($oObj = $oSet->Fetch())
-		{
-			$sAddress = trim($oObj->Get($sEmailAttCode));
-			if (strlen($sAddress) > 0)
-			{
-				$aRecipients[] = $sAddress;
-				$this->m_iRecipients++;
-			}
-		}
-		return implode(', ', $aRecipients);
-	}
-
-
-	public function DoExecute($oTrigger, $aContextArgs)
-	{
-		if (MetaModel::IsLogEnabledNotification())
-		{
-			$oLog = new EventNotificationEmail();
-			if ($this->IsBeingTested())
-			{
-				$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
-			}
-			else
-			{
-				$oLog->Set('message', 'Notification pending');
-			}
-			$oLog->Set('userinfo', UserRights::GetUser());
-			$oLog->Set('trigger_id', $oTrigger->GetKey());
-			$oLog->Set('action_id', $this->GetKey());
-			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
-			// Must be inserted now so that it gets a valid id that will make the link
-			// between an eventual asynchronous task (queued) and the log
-			$oLog->DBInsertNoReload();
-		}
-		else
-		{
-			$oLog = null;
-		}
-
-		try
-		{
-			$sRes = $this->_DoExecute($oTrigger, $aContextArgs, $oLog);
-
-			if ($this->IsBeingTested())
-			{
-				$sPrefix = 'TEST ('.$this->Get('test_recipient').') - ';
-			}
-			else
-			{
-				$sPrefix = '';
-			}
-			if ($oLog)
-			{
-				$oLog->Set('message', $sPrefix . $sRes);
-			}
-		}
-		catch (Exception $e)
-		{
-			if ($oLog)
-			{
-				$oLog->Set('message', 'Error: '.$e->getMessage());
-			}
-		}
-		if ($oLog)
-		{
-			$oLog->DBUpdate();
-		}
-	}
-
-	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
-	{
-		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		try
-		{
-			$this->m_iRecipients = 0;
-			$this->m_aMailErrors = array();
-			$bRes = false; // until we do succeed in sending the email
-	
-			// Determine recicipients
-			//
-			$sTo = $this->FindRecipients('to', $aContextArgs);
-			$sCC = $this->FindRecipients('cc', $aContextArgs);
-			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
-	
-			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
-			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
-	
-			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
-			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
-			
-			$oObj = $aContextArgs['this->object()'];
-			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetEnvironmentId());
-			$sReference = '<'.$sMessageId.'>';
-		}
-		catch(Exception $e)
-		{
-  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-  			throw $e;
-  		}
-		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-		
-		if (!is_null($oLog))
-		{
-			// 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);
-		}
-		$sStyles = file_get_contents(APPROOT.'css/email.css');
-		$sStyles .= MetaModel::GetConfig()->Get('email_css');
-
-		$oEmail = new EMail();
-
-		if ($this->IsBeingTested())
-		{
-			$oEmail->SetSubject('TEST['.$sSubject.']');
-			$sTestBody = $sBody;
-			$sTestBody .= "<div style=\"border: dashed;\">\n";
-			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
-			$sTestBody .= "<p>The email should be sent with the following properties\n";
-			$sTestBody .= "<ul>\n";
-			$sTestBody .= "<li>TO: $sTo</li>\n";
-			$sTestBody .= "<li>CC: $sCC</li>\n";
-			$sTestBody .= "<li>BCC: $sBCC</li>\n";
-			$sTestBody .= "<li>From: $sFrom</li>\n";
-			$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
-			$sTestBody .= "<li>References: $sReference</li>\n";
-			$sTestBody .= "</ul>\n";
-			$sTestBody .= "</p>\n";
-			$sTestBody .= "</div>\n";
-			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
-			$oEmail->SetRecipientTO($this->Get('test_recipient'));
-			$oEmail->SetRecipientFrom($this->Get('test_recipient'));
-			$oEmail->SetReferences($sReference);
-			$oEmail->SetMessageId($sMessageId);
-		}
-		else
-		{
-			$oEmail->SetSubject($sSubject);
-			$oEmail->SetBody($sBody, 'text/html', $sStyles);
-			$oEmail->SetRecipientTO($sTo);
-			$oEmail->SetRecipientCC($sCC);
-			$oEmail->SetRecipientBCC($sBCC);
-			$oEmail->SetRecipientFrom($sFrom);
-			$oEmail->SetRecipientReplyTo($sReplyTo);
-			$oEmail->SetReferences($sReference);
-			$oEmail->SetMessageId($sMessageId);
-		}
-
-		if (isset($aContextArgs['attachments']))
-		{
-			$aAttachmentReport = array();
-			foreach($aContextArgs['attachments'] as $oDocument)
-			{
-				$oEmail->AddAttachment($oDocument->GetData(), $oDocument->GetFileName(), $oDocument->GetMimeType());
-				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
-			}
-			$oLog->Set('attachments', $aAttachmentReport);
-		}
-
-		if (empty($this->m_aMailErrors))
-		{
-			if ($this->m_iRecipients == 0)
-			{
-				return 'No recipient';
-			}
-			else
-			{
-				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
-				switch ($iRes)
-				{
-					case EMAIL_SEND_OK:
-						return "Sent";
-	
-					case EMAIL_SEND_PENDING:
-						return "Pending";
-	
-					case EMAIL_SEND_ERROR:
-						return "Errors: ".implode(', ', $aErrors);
-				}
-			}
-		}
-		else
-		{
-			if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
-			{
-				$sError = implode(', ', $this->m_aMailErrors);
-			}
-			else
-			{
-				$sError = 'Unknown reason';
-			}
-			return 'Notification was not sent: '.$sError;
-		}
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent classes (internal): user defined actions
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+require_once(APPROOT.'/core/asynctask.class.inc.php');
+require_once(APPROOT.'/core/email.class.inc.php');
+
+/**
+ * A user defined action, to customize the application  
+ *
+ * @package     iTopORM
+ */
+abstract class Action extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new 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())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	abstract public function DoExecute($oTrigger, $aContextArgs);
+
+	public function IsActive()
+	{
+		switch($this->Get('status'))
+		{
+			case 'enabled':
+			case 'test':
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
+	public function IsBeingTested()
+	{
+		switch($this->Get('status'))
+		{
+			case 'test':
+				return true;
+
+			default:
+				return false;
+		}
+	}
+}
+
+/**
+ * A notification  
+ *
+ * @package     iTopORM
+ */
+abstract class ActionNotification extends Action
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action_notification",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+/**
+ * An email notification  
+ *
+ * @package     iTopORM
+ */
+class ActionEmail extends ActionNotification
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		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 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 AttributeTemplateHTML("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())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	// count the recipients found
+	protected $m_iRecipients;
+
+	// Errors management : not that simple because we need that function to be
+	// executed in the background, while making sure that any issue would be reported clearly
+	protected $m_aMailErrors; //array of strings explaining the issue
+
+	// returns a the list of emails as a string, or a detailed error description
+	protected function FindRecipients($sRecipAttCode, $aArgs)
+	{
+		$sOQL = $this->Get($sRecipAttCode);
+		if (strlen($sOQL) == '') return '';
+
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$oSearch->AllowAllData();
+		}
+		catch (OQLException $e)
+		{
+			$this->m_aMailErrors[] = "query syntax error for recipient '$sRecipAttCode'";
+			return $e->getMessage();
+		}
+
+		$sClass = $oSearch->GetClass();
+		// Determine the email attribute (the first one will be our choice)
+		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeEmailAddress)
+			{
+				$sEmailAttCode = $sAttCode;
+				// we've got one, exit the loop
+				break;
+			}
+		}
+		if (!isset($sEmailAttCode))
+		{
+			$this->m_aMailErrors[] = "wrong target for recipient '$sRecipAttCode'";
+			return "The objects of the class '$sClass' do not have any email attribute";
+		}
+
+		$oSet = new DBObjectSet($oSearch, array() /* order */, $aArgs);
+		$aRecipients = array();
+		while ($oObj = $oSet->Fetch())
+		{
+			$sAddress = trim($oObj->Get($sEmailAttCode));
+			if (strlen($sAddress) > 0)
+			{
+				$aRecipients[] = $sAddress;
+				$this->m_iRecipients++;
+			}
+		}
+		return implode(', ', $aRecipients);
+	}
+
+
+	public function DoExecute($oTrigger, $aContextArgs)
+	{
+		if (MetaModel::IsLogEnabledNotification())
+		{
+			$oLog = new EventNotificationEmail();
+			if ($this->IsBeingTested())
+			{
+				$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
+			}
+			else
+			{
+				$oLog->Set('message', 'Notification pending');
+			}
+			$oLog->Set('userinfo', UserRights::GetUser());
+			$oLog->Set('trigger_id', $oTrigger->GetKey());
+			$oLog->Set('action_id', $this->GetKey());
+			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
+			// Must be inserted now so that it gets a valid id that will make the link
+			// between an eventual asynchronous task (queued) and the log
+			$oLog->DBInsertNoReload();
+		}
+		else
+		{
+			$oLog = null;
+		}
+
+		try
+		{
+			$sRes = $this->_DoExecute($oTrigger, $aContextArgs, $oLog);
+
+			if ($this->IsBeingTested())
+			{
+				$sPrefix = 'TEST ('.$this->Get('test_recipient').') - ';
+			}
+			else
+			{
+				$sPrefix = '';
+			}
+
+			if ($oLog)
+			{
+				$oLog->Set('message', $sPrefix . $sRes);
+                $oLog->DBUpdate();
+            }
+
+		}
+		catch (Exception $e)
+		{
+			if ($oLog)
+			{
+				$oLog->Set('message', 'Error: '.$e->getMessage());
+
+				try
+				{
+                    $oLog->DBUpdate();
+				}
+				catch (Exception $eSecondTryUpdate)
+				{
+                    IssueLog::Error("Failed to process email ".$oLog->GetKey()." - reason: ".$e->getMessage()."\nTrace:\n".$e->getTraceAsString());
+
+                    $oLog->Set('message', 'Error: more details in the log for email "'.$oLog->GetKey().'"');
+                    $oLog->DBUpdate();
+                }
+			}
+		}
+
+	}
+
+	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
+	{
+		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
+		try
+		{
+			$this->m_iRecipients = 0;
+			$this->m_aMailErrors = array();
+			$bRes = false; // until we do succeed in sending the email
+	
+			// Determine recicipients
+			//
+			$sTo = $this->FindRecipients('to', $aContextArgs);
+			$sCC = $this->FindRecipients('cc', $aContextArgs);
+			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
+	
+			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
+			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
+	
+			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
+			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
+			
+			$oObj = $aContextArgs['this->object()'];
+			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetEnvironmentId());
+			$sReference = '<'.$sMessageId.'>';
+		}
+		catch(Exception $e)
+		{
+  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+  			throw $e;
+  		}
+		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+		
+		if (!is_null($oLog))
+		{
+			// 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);
+		}
+		$sStyles = file_get_contents(APPROOT.'css/email.css');
+		$sStyles .= MetaModel::GetConfig()->Get('email_css');
+
+		$oEmail = new EMail();
+
+		if ($this->IsBeingTested())
+		{
+			$oEmail->SetSubject('TEST['.$sSubject.']');
+			$sTestBody = $sBody;
+			$sTestBody .= "<div style=\"border: dashed;\">\n";
+			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
+			$sTestBody .= "<p>The email should be sent with the following properties\n";
+			$sTestBody .= "<ul>\n";
+			$sTestBody .= "<li>TO: $sTo</li>\n";
+			$sTestBody .= "<li>CC: $sCC</li>\n";
+			$sTestBody .= "<li>BCC: $sBCC</li>\n";
+			$sTestBody .= "<li>From: $sFrom</li>\n";
+			$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
+			$sTestBody .= "<li>References: $sReference</li>\n";
+			$sTestBody .= "</ul>\n";
+			$sTestBody .= "</p>\n";
+			$sTestBody .= "</div>\n";
+			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
+			$oEmail->SetRecipientTO($this->Get('test_recipient'));
+			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
+		}
+		else
+		{
+			$oEmail->SetSubject($sSubject);
+			$oEmail->SetBody($sBody, 'text/html', $sStyles);
+			$oEmail->SetRecipientTO($sTo);
+			$oEmail->SetRecipientCC($sCC);
+			$oEmail->SetRecipientBCC($sBCC);
+			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetRecipientReplyTo($sReplyTo);
+			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
+		}
+
+		if (isset($aContextArgs['attachments']))
+		{
+			$aAttachmentReport = array();
+			foreach($aContextArgs['attachments'] as $oDocument)
+			{
+				$oEmail->AddAttachment($oDocument->GetData(), $oDocument->GetFileName(), $oDocument->GetMimeType());
+				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
+			}
+			$oLog->Set('attachments', $aAttachmentReport);
+		}
+
+		if (empty($this->m_aMailErrors))
+		{
+			if ($this->m_iRecipients == 0)
+			{
+				return 'No recipient';
+			}
+			else
+			{
+				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
+				switch ($iRes)
+				{
+					case EMAIL_SEND_OK:
+						return "Sent";
+	
+					case EMAIL_SEND_PENDING:
+						return "Pending";
+	
+					case EMAIL_SEND_ERROR:
+						return "Errors: ".implode(', ', $aErrors);
+				}
+			}
+		}
+		else
+		{
+			if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
+			{
+				$sError = implode(', ', $this->m_aMailErrors);
+			}
+			else
+			{
+				$sError = 'Unknown reason';
+			}
+			return 'Notification was not sent: '.$sError;
+		}
+	}
+}
+?>

core/apc-compat.php

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

core/apc-emulation.php

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

core/archive.class.inc.php

@@ -1,335 +1,335 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Utility to import/export the DB from/to a ZIP file
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * 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)
- * a file called catalog.xml holding the description of the archive
- */
-class iTopArchive
-{
-	const read = 0;
-	const create = ZipArchive::CREATE;
-	
-	protected $m_sZipPath;
-	protected $m_oZip;
-	protected $m_sVersion;
-	protected $m_sTitle;
-	protected $m_sDescription;
-	protected $m_aPackages;
-	protected $m_aErrorMessages;
-
-	/**
-	 * Construct an iTopArchive object
-	 * @param $sArchivePath string The full path the archive file
-	 * @param $iMode integrer Either iTopArchive::read for reading an existing archive or iTopArchive::create for creating a new one. Updating is not supported (yet)
-	 */
-	public function __construct($sArchivePath, $iMode = iTopArchive::read)
-	{
-		$this->m_sZipPath = $sArchivePath;
-		$this->m_oZip = new ZipArchive();
-		$this->m_oZip->open($this->m_sZipPath, $iMode);
-		$this->m_aErrorMessages = array();
-		$this->m_sVersion = '1.0';
-		$this->m_sTitle = '';
-		$this->m_sDescription = '';
-		$this->m_aPackages = array();
-	}
-
-	public function SetTitle($sTitle)
-	{
-		$this->m_sTitle = $sTitle;
-	}
-	
-	public function SetDescription($sDescription)
-	{
-		$this->m_sDescription = $sDescription;
-	}
-	
-	public function GetTitle()
-	{
-		return $this->m_sTitle;
-	}
-	
-	public function GetDescription()
-	{
-		return $this->m_sDescription;
-	}
-	
-	public function GetPackages()
-	{
-		return $this->m_aPackages;
-	}
-	
-	public function __destruct()
-	{
-		$this->m_oZip->close();
-	}
-	
-	/**
-	 * Get the error message explaining the latest error encountered
-	 * @return array All the error messages encountered during the validation
-	 */
-	public function GetErrors()
-	{
-		return $this->m_aErrorMessages;
-	}
-	
-	/**
-	 * Read the catalog from the archive (zip) file
-	 * @param sPath string Path the the zip file
-	 * @return boolean True in case of success, false otherwise
-	 */
-	public function ReadCatalog()
-	{
-		if ($this->IsValid())
-		{
-			$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
-			$oParser = xml_parser_create();
-			xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
-			xml_parser_free($oParser);
-			
-			$iIndex = $aIndexes['ARCHIVE'][0];
-			$this->m_sVersion = $aValues[$iIndex]['attributes']['VERSION'];
-			$iIndex = $aIndexes['TITLE'][0];
-			$this->m_sTitle = $aValues[$iIndex]['value'];
-			$iIndex = $aIndexes['DESCRIPTION'][0];
-			if (array_key_exists('value', $aValues[$iIndex]))
-			{
-				// #@# implement a get_array_value(array, key, default) ?
-				$this->m_sDescription = $aValues[$iIndex]['value'];
-			}
-			
-			foreach($aIndexes['PACKAGE'] as $iIndex)
-			{
-				$this->m_aPackages[$aValues[$iIndex]['attributes']['HREF']] = array( 'type' => $aValues[$iIndex]['attributes']['TYPE'], 'title'=> $aValues[$iIndex]['attributes']['TITLE'], 'description' => $aValues[$iIndex]['value']);
-			}
-			
-			//echo "Archive path: {$this->m_sZipPath}<br/>\n";
-			//echo "Archive format version: {$this->m_sVersion}<br/>\n";
-			//echo "Title: {$this->m_sTitle}<br/>\n";
-			//echo "Description: {$this->m_sDescription}<br/>\n";
-			//foreach($this->m_aPackages as $aFile)
-			//{
-			//	echo "{$aFile['title']} ({$aFile['type']}): {$aFile['description']}<br/>\n";
-			//}
-		}
-		return true;
-	}
-	
-	public function WriteCatalog()
-	{
-		$sXml  = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">\n"; // split the XML closing tag that disturbs PSPad's syntax coloring
-		$sXml .= "<archive version=\"1.0\">\n";
-		$sXml .= "<title>{$this->m_sTitle}</title>\n";
-		$sXml .= "<description>{$this->m_sDescription}</description>\n";
-		foreach($this->m_aPackages as $sFileName => $aFile)
-		{
-			$sXml .= "<package title=\"{$aFile['title']}\" type=\"{$aFile['type']}\" href=\"$sFileName\">{$aFile['description']}</package>\n";
-		}
-		$sXml .= "</archive>";
-		$this->m_oZip->addFromString('catalog.xml', $sXml);
-	}
-	
-   /**
-	* Add a package to the archive
-	* @param string $sExternalFilePath The path to the file to be added to the archive as a package (directories are not yet implemented)
-	* @param string $sFilePath The name of the file inside the archive
-	* @param string $sTitle A short title for this package
-	* @param string $sType Type of the package. SQL scripts must be of type 'text/sql'
-	* @param string $sDescription A longer description of the purpose of this package
-	* @return none
-	*/
-	public function AddPackage($sExternalFilePath, $sFilePath, $sTitle, $sType, $sDescription)
-	{
-		$this->m_aPackages[$sFilePath] = array('title' => $sTitle, 'type' => $sType, 'description' => $sDescription);
-		$this->m_oZip->addFile($sExternalFilePath, $sFilePath);
-	}
-	 
-   /**
-	* Reads the contents of the given file from the archive
-	* @param string $sFileName The path to the file inside the archive
-	* @return string The content of the file read from the archive
-	*/
-	public function GetFileContents($sFileName)
-	{
-		return $this->m_oZip->getFromName($sFileName);
-	}
-	 
-   /**
-	* Extracts the contents of the given file from the archive
-	* @param string $sFileName The path to the file inside the archive
-	* @param string $sDestinationFileName The path of the file to write
-	* @return none
-	*/
-	 public function ExtractToFile($sFileName, $sDestinationFileName)
-	 {
-	 	$iBufferSize = 64 * 1024; // Read 64K at a time
-		$oZipStream = $this->m_oZip->getStream($sFileName);
-		$oDestinationStream = fopen($sDestinationFileName, 'wb');
-		while (!feof($oZipStream)) {
-			$sContents = fread($oZipStream, $iBufferSize);
-			fwrite($oDestinationStream, $sContents);
-		}
-		fclose($oZipStream);
-		fclose($oDestinationStream);
-	 }
-	 
-	 /**
-	  * Apply a SQL script taken from the archive. The package must be listed in the catalog and of type text/sql
-	  * @param string $sFileName The path to the SQL package inside the archive
-	  * @return boolean false in case of error, true otherwise
-	  */
-	 public function ImportSql($sFileName, $sDatabase = 'itop')
-	 {
-		if ( ($this->m_oZip->locateName($sFileName) == false) || (!isset($this->m_aPackages[$sFileName])) || ($this->m_aPackages[$sFileName]['type'] != 'text/sql'))
-		{
-			// invalid type or not listed in the catalog
-			return false;
-		}
-		$sTempName = tempnam("../tmp/", "sql");
-		//echo "Extracting to: '$sTempName'<br/>\n";
-		$this->ExtractToFile($sFileName, $sTempName);
-		// Note: the command line below works on Windows with the right path to mysql !!!
-		$sCommandLine = 'type "'.$sTempName.'" | "/iTop/MySQL Server 5.0/bin/mysql.exe" -u root '.$sDatabase;
-		//echo "Executing: '$sCommandLine'<br/>\n";
-		exec($sCommandLine, $aOutput, $iRet);
-		//echo "Return code: $iRet<br/>\n";
-		//echo "Output:<br/><pre>\n";
-		//print_r($aOutput);
-		//echo "</pre><br/>\n";
-		unlink($sTempName);
-		return ($iRet == 0);
-	 }
-	 
-	 /**
-	  * Dumps some part of the specified MySQL database into the archive as a text/sql package
-	  * @param $sTitle string A short title for this SQL script
-	  * @param $sDescription string A longer description of the purpose of this SQL script
-	  * @param $sFileName string The name of the package inside the archive
-	  * @param $sDatabase string name of the database
-	  * @param $aTables array array or table names. If empty, all tables are dumped
-	  * @param $bStructureOnly boolean Whether or not to dump the data or just the schema
-	  * @return boolean False in case of error, true otherwise
-	  */
-	 public function AddDatabaseDump($sTitle, $sDescription, $sFileName, $sDatabase = 'itop', $aTables = array(), $bStructureOnly = true)
-	 {
-		$sTempName = tempnam("../tmp/", "sql");
-		$sNoData = $bStructureOnly ? "--no-data" : "";
-		$sCommandLine = "\"/iTop/MySQL Server 5.0/bin/mysqldump.exe\" --user=root --opt $sNoData --result-file=$sTempName $sDatabase ".implode(" ", $aTables);
-		//echo "Executing command: '$sCommandLine'<br/>\n";
-		exec($sCommandLine, $aOutput, $iRet);
-		//echo "Return code: $iRet<br/>\n";
-		//echo "Output:<br/><pre>\n";
-		//print_r($aOutput);
-		//echo "</pre><br/>\n";
-		if ($iRet == 0)
-		{
-			$this->AddPackage($sTempName, $sFileName, $sTitle, 'text/sql', $sDescription);
-		}
-		//unlink($sTempName);
-		return ($iRet == 0);
-	 }
-
-	/**
-	 * Check the consistency of the archive
-	 * @return boolean True if the archive file is consistent
-	 */
-	 public function IsValid()
-	 {
-	 	// TO DO: use a DTD to validate the XML instead of this hand-made validation
-	 	$bResult = true;
-		$aMandatoryTags = array('ARCHIVE' => array('VERSION'),
-								'TITLE' => array(),
-								'DESCRIPTION' => array(),
-								'PACKAGE'  => array('TYPE', 'HREF', 'TITLE'));
-		
-		$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
-		$oParser = xml_parser_create();
-		xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
-		xml_parser_free($oParser);
-		
-		foreach($aMandatoryTags as $sTag => $aAttributes)
-		{
-			// Check that all the required tags are present
-			if (!isset($aIndexes[$sTag]))
-			{
-				$this->m_aErrorMessages[] = "The XML catalog does not contain the mandatory tag $sTag.";
-				$bResult = false; 
-			}
-			else
-			{
-				foreach($aIndexes[$sTag] as $iIndex)
-				{
-					switch($aValues[$iIndex]['type'])
-					{
-						case 'complete':
-						case 'open':
-							// Check that all the required attributes are present
-							foreach($aAttributes as $sAttribute)
-							{
-								if (!isset($aValues[$iIndex]['attributes'][$sAttribute]))
-								{
-									$this->m_aErrorMessages[] = "The tag $sTag ($iIndex) does not contain the required attribute $sAttribute.";
-								}
-							}
-						break;
-						
-						default:
-							// ignore other type of tags: close or cdata
-					}
-				}
-			}
-		}
-		return $bResult;
-	 }
-}
-/*
-// Unit test - reading an archive
-$sArchivePath = '../tmp/archive.zip';
-$oArchive = new iTopArchive($sArchivePath, iTopArchive::read);
-$oArchive->ReadCatalog();
-$oArchive->ImportSql('full_backup.sql');
-
-// Writing an archive --
-
-$sArchivePath = '../tmp/archive2.zip';
-$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
-$oArchive->SetTitle('First Archive !');
-$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
-$oArchive->AddPackage('../tmp/schema.sql', 'test.sql', 'this is just a test', 'text/sql', 'My first attempt at creating an archive from PHP...');
-$oArchive->WriteCatalog();
-
-
-$sArchivePath = '../tmp/archive2.zip';
-$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
-$oArchive->SetTitle('First Archive !');
-$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
-$oArchive->AddDatabaseDump('Test', 'This is my first automatic dump', 'schema.sql', 'itop', array('objects'));
-$oArchive->WriteCatalog();
-*/
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Utility to import/export the DB from/to a ZIP file
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * 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)
+ * a file called catalog.xml holding the description of the archive
+ */
+class iTopArchive
+{
+	const read = 0;
+	const create = ZipArchive::CREATE;
+	
+	protected $m_sZipPath;
+	protected $m_oZip;
+	protected $m_sVersion;
+	protected $m_sTitle;
+	protected $m_sDescription;
+	protected $m_aPackages;
+	protected $m_aErrorMessages;
+
+	/**
+	 * Construct an iTopArchive object
+	 * @param $sArchivePath string The full path the archive file
+	 * @param $iMode integrer Either iTopArchive::read for reading an existing archive or iTopArchive::create for creating a new one. Updating is not supported (yet)
+	 */
+	public function __construct($sArchivePath, $iMode = iTopArchive::read)
+	{
+		$this->m_sZipPath = $sArchivePath;
+		$this->m_oZip = new ZipArchive();
+		$this->m_oZip->open($this->m_sZipPath, $iMode);
+		$this->m_aErrorMessages = array();
+		$this->m_sVersion = '1.0';
+		$this->m_sTitle = '';
+		$this->m_sDescription = '';
+		$this->m_aPackages = array();
+	}
+
+	public function SetTitle($sTitle)
+	{
+		$this->m_sTitle = $sTitle;
+	}
+	
+	public function SetDescription($sDescription)
+	{
+		$this->m_sDescription = $sDescription;
+	}
+	
+	public function GetTitle()
+	{
+		return $this->m_sTitle;
+	}
+	
+	public function GetDescription()
+	{
+		return $this->m_sDescription;
+	}
+	
+	public function GetPackages()
+	{
+		return $this->m_aPackages;
+	}
+	
+	public function __destruct()
+	{
+		$this->m_oZip->close();
+	}
+	
+	/**
+	 * Get the error message explaining the latest error encountered
+	 * @return array All the error messages encountered during the validation
+	 */
+	public function GetErrors()
+	{
+		return $this->m_aErrorMessages;
+	}
+	
+	/**
+	 * Read the catalog from the archive (zip) file
+	 * @param sPath string Path the the zip file
+	 * @return boolean True in case of success, false otherwise
+	 */
+	public function ReadCatalog()
+	{
+		if ($this->IsValid())
+		{
+			$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
+			$oParser = xml_parser_create();
+			xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
+			xml_parser_free($oParser);
+			
+			$iIndex = $aIndexes['ARCHIVE'][0];
+			$this->m_sVersion = $aValues[$iIndex]['attributes']['VERSION'];
+			$iIndex = $aIndexes['TITLE'][0];
+			$this->m_sTitle = $aValues[$iIndex]['value'];
+			$iIndex = $aIndexes['DESCRIPTION'][0];
+			if (array_key_exists('value', $aValues[$iIndex]))
+			{
+				// #@# implement a get_array_value(array, key, default) ?
+				$this->m_sDescription = $aValues[$iIndex]['value'];
+			}
+			
+			foreach($aIndexes['PACKAGE'] as $iIndex)
+			{
+				$this->m_aPackages[$aValues[$iIndex]['attributes']['HREF']] = array( 'type' => $aValues[$iIndex]['attributes']['TYPE'], 'title'=> $aValues[$iIndex]['attributes']['TITLE'], 'description' => $aValues[$iIndex]['value']);
+			}
+			
+			//echo "Archive path: {$this->m_sZipPath}<br/>\n";
+			//echo "Archive format version: {$this->m_sVersion}<br/>\n";
+			//echo "Title: {$this->m_sTitle}<br/>\n";
+			//echo "Description: {$this->m_sDescription}<br/>\n";
+			//foreach($this->m_aPackages as $aFile)
+			//{
+			//	echo "{$aFile['title']} ({$aFile['type']}): {$aFile['description']}<br/>\n";
+			//}
+		}
+		return true;
+	}
+	
+	public function WriteCatalog()
+	{
+		$sXml  = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">\n"; // split the XML closing tag that disturbs PSPad's syntax coloring
+		$sXml .= "<archive version=\"1.0\">\n";
+		$sXml .= "<title>{$this->m_sTitle}</title>\n";
+		$sXml .= "<description>{$this->m_sDescription}</description>\n";
+		foreach($this->m_aPackages as $sFileName => $aFile)
+		{
+			$sXml .= "<package title=\"{$aFile['title']}\" type=\"{$aFile['type']}\" href=\"$sFileName\">{$aFile['description']}</package>\n";
+		}
+		$sXml .= "</archive>";
+		$this->m_oZip->addFromString('catalog.xml', $sXml);
+	}
+	
+   /**
+	* Add a package to the archive
+	* @param string $sExternalFilePath The path to the file to be added to the archive as a package (directories are not yet implemented)
+	* @param string $sFilePath The name of the file inside the archive
+	* @param string $sTitle A short title for this package
+	* @param string $sType Type of the package. SQL scripts must be of type 'text/sql'
+	* @param string $sDescription A longer description of the purpose of this package
+	* @return none
+	*/
+	public function AddPackage($sExternalFilePath, $sFilePath, $sTitle, $sType, $sDescription)
+	{
+		$this->m_aPackages[$sFilePath] = array('title' => $sTitle, 'type' => $sType, 'description' => $sDescription);
+		$this->m_oZip->addFile($sExternalFilePath, $sFilePath);
+	}
+	 
+   /**
+	* Reads the contents of the given file from the archive
+	* @param string $sFileName The path to the file inside the archive
+	* @return string The content of the file read from the archive
+	*/
+	public function GetFileContents($sFileName)
+	{
+		return $this->m_oZip->getFromName($sFileName);
+	}
+	 
+   /**
+	* Extracts the contents of the given file from the archive
+	* @param string $sFileName The path to the file inside the archive
+	* @param string $sDestinationFileName The path of the file to write
+	* @return none
+	*/
+	 public function ExtractToFile($sFileName, $sDestinationFileName)
+	 {
+	 	$iBufferSize = 64 * 1024; // Read 64K at a time
+		$oZipStream = $this->m_oZip->getStream($sFileName);
+		$oDestinationStream = fopen($sDestinationFileName, 'wb');
+		while (!feof($oZipStream)) {
+			$sContents = fread($oZipStream, $iBufferSize);
+			fwrite($oDestinationStream, $sContents);
+		}
+		fclose($oZipStream);
+		fclose($oDestinationStream);
+	 }
+	 
+	 /**
+	  * Apply a SQL script taken from the archive. The package must be listed in the catalog and of type text/sql
+	  * @param string $sFileName The path to the SQL package inside the archive
+	  * @return boolean false in case of error, true otherwise
+	  */
+	 public function ImportSql($sFileName, $sDatabase = 'itop')
+	 {
+		if ( ($this->m_oZip->locateName($sFileName) == false) || (!isset($this->m_aPackages[$sFileName])) || ($this->m_aPackages[$sFileName]['type'] != 'text/sql'))
+		{
+			// invalid type or not listed in the catalog
+			return false;
+		}
+		$sTempName = tempnam("../tmp/", "sql");
+		//echo "Extracting to: '$sTempName'<br/>\n";
+		$this->ExtractToFile($sFileName, $sTempName);
+		// Note: the command line below works on Windows with the right path to mysql !!!
+		$sCommandLine = 'type "'.$sTempName.'" | "/iTop/MySQL Server 5.0/bin/mysql.exe" -u root '.$sDatabase;
+		//echo "Executing: '$sCommandLine'<br/>\n";
+		exec($sCommandLine, $aOutput, $iRet);
+		//echo "Return code: $iRet<br/>\n";
+		//echo "Output:<br/><pre>\n";
+		//print_r($aOutput);
+		//echo "</pre><br/>\n";
+		unlink($sTempName);
+		return ($iRet == 0);
+	 }
+	 
+	 /**
+	  * Dumps some part of the specified MySQL database into the archive as a text/sql package
+	  * @param $sTitle string A short title for this SQL script
+	  * @param $sDescription string A longer description of the purpose of this SQL script
+	  * @param $sFileName string The name of the package inside the archive
+	  * @param $sDatabase string name of the database
+	  * @param $aTables array array or table names. If empty, all tables are dumped
+	  * @param $bStructureOnly boolean Whether or not to dump the data or just the schema
+	  * @return boolean False in case of error, true otherwise
+	  */
+	 public function AddDatabaseDump($sTitle, $sDescription, $sFileName, $sDatabase = 'itop', $aTables = array(), $bStructureOnly = true)
+	 {
+		$sTempName = tempnam("../tmp/", "sql");
+		$sNoData = $bStructureOnly ? "--no-data" : "";
+		$sCommandLine = "\"/iTop/MySQL Server 5.0/bin/mysqldump.exe\" --user=root --opt $sNoData --result-file=$sTempName $sDatabase ".implode(" ", $aTables);
+		//echo "Executing command: '$sCommandLine'<br/>\n";
+		exec($sCommandLine, $aOutput, $iRet);
+		//echo "Return code: $iRet<br/>\n";
+		//echo "Output:<br/><pre>\n";
+		//print_r($aOutput);
+		//echo "</pre><br/>\n";
+		if ($iRet == 0)
+		{
+			$this->AddPackage($sTempName, $sFileName, $sTitle, 'text/sql', $sDescription);
+		}
+		//unlink($sTempName);
+		return ($iRet == 0);
+	 }
+
+	/**
+	 * Check the consistency of the archive
+	 * @return boolean True if the archive file is consistent
+	 */
+	 public function IsValid()
+	 {
+	 	// TO DO: use a DTD to validate the XML instead of this hand-made validation
+	 	$bResult = true;
+		$aMandatoryTags = array('ARCHIVE' => array('VERSION'),
+								'TITLE' => array(),
+								'DESCRIPTION' => array(),
+								'PACKAGE'  => array('TYPE', 'HREF', 'TITLE'));
+		
+		$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
+		$oParser = xml_parser_create();
+		xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
+		xml_parser_free($oParser);
+		
+		foreach($aMandatoryTags as $sTag => $aAttributes)
+		{
+			// Check that all the required tags are present
+			if (!isset($aIndexes[$sTag]))
+			{
+				$this->m_aErrorMessages[] = "The XML catalog does not contain the mandatory tag $sTag.";
+				$bResult = false; 
+			}
+			else
+			{
+				foreach($aIndexes[$sTag] as $iIndex)
+				{
+					switch($aValues[$iIndex]['type'])
+					{
+						case 'complete':
+						case 'open':
+							// Check that all the required attributes are present
+							foreach($aAttributes as $sAttribute)
+							{
+								if (!isset($aValues[$iIndex]['attributes'][$sAttribute]))
+								{
+									$this->m_aErrorMessages[] = "The tag $sTag ($iIndex) does not contain the required attribute $sAttribute.";
+								}
+							}
+						break;
+						
+						default:
+							// ignore other type of tags: close or cdata
+					}
+				}
+			}
+		}
+		return $bResult;
+	 }
+}
+/*
+// Unit test - reading an archive
+$sArchivePath = '../tmp/archive.zip';
+$oArchive = new iTopArchive($sArchivePath, iTopArchive::read);
+$oArchive->ReadCatalog();
+$oArchive->ImportSql('full_backup.sql');
+
+// Writing an archive --
+
+$sArchivePath = '../tmp/archive2.zip';
+$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
+$oArchive->SetTitle('First Archive !');
+$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
+$oArchive->AddPackage('../tmp/schema.sql', 'test.sql', 'this is just a test', 'text/sql', 'My first attempt at creating an archive from PHP...');
+$oArchive->WriteCatalog();
+
+
+$sArchivePath = '../tmp/archive2.zip';
+$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
+$oArchive->SetTitle('First Archive !');
+$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
+$oArchive->AddDatabaseDump('Test', 'This is my first automatic dump', 'schema.sql', 'itop', array('objects'));
+$oArchive->WriteCatalog();
+*/
+?>

core/asynctask.class.inc.php

@@ -1,359 +1,386 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent classes (internal): user defined actions
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class ExecAsyncTask implements iBackgroundProcess
-{
-	public function GetPeriodicity()
-	{	
-		return 2; // seconds
-	}
-
-	public function Process($iTimeLimit)
-	{
-		$sNow = date(AttributeDateTime::GetSQLFormat());
-		// Criteria: planned, and expected to occur... ASAP or in the past
-		$sOQL = "SELECT AsyncTask WHERE (status = 'planned') AND (ISNULL(planned) OR (planned < '$sNow'))";
-		$iProcessed = 0;
-		while (time() < $iTimeLimit)
-		{
-			// Next one ?
-			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array(), null, 1 /* limit count */);
-			$oTask = $oSet->Fetch();
-			if (is_null($oTask))
-			{
-				// Nothing to be done
-				break;
-			}
-			$iProcessed++;
-			if ($oTask->Process())
-			{
-				$oTask->DBDelete();
-			}
-		}
-		return "processed $iProcessed tasks";
-	}
-}
-
-/**
- * A   
- *
- * @package     iTopORM
- */
-abstract class AsyncTask extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => array('created'),
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_async_task",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-
-		// Null is allowed to ease the migration from iTop 2.0.2 and earlier, when the status did not exist, and because the default value is not taken into account in the SQL definition
-		// The value is set from null to planned in the setup program
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('planned,running,idle,error'), "sql"=>"status", "default_value"=>"planned", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("started", array("allowed_values"=>null, "sql"=>"started", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("planned", array("allowed_values"=>null, "sql"=>"planned", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("event_id", array("targetclass"=>"Event", "jointype"=> "", "allowed_values"=>null, "sql"=>"event_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("remaining_retries", array("allowed_values"=>null, "sql"=>"remaining_retries", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("last_error_code", array("allowed_values"=>null, "sql"=>"last_error_code", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("last_attempt", array("allowed_values"=>null, "sql"=>"last_attempt", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	/**
-	 * Every is fine
-	 */
-	const OK = 0;
-	/**
-	 * The task no longer exists
-	 */
-	const DELETED = 1;
-	/**
-	 * The task is already being executed
-	 */
-	const ALREADY_RUNNING = 2;
-
-	/**
-	 *	The current process requests the ownership on the task.
-	 *	In case the task can be accessed concurrently, this function can be overloaded to add a critical section.
-	 *	The function must not block the caller if another process is already owning the task	 
-	 *		 
-	 *	@return integer A code among OK/DELETED/ALREADY_RUNNING.	  	 
-	 */	
-	public function MarkAsRunning()
-	{
-		try
-		{
-			if ($this->Get('status') == 'running')
-			{
-				return self::ALREADY_RUNNING;
-			}
-			else
-			{
-				$this->Set('status', 'running');
-				$this->Set('started', time());
-				$this->DBUpdate();
-				return self::OK;
-			}
-		}
-		catch(Exception $e)
-		{
-			// Corrupted task !! (for example: "Failed to reload object")
-			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$e->getMessage().' - fatal error, deleting the task.');
-	   	if ($this->Get('event_id') != 0)
-	   	{
-	   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-	   		$oEventLog->Set('message', 'Failed, corrupted data: '.$e->getMessage());
-	   		$oEventLog->DBUpdate();
-			}
-			$this->DBDelete();
-			return self::DELETED;
-		}
-	}
-
-	public function GetRetryDelay($iErrorCode = null)
-	{
-		$iRetryDelay = 600;
-		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
-		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
-		{
-			$aConfig = $aRetries[get_class($this)];
-			$iRetryDelay = $aConfig['retry_delay'];
-		}
-		return $iRetryDelay;
-	}
-
-	public function GetMaxRetries($iErrorCode = null)
-	{
-		$iMaxRetries = 0;
-		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
-		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
-		{
-			$aConfig = $aRetries[get_class($this)];
-			$iMaxRetries = $aConfig['max_retries'];
-		}
-	}
-
-	/**
-	 * Override to notify people that a task cannot be performed
-	 */
-	protected function OnDefinitiveFailure()
-	{
-	}
-
-  	protected function OnInsert()
-	{
-		$this->Set('created', time());
-	}
-
-   /**
-    * @return boolean True if the task record can be deleted
-    */
-	public function Process()
-   {
-		// By default: consider that the task is not completed
-		$bRet = false;
-
-		// Attempt to take the ownership
-		$iStatus = $this->MarkAsRunning();
-		if ($iStatus == self::OK)
-		{
-			try
-			{
-		   	$sStatus = $this->DoProcess();
-		   	if ($this->Get('event_id') != 0)
-		   	{
-		   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-		   		$oEventLog->Set('message', $sStatus);
-		   		$oEventLog->DBUpdate();
-				}
-				$bRet = true;
-			}
-			catch(Exception $e)
-			{
-				$this->HandleError($e->getMessage(), $e->getCode());
-			}
-		}
-		else
-		{
-			// Already done or being handled by another process... skip...
-			$bRet = false;
-		}
-		return $bRet;
-	}
-
-	/**
-	 * Overridable to extend the behavior in case of error (logging)
-	 */
-	protected function HandleError($sErrorMessage, $iErrorCode)
-	{
-		if ($this->Get('last_attempt') == '')
-		{
-			// First attempt
-			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
-		}
-
-		$this->Set('last_error', $sErrorMessage);
-		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
-		$this->Set('last_attempt', time());
-
-		$iRemaining = $this->Get('remaining_retries');
-		if ($iRemaining > 0)
-		{
-			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
-			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
-
-			$this->Set('remaining_retries', $iRemaining - 1);
-			$this->Set('status', 'planned');
-			$this->Set('started', null);
-			$this->Set('planned', time() + $iRetryDelay);
-		}
-		else
-		{
-			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
-
-			$this->Set('status', 'error');
-			$this->Set('started', null);
-			$this->Set('planned', null);
-			$this->OnDefinitiveFailure();
-		}
-		$this->DBUpdate();
-	}
-
-	/**
-	 * Throws an exception (message and code)
-	 */	 	
-	abstract public function DoProcess();
-
-	/**
-	 * Describes the error codes that DoProcess can return by the mean of exceptions	
-	 */	
-	static public function EnumErrorCodes()
-	{
-		return array();
-	}
-}
-
-/**
- * An email notification  
- *
- * @package     iTopORM
- */
-class AsyncSendEmail extends AsyncTask
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "created",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_async_send_email",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>Email::ORIGINAL_FORMAT, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLongText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-//		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
-//		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	static public function AddToQueue(EMail $oEMail, $oLog)
-	{
-		$oNew = MetaModel::NewObject(__class__);
-		if ($oLog)
-		{
-			$oNew->Set('event_id', $oLog->GetKey());
-		}
-		$oNew->Set('to', $oEMail->GetRecipientTO(true /* string */));
-		$oNew->Set('subject', $oEMail->GetSubject());
-
-//		$oNew->Set('version', 1);
-//		$sMessage = serialize($oEMail);
-		$oNew->Set('version', 2);
-		$sMessage = $oEMail->SerializeV2();
-		$oNew->Set('message', $sMessage);
-		$oNew->DBInsert();
-	}
-
-	public function DoProcess()
-	{
-		$sMessage = $this->Get('message');
-		$iVersion = (int) $this->Get('version');
-		switch($iVersion)
-		{
-			case Email::FORMAT_V2:
-			$oEMail = Email::UnSerializeV2($sMessage);				
-			break;
-			
-			case Email::ORIGINAL_FORMAT:
-			$oEMail = unserialize($sMessage);				
-			break;
-			
-			default:
-			return 'Unknown version of the serialization format: '.$iVersion;				
-		}
-		$iRes = $oEMail->Send($aIssues, true /* force synchro !!!!! */);
-		switch ($iRes)
-		{
-		case EMAIL_SEND_OK:
-			return "Sent";
-
-		case EMAIL_SEND_PENDING:
-			return "Bug - the email should be sent in synchronous mode";
-
-		case EMAIL_SEND_ERROR:
-			return "Failed: ".implode(', ', $aIssues);
-		}
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent classes (internal): user defined actions
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class ExecAsyncTask implements iBackgroundProcess
+{
+	public function GetPeriodicity()
+	{	
+		return 2; // seconds
+	}
+
+	public function Process($iTimeLimit)
+	{
+		$sNow = date(AttributeDateTime::GetSQLFormat());
+		// Criteria: planned, and expected to occur... ASAP or in the past
+		$sOQL = "SELECT AsyncTask WHERE (status = 'planned') AND (ISNULL(planned) OR (planned < '$sNow'))";
+		$iProcessed = 0;
+		while (time() < $iTimeLimit)
+		{
+			// Next one ?
+			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array(), null, 1 /* limit count */);
+			$oTask = $oSet->Fetch();
+			if (is_null($oTask))
+			{
+				// Nothing to be done
+				break;
+			}
+			$iProcessed++;
+			if ($oTask->Process())
+			{
+				$oTask->DBDelete();
+			}
+		}
+		return "processed $iProcessed tasks";
+	}
+}
+
+/**
+ * A   
+ *
+ * @package     iTopORM
+ */
+abstract class AsyncTask extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => array('created'),
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_task",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+
+		// Null is allowed to ease the migration from iTop 2.0.2 and earlier, when the status did not exist, and because the default value is not taken into account in the SQL definition
+		// The value is set from null to planned in the setup program
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('planned,running,idle,error'), "sql"=>"status", "default_value"=>"planned", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("started", array("allowed_values"=>null, "sql"=>"started", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("planned", array("allowed_values"=>null, "sql"=>"planned", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("event_id", array("targetclass"=>"Event", "jointype"=> "", "allowed_values"=>null, "sql"=>"event_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("remaining_retries", array("allowed_values"=>null, "sql"=>"remaining_retries", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("last_error_code", array("allowed_values"=>null, "sql"=>"last_error_code", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("last_attempt", array("allowed_values"=>null, "sql"=>"last_attempt", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	/**
+	 * Every is fine
+	 */
+	const OK = 0;
+	/**
+	 * The task no longer exists
+	 */
+	const DELETED = 1;
+	/**
+	 * The task is already being executed
+	 */
+	const ALREADY_RUNNING = 2;
+
+	/**
+	 *	The current process requests the ownership on the task.
+	 *	In case the task can be accessed concurrently, this function can be overloaded to add a critical section.
+	 *	The function must not block the caller if another process is already owning the task	 
+	 *		 
+	 *	@return integer A code among OK/DELETED/ALREADY_RUNNING.	  	 
+	 */	
+	public function MarkAsRunning()
+	{
+		try
+		{
+			if ($this->Get('status') == 'running')
+			{
+				return self::ALREADY_RUNNING;
+			}
+			else
+			{
+				$this->Set('status', 'running');
+				$this->Set('started', time());
+				$this->DBUpdate();
+				return self::OK;
+			}
+		}
+		catch(Exception $e)
+		{
+			// Corrupted task !! (for example: "Failed to reload object")
+			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$e->getMessage().' - fatal error, deleting the task.');
+	   	if ($this->Get('event_id') != 0)
+	   	{
+	   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+	   		$oEventLog->Set('message', 'Failed, corrupted data: '.$e->getMessage());
+	   		$oEventLog->DBUpdate();
+			}
+			$this->DBDelete();
+			return self::DELETED;
+		}
+	}
+
+	public function GetRetryDelay($iErrorCode = null)
+	{
+		$iRetryDelay = 600;
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
+		{
+			$aConfig = $aRetries[get_class($this)];
+			$iRetryDelay = $aConfig['retry_delay'];
+		}
+		return $iRetryDelay;
+	}
+
+	public function GetMaxRetries($iErrorCode = null)
+	{
+		$iMaxRetries = 0;
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
+		{
+			$aConfig = $aRetries[get_class($this)];
+			$iMaxRetries = $aConfig['max_retries'];
+		}
+		return $iMaxRetries;
+	}
+
+	/**
+	 * Override to notify people that a task cannot be performed
+	 */
+	protected function OnDefinitiveFailure()
+	{
+	}
+
+  	protected function OnInsert()
+	{
+		$this->Set('created', time());
+	}
+
+   /**
+    * @return boolean True if the task record can be deleted
+    */
+	public function Process()
+	{
+		// By default: consider that the task is not completed
+		$bRet = false;
+
+		// Attempt to take the ownership
+		$iStatus = $this->MarkAsRunning();
+		if ($iStatus == self::OK)
+		{
+			try
+			{
+				$sStatus = $this->DoProcess();
+				if ($this->Get('event_id') != 0)
+				{
+					$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+					$oEventLog->Set('message', $sStatus);
+					$oEventLog->DBUpdate();
+				}
+				$bRet = true;
+			} catch (Exception $e)
+			{
+				$this->HandleError($e->getMessage(), $e->getCode());
+			}
+		}
+		else
+		{
+			// Already done or being handled by another process... skip...
+			$bRet = false;
+		}
+
+		return $bRet;
+	}
+
+	/**
+	 * Overridable to extend the behavior in case of error (logging)
+	 */
+	protected function HandleError($sErrorMessage, $iErrorCode)
+	{
+		if ($this->Get('last_attempt') == '')
+		{
+			// First attempt
+			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
+		}
+
+		$this->Set('last_error', $sErrorMessage);
+		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
+		$this->Set('last_attempt', time());
+
+		$iRemaining = $this->Get('remaining_retries');
+		if ($iRemaining > 0)
+		{
+			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
+			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
+			if ($this->Get('event_id') != 0)
+			{
+				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s'");
+                try
+                {
+                    $oEventLog->DBUpdate();
+                }
+                catch (Exception $e)
+                {
+                    $oEventLog->Set('message', "Failed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s', more details in the log");
+                    $oEventLog->DBUpdate();
+                }
+			}
+			$this->Set('remaining_retries', $iRemaining - 1);
+			$this->Set('status', 'planned');
+			$this->Set('started', null);
+			$this->Set('planned', time() + $iRetryDelay);
+		}
+		else
+		{
+			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
+			if ($this->Get('event_id') != 0)
+			{
+				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task.");
+				try
+				{
+                    $oEventLog->DBUpdate();
+				}
+				catch (Exception $e)
+				{
+                    $oEventLog->Set('message', 'Failed to process async task, more details in the log');
+                    $oEventLog->DBUpdate();
+				}
+			}
+			$this->Set('status', 'error');
+			$this->Set('started', null);
+			$this->Set('planned', null);
+			$this->OnDefinitiveFailure();
+		}
+		$this->DBUpdate();
+	}
+
+	/**
+	 * Throws an exception (message and code)
+	 */	 	
+	abstract public function DoProcess();
+
+	/**
+	 * Describes the error codes that DoProcess can return by the mean of exceptions	
+	 */	
+	static public function EnumErrorCodes()
+	{
+		return array();
+	}
+}
+
+/**
+ * An email notification  
+ *
+ * @package     iTopORM
+ */
+class AsyncSendEmail extends AsyncTask
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "created",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_send_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>Email::ORIGINAL_FORMAT, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLongText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+//		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
+//		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	static public function AddToQueue(EMail $oEMail, $oLog)
+	{
+		$oNew = MetaModel::NewObject(__class__);
+		if ($oLog)
+		{
+			$oNew->Set('event_id', $oLog->GetKey());
+		}
+		$oNew->Set('to', $oEMail->GetRecipientTO(true /* string */));
+		$oNew->Set('subject', $oEMail->GetSubject());
+
+//		$oNew->Set('version', 1);
+//		$sMessage = serialize($oEMail);
+		$oNew->Set('version', 2);
+		$sMessage = $oEMail->SerializeV2();
+		$oNew->Set('message', $sMessage);
+		$oNew->DBInsert();
+	}
+
+	public function DoProcess()
+	{
+		$sMessage = $this->Get('message');
+		$iVersion = (int) $this->Get('version');
+		switch($iVersion)
+		{
+			case Email::FORMAT_V2:
+			$oEMail = Email::UnSerializeV2($sMessage);				
+			break;
+			
+			case Email::ORIGINAL_FORMAT:
+			$oEMail = unserialize($sMessage);				
+			break;
+			
+			default:
+			return 'Unknown version of the serialization format: '.$iVersion;				
+		}
+		$iRes = $oEMail->Send($aIssues, true /* force synchro !!!!! */);
+		switch ($iRes)
+		{
+		case EMAIL_SEND_OK:
+			return "Sent";
+
+		case EMAIL_SEND_PENDING:
+			return "Bug - the email should be sent in synchronous mode";
+
+		case EMAIL_SEND_ERROR:
+			return "Failed: ".implode(', ', $aIssues);
+		}
+	}
+}
+?>

core/background.inc.php

@@ -1,55 +1,55 @@
-<?php
-// Copyright (C) 2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Tasks performed in the background
- *
- * @copyright   Copyright (C) 2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class ObsolescenceDateUpdater implements iBackgroundProcess
-{
-	public function GetPeriodicity()
-	{
-		return MetaModel::GetConfig()->Get('obsolescence.date_update_interval'); // 10 mn
-	}
-
-	public function Process($iUnixTimeLimit)
-	{
-		$iCountSet = 0;
-		$iCountReset = 0;
-		$iClasses = 0;
-		foreach (MetaModel::EnumObsoletableClasses() as $sClass)
-		{
-			$oObsoletedToday = new DBObjectSearch($sClass);
-			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '=');
-			$oObsoletedToday->AddCondition('obsolescence_date', null, '=');
-			$sToday = date(AttributeDate::GetSQLFormat());
-			$iCountSet += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => $sToday));
-
-			$oObsoletedToday = new DBObjectSearch($sClass);
-			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '!=');
-			$oObsoletedToday->AddCondition('obsolescence_date', null, '!=');
-			$iCountReset += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => null));
-		}
-		echo "Obsolescence date updated (classes: $iClasses ; set: $iCountSet ; reset: $iCountReset)\n";
-	}
-}
+<?php
+// Copyright (C) 2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Tasks performed in the background
+ *
+ * @copyright   Copyright (C) 2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class ObsolescenceDateUpdater implements iBackgroundProcess
+{
+	public function GetPeriodicity()
+	{
+		return MetaModel::GetConfig()->Get('obsolescence.date_update_interval'); // 10 mn
+	}
+
+	public function Process($iUnixTimeLimit)
+	{
+		$iCountSet = 0;
+		$iCountReset = 0;
+		$iClasses = 0;
+		foreach (MetaModel::EnumObsoletableClasses() as $sClass)
+		{
+			$oObsoletedToday = new DBObjectSearch($sClass);
+			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '=');
+			$oObsoletedToday->AddCondition('obsolescence_date', null, '=');
+			$sToday = date(AttributeDate::GetSQLFormat());
+			$iCountSet += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => $sToday));
+
+			$oObsoletedToday = new DBObjectSearch($sClass);
+			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '!=');
+			$oObsoletedToday->AddCondition('obsolescence_date', null, '!=');
+			$iCountReset += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => null));
+		}
+		return "Obsolescence date updated (classes: $iClasses ; set: $iCountSet ; reset: $iCountReset)\n";
+	}
+}

core/backgroundprocess.inc.php

@@ -1,67 +1,88 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * interface iProcess
- * Something that can be executed 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-interface iProcess
-{
-	public function Process($iUnixTimeLimit);
-}
-
-/**
- * interface iBackgroundProcess
- * Any extension that must be called regularly to be executed in the background 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-interface iBackgroundProcess extends iProcess
-{
-	/*
-		Gives the repetition rate in seconds
-		@returns integer
-	*/
-	public function GetPeriodicity();
-}
-
-/**
- * interface iScheduledProcess
- * A variant of process that must be called at specific times
- *
- * @copyright   Copyright (C) 2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-interface iScheduledProcess extends iProcess
-{
-	/*
-		Gives the exact time at which the process must be run next time
-		@returns DateTime
-	*/
-	public function GetNextOccurrence();
-}
-
-?>
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * interface iProcess
+ * Something that can be executed 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iProcess
+{
+	/**
+	 * @param int $iUnixTimeLimit
+	 *
+	 * @return string status message
+	 * @throws \ProcessException
+	 * @throws \ProcessFatalException
+	 * @throws MySQLHasGoneAwayException
+	 */
+	public function Process($iUnixTimeLimit);
+}
+
+/**
+ * interface iBackgroundProcess
+ * Any extension that must be called regularly to be executed in the background 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iBackgroundProcess extends iProcess
+{
+	/**
+	 * @return int repetition rate in seconds
+	 */
+	public function GetPeriodicity();
+}
+
+/**
+ * interface iScheduledProcess
+ * A variant of process that must be called at specific times
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iScheduledProcess extends iProcess
+{
+	/**
+	 * @return DateTime exact time at which the process must be run next time
+	 */
+	public function GetNextOccurrence();
+}
+
+/**
+ * Class ProcessException
+ * Exception for iProcess implementations.<br>
+ * An error happened during the processing but we can go on with the next implementations.
+ */
+class ProcessException extends CoreException
+{
+
+}
+
+/**
+ * Class ProcessFatalException
+ * Exception for iProcess implementations.<br>
+ * A big error occurred, we have to stop the iProcess processing.
+ */
+class ProcessFatalException extends CoreException
+{
+
+}

core/bulkexport.class.inc.php

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

core/cmdbchange.class.inc.php

@@ -1,87 +1,87 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class (internal) cmdbChange
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A change as requested/validated at once by user, may groups many atomic changes 
- *
- * @package     iTopORM
- */
-class CMDBChange extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "date",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_change",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			'indexes' => array(
-				array('origin'),
-			)
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum('interactive,csv-interactive,csv-import.php,webservice-soap,webservice-rest,synchro-data-source,email-processing,custom-extension'), "sql"=>"origin", "default_value"=>"interactive", "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	// Helper to keep track of the author of a given change,
-	// taking into account a variety of cases (contact attached or not, impersonation)
-	static public function GetCurrentUserName()
-	{
-		if (UserRights::IsImpersonated())
-		{
-			$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUserFriendlyName(), UserRights::GetUserFriendlyName());
-		}
-		else
-		{
-			$sUserString = UserRights::GetUserFriendlyName();
-		}
-		return $sUserString;
-	}
-
-	public function GetUserName()
-	{
-		if (preg_match('/^(.*)\\(CSV\\)$/i', $this->Get('userinfo'), $aMatches))
-		{
-			$sUser = $aMatches[1];
-		}
-		else
-		{
-			$sUser = $this->Get('userinfo');
-		}
-		return $sUser;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class (internal) cmdbChange
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A change as requested/validated at once by user, may groups many atomic changes 
+ *
+ * @package     iTopORM
+ */
+class CMDBChange extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "date",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_change",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			'indexes' => array(
+				array('origin'),
+			)
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum('interactive,csv-interactive,csv-import.php,webservice-soap,webservice-rest,synchro-data-source,email-processing,custom-extension'), "sql"=>"origin", "default_value"=>"interactive", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	// Helper to keep track of the author of a given change,
+	// taking into account a variety of cases (contact attached or not, impersonation)
+	static public function GetCurrentUserName()
+	{
+		if (UserRights::IsImpersonated())
+		{
+			$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUserFriendlyName(), UserRights::GetUserFriendlyName());
+		}
+		else
+		{
+			$sUserString = UserRights::GetUserFriendlyName();
+		}
+		return $sUserString;
+	}
+
+	public function GetUserName()
+	{
+		if (preg_match('/^(.*)\\(CSV\\)$/i', $this->Get('userinfo'), $aMatches))
+		{
+			$sUser = $aMatches[1];
+		}
+		else
+		{
+			$sUser = $this->Get('userinfo');
+		}
+		return $sUser;
+	}
+}
+
+?>

core/computing.inc.php

@@ -1,139 +1,139 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Any extension to compute things like a stop watch deadline or working hours 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Metric computing for stop watches
- */ 
-interface iMetricComputer
-{
-	public static function GetDescription();
-	public function ComputeMetric($oObject);
-}
-
-/**
- * Working time computing for stop watches
- */ 
-interface iWorkingTimeComputer
-{
-	public static function GetDescription();
-
-	/**
-	 * Get the date/time corresponding to a given delay in the future from the present
-	 * considering only the valid (open) hours for a specified object
-	 * @param $oObject DBObject The object for which to compute the deadline
-	 * @param $iDuration integer The duration (in seconds) in the future
-	 * @param $oStartDate DateTime The starting point for the computation
-	 * @return DateTime The date/time for the deadline
-	 */
-	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate);
-	
-	/**
-	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
-	 * @param $oObject DBObject The object for which to compute the duration
-	 * @param $oStartDate DateTime The starting point for the computation (default = now)
-	 * @param $oEndDate DateTime The ending point for the computation (default = now)
-	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
-	 */
-	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate);
-}
-
-/**
- * Default implementation oof deadline computing: NO deadline
- */
-class DefaultMetricComputer implements iMetricComputer
-{
-	public static function GetDescription()
-	{
-		return "Null";
-	}
-
-	public function ComputeMetric($oObject)
-	{
-		return null;
-	}
-}
-
-/**
- * Default implementation of working time computing
- */ 
-class DefaultWorkingTimeComputer implements iWorkingTimeComputer
-{
-	public static function GetDescription()
-	{
-		return "24x7, no holidays";
-	}
-
-	/**
-	 * Get the date/time corresponding to a given delay in the future from the present
-	 * considering only the valid (open) hours for a specified object
-	 * @param $oObject DBObject The object for which to compute the deadline
-	 * @param $iDuration integer The duration (in seconds) in the future
-	 * @param $oStartDate DateTime The starting point for the computation
-	 * @return DateTime The date/time for the deadline
-	 */
-	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate)
-	{
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
-		}
-		//echo "GetDeadline - default: ".$oStartDate->format('Y-m-d H:i:s')." + $iDuration<br/>\n";
-		// Default implementation: 24x7, no holidays: to compute the deadline, just add
-		// the specified duration to the given date/time
-		$oResult = clone $oStartDate;
-		$oResult->modify('+'.$iDuration.' seconds');
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oResult->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_END);
-		}
-		return $oResult;
-	}
-	
-	/**
-	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
-	 * @param $oObject DBObject The object for which to compute the duration
-	 * @param $oStartDate DateTime The starting point for the computation (default = now)
-	 * @param $oEndDate DateTime The ending point for the computation (default = now)
-	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
-	 */
-	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
-	{
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
-		}
-		//echo "GetOpenDuration - default: ".$oStartDate->format('Y-m-d H:i:s')." to ".$oEndDate->format('Y-m-d H:i:s')."<br/>\n";
-		$iDuration = abs($oEndDate->format('U') - $oStartDate->format('U'));
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oEndDate->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_DURATION);
-		}
-		return $iDuration;
-	}
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Any extension to compute things like a stop watch deadline or working hours 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Metric computing for stop watches
+ */ 
+interface iMetricComputer
+{
+	public static function GetDescription();
+	public function ComputeMetric($oObject);
+}
+
+/**
+ * Working time computing for stop watches
+ */ 
+interface iWorkingTimeComputer
+{
+	public static function GetDescription();
+
+	/**
+	 * Get the date/time corresponding to a given delay in the future from the present
+	 * considering only the valid (open) hours for a specified object
+	 * @param $oObject DBObject The object for which to compute the deadline
+	 * @param $iDuration integer The duration (in seconds) in the future
+	 * @param $oStartDate DateTime The starting point for the computation
+	 * @return DateTime The date/time for the deadline
+	 */
+	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate);
+	
+	/**
+	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
+	 * @param $oObject DBObject The object for which to compute the duration
+	 * @param $oStartDate DateTime The starting point for the computation (default = now)
+	 * @param $oEndDate DateTime The ending point for the computation (default = now)
+	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
+	 */
+	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate);
+}
+
+/**
+ * Default implementation oof deadline computing: NO deadline
+ */
+class DefaultMetricComputer implements iMetricComputer
+{
+	public static function GetDescription()
+	{
+		return "Null";
+	}
+
+	public function ComputeMetric($oObject)
+	{
+		return null;
+	}
+}
+
+/**
+ * Default implementation of working time computing
+ */ 
+class DefaultWorkingTimeComputer implements iWorkingTimeComputer
+{
+	public static function GetDescription()
+	{
+		return "24x7, no holidays";
+	}
+
+	/**
+	 * Get the date/time corresponding to a given delay in the future from the present
+	 * considering only the valid (open) hours for a specified object
+	 * @param $oObject DBObject The object for which to compute the deadline
+	 * @param $iDuration integer The duration (in seconds) in the future
+	 * @param $oStartDate DateTime The starting point for the computation
+	 * @return DateTime The date/time for the deadline
+	 */
+	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate)
+	{
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
+		}
+		//echo "GetDeadline - default: ".$oStartDate->format('Y-m-d H:i:s')." + $iDuration<br/>\n";
+		// Default implementation: 24x7, no holidays: to compute the deadline, just add
+		// the specified duration to the given date/time
+		$oResult = clone $oStartDate;
+		$oResult->modify('+'.$iDuration.' seconds');
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oResult->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_END);
+		}
+		return $oResult;
+	}
+	
+	/**
+	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
+	 * @param $oObject DBObject The object for which to compute the duration
+	 * @param $oStartDate DateTime The starting point for the computation (default = now)
+	 * @param $oEndDate DateTime The ending point for the computation (default = now)
+	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
+	 */
+	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
+	{
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
+		}
+		//echo "GetOpenDuration - default: ".$oStartDate->format('Y-m-d H:i:s')." to ".$oEndDate->format('Y-m-d H:i:s')."<br/>\n";
+		$iDuration = abs($oEndDate->format('U') - $oStartDate->format('U'));
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oEndDate->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_DURATION);
+		}
+		return $iDuration;
+	}
+}
+
+
+?>

core/coreexception.class.inc.php

@@ -1,115 +1,129 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Exception management
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-
-class CoreException extends Exception
-{
-	public function __construct($sIssue, $aContextData = null, $sImpact = '')
-	{
-		$this->m_sIssue = $sIssue;
-		$this->m_sImpact = $sImpact;
-		$this->m_aContextData = $aContextData ? $aContextData : array();
-		
-		$sMessage = $sIssue;
-		if (!empty($sImpact)) $sMessage .= "($sImpact)";
-		if (count($this->m_aContextData) > 0)
-		{
-			$sMessage .= ": ";
-			$aContextItems = array();
-			foreach($this->m_aContextData as $sKey => $value)
-			{
-				if (is_array($value))
-				{
-					$aPairs = array();
-					foreach($value as $key => $val)
-					{
-						if (is_array($val))
-						{
-							$aPairs[] = $key.'=>('.implode(', ', $val).')';
-						}
-						else
-						{
-							$aPairs[] = $key.'=>'.$val;
-						}
-					}
-					$sValue = '{'.implode('; ', $aPairs).'}';
-				}
-				else
-				{
-					$sValue = $value;
-				}
-				$aContextItems[] = "$sKey = $sValue";
-			}
-			$sMessage .= implode(', ', $aContextItems);
-		}
-		parent::__construct($sMessage, 0);
-	}
-
-	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
-	{
-		return $this->getMessage();
-	}
-
-	public function getTraceAsHtml()
-	{
-		$aBackTrace = $this->getTrace();
-		return MyHelpers::get_callstack_html(0, $this->getTrace());
-		// return "<pre>\n".$this->getTraceAsString()."</pre>\n";
-	}
-
-	public function addInfo($sKey, $value)
-	{
-		$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
-{
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Exception management
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+
+class CoreException extends Exception
+{
+	public function __construct($sIssue, $aContextData = null, $sImpact = '')
+	{
+		$this->m_sIssue = $sIssue;
+		$this->m_sImpact = $sImpact;
+		$this->m_aContextData = $aContextData ? $aContextData : array();
+		
+		$sMessage = $sIssue;
+		if (!empty($sImpact)) $sMessage .= "($sImpact)";
+		if (count($this->m_aContextData) > 0)
+		{
+			$sMessage .= ": ";
+			$aContextItems = array();
+			foreach($this->m_aContextData as $sKey => $value)
+			{
+				if (is_array($value))
+				{
+					$aPairs = array();
+					foreach($value as $key => $val)
+					{
+						if (is_array($val))
+						{
+							$aPairs[] = $key.'=>('.implode(', ', $val).')';
+						}
+						else
+						{
+							$aPairs[] = $key.'=>'.$val;
+						}
+					}
+					$sValue = '{'.implode('; ', $aPairs).'}';
+				}
+				else
+				{
+					$sValue = $value;
+				}
+				$aContextItems[] = "$sKey = $sValue";
+			}
+			$sMessage .= implode(', ', $aContextItems);
+		}
+		parent::__construct($sMessage, 0);
+	}
+
+	/**
+	 * @return string code and message for log purposes
+	 */
+	public function getInfoLog()
+	{
+		return 'error_code='.$this->getCode().', message="'.$this->getMessage().'"';
+	}
+	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
+	{
+		return $this->getMessage();
+	}
+
+	public function getTraceAsHtml()
+	{
+		$aBackTrace = $this->getTrace();
+		return MyHelpers::get_callstack_html(0, $this->getTrace());
+		// return "<pre>\n".$this->getTraceAsString()."</pre>\n";
+	}
+
+	public function addInfo($sKey, $value)
+	{
+		$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
+{
+}
+
+/**
+ * Throwned when querying on an object that exists in the database but is archived
+ *
+ * @see N.1108
+ */
+class ArchivedObjectException extends CoreException
+{
+}

core/csvparser.class.inc.php

@@ -1,271 +1,271 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * CSV parser
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-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);
-
-define('NULL_VALUE', '<NULL>');
-
-
-/**
- * CSVParser
- *
- * @package     iTopORM
- */
-class CSVParser
-{
-	private $m_sCSVData;
-	private $m_sSep;
-	private $m_sTextQualifier;
-	private $m_iTimeLimitPerRow;
-
-	public function __construct($sTxt, $sSep = ',', $sTextQualifier = '"', $iTimeLimitPerRow = null)
-	{
-		$this->m_sCSVData = str_replace("\r\n", "\n", $sTxt);
-		$this->m_sSep = $sSep;
-		$this->m_sTextQualifier = $sTextQualifier;
-		$this->m_iTimeLimitPerRow = $iTimeLimitPerRow;
-	}
-
-	protected $m_sCurrCell = '';
-	protected $m_aCurrRow = array();
-	protected $m_iToSkip = 0;
-	protected $m_aDataSet = array();
-
-	protected function __AddChar($c)
-	{
-		$this->m_sCurrCell .= $c;
-	}
-	protected function __ClearCell()
-	{
-		$this->m_sCurrCell = '';
-	}
-	protected function __AddCell($c = null, $aFieldMap = null, $bTrimSpaces = false)
-	{
-		if ($bTrimSpaces)
-		{
-			$sCell = trim($this->m_sCurrCell);
-		}
-		else
-		{
-			$sCell = $this->m_sCurrCell;
-		}
-		if ($sCell == NULL_VALUE)
-		{
-			$sCell = null;
-		}
-
-		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)
-	{
-		$this->__AddCell($c, $aFieldMap, $bTrimSpaces);
-
-		if ($this->m_iToSkip > 0)
-		{
-			$this->m_iToSkip--;
-		}
-		elseif (count($this->m_aCurrRow) > 1)
-		{
-			$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)
-			{
-				$this->m_aDataSet[] = $this->m_aCurrRow;
-			}
-		}
-		else
-		{
-			// blank line, skip silently
-		}
-		$this->m_aCurrRow = array();
-		
-		// More time for the next row
-		if ($this->m_iTimeLimitPerRow !== null)
-		{
-			set_time_limit($this->m_iTimeLimitPerRow);
-		}
-	}
-	protected function __AddCellTrimmed($c = null, $aFieldMap = null)
-	{
-		$this->__AddCell($c, $aFieldMap, true);
-	}
-
-	protected function __AddRowTrimmed($c = null, $aFieldMap = null)
-	{
-		$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;
-		$iTimeLimit = null;
-		if ($this->m_iTimeLimitPerRow !== null)
-		{
-			// Give some time for the first row
-			$iTimeLimit = ini_get('max_execution_time');
-			set_time_limit($this->m_iTimeLimitPerRow);
-		}
-		for($i = 0; $i <= $iDataLength ; $i++)
-		{
-			if ($i == $iDataLength)
-			{
-				$c = null;
-				$iEvent = evEND;
-			}
-			else
-			{
-				$c = $this->m_sCSVData[$i];
-
-				if ($c == $this->m_sSep)
-				{
-					$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;
-				}
-			}
-
-			$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;
-		}
-		if ($iTimeLimit !== null)
-		{
-			// Restore the previous time limit
-			set_time_limit($iTimeLimit);
-		}
-		return $this->m_aDataSet;
-	}
-
-	public function ListFields()
-	{
-		$aHeader = $this->ToArray(0, null, 1);
-		return $aHeader[0];
-	}
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * CSV parser
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+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);
+
+define('NULL_VALUE', '<NULL>');
+
+
+/**
+ * CSVParser
+ *
+ * @package     iTopORM
+ */
+class CSVParser
+{
+	private $m_sCSVData;
+	private $m_sSep;
+	private $m_sTextQualifier;
+	private $m_iTimeLimitPerRow;
+
+	public function __construct($sTxt, $sSep = ',', $sTextQualifier = '"', $iTimeLimitPerRow = null)
+	{
+		$this->m_sCSVData = str_replace("\r\n", "\n", $sTxt);
+		$this->m_sSep = $sSep;
+		$this->m_sTextQualifier = $sTextQualifier;
+		$this->m_iTimeLimitPerRow = $iTimeLimitPerRow;
+	}
+
+	protected $m_sCurrCell = '';
+	protected $m_aCurrRow = array();
+	protected $m_iToSkip = 0;
+	protected $m_aDataSet = array();
+
+	protected function __AddChar($c)
+	{
+		$this->m_sCurrCell .= $c;
+	}
+	protected function __ClearCell()
+	{
+		$this->m_sCurrCell = '';
+	}
+	protected function __AddCell($c = null, $aFieldMap = null, $bTrimSpaces = false)
+	{
+		if ($bTrimSpaces)
+		{
+			$sCell = trim($this->m_sCurrCell);
+		}
+		else
+		{
+			$sCell = $this->m_sCurrCell;
+		}
+		if ($sCell == NULL_VALUE)
+		{
+			$sCell = null;
+		}
+
+		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)
+	{
+		$this->__AddCell($c, $aFieldMap, $bTrimSpaces);
+
+		if ($this->m_iToSkip > 0)
+		{
+			$this->m_iToSkip--;
+		}
+		elseif (count($this->m_aCurrRow) > 1)
+		{
+			$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)
+			{
+				$this->m_aDataSet[] = $this->m_aCurrRow;
+			}
+		}
+		else
+		{
+			// blank line, skip silently
+		}
+		$this->m_aCurrRow = array();
+		
+		// More time for the next row
+		if ($this->m_iTimeLimitPerRow !== null)
+		{
+			set_time_limit($this->m_iTimeLimitPerRow);
+		}
+	}
+	protected function __AddCellTrimmed($c = null, $aFieldMap = null)
+	{
+		$this->__AddCell($c, $aFieldMap, true);
+	}
+
+	protected function __AddRowTrimmed($c = null, $aFieldMap = null)
+	{
+		$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;
+		$iTimeLimit = null;
+		if ($this->m_iTimeLimitPerRow !== null)
+		{
+			// Give some time for the first row
+			$iTimeLimit = ini_get('max_execution_time');
+			set_time_limit($this->m_iTimeLimitPerRow);
+		}
+		for($i = 0; $i <= $iDataLength ; $i++)
+		{
+			if ($i == $iDataLength)
+			{
+				$c = null;
+				$iEvent = evEND;
+			}
+			else
+			{
+				$c = $this->m_sCSVData[$i];
+
+				if ($c == $this->m_sSep)
+				{
+					$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;
+				}
+			}
+
+			$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;
+		}
+		if ($iTimeLimit !== null)
+		{
+			// Restore the previous time limit
+			set_time_limit($iTimeLimit);
+		}
+		return $this->m_aDataSet;
+	}
+
+	public function ListFields()
+	{
+		$aHeader = $this->ToArray(0, null, 1);
+		return $aHeader[0];
+	}
+}
+
+
+?>

core/data.generator.class.inc.php

@@ -1,374 +1,374 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * data generator
- * helps the consultants in creating dummy data sets, for various test purposes (validation, usability, scalability) 
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Data Generator helper class
- *
- * This class is useful to generate a lot of sample data that look consistent
- * for a given organization in order to simulate a real CMDB
- */
-class cmdbDataGenerator
-{
-	protected $m_sOrganizationKey;
-	protected $m_sOrganizationCode;
-	protected $m_sOrganizationName;
-	protected $m_OrganizationDomains;
-	
-	/**
-	 * Constructor
-	 */
-	public function __construct($sOrganizationId = "")
-	{
-		global $aCompanies, $aCompaniesCode;
-		if ($sOrganizationId == '')
-		{
-			// No organization provided, pick a random and unused one from our predefined list
-			$retries = 5*count($aCompanies);
-			while ( ($retries > 0) && !isset($this->m_sOrganizationCode)) // Stupid algorithm, but I'm too lazy to do something bulletproof tonight
-			{
-				$index = rand(0, count($aCompanies) - 1);
-				if (!$this->OrganizationExists($aCompanies[$index]['code']))
-				{
-					$this->m_sOrganizationCode = $aCompanies[$index]['code'];
-					$this->m_sOrganizationName = $aCompanies[$index]['name'];
-					$this->m_OrganizationDomains = $aCompanies[$index]['domain'];
-				}
-				$retries--;
-			}
-		}
-		else
-		{
-			// A code has been provided, let's take the information we need from the organization itself
-			$this->m_sOrganizationId = $sOrganizationId;
-			$oOrg = $this->GetOrganization($sOrganizationId);
-			if ($oOrg == null)
-			{
-				echo "Unable to find the organization '$sOrganisationCode' in the database... can not add objects into this organization.<br/>\n";
-				exit();
-			}
-			$this->m_sOrganizationCode = $oOrg->Get('code');
-			$this->m_sOrganizationName = $oOrg->Get('name');
-			if (!isset($aCompaniesCode[$this->m_sOrganizationCode]['domain']))
-			{
-				// Generate some probable domain names for this organization
-				$this->m_OrganizationDomains = array(strtolower($this->m_sOrganizationCode).".com", strtolower($this->m_sOrganizationCode).".org", strtolower($this->m_sOrganizationCode)."corp.net",);
-			}
-			else
-			{
-				// Pick the domain names for this organization from the predefined list
-				$this->m_OrganizationDomains = $aCompaniesCode[$this->m_sOrganizationCode]['domain'];
-			}
-		}
-		
-		if (!isset($this->m_sOrganizationCode))
-		{
-			echo "Unable to find an organization code which is not already used... can not create a new organization. Enhance the list of fake organizations (\$aCompanies in data_sample.inc.php).<br/>\n";
-			exit();
-		}
-	}
-	
-	/**
-	 * Get the current organization id used by the generator
-	 *
-	 * @return string The organization id
-	 */
-	public function GetOrganizationId()
-	{
-		return $this->m_sOrganizationId;
-	}
-	
-	/**
-	 * Get the current organization id used by the generator
-	 *
-	 * @param string The organization id
-	 * @return none
-	 */
-	public function SetOrganizationId($sId)
-	{
-		$this->m_sOrganizationId = $sId;
-	}
-	
-	/**
-	 * Get the current organization code used by the generator
-	 *
-	 * @return string The organization code
-	 */
-	public function GetOrganizationCode()
-	{
-		return $this->m_sOrganizationCode;
-	}
-
-	/**
-	 * Get the current organization name used by the generator
-	 *
-	 * @return string The organization name
-	 */
-	function GetOrganizationName()
-	{
-		return $this->m_sOrganizationName;
-	}
-	
-	/**
-	 * Get a pseudo random first name taken from a (big) prefedined list
-	 *
-	 * @return string A random first name
-	 */
-	function GenerateFirstName()
-	{
-		global $aFirstNames;
-		return $aFirstNames[rand(0, count($aFirstNames) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random last name taken from a (big) prefedined list
-	 *
-	 * @return string A random last name
-	 */
-	function GenerateLastName()
-	{
-		global $aNames;
-		return $aNames[rand(0, count($aNames) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random country name taken from a prefedined list
-	 *
-	 * @return string A random city name
-	 */
-	function GenerateCountryName()
-	{
-		global $aCountries;
-		return $aCountries[rand(0, count($aCountries) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random city name taken from a (big) prefedined list
-	 *
-	 * @return string A random city name
-	 */
-	function GenerateCityName()
-	{
-		global $aCities;
-		return $aCities[rand(0, count($aCities) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random email address made of the first name, last name and organization's domain
-	 *
-	 * @return string A random email address
-	 */
-	function GenerateEmail($sFirstName, $sLastName)
-	{
-		if (rand(1, 20) > 18)
-		{
-			// some people (let's say 5~10%) have an irregular email address
-			$sEmail = strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
-		}
-		else
-		{
-			$sEmail = strtolower($this->CleanForEmail($sFirstName)).".".strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
-		}
-		return $sEmail;
-	}
-
-	/**
-	 * Generate (pseudo) random strings that follow a given pattern
-	 *
-	 *	The template is made of any number of 'parts' separated by pipes '|'
-	 *  Each part is either:
-	 *  - domain() => returns a domain name for the current organization
-	 *  - enum(aaa,bb,c,dddd) => returns randomly one of aaa,bb,c or dddd with the same
-	 *    probability of occurence. If you want to change the probability you can repeat some values
-	 *    i.e enum(most probable,most probable,most probable,most probable,most probable,rare) 
-	 *	- number(xxx-yyy) => a random number between xxx and yyy (bounds included)
-	 *   note that if the first number (xxx) begins with a zero, then the result will zero padded
-	 *   to the same number of digits as xxx.
-	 *  All other 'part' that does not follow one of the above mentioned pattern is returned as is
-	 *
-	 * Example: GenerateString("enum(sw,rtr,gw)|number(00-99)|.|domain()")
-	 *          will produce strings like "sw01.netcmdb.com" or "rtr45.itop.org"
-	 *
-	 * @param string $sTemplate The template used for generating the string
-	 * @return string The generated pseudo random the string
-	 */
-	function GenerateString($sTemplate)
-	{
-		$sResult = "";
-		$aParts = explode("\|", $sTemplate);
-		foreach($aParts as $sPart)
-		{
-			if (preg_match("/domain\(\)/", $sPart, $aMatches))
-			{
-				$sResult .= strtolower($this->GenerateDomain());
-			}
-			elseif (preg_match("/enum\((.+)\)/", $sPart, $aMatches))
-			{
-				$sEnumValues = $aMatches[1];
-				$aEnumValues = explode(",", $sEnumValues);
-				$sResult .= $aEnumValues[rand(0, count($aEnumValues) - 1)];
-			}
-			elseif (preg_match("/number\((\d+)-(\d+)\)/", $sPart, $aMatches))
-			{
-				$sStartNumber = $aMatches[1];
-				if ($sStartNumber[0] == '0')
-				{
-					// number must be zero padded
-					$sFormat = "%0".strlen($sStartNumber)."d";
-				}
-				else
-				{
-					$sFormat = "%d";
-				}
-				$sEndNumber = $aMatches[2];
-				$sResult .= sprintf($sFormat, rand($sStartNumber, $sEndNumber));
-			}
-			else
-			{
-				$sResult .= $sPart;
-			}
-		}
-		return $sResult;
-	}
-
-	/**
-	 * Generate a foreign key by picking a random element of the given class in a set limited by the given search criteria
-	 *
-	 * Example: GenerateKey("bizLocation", array('org_id', $oGenerator->GetOrganizationId());
-	 *          will produce the foreign key of a Location object picked at random in the same organization
-	 *
-	 * @param string $sClass The name of the class to search for
-	 * @param string $aFilterCriteria A hash array of filterCOde => FilterValue (the strict operator '=' is used )
-	 * @return mixed The key to an object of the given class, or null if none are found
-	 */
-	function GenerateKey($sClass, $aFilterCriteria)
-	{
-		$retKey = null;
-		$oFilter = new DBObjectSearch($sClass);
-		foreach($aFilterCriteria as $sFilterCode => $filterValue)
-		{
-			$oFilter->AddCondition($sFilterCode, $filterValue, '=');
-		}
-		$oSet = new CMDBObjectSet($oFilter);
-		if ($oSet->Count() > 0)
-		{
-			$max_count = $index = rand(1, $oSet->Count());
-			do
-			{
-				$oObj = $oSet->Fetch();
-				$index--;
-			}
-			while($index > 0);
-			
-			if (!is_object($oObj))
-			{
-				echo "<pre>";
-				echo "ERROR: non empty set, but invalid object picked! class='$sClass'\n";
-				echo "Index chosen: $max_count\n";
-				echo "The set is supposed to contain ".$oSet->Count()." object(s)\n";
-				echo "Filter criteria:\n";
-				print_r($aFilterCriteria);
-				echo "</pre>";
-			}
-			else
-			{
-				$retKey = $oObj->GetKey();
-			}
-		}
-		return $retKey;
-	}
-	///////////////////////////////////////////////////////////////////////////////
-	//
-	//  Protected methods
-	//
-	///////////////////////////////////////////////////////////////////////////////
-		
-	/**
-	 * Generate a (random) domain name consistent with the organization name & code
-	 *
-	 * The values are pulled from a (limited) predefined list. Note that a given
-	 * organization may have several domain names, so the result may be random
-	 *
-	 * @return string A domain name (like netcnmdb.com)
-	 */
-	protected function GenerateDomain()
-	{
-		if (is_array($this->m_OrganizationDomains))
-		{
-			$sDomain = $this->m_OrganizationDomains[rand(0, count($this->m_OrganizationDomains)-1)];
-		}
-		else
-		{
-			$sDomain = $this->m_OrganizationDomains;
-		}
-		return $sDomain;
-	}
-	
-	/**
-	 * Strips accented characters from a string in order to produce a suitable email address
-	 *
-	 * @param string The text string to clean
-	 * @return string The cleanified text string
-	 */
-	protected function CleanForEmail($sText)
-	{
-		return str_replace(array("'", "é", "è", "ê", "ç", "à", "â", "ñ", "ö", "ä"), array("", "e", "e", "e", "c", "a", "a", "n", "oe", "ae"), $sText);
-	}
-
-	/**
-	 * Check if an organization with the given code already exists in the database
-	 *
-	 * @param string $sCode The code to look for
-	 * @return boolean true if the given organization exists, false otherwise
-	 */
-	protected function OrganizationExists($sCode)
-	{
-		$oFilter = new DBObjectSearch('Organization');
-		$oFilter->AddCondition('code', $sCode, '=');
-		$oSet = new CMDBObjectSet($oFilter);
-		return ($oSet->Count() > 0);
-	}
-
-	/**
-	 * Search for an organization with the given code in the database
-	 *
-	 * @param string $Id The organization Id to look for
-	 * @return cmdbOrganization the organization if it exists, null otherwise
-	 */
-	protected function GetOrganization($sId)
-	{
-		$oOrg = null;
-		$oFilter = new DBObjectSearch('Organization');
-		$oFilter->AddCondition('id', $sId, '=');
-		$oSet = new CMDBObjectSet($oFilter);
-		if ($oSet->Count() > 0)
-		{
-			$oOrg = $oSet->Fetch(); // Let's take the first one found
-		}
-		return $oOrg;
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * data generator
+ * helps the consultants in creating dummy data sets, for various test purposes (validation, usability, scalability) 
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Data Generator helper class
+ *
+ * This class is useful to generate a lot of sample data that look consistent
+ * for a given organization in order to simulate a real CMDB
+ */
+class cmdbDataGenerator
+{
+	protected $m_sOrganizationKey;
+	protected $m_sOrganizationCode;
+	protected $m_sOrganizationName;
+	protected $m_OrganizationDomains;
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct($sOrganizationId = "")
+	{
+		global $aCompanies, $aCompaniesCode;
+		if ($sOrganizationId == '')
+		{
+			// No organization provided, pick a random and unused one from our predefined list
+			$retries = 5*count($aCompanies);
+			while ( ($retries > 0) && !isset($this->m_sOrganizationCode)) // Stupid algorithm, but I'm too lazy to do something bulletproof tonight
+			{
+				$index = rand(0, count($aCompanies) - 1);
+				if (!$this->OrganizationExists($aCompanies[$index]['code']))
+				{
+					$this->m_sOrganizationCode = $aCompanies[$index]['code'];
+					$this->m_sOrganizationName = $aCompanies[$index]['name'];
+					$this->m_OrganizationDomains = $aCompanies[$index]['domain'];
+				}
+				$retries--;
+			}
+		}
+		else
+		{
+			// A code has been provided, let's take the information we need from the organization itself
+			$this->m_sOrganizationId = $sOrganizationId;
+			$oOrg = $this->GetOrganization($sOrganizationId);
+			if ($oOrg == null)
+			{
+				echo "Unable to find the organization '$sOrganisationCode' in the database... can not add objects into this organization.<br/>\n";
+				exit();
+			}
+			$this->m_sOrganizationCode = $oOrg->Get('code');
+			$this->m_sOrganizationName = $oOrg->Get('name');
+			if (!isset($aCompaniesCode[$this->m_sOrganizationCode]['domain']))
+			{
+				// Generate some probable domain names for this organization
+				$this->m_OrganizationDomains = array(strtolower($this->m_sOrganizationCode).".com", strtolower($this->m_sOrganizationCode).".org", strtolower($this->m_sOrganizationCode)."corp.net",);
+			}
+			else
+			{
+				// Pick the domain names for this organization from the predefined list
+				$this->m_OrganizationDomains = $aCompaniesCode[$this->m_sOrganizationCode]['domain'];
+			}
+		}
+		
+		if (!isset($this->m_sOrganizationCode))
+		{
+			echo "Unable to find an organization code which is not already used... can not create a new organization. Enhance the list of fake organizations (\$aCompanies in data_sample.inc.php).<br/>\n";
+			exit();
+		}
+	}
+	
+	/**
+	 * Get the current organization id used by the generator
+	 *
+	 * @return string The organization id
+	 */
+	public function GetOrganizationId()
+	{
+		return $this->m_sOrganizationId;
+	}
+	
+	/**
+	 * Get the current organization id used by the generator
+	 *
+	 * @param string The organization id
+	 * @return none
+	 */
+	public function SetOrganizationId($sId)
+	{
+		$this->m_sOrganizationId = $sId;
+	}
+	
+	/**
+	 * Get the current organization code used by the generator
+	 *
+	 * @return string The organization code
+	 */
+	public function GetOrganizationCode()
+	{
+		return $this->m_sOrganizationCode;
+	}
+
+	/**
+	 * Get the current organization name used by the generator
+	 *
+	 * @return string The organization name
+	 */
+	function GetOrganizationName()
+	{
+		return $this->m_sOrganizationName;
+	}
+	
+	/**
+	 * Get a pseudo random first name taken from a (big) prefedined list
+	 *
+	 * @return string A random first name
+	 */
+	function GenerateFirstName()
+	{
+		global $aFirstNames;
+		return $aFirstNames[rand(0, count($aFirstNames) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random last name taken from a (big) prefedined list
+	 *
+	 * @return string A random last name
+	 */
+	function GenerateLastName()
+	{
+		global $aNames;
+		return $aNames[rand(0, count($aNames) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random country name taken from a prefedined list
+	 *
+	 * @return string A random city name
+	 */
+	function GenerateCountryName()
+	{
+		global $aCountries;
+		return $aCountries[rand(0, count($aCountries) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random city name taken from a (big) prefedined list
+	 *
+	 * @return string A random city name
+	 */
+	function GenerateCityName()
+	{
+		global $aCities;
+		return $aCities[rand(0, count($aCities) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random email address made of the first name, last name and organization's domain
+	 *
+	 * @return string A random email address
+	 */
+	function GenerateEmail($sFirstName, $sLastName)
+	{
+		if (rand(1, 20) > 18)
+		{
+			// some people (let's say 5~10%) have an irregular email address
+			$sEmail = strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
+		}
+		else
+		{
+			$sEmail = strtolower($this->CleanForEmail($sFirstName)).".".strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
+		}
+		return $sEmail;
+	}
+
+	/**
+	 * Generate (pseudo) random strings that follow a given pattern
+	 *
+	 *	The template is made of any number of 'parts' separated by pipes '|'
+	 *  Each part is either:
+	 *  - domain() => returns a domain name for the current organization
+	 *  - enum(aaa,bb,c,dddd) => returns randomly one of aaa,bb,c or dddd with the same
+	 *    probability of occurence. If you want to change the probability you can repeat some values
+	 *    i.e enum(most probable,most probable,most probable,most probable,most probable,rare) 
+	 *	- number(xxx-yyy) => a random number between xxx and yyy (bounds included)
+	 *   note that if the first number (xxx) begins with a zero, then the result will zero padded
+	 *   to the same number of digits as xxx.
+	 *  All other 'part' that does not follow one of the above mentioned pattern is returned as is
+	 *
+	 * Example: GenerateString("enum(sw,rtr,gw)|number(00-99)|.|domain()")
+	 *          will produce strings like "sw01.netcmdb.com" or "rtr45.itop.org"
+	 *
+	 * @param string $sTemplate The template used for generating the string
+	 * @return string The generated pseudo random the string
+	 */
+	function GenerateString($sTemplate)
+	{
+		$sResult = "";
+		$aParts = explode("\|", $sTemplate);
+		foreach($aParts as $sPart)
+		{
+			if (preg_match("/domain\(\)/", $sPart, $aMatches))
+			{
+				$sResult .= strtolower($this->GenerateDomain());
+			}
+			elseif (preg_match("/enum\((.+)\)/", $sPart, $aMatches))
+			{
+				$sEnumValues = $aMatches[1];
+				$aEnumValues = explode(",", $sEnumValues);
+				$sResult .= $aEnumValues[rand(0, count($aEnumValues) - 1)];
+			}
+			elseif (preg_match("/number\((\d+)-(\d+)\)/", $sPart, $aMatches))
+			{
+				$sStartNumber = $aMatches[1];
+				if ($sStartNumber[0] == '0')
+				{
+					// number must be zero padded
+					$sFormat = "%0".strlen($sStartNumber)."d";
+				}
+				else
+				{
+					$sFormat = "%d";
+				}
+				$sEndNumber = $aMatches[2];
+				$sResult .= sprintf($sFormat, rand($sStartNumber, $sEndNumber));
+			}
+			else
+			{
+				$sResult .= $sPart;
+			}
+		}
+		return $sResult;
+	}
+
+	/**
+	 * Generate a foreign key by picking a random element of the given class in a set limited by the given search criteria
+	 *
+	 * Example: GenerateKey("bizLocation", array('org_id', $oGenerator->GetOrganizationId());
+	 *          will produce the foreign key of a Location object picked at random in the same organization
+	 *
+	 * @param string $sClass The name of the class to search for
+	 * @param string $aFilterCriteria A hash array of filterCOde => FilterValue (the strict operator '=' is used )
+	 * @return mixed The key to an object of the given class, or null if none are found
+	 */
+	function GenerateKey($sClass, $aFilterCriteria)
+	{
+		$retKey = null;
+		$oFilter = new DBObjectSearch($sClass);
+		foreach($aFilterCriteria as $sFilterCode => $filterValue)
+		{
+			$oFilter->AddCondition($sFilterCode, $filterValue, '=');
+		}
+		$oSet = new CMDBObjectSet($oFilter);
+		if ($oSet->Count() > 0)
+		{
+			$max_count = $index = rand(1, $oSet->Count());
+			do
+			{
+				$oObj = $oSet->Fetch();
+				$index--;
+			}
+			while($index > 0);
+			
+			if (!is_object($oObj))
+			{
+				echo "<pre>";
+				echo "ERROR: non empty set, but invalid object picked! class='$sClass'\n";
+				echo "Index chosen: $max_count\n";
+				echo "The set is supposed to contain ".$oSet->Count()." object(s)\n";
+				echo "Filter criteria:\n";
+				print_r($aFilterCriteria);
+				echo "</pre>";
+			}
+			else
+			{
+				$retKey = $oObj->GetKey();
+			}
+		}
+		return $retKey;
+	}
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Protected methods
+	//
+	///////////////////////////////////////////////////////////////////////////////
+		
+	/**
+	 * Generate a (random) domain name consistent with the organization name & code
+	 *
+	 * The values are pulled from a (limited) predefined list. Note that a given
+	 * organization may have several domain names, so the result may be random
+	 *
+	 * @return string A domain name (like netcnmdb.com)
+	 */
+	protected function GenerateDomain()
+	{
+		if (is_array($this->m_OrganizationDomains))
+		{
+			$sDomain = $this->m_OrganizationDomains[rand(0, count($this->m_OrganizationDomains)-1)];
+		}
+		else
+		{
+			$sDomain = $this->m_OrganizationDomains;
+		}
+		return $sDomain;
+	}
+	
+	/**
+	 * Strips accented characters from a string in order to produce a suitable email address
+	 *
+	 * @param string The text string to clean
+	 * @return string The cleanified text string
+	 */
+	protected function CleanForEmail($sText)
+	{
+		return str_replace(array("'", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>", "<EFBFBD>"), array("", "e", "e", "e", "c", "a", "a", "n", "oe", "ae"), $sText);
+	}
+
+	/**
+	 * Check if an organization with the given code already exists in the database
+	 *
+	 * @param string $sCode The code to look for
+	 * @return boolean true if the given organization exists, false otherwise
+	 */
+	protected function OrganizationExists($sCode)
+	{
+		$oFilter = new DBObjectSearch('Organization');
+		$oFilter->AddCondition('code', $sCode, '=');
+		$oSet = new CMDBObjectSet($oFilter);
+		return ($oSet->Count() > 0);
+	}
+
+	/**
+	 * Search for an organization with the given code in the database
+	 *
+	 * @param string $Id The organization Id to look for
+	 * @return cmdbOrganization the organization if it exists, null otherwise
+	 */
+	protected function GetOrganization($sId)
+	{
+		$oOrg = null;
+		$oFilter = new DBObjectSearch('Organization');
+		$oFilter->AddCondition('id', $sId, '=');
+		$oSet = new CMDBObjectSet($oFilter);
+		if ($oSet->Count() > 0)
+		{
+			$oOrg = $oSet->Fetch(); // Let's take the first one found
+		}
+		return $oOrg;
+	}
+}
+?>

core/datamodel.core.xml

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

core/dbobjectiterator.php

@@ -1,63 +1,63 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
- *
- * @package     iTopORM
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-interface iDBObjectSetIterator extends Countable
-{
-	/**
-	 * The class of the objects of the collection (at least a common ancestor)
-	 *
-	 * @return string
-	 */
-	public function GetClass();
-
-	/**
-	 * The total number of objects in the collection
-	 *
-	 * @return int
-	 */
-	public function Count();
-
-	/**
-	 * Reset the cursor to the first item in the collection. Equivalent to Seek(0)
-	 *
-	 * @return DBObject The fetched object or null when at the end
-	 */
-	public function Rewind();
-
-	/**
-	 * Position the cursor to the given 0-based position
-	 *
-	 * @param int $iRow
-	 */
-	public function Seek($iPosition);
-
-	/**
-	 * Fetch the object at the current position in the collection and move the cursor to the next position.
-	 *
-	 * @return DBObject The fetched object or null when at the end
-	 */
-	public function Fetch();
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
+ *
+ * @package     iTopORM
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iDBObjectSetIterator extends Countable
+{
+	/**
+	 * The class of the objects of the collection (at least a common ancestor)
+	 *
+	 * @return string
+	 */
+	public function GetClass();
+
+	/**
+	 * The total number of objects in the collection
+	 *
+	 * @return int
+	 */
+	public function Count();
+
+	/**
+	 * Reset the cursor to the first item in the collection. Equivalent to Seek(0)
+	 *
+	 * @return DBObject The fetched object or null when at the end
+	 */
+	public function Rewind();
+
+	/**
+	 * Position the cursor to the given 0-based position
+	 *
+	 * @param int $iRow
+	 */
+	public function Seek($iPosition);
+
+	/**
+	 * Fetch the object at the current position in the collection and move the cursor to the next position.
+	 *
+	 * @return DBObject The fetched object or null when at the end
+	 */
+	public function Fetch();
+}

core/dbproperty.class.inc.php

@@ -1,160 +1,160 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Database properties - manage database instances in a complex installation
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A database property 
- *
- * @package     iTopORM
- */
-class DBProperty extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "cloud",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_db_properties",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		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 AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeDateTime("change_date", array("allowed_values"=>null, "sql"=>"change_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("change_comment", array("allowed_values"=>null, "sql"=>"change_comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	/**
-	 * Helper to check wether the table has been created into the DB 
-	 * (this table did not exist in 1.0.1 and older versions)
-	 */
-	public static function IsInstalled()
-	{
-		$sTable = MetaModel::DBGetTable(__CLASS__);
-		if (CMDBSource::IsTable($sTable))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-		return false;
-	}
-
-	public static function SetProperty($sName, $sValue, $sComment = '', $sDescription = null)
-	{
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
-			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
-			if ($oSet->Count() == 0)
-			{
-				$oProp = new DBProperty();
-				$oProp->Set('name', $sName);
-				$oProp->Set('description', $sDescription);
-				$oProp->Set('value', $sValue);
-				$oProp->Set('change_date', time());
-				$oProp->Set('change_comment', $sComment);
-				$oProp->DBInsert();
-			}
-			elseif ($oSet->Count() == 1)
-			{
-				$oProp = $oSet->fetch();
-				if (!is_null($sDescription))
-				{
-					$oProp->Set('description', $sDescription);
-				}
-				$oProp->Set('value', $sValue);
-				$oProp->Set('change_date', time());
-				$oProp->Set('change_comment', $sComment);
-				$oProp->DBUpdate();
-			}
-			else
-			{
-				// Houston...
-				throw new CoreException('duplicate db property');
-			}
-		}
-		catch (MySQLException $e)
-		{
-			// This might be because the table could not be found,
-			// let's check it and discard silently if this is really the case
-			if (self::IsInstalled())
-			{
-				throw $e;
-			}
-			IssueLog::Error('Attempting to write a DBProperty while the module has not been installed');
-		}
-	}
-
-	public static function GetProperty($sName, $default = null)
-	{
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
-			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
-			$iCount = $oSet->Count();
-			if ($iCount == 0)
-			{
-				//throw new CoreException('unknown db property', array('name' => $sName));
-				$sValue = $default;
-			}
-			elseif ($iCount == 1)
-			{
-				$oProp = $oSet->fetch();
-				$sValue = $oProp->Get('value');
-			}
-			else
-			{
-				// $iCount > 1
-				// Houston...
-				throw new CoreException('duplicate db property', array('name' => $sName, 'count' => $iCount));
-			}
-		}
-		catch (MySQLException $e)
-		{
-			// This might be because the table could not be found,
-			// let's check it and discard silently if this is really the case
-			if (self::IsInstalled())
-			{
-				throw $e;
-			}
-			$sValue = $default;
-		}
-		return $sValue;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Database properties - manage database instances in a complex installation
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A database property 
+ *
+ * @package     iTopORM
+ */
+class DBProperty extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "cloud",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_db_properties",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		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 AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDateTime("change_date", array("allowed_values"=>null, "sql"=>"change_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("change_comment", array("allowed_values"=>null, "sql"=>"change_comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	/**
+	 * Helper to check wether the table has been created into the DB 
+	 * (this table did not exist in 1.0.1 and older versions)
+	 */
+	public static function IsInstalled()
+	{
+		$sTable = MetaModel::DBGetTable(__CLASS__);
+		if (CMDBSource::IsTable($sTable))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+		return false;
+	}
+
+	public static function SetProperty($sName, $sValue, $sComment = '', $sDescription = null)
+	{
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
+			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
+			if ($oSet->Count() == 0)
+			{
+				$oProp = new DBProperty();
+				$oProp->Set('name', $sName);
+				$oProp->Set('description', $sDescription);
+				$oProp->Set('value', $sValue);
+				$oProp->Set('change_date', time());
+				$oProp->Set('change_comment', $sComment);
+				$oProp->DBInsert();
+			}
+			elseif ($oSet->Count() == 1)
+			{
+				$oProp = $oSet->fetch();
+				if (!is_null($sDescription))
+				{
+					$oProp->Set('description', $sDescription);
+				}
+				$oProp->Set('value', $sValue);
+				$oProp->Set('change_date', time());
+				$oProp->Set('change_comment', $sComment);
+				$oProp->DBUpdate();
+			}
+			else
+			{
+				// Houston...
+				throw new CoreException('duplicate db property');
+			}
+		}
+		catch (MySQLException $e)
+		{
+			// This might be because the table could not be found,
+			// let's check it and discard silently if this is really the case
+			if (self::IsInstalled())
+			{
+				throw $e;
+			}
+			IssueLog::Error('Attempting to write a DBProperty while the module has not been installed');
+		}
+	}
+
+	public static function GetProperty($sName, $default = null)
+	{
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
+			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
+			$iCount = $oSet->Count();
+			if ($iCount == 0)
+			{
+				//throw new CoreException('unknown db property', array('name' => $sName));
+				$sValue = $default;
+			}
+			elseif ($iCount == 1)
+			{
+				$oProp = $oSet->fetch();
+				$sValue = $oProp->Get('value');
+			}
+			else
+			{
+				// $iCount > 1
+				// Houston...
+				throw new CoreException('duplicate db property', array('name' => $sName, 'count' => $iCount));
+			}
+		}
+		catch (MySQLException $e)
+		{
+			// This might be because the table could not be found,
+			// let's check it and discard silently if this is really the case
+			if (self::IsInstalled())
+			{
+				throw $e;
+			}
+			$sValue = $default;
+		}
+		return $sValue;
+	}
+}
+
+?>

core/deletionplan.class.inc.php

@@ -1,298 +1,298 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Algorithm to delete object(s) and maintain data integrity
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class DeleteException extends CoreException
-{
-}
-
-/**
- * Deletion plan (other objects to be deleted/modified, eventual issues, etc.) 
- *
- * @package     iTopORM
- */
-class DeletionPlan
-{
-	//protected $m_aIssues;
-
-	protected $m_bFoundStopper;
-	protected $m_bFoundSecurityIssue;
-	protected $m_bFoundManualDelete;
-	protected $m_bFoundManualOperation;
-
-	protected $m_iToDelete;
-	protected $m_iToUpdate;
-
-  	protected $m_aToDelete;
-  	protected $m_aToUpdate;
-
-	protected static $m_aModeUpdate = array(
-		DEL_SILENT => array(
-			DEL_SILENT => DEL_SILENT,
-			DEL_AUTO => DEL_AUTO,
-			DEL_MANUAL => DEL_MANUAL
-		),
-		DEL_MANUAL => array(
-			DEL_SILENT => DEL_MANUAL,
-			DEL_AUTO => DEL_AUTO,
-			DEL_MANUAL => DEL_MANUAL
-		),
-		DEL_AUTO => array(
-			DEL_SILENT => DEL_AUTO,
-			DEL_AUTO => DEL_AUTO,
-			DEL_MANUAL => DEL_AUTO
-		)
-	);
-
-	public function __construct()
-	{
-		$this->m_iToDelete = 0;
-		$this->m_iToUpdate = 0;
-
-		$this->m_aToDelete = array();
-		$this->m_aToUpdate = array();
-
-		$this->m_bFoundStopper = false;
-		$this->m_bFoundSecurityIssue = false;
-		$this->m_bFoundManualDelete = false;
-		$this->m_bFoundManualOperation = false;
-	}
-
-	public function ComputeResults()
-	{
-		$this->m_iToDelete = 0;
-		$this->m_iToUpdate = 0;
-
-		foreach($this->m_aToDelete as $sClass => $aToDelete)
-		{
-			foreach($aToDelete as $iId => $aData)
-			{
-				$this->m_iToDelete++;
-				if (isset($aData['issue']))
-				{
-					$this->m_bFoundStopper = true;
-					$this->m_bFoundManualOperation = true;
-					if (isset($aData['issue_security']))
-					{
-						$this->m_bFoundSecurityIssue = true;
-					}
-				}
-				if ($aData['mode'] == DEL_MANUAL)
-				{
-					$this->m_aToDelete[$sClass][$iId]['issue'] = $sClass.'::'.$iId.' '.Dict::S('UI:Delete:MustBeDeletedManually');
-					$this->m_bFoundStopper = true;
-					$this->m_bFoundManualDelete = true;
-				}
-			}
-		}
-
-		// Getting and setting time limit are not symetric:
-		// www.php.net/manual/fr/function.set-time-limit.php#72305
-		$iPreviousTimeLimit = ini_get('max_execution_time');
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		foreach($this->m_aToUpdate as $sClass => $aToUpdate)
-		{
-			foreach($aToUpdate as $iId => $aData)
-			{
-				set_time_limit($iLoopTimeLimit);
-				$this->m_iToUpdate++;
-
-				$oObject = $aData['to_reset'];
-				$aExtKeyLabels = array();
-				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
-				{
-					$oObject->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-					$aExtKeyLabels[] = $aRemoteAttDef->GetLabel();
-				}
-				$this->m_aToUpdate[$sClass][$iId]['attributes_list'] = implode(', ', $aExtKeyLabels); 
-
-				list($bRes, $aIssues, $bSecurityIssues) = $oObject->CheckToWrite();
-				if (!$bRes)
-				{
-					$this->m_aToUpdate[$sClass][$iId]['issue'] = implode(', ', $aIssues);
-					$this->m_bFoundStopper = true;
-
-					if ($bSecurityIssues)
-					{
-						$this->m_aToUpdate[$sClass][$iId]['issue_security'] = true;
-						$this->m_bFoundSecurityIssue = true;
-					}
-				}
-			}
-		}
-		set_time_limit($iPreviousTimeLimit);
-	}
-
-	public function GetIssues()
-	{
-		$aIssues = array();
-		foreach ($this->m_aToDelete as $sClass => $aToDelete)
-		{
-			foreach ($aToDelete as $iId => $aData)
-			{
-				if (isset($aData['issue']))
-				{
-					$aIssues[] = $aData['issue'];
-				}
-			}
-		}
-		foreach ($this->m_aToUpdate as $sClass => $aToUpdate)
-		{
-			foreach ($aToUpdate as $iId => $aData)
-			{
-				if (isset($aData['issue']))
-				{
-					$aIssues[] = $aData['issue'];
-				}
-			}
-		}
-		return $aIssues;
-	}
-
-	public function ListDeletes()
-	{
-		return $this->m_aToDelete;
-	}
-
-	public function ListUpdates()
-	{
-		return $this->m_aToUpdate;
-	}
-
-	public function GetTargetCount()
-	{
-		return $this->m_iToDelete + $this->m_iToUpdate;
-	}
-
-	public function FoundStopper()
-	{
-		return $this->m_bFoundStopper;
-	}
-
-	public function FoundSecurityIssue()
-	{
-		return $this->m_bFoundSecurityIssue;
-	}
-
-	public function FoundManualOperation()
-	{
-		return $this->m_bFoundManualOperation;
-	}
-
-	public function FoundManualDelete()
-	{
-		return $this->m_bFoundManualDelete;
-	}
-
-	public function FoundManualUpdate()
-	{
-	}
-
-	public function AddToDelete($oObject, $iDeletionMode = null)
-	{
-		if (is_null($iDeletionMode))
-		{
-			$bRequestedExplicitely = true;
-			$iDeletionMode = DEL_AUTO;
-		}
-		else
-		{
-			$bRequestedExplicitely = false;
-		}
-
-		$sClass = get_class($oObject);
-		$iId = $oObject->GetKey();
-
-		if (isset($this->m_aToUpdate[$sClass][$iId]))
-		{
-			unset($this->m_aToUpdate[$sClass][$iId]);
-		}
-
-		if (isset($this->m_aToDelete[$sClass][$iId]))
-		{
-			if ($this->m_aToDelete[$sClass][$iId]['requested_explicitely'])
-			{
-				// No change: let it in mode DEL_AUTO
-			}
-			else
-			{
-				$iPrevDeletionMode = $this->m_aToDelete[$sClass][$iId]['mode'];
-				$iNewDeletionMode = self::$m_aModeUpdate[$iPrevDeletionMode][$iDeletionMode];
-				$this->m_aToDelete[$sClass][$iId]['mode'] = $iNewDeletionMode;
-	
-				if ($bRequestedExplicitely)
-				{
-					// This object was in the root list
-					$this->m_aToDelete[$sClass][$iId]['requested_explicitely'] = true;
-					$this->m_aToDelete[$sClass][$iId]['mode'] = DEL_AUTO;
-				}
-			}
-		}
-		else
-		{
-			$this->m_aToDelete[$sClass][$iId] = array(
-				'to_delete' => $oObject,
-				'mode' => $iDeletionMode,
-				'requested_explicitely' => $bRequestedExplicitely,
-			);
-		}
-	}
-
-	public function SetDeletionIssues($oObject, $aIssues, $bSecurityIssue)
-	{
-		if (count($aIssues) > 0)
-		{
-			$sClass = get_class($oObject);
-			$iId = $oObject->GetKey();
-			$this->m_aToDelete[$sClass][$iId]['issue'] = implode(', ', $aIssues);
-			if ($bSecurityIssue)
-			{
-				$this->m_aToDelete[$sClass][$iId]['issue_security'] = true;
-			}
-		}
-	}
-
-	public function AddToUpdate($oObject, $oAttDef, $value = 0)
-	{
-		$sClass = get_class($oObject);
-		$iId = $oObject->GetKey();
-		if (isset($this->m_aToDelete[$sClass][$iId]))
-		{
-			// skip... it should be deleted anyhow !
-		}
-		else
-		{
-			if (!isset($this->m_aToUpdate[$sClass][$iId]))
-			{
-				$this->m_aToUpdate[$sClass][$iId] = array(
-					'to_reset' => $oObject,
-				);
-			}
-			$this->m_aToUpdate[$sClass][$iId]['attributes'][$oAttDef->GetCode()] = $oAttDef;
-			$this->m_aToUpdate[$sClass][$iId]['values'][$oAttDef->GetCode()] = $value;
-		}
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Algorithm to delete object(s) and maintain data integrity
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class DeleteException extends CoreException
+{
+}
+
+/**
+ * Deletion plan (other objects to be deleted/modified, eventual issues, etc.) 
+ *
+ * @package     iTopORM
+ */
+class DeletionPlan
+{
+	//protected $m_aIssues;
+
+	protected $m_bFoundStopper;
+	protected $m_bFoundSecurityIssue;
+	protected $m_bFoundManualDelete;
+	protected $m_bFoundManualOperation;
+
+	protected $m_iToDelete;
+	protected $m_iToUpdate;
+
+  	protected $m_aToDelete;
+  	protected $m_aToUpdate;
+
+	protected static $m_aModeUpdate = array(
+		DEL_SILENT => array(
+			DEL_SILENT => DEL_SILENT,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_MANUAL
+		),
+		DEL_MANUAL => array(
+			DEL_SILENT => DEL_MANUAL,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_MANUAL
+		),
+		DEL_AUTO => array(
+			DEL_SILENT => DEL_AUTO,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_AUTO
+		)
+	);
+
+	public function __construct()
+	{
+		$this->m_iToDelete = 0;
+		$this->m_iToUpdate = 0;
+
+		$this->m_aToDelete = array();
+		$this->m_aToUpdate = array();
+
+		$this->m_bFoundStopper = false;
+		$this->m_bFoundSecurityIssue = false;
+		$this->m_bFoundManualDelete = false;
+		$this->m_bFoundManualOperation = false;
+	}
+
+	public function ComputeResults()
+	{
+		$this->m_iToDelete = 0;
+		$this->m_iToUpdate = 0;
+
+		foreach($this->m_aToDelete as $sClass => $aToDelete)
+		{
+			foreach($aToDelete as $iId => $aData)
+			{
+				$this->m_iToDelete++;
+				if (isset($aData['issue']))
+				{
+					$this->m_bFoundStopper = true;
+					$this->m_bFoundManualOperation = true;
+					if (isset($aData['issue_security']))
+					{
+						$this->m_bFoundSecurityIssue = true;
+					}
+				}
+				if ($aData['mode'] == DEL_MANUAL)
+				{
+					$this->m_aToDelete[$sClass][$iId]['issue'] = $sClass.'::'.$iId.' '.Dict::S('UI:Delete:MustBeDeletedManually');
+					$this->m_bFoundStopper = true;
+					$this->m_bFoundManualDelete = true;
+				}
+			}
+		}
+
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		foreach($this->m_aToUpdate as $sClass => $aToUpdate)
+		{
+			foreach($aToUpdate as $iId => $aData)
+			{
+				set_time_limit($iLoopTimeLimit);
+				$this->m_iToUpdate++;
+
+				$oObject = $aData['to_reset'];
+				$aExtKeyLabels = array();
+				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+				{
+					$oObject->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+					$aExtKeyLabels[] = $aRemoteAttDef->GetLabel();
+				}
+				$this->m_aToUpdate[$sClass][$iId]['attributes_list'] = implode(', ', $aExtKeyLabels); 
+
+				list($bRes, $aIssues, $bSecurityIssues) = $oObject->CheckToWrite();
+				if (!$bRes)
+				{
+					$this->m_aToUpdate[$sClass][$iId]['issue'] = implode(', ', $aIssues);
+					$this->m_bFoundStopper = true;
+
+					if ($bSecurityIssues)
+					{
+						$this->m_aToUpdate[$sClass][$iId]['issue_security'] = true;
+						$this->m_bFoundSecurityIssue = true;
+					}
+				}
+			}
+		}
+		set_time_limit($iPreviousTimeLimit);
+	}
+
+	public function GetIssues()
+	{
+		$aIssues = array();
+		foreach ($this->m_aToDelete as $sClass => $aToDelete)
+		{
+			foreach ($aToDelete as $iId => $aData)
+			{
+				if (isset($aData['issue']))
+				{
+					$aIssues[] = $aData['issue'];
+				}
+			}
+		}
+		foreach ($this->m_aToUpdate as $sClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $iId => $aData)
+			{
+				if (isset($aData['issue']))
+				{
+					$aIssues[] = $aData['issue'];
+				}
+			}
+		}
+		return $aIssues;
+	}
+
+	public function ListDeletes()
+	{
+		return $this->m_aToDelete;
+	}
+
+	public function ListUpdates()
+	{
+		return $this->m_aToUpdate;
+	}
+
+	public function GetTargetCount()
+	{
+		return $this->m_iToDelete + $this->m_iToUpdate;
+	}
+
+	public function FoundStopper()
+	{
+		return $this->m_bFoundStopper;
+	}
+
+	public function FoundSecurityIssue()
+	{
+		return $this->m_bFoundSecurityIssue;
+	}
+
+	public function FoundManualOperation()
+	{
+		return $this->m_bFoundManualOperation;
+	}
+
+	public function FoundManualDelete()
+	{
+		return $this->m_bFoundManualDelete;
+	}
+
+	public function FoundManualUpdate()
+	{
+	}
+
+	public function AddToDelete($oObject, $iDeletionMode = null)
+	{
+		if (is_null($iDeletionMode))
+		{
+			$bRequestedExplicitely = true;
+			$iDeletionMode = DEL_AUTO;
+		}
+		else
+		{
+			$bRequestedExplicitely = false;
+		}
+
+		$sClass = get_class($oObject);
+		$iId = $oObject->GetKey();
+
+		if (isset($this->m_aToUpdate[$sClass][$iId]))
+		{
+			unset($this->m_aToUpdate[$sClass][$iId]);
+		}
+
+		if (isset($this->m_aToDelete[$sClass][$iId]))
+		{
+			if ($this->m_aToDelete[$sClass][$iId]['requested_explicitely'])
+			{
+				// No change: let it in mode DEL_AUTO
+			}
+			else
+			{
+				$iPrevDeletionMode = $this->m_aToDelete[$sClass][$iId]['mode'];
+				$iNewDeletionMode = self::$m_aModeUpdate[$iPrevDeletionMode][$iDeletionMode];
+				$this->m_aToDelete[$sClass][$iId]['mode'] = $iNewDeletionMode;
+	
+				if ($bRequestedExplicitely)
+				{
+					// This object was in the root list
+					$this->m_aToDelete[$sClass][$iId]['requested_explicitely'] = true;
+					$this->m_aToDelete[$sClass][$iId]['mode'] = DEL_AUTO;
+				}
+			}
+		}
+		else
+		{
+			$this->m_aToDelete[$sClass][$iId] = array(
+				'to_delete' => $oObject,
+				'mode' => $iDeletionMode,
+				'requested_explicitely' => $bRequestedExplicitely,
+			);
+		}
+	}
+
+	public function SetDeletionIssues($oObject, $aIssues, $bSecurityIssue)
+	{
+		if (count($aIssues) > 0)
+		{
+			$sClass = get_class($oObject);
+			$iId = $oObject->GetKey();
+			$this->m_aToDelete[$sClass][$iId]['issue'] = implode(', ', $aIssues);
+			if ($bSecurityIssue)
+			{
+				$this->m_aToDelete[$sClass][$iId]['issue_security'] = true;
+			}
+		}
+	}
+
+	public function AddToUpdate($oObject, $oAttDef, $value = 0)
+	{
+		$sClass = get_class($oObject);
+		$iId = $oObject->GetKey();
+		if (isset($this->m_aToDelete[$sClass][$iId]))
+		{
+			// skip... it should be deleted anyhow !
+		}
+		else
+		{
+			if (!isset($this->m_aToUpdate[$sClass][$iId]))
+			{
+				$this->m_aToUpdate[$sClass][$iId] = array(
+					'to_reset' => $oObject,
+				);
+			}
+			$this->m_aToUpdate[$sClass][$iId]['attributes'][$oAttDef->GetCode()] = $oAttDef;
+			$this->m_aToUpdate[$sClass][$iId]['values'][$oAttDef->GetCode()] = $value;
+		}
+	}
+}
+?>

core/designdocument.class.inc.php

@@ -1,268 +1,282 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Design document and associated nodes
- * @package Core
- */
-
-namespace Combodo\iTop;
-
-use \DOMDocument;
-use \DOMFormatException;
-
-/**
- * Class \Combodo\iTop\DesignDocument
- *
- * A design document is the DOM tree that modelize behaviors. One of its
- * characteristics is that it can be altered by the mean of the same kind of document.
- *
- */
-class DesignDocument extends DOMDocument
-{
-	/**
-	 * @throws \Exception
-	 */
-	public function __construct()
-	{
-		parent::__construct('1.0', 'UTF-8');
-		$this->Init();
-	}
-
-	/**
-	 * Overloadable. Called prior to data loading.
-	 */
-	protected function Init()
-	{
-		$this->registerNodeClass('DOMElement', '\Combodo\iTop\DesignElement');
-
-		$this->formatOutput = true; // indent (must be loaded with option LIBXML_NOBLANKS)
-		$this->preserveWhiteSpace = true; // otherwise the formatOutput option would have no effect
-	}
-
-	/**
-	 * Overload of the standard API
-	 */
-	public function load($filename, $options = 0)
-	{
-		parent::load($filename, LIBXML_NOBLANKS);
-	}
-
-	/**
-	 * Overload of the standard API
-	 */
-	public function save($filename, $options = 0)
-	{
-		$this->documentElement->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
-		return parent::save($filename, LIBXML_NOBLANKS);
-	}
-
-	/**
-	 * Create an HTML representation of the DOM, for debugging purposes
-	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
-	 * @return mixed void or the HTML representation of the DOM
-	 */
-	public function Dump($bReturnRes = false)
-	{
-		$sXml = $this->saveXML();
-		if ($bReturnRes)
-		{
-			return $sXml;
-		}
-		else
-		{
-			echo "<pre>\n";
-			echo htmlentities($sXml);
-			echo "</pre>\n";
-		}
-	}
-
-	/**
-	 * Quote and escape strings for use within an XPath expression
-	 * Usage: DesignDocument::GetNodes('class[@id='.DesignDocument::XPathQuote($sId).']');
-	 * @param $sValue The value to be quoted
-	 * @return string to be used within an XPath
-	 */
-	public static function XPathQuote($sValue)
-	{
-		if (strpos($sValue, '"') !== false)
-		{
-			$aParts = explode('"', $sValue);
-			$sRet = 'concat("'.implode('", \'"\', "', $aParts).'")';
-		}
-		else
-		{
-			$sRet = '"'.$sValue.'"';
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Extracts some nodes from the DOM
-	 * @param string $sXPath A XPath expression
-	 * @param DesignNode|null $oContextNode The node to start the search from
-	 * @return \DOMNodeList
-	 */
-	public function GetNodes($sXPath, $oContextNode = null)
-	{
-		$oXPath = new \DOMXPath($this);
-		if (is_null($oContextNode))
-		{
-			$oResult = $oXPath->query($sXPath);
-		}
-		else
-		{
-			$oResult = $oXPath->query($sXPath, $oContextNode);
-		}
-		return $oResult;
-	}
-
-	/**
-	 * An alternative to getNodePath, that gives the id of nodes instead of the position within the children
-	 * @param $oNode The node to describe
-	 * @return string
-	 */
-	public static function GetItopNodePath($oNode)
-	{
-		if ($oNode instanceof \DOMDocument) return '';
-		if (is_null($oNode)) return '';
-
-		$sId = $oNode->getAttribute('id');
-		$sNodeDesc = ($sId != '') ? $oNode->nodeName.'['.$sId.']' : $oNode->nodeName;
-		return self::GetItopNodePath($oNode->parentNode).'/'.$sNodeDesc;
-	}
-}
-
-/**
- * DesignElement: helper to read/change the DOM
- * @package ModelFactory
- */
-class DesignElement extends \DOMElement
-{
-	/**
-	 * Extracts some nodes from the DOM
-	 * @param string $sXPath A XPath expression
-	 * @return \DOMNodeList
-	 */
-	public function GetNodes($sXPath)
-	{
-		return $this->ownerDocument->GetNodes($sXPath, $this);
-	}
-
-	/**
-	 * Create an HTML representation of the DOM, for debugging purposes
-	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
-	 * @return mixed void or the HTML representation of the DOM
-	 */
-	public function Dump($bReturnRes = false)
-	{
-		$oDoc = new DesignDocument();
-		$oClone = $oDoc->importNode($this->cloneNode(true), true);
-		$oDoc->appendChild($oClone);
-
-		$sXml = $oDoc->saveXML($oClone);
-		if ($bReturnRes)
-		{
-			return $sXml;
-		}
-		else
-		{
-			echo "<pre>\n";
-			echo htmlentities($sXml);
-			echo "</pre>\n";
-		}
-	}
-
-	/**
-	 * Returns the node directly under the given node
-	 * @param $sTagName
-	 * @param bool|true $bMustExist
-	 * @return MFElement
-	 * @throws DOMFormatException
-	 */
-	public function GetUniqueElement($sTagName, $bMustExist = true)
-	{
-		$oNode = null;
-		foreach($this->childNodes as $oChildNode)
-		{
-			if ($oChildNode->nodeName == $sTagName)
-			{
-				$oNode = $oChildNode;
-				break;
-			}
-		}
-		if ($bMustExist && is_null($oNode))
-		{
-			throw new DOMFormatException('Missing unique tag: '.$sTagName);
-		}
-		return $oNode;
-	}
-
-	/**
-	 * Returns the node directly under the current node, or null if missing
-	 * @param $sTagName
-	 * @return MFElement
-	 * @throws DOMFormatException
-	 */
-	public function GetOptionalElement($sTagName)
-	{
-		return $this->GetUniqueElement($sTagName, false);
-	}
-
-	/**
-	 * Returns the TEXT of the current node (possibly from several child nodes)
-	 * @param null $sDefault
-	 * @return null|string
-	 */
-	public function GetText($sDefault = null)
-	{
-		$sText = null;
-		foreach($this->childNodes as $oChildNode)
-		{
-			if ($oChildNode instanceof \DOMText)
-			{
-				if (is_null($sText)) $sText = '';
-				$sText .= $oChildNode->wholeText;
-			}
-		}
-		if (is_null($sText))
-		{
-			return $sDefault;
-		}
-		else
-		{
-			return $sText;
-		}
-	}
-
-	/**
-	 * Get the TEXT value from a child node
-	 * @param string $sTagName
-	 * @param string|null $sDefault
-	 * @return string
-	 */
-	public function GetChildText($sTagName, $sDefault = null)
-	{
-		$sRet = $sDefault;
-		if ($oChild = $this->GetOptionalElement($sTagName))
-		{
-			$sRet = $oChild->GetText($sDefault);
-		}
-		return $sRet;
-	}
-}
+<?php
+/**
+ * Copyright (c) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Design document and associated nodes
+ * @package Core
+ */
+
+namespace Combodo\iTop;
+
+use \DOMDocument;
+use \DOMFormatException;
+
+/**
+ * Class \Combodo\iTop\DesignDocument
+ *
+ * A design document is the DOM tree that modelize behaviors. One of its
+ * characteristics is that it can be altered by the mean of the same kind of document.
+ *
+ */
+class DesignDocument extends DOMDocument
+{
+	/**
+	 * @throws \Exception
+	 */
+	public function __construct()
+	{
+		parent::__construct('1.0', 'UTF-8');
+		$this->Init();
+	}
+
+	/**
+	 * Overloadable. Called prior to data loading.
+	 */
+	protected function Init()
+	{
+		$this->registerNodeClass('DOMElement', '\Combodo\iTop\DesignElement');
+
+		$this->formatOutput = true; // indent (must be loaded with option LIBXML_NOBLANKS)
+		$this->preserveWhiteSpace = true; // otherwise the formatOutput option would have no effect
+	}
+
+	/**
+	 * Overload of the standard API
+	 *
+	 * @param $filename
+	 * @param int $options
+	 */
+	public function load($filename, $options = 0)
+	{
+		parent::load($filename, LIBXML_NOBLANKS);
+	}
+
+	/**
+	 * Overload of the standard API
+	 *
+	 * @param $filename
+	 * @param int $options
+	 *
+	 * @return int
+	 */
+	public function save($filename, $options = 0)
+	{
+		$this->documentElement->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
+		return parent::save($filename, LIBXML_NOBLANKS);
+	}
+
+	/**
+	 * Create an HTML representation of the DOM, for debugging purposes
+	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
+	 * @return mixed void or the HTML representation of the DOM
+	 */
+	public function Dump($bReturnRes = false)
+	{
+		$sXml = $this->saveXML();
+		if ($bReturnRes)
+		{
+			return $sXml;
+		}
+
+		echo "<pre>\n";
+		echo htmlentities($sXml);
+		echo "</pre>\n";
+
+		return '';
+	}
+
+	/**
+	 * Quote and escape strings for use within an XPath expression
+	 * Usage: DesignDocument::GetNodes('class[@id='.DesignDocument::XPathQuote($sId).']');
+	 * @param string $sValue The value to be quoted
+	 * @return string to be used within an XPath
+	 */
+	public static function XPathQuote($sValue)
+	{
+		if (strpos($sValue, '"') !== false)
+		{
+			$aParts = explode('"', $sValue);
+			$sRet = 'concat("'.implode('", \'"\', "', $aParts).'")';
+		}
+		else
+		{
+			$sRet = '"'.$sValue.'"';
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Extracts some nodes from the DOM
+	 * @param string $sXPath A XPath expression
+	 * @param DesignElement $oContextNode The node to start the search from
+	 * @return \DOMNodeList
+	 */
+	public function GetNodes($sXPath, $oContextNode = null)
+	{
+		$oXPath = new \DOMXPath($this);
+		if (is_null($oContextNode))
+		{
+			$oResult = $oXPath->query($sXPath);
+		}
+		else
+		{
+			$oResult = $oXPath->query($sXPath, $oContextNode);
+		}
+		return $oResult;
+	}
+
+	/**
+	 * An alternative to getNodePath, that gives the id of nodes instead of the position within the children
+	 * @param DesignElement $oNode The node to describe
+	 * @return string
+	 */
+	public static function GetItopNodePath($oNode)
+	{
+		if ($oNode instanceof \DOMDocument) return '';
+		if (is_null($oNode)) return '';
+
+		$sId = $oNode->getAttribute('id');
+		$sNodeDesc = ($sId != '') ? $oNode->nodeName.'['.$sId.']' : $oNode->nodeName;
+		return self::GetItopNodePath($oNode->parentNode).'/'.$sNodeDesc;
+	}
+}
+
+/**
+ * DesignElement: helper to read/change the DOM
+ * @package ModelFactory
+ */
+class DesignElement extends \DOMElement
+{
+	/**
+	 * Extracts some nodes from the DOM
+	 * @param string $sXPath A XPath expression
+	 * @return \DOMNodeList
+	 */
+	public function GetNodes($sXPath)
+	{
+		return $this->ownerDocument->GetNodes($sXPath, $this);
+	}
+
+	/**
+	 * Create an HTML representation of the DOM, for debugging purposes
+	 *
+	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
+	 *
+	 * @return mixed void or the HTML representation of the DOM
+	 * @throws \Exception
+	 */
+	public function Dump($bReturnRes = false)
+	{
+		$oDoc = new DesignDocument();
+		$oClone = $oDoc->importNode($this->cloneNode(true), true);
+		$oDoc->appendChild($oClone);
+
+		$sXml = $oDoc->saveXML($oClone);
+		if ($bReturnRes)
+		{
+			return $sXml;
+		}
+		echo "<pre>\n";
+		echo htmlentities($sXml);
+		echo "</pre>\n";
+		return '';
+	}
+	/**
+	 * Returns the node directly under the given node
+	 * @param $sTagName
+	 * @param bool|true $bMustExist
+	 * @return \MFElement
+	 * @throws DOMFormatException
+	 */
+	public function GetUniqueElement($sTagName, $bMustExist = true)
+	{
+		$oNode = null;
+		foreach($this->childNodes as $oChildNode)
+		{
+			if ($oChildNode->nodeName == $sTagName)
+			{
+				$oNode = $oChildNode;
+				break;
+			}
+		}
+		if ($bMustExist && is_null($oNode))
+		{
+			throw new DOMFormatException('Missing unique tag: '.$sTagName);
+		}
+		return $oNode;
+	}
+
+	/**
+	 * Returns the node directly under the current node, or null if missing
+	 * @param $sTagName
+	 * @return \MFElement
+	 * @throws DOMFormatException
+	 */
+	public function GetOptionalElement($sTagName)
+	{
+		return $this->GetUniqueElement($sTagName, false);
+	}
+
+	/**
+	 * Returns the TEXT of the current node (possibly from several child nodes)
+	 * @param null $sDefault
+	 * @return null|string
+	 */
+	public function GetText($sDefault = null)
+	{
+		$sText = null;
+		foreach($this->childNodes as $oChildNode)
+		{
+			if ($oChildNode instanceof \DOMText)
+			{
+				if (is_null($sText)) $sText = '';
+				$sText .= $oChildNode->wholeText;
+			}
+		}
+		if (is_null($sText))
+		{
+			return $sDefault;
+		}
+		else
+		{
+			return $sText;
+		}
+	}
+
+	/**
+	 * Get the TEXT value from a child node
+	 *
+	 * @param string $sTagName
+	 * @param string|null $sDefault
+	 *
+	 * @return string
+	 * @throws \DOMFormatException
+	 */
+	public function GetChildText($sTagName, $sDefault = null)
+	{
+		$sRet = $sDefault;
+		if ($oChild = $this->GetOptionalElement($sTagName))
+		{
+			$sRet = $oChild->GetText($sDefault);
+		}
+		return $sRet;
+	}
+}

core/dict.class.inc.php

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

core/displayablegraph.class.inc.php

@@ -1270,6 +1270,7 @@ class DisplayableGraph extends SimpleGraph
 
 		$oPdf->SetAutoPageBreak(true, $fBreakMargin);
 		$oPdf->SetAlpha(1);
+		$oPdf->SetTextColor(0, 0, 0);
 	}
 	
 	/**
@@ -1438,22 +1439,22 @@ class DisplayableGraph extends SimpleGraph
 			}
 			$aExcludedByClass[get_class($oObj)][] = $oObj->GetKey();
 		}
+		$sSftShort = Dict::S('UI:ElementsDisplayed');
+		$sSearchToggle = Dict::S('UI:Search:Toggle');
 		$oP->add("<div class=\"not-printable\">\n");
-		$oP->add("<div id=\"ds_flash\" class=\"SearchDrawer\" style=\"display:none;\">\n");
-		if (!$oP->IsPrintableVersion())
-		{
-			$oP->add_ready_script(
+		$oP->add(
 <<<EOF
-	$( "#tabbedContent_0" ).tabs({ heightStyle: "fill" });
+ <div id="ds_flash" class="search_box">
+	<form id="dh_flash" class="search_form_handler closed">
+	<h2 class="sf_title"><span class="sft_long">$sSftShort</span><span class="sft_short">$sSftShort</span><span class="sft_toggler fa fa-caret-down pull-right" title="$sSearchToggle"></span></h2>
+	<div id="dh_flash_criterion_outer" class="sf_criterion_area"><div class="sf_criterion_row">
 EOF
-			);
-		}
+		);
 		
 		$oP->add_ready_script(
 <<<EOF
-	$("#dh_flash").click( function() {
-		$("#ds_flash").slideToggle('normal', function() { $("#ds_flash").parent().resize(); $("#dh_flash").trigger('toggle_complete'); } );
-		$("#dh_flash").toggleClass('open');
+	$("#dh_flash > .sf_title").click( function() {
+		$("#dh_flash").toggleClass('closed');
 	});
     $('#ReloadMovieBtn').button().button('disable');
 EOF
@@ -1476,9 +1477,8 @@ EOF
 			$idx++;
 		}
 		$oP->add("<p style=\"text-align:right\"><button type=\"button\" id=\"ReloadMovieBtn\" onClick=\"DoReload()\">".Dict::S('UI:Button:Refresh')."</button></p>");
+		$oP->add("</div></div></form>");
 		$oP->add("</div>\n");
-		$oP->add("<div class=\"HRDrawer\"></div>\n");
-		$oP->add("<div id=\"dh_flash\" class=\"DrawerHandle\">".Dict::S('UI:ElementsDisplayed')."</div>\n");
 	 	$oP->add("</div>\n"); // class="not-printable"
 
 		$aAdditionalContexts = array();

core/event.class.inc.php

@@ -1,411 +1,437 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Event and derived
- * Application internal events
- * There is also a file log 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class Event extends DBObject implements iDisplay
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		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 AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'finalclass', 'message')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	/**
-	 * Maps the given context parameter name to the appropriate filter/search code for this class
-	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
-	 * @return string Filter code, i.e. 'customer_id'
-	 */
-	public static function MapContextParam($sContextParam)
-	{
-		if ($sContextParam == 'menu')
-		{
-			return null;
-		}
-		else
-		{
-			return $sContextParam;
-		}
-	}
-
-	/**
-	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
-	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
-	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
-	 * To Be overridden by derived classes
-	 * @param void
-	 * @return String The desired higlight class for the object/row
-	 */
-	public function GetHilightClass()
-	{
-		// Possible return values are:
-		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
-		return HILIGHT_CLASS_NONE; // Not hilighted by default
-	}
-
-	public static function GetUIPage()
-	{
-		return 'UI.php';
-	}
-
-	function DisplayDetails(WebPage $oPage, $bEditMode = false)
-	{
-		// Object's details
-		//$this->DisplayBareHeader($oPage, $bEditMode);
-		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
-		$this->DisplayBareProperties($oPage, $bEditMode);
-	}
-	
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		if ($bEditMode) return array(); // Not editable
-		
-		$aDetails = array();
-		$sClass = get_class($this);
-		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
-		foreach( $aZList as $sAttCode)
-		{
-			$sDisplayValue = $this->GetAsHTML($sAttCode);	
-			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
-		}
-		$oPage->Details($aDetails);
-		return array();
-	}
-}
-
-class EventNotification extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_notification",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false),
-			'indexes' => array(
-				array('object_id'),
-			)
-		);
-		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())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'message')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-}
-
-class EventNotificationEmail extends EventNotification
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_email",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new 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 AttributeHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTable("attachments", array("allowed_values"=>null, "sql"=>"attachments", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject', 'attachments')); // Attributes to be displayed for a list
-
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-}
-
-class EventIssue extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_issue",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("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())));
-
-		// 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
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'issue', 'impact')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	protected function OnInsert()
-	{
-		// 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 (avoid warnings in case the value cannot be easily casted into 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)");
-		}
-	}
-}
-
-
-class EventWebService extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_webservice",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("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())));
-
-		// 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
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'verb', 'result')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class EventRestService extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_restservice",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("operation", array("allowed_values"=>null, "sql"=>"operation", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("json_input", array("allowed_values"=>null, "sql"=>"json_input", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("code", array("allowed_values"=>null, "sql"=>"code", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("json_output", array("allowed_values"=>null, "sql"=>"json_output", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("provider", array("allowed_values"=>null, "sql"=>"provider", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'operation', 'version', 'json_input', 'message', 'code', 'json_output', 'provider')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'operation', 'message')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class EventLoginUsage extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_loginusage",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		$aZList = array('date', 'user_id');
-		if (MetaModel::IsValidAttCode('Contact', 'name'))
-		{
-			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_name", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"contactid", "is_null_allowed"=>true, "depends_on"=>array())));
-			$aZList[] = 'contact_name';
-		}
-		if (MetaModel::IsValidAttCode('Contact', 'email'))
-		{
-			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_email", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
-			$aZList[] = 'contact_email';
-		}
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array_merge($aZList, array('userinfo', 'message'))); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array_merge($aZList, array('userinfo'))); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', $aZList); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Event and derived
+ * Application internal events
+ * There is also a file log 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class Event extends DBObject implements iDisplay
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		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 AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'finalclass', 'message')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	/**
+	 * Maps the given context parameter name to the appropriate filter/search code for this class
+	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
+	 * @return string Filter code, i.e. 'customer_id'
+	 */
+	public static function MapContextParam($sContextParam)
+	{
+		if ($sContextParam == 'menu')
+		{
+			return null;
+		}
+		else
+		{
+			return $sContextParam;
+		}
+	}
+
+	/**
+	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
+	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
+	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+	 * To Be overridden by derived classes
+	 * @param void
+	 * @return String The desired higlight class for the object/row
+	 */
+	public function GetHilightClass()
+	{
+		// Possible return values are:
+		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
+		return HILIGHT_CLASS_NONE; // Not hilighted by default
+	}
+
+	public static function GetUIPage()
+	{
+		return 'UI.php';
+	}
+
+	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+		// Object's details
+		//$this->DisplayBareHeader($oPage, $bEditMode);
+		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$this->DisplayBareProperties($oPage, $bEditMode);
+	}
+	
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		if ($bEditMode) return array(); // Not editable
+		
+		$aDetails = array();
+		$sClass = get_class($this);
+		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
+		foreach( $aZList as $sAttCode)
+		{
+			$sDisplayValue = $this->GetAsHTML($sAttCode);	
+			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
+		}
+		$oPage->Details($aDetails);
+		return array();
+	}
+}
+
+class EventNotification extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_notification",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false),
+			'indexes' => array(
+				array('object_id'),
+			)
+		);
+		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())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'message')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+}
+
+class EventNotificationEmail extends EventNotification
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new 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 AttributeHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTable("attachments", array("allowed_values"=>null, "sql"=>"attachments", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject', 'attachments')); // Attributes to be displayed for a list
+
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+}
+
+class EventIssue extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_issue",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("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())));
+
+		// 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
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'issue', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	protected function OnInsert()
+	{
+		// 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 (avoid warnings in case the value cannot be easily casted into 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)");
+		}
+	}
+}
+
+
+class EventWebService extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_webservice",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("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())));
+
+		// 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
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'verb', 'result')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class EventRestService extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_restservice",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("operation", array("allowed_values"=>null, "sql"=>"operation", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("json_input", array("allowed_values"=>null, "sql"=>"json_input", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("code", array("allowed_values"=>null, "sql"=>"code", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("json_output", array("allowed_values"=>null, "sql"=>"json_output", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("provider", array("allowed_values"=>null, "sql"=>"provider", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'operation', 'version', 'json_input', 'message', 'code', 'json_output', 'provider')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'operation', 'message')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class EventLoginUsage extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_loginusage",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		$aZList = array('date', 'user_id');
+		if (MetaModel::IsValidAttCode('Contact', 'name'))
+		{
+			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_name", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"contactid", "is_null_allowed"=>true, "depends_on"=>array())));
+			$aZList[] = 'contact_name';
+		}
+		if (MetaModel::IsValidAttCode('Contact', 'email'))
+		{
+			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_email", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
+			$aZList[] = 'contact_email';
+		}
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array_merge($aZList, array('userinfo', 'message'))); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array_merge($aZList, array('userinfo'))); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', $aZList); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class EventOnObject extends Event
+{
+    public static function Init()
+    {
+        $aParams = array
+        (
+            "category" => "core/cmdb,view_in_gui",
+            "key_type" => "autoincrement",
+            "name_attcode" => "",
+            "state_attcode" => "",
+            "reconc_keys" => array(),
+            "db_table" => "priv_event_onobject",
+            "db_key_field" => "id",
+            "db_finalclass_field" => "",
+            "display_template" => "",
+            "order_by_default" => array('date' => false)
+        );
+        MetaModel::Init_Params($aParams);
+        MetaModel::Init_InheritAttributes();
+        MetaModel::Init_AddAttribute(new AttributeString("obj_class", array("allowed_values"=>null, "sql"=>"obj_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+        MetaModel::Init_AddAttribute(new AttributeInteger("obj_key", array("allowed_values"=>null, "sql"=>"obj_key", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+        // Display lists
+        MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for the complete details
+        MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for a list
+    }
+}

core/excelbulkexport.class.inc.php

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

core/expression.class.inc.php

@@ -1,4 +1,4 @@
-<?php
-// The file has been moved in iTop 2.2.0+ (revision 3803)
-// Preserve backward compatibility with some external tools (Cf. toolkit)
-require_once(APPROOT.'core/oql/expression.class.inc.php');
+<?php
+// The file has been moved in iTop 2.2.0+ (revision 3803)
+// Preserve backward compatibility with some external tools (Cf. toolkit)
+require_once(APPROOT.'core/oql/expression.class.inc.php');

core/expressioncache.class.inc.php

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

core/filterdef.class.inc.php

@@ -1,212 +1,212 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Definition of a filter
- * Most of the time, a filter corresponds to an attribute, but we could imagine other search criteria
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-
-require_once('MyHelpers.class.inc.php');
-
-
-/**
- * Definition of a filter (could be made out of an existing attribute, or from an expression) 
- *
- * @package     iTopORM
- */
-abstract class FilterDefinition
-{
-	abstract public function GetType();
-	abstract public function GetTypeDesc();
-
-	protected $m_sCode;
-	private $m_aParams = array();
-	protected function Get($sParamName) {return $this->m_aParams[$sParamName];}
-	
-	public function __construct($sCode, $aParams = array())
-	{
-		$this->m_sCode = $sCode;
-		$this->m_aParams = $aParams;
-		$this->ConsistencyCheck();
-	}
-
-	// to be overloaded
-	static protected function ListExpectedParams()
-	{
-		return array();
-	}
-
-	private function ConsistencyCheck()
-	{
-		// Check that any mandatory param has been specified
-		//
-		$aExpectedParams = $this->ListExpectedParams();
-		foreach($aExpectedParams as $sParamName)
-		{
-			if (!array_key_exists($sParamName, $this->m_aParams))
-			{
-				$aBacktrace = debug_backtrace();
-				$sTargetClass = $aBacktrace[2]["class"];
-				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
-				throw new CoreException("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
-			}
-		}
-	} 
-
-	public function GetCode() {return $this->m_sCode;} 
-	abstract public function GetLabel(); 
-	abstract public function GetValuesDef(); 
-
-	// returns an array of opcode=>oplabel (e.g. "differs from")
-	abstract public function GetOperators();
-	// returns an opcode
-	abstract public function GetLooseOperator();
-	abstract public function GetSQLExpressions();
-
-	// Wrapper - no need for overloading this one
-	public function GetOpDescription($sOpCode)
-	{
-		$aOperators = $this->GetOperators();
-		if (!array_key_exists($sOpCode, $aOperators))
-		{
-			throw new CoreException("Unknown operator '$sOpCode'");
-		}
-		
-		return $aOperators[$sOpCode];
-	}
-}
-
-/**
- * Match against the object unique identifier 
- *
- * @package     iTopORM
- */
-class FilterPrivateKey extends FilterDefinition
-{
-	static protected function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("id_field"));
-	}
-
-	public function GetType() {return "PrivateKey";}
-	public function GetTypeDesc() {return "Match against object identifier";}
-
-	public function GetLabel()
-	{
-		return "Object Private Key";
-	} 
-
-	public function GetValuesDef()
-	{
-		return null;
-	}
-
-	public function GetOperators()
-	{
-		return array(
-			"="=>"equals",
-			"!="=>"differs from",
-			"IN"=>"in",
-			"NOTIN"=>"not in"
-		);
-	}
-	public function GetLooseOperator()
-	{
-		return "IN";
-	}
-
-	public function GetSQLExpressions()
-	{
-		return array(
-			'' => $this->Get("id_field"),
-		);
-	}
-}
-
-/**
- * Match against an existing attribute (the attribute type will determine the available operators) 
- *
- * @package     iTopORM
- */
-class FilterFromAttribute extends FilterDefinition
-{
-	static protected function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("refattribute"));
-	}
-
-	public function __construct($oRefAttribute, $sSuffix = '')
-	{
-		// In this very specific case, the code is the one of the attribute
-		 // (this to get a very very simple syntax upon declaration)
-		$aParam = array();
-		$aParam["refattribute"] = $oRefAttribute;
-		parent::__construct($oRefAttribute->GetCode().$sSuffix, $aParam);
-	}
-
-	public function GetType() {return "Basic";}
-	public function GetTypeDesc() {return "Match against field contents";}
-
-	public function __GetRefAttribute() // for checking purposes only !!!
-	{
-		return $oAttDef = $this->Get("refattribute");
-	}
-
-	public function GetLabel()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetLabel();
-	} 
-
-	public function GetValuesDef()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetValuesDef();
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetAllowedValues($aArgs, $sContains);
-	}
-
-	public function GetOperators()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetBasicFilterOperators();
-	}
-	public function GetLooseOperator()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetBasicFilterLooseOperator();
-	}
-
-	public function GetSQLExpressions()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetSQLExpressions();
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Definition of a filter
+ * Most of the time, a filter corresponds to an attribute, but we could imagine other search criteria
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+
+require_once('MyHelpers.class.inc.php');
+
+
+/**
+ * Definition of a filter (could be made out of an existing attribute, or from an expression) 
+ *
+ * @package     iTopORM
+ */
+abstract class FilterDefinition
+{
+	abstract public function GetType();
+	abstract public function GetTypeDesc();
+
+	protected $m_sCode;
+	private $m_aParams = array();
+	protected function Get($sParamName) {return $this->m_aParams[$sParamName];}
+	
+	public function __construct($sCode, $aParams = array())
+	{
+		$this->m_sCode = $sCode;
+		$this->m_aParams = $aParams;
+		$this->ConsistencyCheck();
+	}
+
+	// to be overloaded
+	static protected function ListExpectedParams()
+	{
+		return array();
+	}
+
+	private function ConsistencyCheck()
+	{
+		// Check that any mandatory param has been specified
+		//
+		$aExpectedParams = $this->ListExpectedParams();
+		foreach($aExpectedParams as $sParamName)
+		{
+			if (!array_key_exists($sParamName, $this->m_aParams))
+			{
+				$aBacktrace = debug_backtrace();
+				$sTargetClass = $aBacktrace[2]["class"];
+				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
+				throw new CoreException("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
+			}
+		}
+	} 
+
+	public function GetCode() {return $this->m_sCode;} 
+	abstract public function GetLabel(); 
+	abstract public function GetValuesDef(); 
+
+	// returns an array of opcode=>oplabel (e.g. "differs from")
+	abstract public function GetOperators();
+	// returns an opcode
+	abstract public function GetLooseOperator();
+	abstract public function GetSQLExpressions();
+
+	// Wrapper - no need for overloading this one
+	public function GetOpDescription($sOpCode)
+	{
+		$aOperators = $this->GetOperators();
+		if (!array_key_exists($sOpCode, $aOperators))
+		{
+			throw new CoreException("Unknown operator '$sOpCode'");
+		}
+		
+		return $aOperators[$sOpCode];
+	}
+}
+
+/**
+ * Match against the object unique identifier 
+ *
+ * @package     iTopORM
+ */
+class FilterPrivateKey extends FilterDefinition
+{
+	static protected function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("id_field"));
+	}
+
+	public function GetType() {return "PrivateKey";}
+	public function GetTypeDesc() {return "Match against object identifier";}
+
+	public function GetLabel()
+	{
+		return "Object Private Key";
+	} 
+
+	public function GetValuesDef()
+	{
+		return null;
+	}
+
+	public function GetOperators()
+	{
+		return array(
+			"="=>"equals",
+			"!="=>"differs from",
+			"IN"=>"in",
+			"NOTIN"=>"not in"
+		);
+	}
+	public function GetLooseOperator()
+	{
+		return "IN";
+	}
+
+	public function GetSQLExpressions()
+	{
+		return array(
+			'' => $this->Get("id_field"),
+		);
+	}
+}
+
+/**
+ * Match against an existing attribute (the attribute type will determine the available operators) 
+ *
+ * @package     iTopORM
+ */
+class FilterFromAttribute extends FilterDefinition
+{
+	static protected function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("refattribute"));
+	}
+
+	public function __construct($oRefAttribute, $sSuffix = '')
+	{
+		// In this very specific case, the code is the one of the attribute
+		 // (this to get a very very simple syntax upon declaration)
+		$aParam = array();
+		$aParam["refattribute"] = $oRefAttribute;
+		parent::__construct($oRefAttribute->GetCode().$sSuffix, $aParam);
+	}
+
+	public function GetType() {return "Basic";}
+	public function GetTypeDesc() {return "Match against field contents";}
+
+	public function __GetRefAttribute() // for checking purposes only !!!
+	{
+		return $oAttDef = $this->Get("refattribute");
+	}
+
+	public function GetLabel()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetLabel();
+	} 
+
+	public function GetValuesDef()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetValuesDef();
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetAllowedValues($aArgs, $sContains);
+	}
+
+	public function GetOperators()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetBasicFilterOperators();
+	}
+	public function GetLooseOperator()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetBasicFilterLooseOperator();
+	}
+
+	public function GetSQLExpressions()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetSQLExpressions();
+	}
+}
+
+?>

core/htmlsanitizer.class.inc.php

@@ -151,11 +151,17 @@ class HTMLPurifierSanitizer extends HTMLSanitizer
 class HTMLDOMSanitizer extends HTMLSanitizer
 {
 	protected $oDoc;
+
+	/**
+	 * @var array
+	 * @see https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Arich_text_limitations
+	 */
 	protected static $aTagsWhiteList = array(
 		'html' => array(),
 		'body' => array(),
 		'a' => array('href', 'name', 'style', 'target', 'title'),
 		'p' => array('style'),
+		'blockquote' => array('style'),
 		'br' => array(),
 		'span' => array('style'),
 		'div' => array('style'),
@@ -178,16 +184,15 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'table' => array('style', 'width', 'summary', 'align', 'border', 'cellpadding', 'cellspacing'),
 		'thead' => array('style'),
 		'tbody' => array('style'),
-		'tr' => array('style'),
-		'td' => array('style', 'colspan'),
-		'th' => array('style'),
+		'tr' => array('style', 'colspan', 'rowspan'),
+		'td' => array('style', 'colspan', 'rowspan'),
+		'th' => array('style', 'colspan', 'rowspan'),
 		'fieldset' => array('style'),
 		'legend' => array('style'),
 		'font' => array('face', 'color', 'style', 'size'),
 		'big' => array(),
 		'small' => array(),
 		'tt' => array(),
-		'code' => array(),
 		'kbd' => array(),
 		'samp' => array(),
 		'var' => array(),
@@ -198,23 +203,49 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		'q' => array(),
 		'hr' => array('style'),
 		'pre' => array(),
-		'center' => array(),
-		'caption' => array(),
 	);
-	
+
 	protected static $aAttrsWhiteList = array(
 		'src' => '/^(http:|https:|data:)/i',
 	);
-	
+
+	/**
+	 * @var array
+	 * @see https://www.itophub.io/wiki/page?id=2_5_0%3Aadmin%3Arich_text_limitations
+	 */
 	protected static $aStylesWhiteList = array(
-		'background-color', 'color', 'float', 'font', 'font-style', 'font-size', 'font-family', 'padding', 'margin', 'border', 'cellpadding', 'cellspacing', 'bordercolor', 'border-collapse', 'width', 'height', 'text-align',
+		'background-color',
+		'border',
+		'border-collapse',
+		'bordercolor',
+		'cellpadding',
+		'cellspacing',
+		'color',
+		'float',
+		'font',
+		'font-family',
+		'font-size',
+		'font-style',
+		'height',
+		'margin',
+		'padding',
+		'text-align',
+		'width',
 	);
 
 	public function __construct()
 	{
+		// Building href validation pattern from url and email validation patterns as the patterns are not used the same way in HTML content than in standard attributes value.
+		// eg. "foo@bar.com" vs "mailto:foo@bar.com?subject=Title&body=Hello%20world"
 		if (!array_key_exists('href', self::$aAttrsWhiteList))
 		{
-			$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
+			// Regular urls
+			$sUrlPattern = utils::GetConfig()->Get('url_validation_pattern');
+			// Mailto urls
+			$sMailtoPattern = '(mailto:(' . utils::GetConfig()->Get('email_validation_pattern') . ')(?:\?(?:subject|body)=([a-zA-Z0-9+\$_.-]*)(?:&(?:subject|body)=([a-zA-Z0-9+\$_.-]*))?)?)';
+
+			$sPattern = $sUrlPattern . '|' . $sMailtoPattern;
+			$sPattern = '/'.str_replace('/', '\/', $sPattern).'/i';
 			self::$aAttrsWhiteList['href'] = $sPattern;
 		}
 	}
@@ -315,7 +346,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 					$this->CleanNode($oNode);
 					if (($oNode instanceof DOMElement) && (strtolower($oNode->tagName) == 'img'))
 					{
-						$this->ProcessImage($oNode);
+						InlineImage::ProcessImageTag($oNode);
 					}
 				}
 			}
@@ -326,24 +357,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 			}
 		}
 	}
-	
-	/**
-	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
-	 * so that we can later reconstruct the full "src" URL when needed
-	 * @param DOMNode $oElement
-	 */
-	protected function ProcessImage(DOMNode $oElement)
-	{
-		$sSrc = $oElement->getAttribute('src');
-		$sDownloadUrl = str_replace(array('.', '?'), array('\.', '\?'), INLINEIMAGE_DOWNLOAD_URL); // Escape . and ?
-		$sUrlPattern = '|'.$sDownloadUrl.'([0-9]+)&s=([0-9a-f]+)|';
-		if (preg_match($sUrlPattern, $sSrc, $aMatches))
-		{
-			$oElement->setAttribute('data-img-id', $aMatches[1]);
-			$oElement->setAttribute('data-img-secret', $aMatches[2]);
-		}
-	}
-	
+
 	protected function CleanStyle($sStyle)
 	{
 		$aAllowedStyles = array();

core/inlineimage.class.inc.php

@@ -27,6 +27,11 @@ define('INLINEIMAGE_DOWNLOAD_URL', 'pages/ajax.document.php?operation=download_i
 
 class InlineImage extends DBObject
 {
+	/** @var string attribute to be added to IMG tags to contain ID */
+	const DOM_ATTR_ID = 'data-img-id';
+	/** @var string attribute to be added to IMG tags to contain secret */
+	const DOM_ATTR_SECRET = 'data-img-secret';
+
 	public static function Init()
 	{
 		$aParams = array
@@ -208,7 +213,8 @@ class InlineImage extends DBObject
 		$aNeedles = array();
 		$aReplacements = array();
 		// Find img tags with an attribute data-img-id
-		if (preg_match_all('/<img ([^>]*)data-img-id="([0-9]+)"([^>]*)>/i', $sHtml, $aMatches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		if (preg_match_all('/<img ([^>]*)'.self::DOM_ATTR_ID.'="([0-9]+)"([^>]*)>/i',
+			$sHtml, $aMatches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
 		{
 			$sUrl = utils::GetAbsoluteUrlAppRoot().INLINEIMAGE_DOWNLOAD_URL;
 			foreach($aMatches as $aImgInfo)
@@ -230,6 +236,42 @@ class InlineImage extends DBObject
 		return $sHtml;
 	}
 
+	/**
+	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
+	 * so that we can later reconstruct the full "src" URL when needed
+	 *
+	 * @param \DOMElement $oElement
+	 */
+	public static function ProcessImageTag(DOMElement $oElement)
+	{
+		$sSrc = $oElement->getAttribute('src');
+		$sDownloadUrl = str_replace(array('.', '?'), array('\.', '\?'), INLINEIMAGE_DOWNLOAD_URL); // Escape . and ?
+		$sUrlPattern = '|'.$sDownloadUrl.'([0-9]+)&s=([0-9a-f]+)|';
+		$bIsInlineImage = preg_match($sUrlPattern, $sSrc, $aMatches);
+		if (!$bIsInlineImage)
+		{
+			return;
+		}
+		$iInlineImageId = $aMatches[1];
+		$sInlineIMageSecret = $aMatches[2];
+
+		$sAppRoot = utils::GetAbsoluteUrlAppRoot();
+		$sAppRootPattern = '/^'.preg_quote($sAppRoot, '/').'/';
+		$bIsSameItop = preg_match($sAppRootPattern, $sSrc);
+		if (!$bIsSameItop)
+		{
+			// @see N°1921
+			// image from another iTop should be treated as external images
+			$oElement->removeAttribute(self::DOM_ATTR_ID);
+			$oElement->removeAttribute(self::DOM_ATTR_SECRET);
+
+			return;
+		}
+
+		$oElement->setAttribute(self::DOM_ATTR_ID, $iInlineImageId);
+		$oElement->setAttribute(self::DOM_ATTR_SECRET, $sInlineIMageSecret);
+	}
+
 	/**
 	 * Get the javascript fragment  - to be added to "on document ready" - to adjust (on the fly) the width on Inline Images
 	 */
@@ -497,10 +539,10 @@ EOF
  */
 class InlineImageGC implements iBackgroundProcess
 {
-	public function GetPeriodicity()
-	{
-		return 3600; // Runs every 3600 seconds
-	}
+    public function GetPeriodicity()
+    {
+        return 3600; // Runs every hour
+    }
 
 	public function Process($iTimeLimit)
 	{

core/kpi.class.inc.php

@@ -1,397 +1,397 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Measures operations duration, memory usage, etc. (and some other KPIs)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ExecutionKPI
-{
-	static protected $m_bEnabled_Duration = false;
-	static protected $m_bEnabled_Memory = false;
-	static protected $m_bBlameCaller = false;
-	static protected $m_sAllowedUser = '*';
-
-	static protected $m_aStats = array(); // Recurrent operations
-	static protected $m_aExecData = array(); // One shot operations
-
-	protected $m_fStarted = null;
-	protected $m_iInitialMemory = null;
-
-	static public function EnableDuration($iLevel)
-	{
-		if ($iLevel > 0)
-		{
-			self::$m_bEnabled_Duration = true;
-			if ($iLevel > 1)
-			{
-				self::$m_bBlameCaller = true;
-			}
-		}
-	}
-
-	static public function EnableMemory($iLevel)
-	{
-		if ($iLevel > 0)
-		{
-			self::$m_bEnabled_Memory = true;
-		}
-	}
-
-	/**
-	 * @param string sUser A user login or * for all users	
-	 */	
-	static public function SetAllowedUser($sUser)
-	{
-		self::$m_sAllowedUser = $sUser;
-	}
-
-	static public function IsEnabled()
-	{
-		if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory)
-		{
-			if ((self::$m_sAllowedUser == '*') || (UserRights::GetUser() == trim(self::$m_sAllowedUser)))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	static public function GetDescription()
-	{
-		$aFeatures = array();
-		if (self::$m_bEnabled_Duration) $aFeatures[] = 'Duration'; 
-		if (self::$m_bEnabled_Memory)   $aFeatures[] = 'Memory usage';
-		$sFeatures = implode(', ', $aFeatures);
-		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
-		return "KPI logging is active for $sFor. Measures: $sFeatures";
-	}
-
-	static public function ReportStats()
-	{
-		if (!self::IsEnabled()) return;
-
-		global $fItopStarted;
-		$sExecId = microtime(); // id to differentiate the hrefs!
-
-		$aBeginTimes = array();
-		foreach (self::$m_aExecData as $aOpStats)
-		{
-			$aBeginTimes[] = $aOpStats['time_begin'];
-		}
-		array_multisort($aBeginTimes, self::$m_aExecData);
-
-		$sTableStyle = 'background-color: #ccc; margin: 10px;';
-
-		self::Report("<hr/>");
-		self::Report("<div style=\"background-color: grey; padding: 10px;\">");
-		self::Report("<h3><a name=\"".md5($sExecId)."\">KPIs</a> - ".$_SERVER['REQUEST_URI']." (".$_SERVER['REQUEST_METHOD'].")</h3>");
-		self::Report("<p>".date('Y-m-d H:i:s', $fItopStarted)."</p>");
-		self::Report("<p>log_kpi_user_id: ".MetaModel::GetConfig()->Get('log_kpi_user_id')."</p>");
-		self::Report("<div>");
-		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
-		self::Report("<thead>");
-		self::Report("   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>");
-		self::Report("</thead>");
-		foreach (self::$m_aExecData as $aOpStats)
-		{
-			$sOperation = $aOpStats['op'];
-			$sBegin = $sEnd = $sDuration = $sMemBegin = $sMemEnd = $sMemPeak = '?';
-		
-			$sBegin = round($aOpStats['time_begin'], 3);
-			$sEnd = round($aOpStats['time_end'], 3);
-			$fDuration = $aOpStats['time_end'] - $aOpStats['time_begin'];
-			$sDuration = round($fDuration, 3);
-
-			if (isset($aOpStats['mem_begin']))
-			{
-				$sMemBegin = self::MemStr($aOpStats['mem_begin']);
-				$sMemEnd = self::MemStr($aOpStats['mem_end']);
-				if (isset($aOpStats['mem_peak']))
-				{
-					$sMemPeak = self::MemStr($aOpStats['mem_peak']);
-				}
-			}
-
-			self::Report("<tr>");
-			self::Report("   <td>$sOperation</td><td>$sBegin</td><td>$sEnd</td><td>$sDuration</td><td>$sMemBegin</td><td>$sMemEnd</td><td>$sMemPeak</td>");
-			self::Report("</tr>");
-		}
-		self::Report("</table>");
-		self::Report("</div>");
-
-		$aConsolidatedStats = array();
-		foreach (self::$m_aStats as $sOperation => $aOpStats)
-		{
-			$fTotalOp = 0;
-			$iTotalOp = 0;
-			$fMinOp = null;
-			$fMaxOp = 0;
-			$sMaxOpArguments = null;
-			foreach ($aOpStats as $sArguments => $aEvents)
-			{
-				foreach ($aEvents as $aEventData)
-				{
-					$fDuration = $aEventData['time'];
-					$fTotalOp += $fDuration;
-					$iTotalOp++;
-
-					$fMinOp = is_null($fMinOp) ? $fDuration : min($fMinOp, $fDuration);
-					if ($fDuration > $fMaxOp)
-					{
-						$sMaxOpArguments = $sArguments;
-						$fMaxOp = $fDuration;
-					}
-				}
-			}
-			$aConsolidatedStats[$sOperation] = array(
-				'count' => $iTotalOp,
-				'duration' => $fTotalOp,
-				'min' => $fMinOp,
-				'max' => $fMaxOp,
-				'avg' => $fTotalOp / $iTotalOp,
-				'max_args' => $sMaxOpArguments
-			);
-		}
-
-		self::Report("<div>");
-		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
-		self::Report("<thead>");
-		self::Report("   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>");
-		self::Report("</thead>");
-		foreach ($aConsolidatedStats as $sOperation => $aOpStats)
-		{
-			$sOperation = '<a href="#'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
-			$sCount = $aOpStats['count'];
-			$sDuration = round($aOpStats['duration'], 3);
-			$sMin = round($aOpStats['min'], 3);
-			$sMax = '<a href="#'.md5($sExecId.$aOpStats['max_args']).'">'.round($aOpStats['max'], 3).'</a>';
-			$sAvg = round($aOpStats['avg'], 3);
-
-			self::Report("<tr>");
-			self::Report("   <td>$sOperation</td><td>$sCount</td><td>$sDuration</td><td>$sMin</td><td>$sMax</td><td>$sAvg</td>");
-			self::Report("</tr>");
-		}
-		self::Report("</table>");
-		self::Report("</div>");
-
-		self::Report("</div>");
-
-		// Report operation details
-		foreach (self::$m_aStats as $sOperation => $aOpStats)
-		{
-			$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
-			self::Report("<h4>$sOperationHtml</h4>");
-			self::Report("<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>");
-			self::Report("<table border=\"1\" style=\"$sTableStyle\">");
-			self::Report("<thead>");
-			self::Report("   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>");
-			self::Report("</thead>");
-			foreach ($aOpStats as $sArguments => $aEvents)
-			{
-				$sHtmlArguments = '<a name="'.md5($sExecId.$sArguments).'"><div style="white-space: pre-wrap;">'.$sArguments.'</div></a>';
-				if ($aConsolidatedStats[$sOperation]['max_args'] == $sArguments)
-				{
-					$sHtmlArguments = '<span style="color: red;">'.$sHtmlArguments.'</span>';
-				}
-				if (isset($aEvents[0]['callers']))
-				{
-					$sHtmlArguments .= '<div style="padding: 10px;">';
-					$sHtmlArguments .= '<table border="1" bgcolor="#cfc">';
-					$sHtmlArguments .= '<tr><td colspan="2" bgcolor="#e9b96">Call stack for the <b>FIRST</b> caller</td></tr>';
-
-					foreach ($aEvents[0]['callers'] as $aCall)
-					{
-						$sHtmlArguments .= '<tr>';
-						$sHtmlArguments .= '<td>'.$aCall['Function'].'</td>';
-						$sHtmlArguments .= '<td>'.$aCall['File'].':'.$aCall['Line'].'</td>';
-						$sHtmlArguments .= '</tr>';
-					}
-					$sHtmlArguments .= '</table>';
-					$sHtmlArguments .= '</div>';
-				}
-
-				$fTotalInter = 0;
-				$fMinInter = null;
-				$fMaxInter = 0;
-				foreach ($aEvents as $aEventData)
-				{
-					$fDuration = $aEventData['time'];
-					$fTotalInter += $fDuration;
-					$fMinInter = is_null($fMinInter) ? $fDuration : min($fMinInter, $fDuration);
-					$fMaxInter = max($fMaxInter, $fDuration);
-				}
-
-				$iCountInter = count($aEvents);
-				$sTotalInter = round($fTotalInter, 3);
-				$sMinInter = round($fMinInter, 3);
-				$sMaxInter = round($fMaxInter, 3);
-				self::Report("<tr>");
-				self::Report("   <td>$sHtmlArguments</td><td>$iCountInter</td><td>$sTotalInter</td><td>$sMinInter</td><td>$sMaxInter</td>");
-				self::Report("</tr>");
-			}
-			self::Report("</table>");
-		}
-	}
-
-
-	public function __construct()
-	{
-		$this->ResetCounters();
-	}
-
-	// Get the duration since startup, and reset the counter for the next measure
-	//
-	public function ComputeAndReport($sOperationDesc)
-	{
-		global $fItopStarted;
-
-		$aNewEntry = null;
-
-		if (self::$m_bEnabled_Duration)
-		{
-			$fStopped = MyHelpers::getmicrotime();
-			$aNewEntry = array(
-				'op' => $sOperationDesc,
-				'time_begin' => $this->m_fStarted - $fItopStarted,
-				'time_end' => $fStopped - $fItopStarted,
-			);
-			// Reset for the next operation (if the object is recycled)
-			$this->m_fStarted = $fStopped;
-		}
-
-		if (self::$m_bEnabled_Memory)
-		{
-			$iCurrentMemory = self::memory_get_usage();
-			if (is_null($aNewEntry))
-			{
-				$aNewEntry = array('op' => $sOperationDesc);
-			}
-			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
-			$aNewEntry['mem_end'] = $iCurrentMemory;
-			if (function_exists('memory_get_peak_usage'))
-			{
-				$aNewEntry['mem_peak'] = memory_get_peak_usage();
-			}
-			// Reset for the next operation (if the object is recycled)
-			$this->m_iInitialMemory = $iCurrentMemory;
-		}
-
-		if (!is_null($aNewEntry))
-		{
-			self::$m_aExecData[] = $aNewEntry;
-		}
-		$this->ResetCounters();
-	}
-
-	public function ComputeStats($sOperation, $sArguments)
-	{
-		if (self::$m_bEnabled_Duration)
-		{
-			$fStopped = MyHelpers::getmicrotime();
-			$fDuration = $fStopped - $this->m_fStarted;
-			if (self::$m_bBlameCaller)
-			{
-				self::$m_aStats[$sOperation][$sArguments][] = array(
-					'time' => $fDuration,
-					'callers' => MyHelpers::get_callstack(1),
-				);
-			}
-			else
-			{
-				self::$m_aStats[$sOperation][$sArguments][] = array(
-					'time' => $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();
-		}
-	}
-
-	const HtmlReportFile = 'log/kpi.html';
-
-	static protected function Report($sText)
-	{
-		file_put_contents(APPROOT.self::HtmlReportFile, "$sText\n", FILE_APPEND | LOCK_EX);
-	}
-
-	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;
-		}
-	}
-
-	static public function memory_get_peak_usage($bRealUsage = false)
-	{
-		if (function_exists('memory_get_peak_usage'))
-		{
-			return memory_get_peak_usage($bRealUsage);
-		}
-		// PHP > 5.2.1 - this verb depends on a compilation option
-		return 0;
-	}
-}
-
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Measures operations duration, memory usage, etc. (and some other KPIs)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class ExecutionKPI
+{
+	static protected $m_bEnabled_Duration = false;
+	static protected $m_bEnabled_Memory = false;
+	static protected $m_bBlameCaller = false;
+	static protected $m_sAllowedUser = '*';
+
+	static protected $m_aStats = array(); // Recurrent operations
+	static protected $m_aExecData = array(); // One shot operations
+
+	protected $m_fStarted = null;
+	protected $m_iInitialMemory = null;
+
+	static public function EnableDuration($iLevel)
+	{
+		if ($iLevel > 0)
+		{
+			self::$m_bEnabled_Duration = true;
+			if ($iLevel > 1)
+			{
+				self::$m_bBlameCaller = true;
+			}
+		}
+	}
+
+	static public function EnableMemory($iLevel)
+	{
+		if ($iLevel > 0)
+		{
+			self::$m_bEnabled_Memory = true;
+		}
+	}
+
+	/**
+	 * @param string sUser A user login or * for all users	
+	 */	
+	static public function SetAllowedUser($sUser)
+	{
+		self::$m_sAllowedUser = $sUser;
+	}
+
+	static public function IsEnabled()
+	{
+		if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory)
+		{
+			if ((self::$m_sAllowedUser == '*') || (UserRights::GetUser() == trim(self::$m_sAllowedUser)))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	static public function GetDescription()
+	{
+		$aFeatures = array();
+		if (self::$m_bEnabled_Duration) $aFeatures[] = 'Duration'; 
+		if (self::$m_bEnabled_Memory)   $aFeatures[] = 'Memory usage';
+		$sFeatures = implode(', ', $aFeatures);
+		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
+		return "KPI logging is active for $sFor. Measures: $sFeatures";
+	}
+
+	static public function ReportStats()
+	{
+		if (!self::IsEnabled()) return;
+
+		global $fItopStarted;
+		$sExecId = microtime(); // id to differentiate the hrefs!
+
+		$aBeginTimes = array();
+		foreach (self::$m_aExecData as $aOpStats)
+		{
+			$aBeginTimes[] = $aOpStats['time_begin'];
+		}
+		array_multisort($aBeginTimes, self::$m_aExecData);
+
+		$sTableStyle = 'background-color: #ccc; margin: 10px;';
+
+		self::Report("<hr/>");
+		self::Report("<div style=\"background-color: grey; padding: 10px;\">");
+		self::Report("<h3><a name=\"".md5($sExecId)."\">KPIs</a> - ".$_SERVER['REQUEST_URI']." (".$_SERVER['REQUEST_METHOD'].")</h3>");
+		self::Report("<p>".date('Y-m-d H:i:s', $fItopStarted)."</p>");
+		self::Report("<p>log_kpi_user_id: ".UserRights::GetUserId()."</p>");
+		self::Report("<div>");
+		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
+		self::Report("<thead>");
+		self::Report("   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>");
+		self::Report("</thead>");
+		foreach (self::$m_aExecData as $aOpStats)
+		{
+			$sOperation = $aOpStats['op'];
+			$sBegin = $sEnd = $sDuration = $sMemBegin = $sMemEnd = $sMemPeak = '?';
+		
+			$sBegin = round($aOpStats['time_begin'], 3);
+			$sEnd = round($aOpStats['time_end'], 3);
+			$fDuration = $aOpStats['time_end'] - $aOpStats['time_begin'];
+			$sDuration = round($fDuration, 3);
+
+			if (isset($aOpStats['mem_begin']))
+			{
+				$sMemBegin = self::MemStr($aOpStats['mem_begin']);
+				$sMemEnd = self::MemStr($aOpStats['mem_end']);
+				if (isset($aOpStats['mem_peak']))
+				{
+					$sMemPeak = self::MemStr($aOpStats['mem_peak']);
+				}
+			}
+
+			self::Report("<tr>");
+			self::Report("   <td>$sOperation</td><td>$sBegin</td><td>$sEnd</td><td>$sDuration</td><td>$sMemBegin</td><td>$sMemEnd</td><td>$sMemPeak</td>");
+			self::Report("</tr>");
+		}
+		self::Report("</table>");
+		self::Report("</div>");
+
+		$aConsolidatedStats = array();
+		foreach (self::$m_aStats as $sOperation => $aOpStats)
+		{
+			$fTotalOp = 0;
+			$iTotalOp = 0;
+			$fMinOp = null;
+			$fMaxOp = 0;
+			$sMaxOpArguments = null;
+			foreach ($aOpStats as $sArguments => $aEvents)
+			{
+				foreach ($aEvents as $aEventData)
+				{
+					$fDuration = $aEventData['time'];
+					$fTotalOp += $fDuration;
+					$iTotalOp++;
+
+					$fMinOp = is_null($fMinOp) ? $fDuration : min($fMinOp, $fDuration);
+					if ($fDuration > $fMaxOp)
+					{
+						$sMaxOpArguments = $sArguments;
+						$fMaxOp = $fDuration;
+					}
+				}
+			}
+			$aConsolidatedStats[$sOperation] = array(
+				'count' => $iTotalOp,
+				'duration' => $fTotalOp,
+				'min' => $fMinOp,
+				'max' => $fMaxOp,
+				'avg' => $fTotalOp / $iTotalOp,
+				'max_args' => $sMaxOpArguments
+			);
+		}
+
+		self::Report("<div>");
+		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
+		self::Report("<thead>");
+		self::Report("   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>");
+		self::Report("</thead>");
+		foreach ($aConsolidatedStats as $sOperation => $aOpStats)
+		{
+			$sOperation = '<a href="#'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
+			$sCount = $aOpStats['count'];
+			$sDuration = round($aOpStats['duration'], 3);
+			$sMin = round($aOpStats['min'], 3);
+			$sMax = '<a href="#'.md5($sExecId.$aOpStats['max_args']).'">'.round($aOpStats['max'], 3).'</a>';
+			$sAvg = round($aOpStats['avg'], 3);
+
+			self::Report("<tr>");
+			self::Report("   <td>$sOperation</td><td>$sCount</td><td>$sDuration</td><td>$sMin</td><td>$sMax</td><td>$sAvg</td>");
+			self::Report("</tr>");
+		}
+		self::Report("</table>");
+		self::Report("</div>");
+
+		self::Report("</div>");
+
+		// Report operation details
+		foreach (self::$m_aStats as $sOperation => $aOpStats)
+		{
+			$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
+			self::Report("<h4>$sOperationHtml</h4>");
+			self::Report("<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>");
+			self::Report("<table border=\"1\" style=\"$sTableStyle\">");
+			self::Report("<thead>");
+			self::Report("   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>");
+			self::Report("</thead>");
+			foreach ($aOpStats as $sArguments => $aEvents)
+			{
+				$sHtmlArguments = '<a name="'.md5($sExecId.$sArguments).'"><div style="white-space: pre-wrap;">'.$sArguments.'</div></a>';
+				if ($aConsolidatedStats[$sOperation]['max_args'] == $sArguments)
+				{
+					$sHtmlArguments = '<span style="color: red;">'.$sHtmlArguments.'</span>';
+				}
+				if (isset($aEvents[0]['callers']))
+				{
+					$sHtmlArguments .= '<div style="padding: 10px;">';
+					$sHtmlArguments .= '<table border="1" bgcolor="#cfc">';
+					$sHtmlArguments .= '<tr><td colspan="2" bgcolor="#e9b96">Call stack for the <b>FIRST</b> caller</td></tr>';
+
+					foreach ($aEvents[0]['callers'] as $aCall)
+					{
+						$sHtmlArguments .= '<tr>';
+						$sHtmlArguments .= '<td>'.$aCall['Function'].'</td>';
+						$sHtmlArguments .= '<td>'.$aCall['File'].':'.$aCall['Line'].'</td>';
+						$sHtmlArguments .= '</tr>';
+					}
+					$sHtmlArguments .= '</table>';
+					$sHtmlArguments .= '</div>';
+				}
+
+				$fTotalInter = 0;
+				$fMinInter = null;
+				$fMaxInter = 0;
+				foreach ($aEvents as $aEventData)
+				{
+					$fDuration = $aEventData['time'];
+					$fTotalInter += $fDuration;
+					$fMinInter = is_null($fMinInter) ? $fDuration : min($fMinInter, $fDuration);
+					$fMaxInter = max($fMaxInter, $fDuration);
+				}
+
+				$iCountInter = count($aEvents);
+				$sTotalInter = round($fTotalInter, 3);
+				$sMinInter = round($fMinInter, 3);
+				$sMaxInter = round($fMaxInter, 3);
+				self::Report("<tr>");
+				self::Report("   <td>$sHtmlArguments</td><td>$iCountInter</td><td>$sTotalInter</td><td>$sMinInter</td><td>$sMaxInter</td>");
+				self::Report("</tr>");
+			}
+			self::Report("</table>");
+		}
+	}
+
+
+	public function __construct()
+	{
+		$this->ResetCounters();
+	}
+
+	// Get the duration since startup, and reset the counter for the next measure
+	//
+	public function ComputeAndReport($sOperationDesc)
+	{
+		global $fItopStarted;
+
+		$aNewEntry = null;
+
+		if (self::$m_bEnabled_Duration)
+		{
+			$fStopped = MyHelpers::getmicrotime();
+			$aNewEntry = array(
+				'op' => $sOperationDesc,
+				'time_begin' => $this->m_fStarted - $fItopStarted,
+				'time_end' => $fStopped - $fItopStarted,
+			);
+			// Reset for the next operation (if the object is recycled)
+			$this->m_fStarted = $fStopped;
+		}
+
+		if (self::$m_bEnabled_Memory)
+		{
+			$iCurrentMemory = self::memory_get_usage();
+			if (is_null($aNewEntry))
+			{
+				$aNewEntry = array('op' => $sOperationDesc);
+			}
+			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
+			$aNewEntry['mem_end'] = $iCurrentMemory;
+			if (function_exists('memory_get_peak_usage'))
+			{
+				$aNewEntry['mem_peak'] = memory_get_peak_usage();
+			}
+			// Reset for the next operation (if the object is recycled)
+			$this->m_iInitialMemory = $iCurrentMemory;
+		}
+
+		if (!is_null($aNewEntry))
+		{
+			self::$m_aExecData[] = $aNewEntry;
+		}
+		$this->ResetCounters();
+	}
+
+	public function ComputeStats($sOperation, $sArguments)
+	{
+		if (self::$m_bEnabled_Duration)
+		{
+			$fStopped = MyHelpers::getmicrotime();
+			$fDuration = $fStopped - $this->m_fStarted;
+			if (self::$m_bBlameCaller)
+			{
+				self::$m_aStats[$sOperation][$sArguments][] = array(
+					'time' => $fDuration,
+					'callers' => MyHelpers::get_callstack(1),
+				);
+			}
+			else
+			{
+				self::$m_aStats[$sOperation][$sArguments][] = array(
+					'time' => $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();
+		}
+	}
+
+	const HtmlReportFile = 'log/kpi.html';
+
+	static protected function Report($sText)
+	{
+		file_put_contents(APPROOT.self::HtmlReportFile, "$sText\n", FILE_APPEND | LOCK_EX);
+	}
+
+	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;
+		}
+	}
+
+	static public function memory_get_peak_usage($bRealUsage = false)
+	{
+		if (function_exists('memory_get_peak_usage'))
+		{
+			return memory_get_peak_usage($bRealUsage);
+		}
+		// PHP > 5.2.1 - this verb depends on a compilation option
+		return 0;
+	}
+}
+