📝 N°3218 Add some PHPDoc on current change set/get

In the CoreException constructor, we're using the $aContextData parameter to do a count(), a foreach(), and uses values as string.
Only a null check was done.
Now we are also checking that the value is_array().
As others checks (Countable, Iterable, __toString() impl) are quite difficult depending on the PHP version we're running, we didn't add any other checks.

The call in \MatchExpression::__construct (added in 05a0d612) was passing directly an Expression object. We could embed it in an array, but the object hierarchy isn't implementing __toString so we would have another bug.
In consequence we removed this parameter.

.editorconfig

@@ -1,3 +1,5 @@
+root = true
+
 [*]
 charset = utf-8
 end_of_line = lf
@@ -11,7 +13,7 @@ ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
 ij_smart_tabs = false
-ij_visual_guides = 80, 120, 140
+ij_visual_guides = 80,120
 ij_wrap_on_typing = true
 
 [*.css]
@@ -20,7 +22,8 @@ ij_smart_tabs = true
 ij_css_align_closing_brace_with_properties = false
 ij_css_blank_lines_around_nested_selector = 1
 ij_css_blank_lines_between_blocks = 1
-ij_css_brace_placement = 0
+ij_css_brace_placement = end_of_line
+ij_css_enforce_quotes_on_format = false
 ij_css_hex_color_long_format = false
 ij_css_hex_color_lower_case = false
 ij_css_hex_color_short_format = false
@@ -31,52 +34,8 @@ ij_css_keep_single_line_blocks = false
 ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
 ij_css_space_after_colon = true
 ij_css_space_before_opening_brace = true
-ij_css_value_alignment = 0
-
-[*.csv]
-max_line_length = 2147483647
-ij_wrap_on_typing = false
-ij_csv_wrap_long_lines = false
-
-[*.feature]
-indent_size = 2
-ij_gherkin_keep_indents_on_empty_lines = false
-
-[*.less]
-indent_size = 2
-ij_less_align_closing_brace_with_properties = false
-ij_less_blank_lines_around_nested_selector = 1
-ij_less_blank_lines_between_blocks = 1
-ij_less_brace_placement = 0
-ij_less_hex_color_long_format = false
-ij_less_hex_color_lower_case = false
-ij_less_hex_color_short_format = false
-ij_less_hex_color_upper_case = false
-ij_less_keep_blank_lines_in_code = 2
-ij_less_keep_indents_on_empty_lines = false
-ij_less_keep_single_line_blocks = false
-ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_less_space_after_colon = true
-ij_less_space_before_opening_brace = true
-ij_less_value_alignment = 0
-
-[*.sass]
-indent_size = 2
-ij_sass_align_closing_brace_with_properties = false
-ij_sass_blank_lines_around_nested_selector = 1
-ij_sass_blank_lines_between_blocks = 1
-ij_sass_brace_placement = 0
-ij_sass_hex_color_long_format = false
-ij_sass_hex_color_lower_case = false
-ij_sass_hex_color_short_format = false
-ij_sass_hex_color_upper_case = false
-ij_sass_keep_blank_lines_in_code = 2
-ij_sass_keep_indents_on_empty_lines = false
-ij_sass_keep_single_line_blocks = false
-ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
-ij_sass_space_after_colon = true
-ij_sass_space_before_opening_brace = true
-ij_sass_value_alignment = 0
+ij_css_use_double_quotes = true
+ij_css_value_alignment = do_not_align
 
 [*.scss]
 indent_style = tab
@@ -84,6 +43,7 @@ ij_scss_align_closing_brace_with_properties = false
 ij_scss_blank_lines_around_nested_selector = 1
 ij_scss_blank_lines_between_blocks = 1
 ij_scss_brace_placement = 0
+ij_scss_enforce_quotes_on_format = false
 ij_scss_hex_color_long_format = false
 ij_scss_hex_color_lower_case = false
 ij_scss_hex_color_short_format = false
@@ -94,6 +54,7 @@ ij_scss_keep_single_line_blocks = false
 ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow
 ij_scss_space_after_colon = true
 ij_scss_space_before_opening_brace = true
+ij_scss_use_double_quotes = true
 ij_scss_value_alignment = 0
 
 [*.twig]
@@ -101,6 +62,7 @@ indent_style = tab
 ij_smart_tabs = true
 ij_wrap_on_typing = false
 ij_twig_keep_indents_on_empty_lines = false
+ij_twig_spaces_inside_comments_delimiters = true
 ij_twig_spaces_inside_delimiters = true
 ij_twig_spaces_inside_variable_delimiters = true
 
@@ -112,6 +74,36 @@ ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}]
+indent_size = 2
+tab_width = 2
+ij_smart_tabs = true
+ij_xml_align_attributes = true
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = false
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = true
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = false
+ij_xml_text_wrap = normal
+
+[{*.bash,*.sh,*.zsh}]
+indent_size = 2
+tab_width = 2
+ij_shell_binary_ops_start_line = false
+ij_shell_keep_column_alignment_padding = false
+ij_shell_minify_program = false
+ij_shell_redirect_followed_by_space = false
+ij_shell_switch_cases_indented = false
+
 [{*.cjs,*.js}]
 indent_style = tab
 ij_continuation_indent_size = 4
@@ -134,13 +126,13 @@ ij_javascript_array_initializer_wrap = off
 ij_javascript_assignment_wrap = off
 ij_javascript_binary_operation_sign_on_next_line = false
 ij_javascript_binary_operation_wrap = off
-ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**/*
+ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/**
 ij_javascript_blank_lines_after_imports = 1
 ij_javascript_blank_lines_around_class = 1
 ij_javascript_blank_lines_around_field = 0
 ij_javascript_blank_lines_around_function = 1
 ij_javascript_blank_lines_around_method = 1
-ij_javascript_block_brace_style = next_line
+ij_javascript_block_brace_style = end_of_line
 ij_javascript_call_parameters_new_line_after_left_paren = false
 ij_javascript_call_parameters_right_paren_on_new_line = false
 ij_javascript_call_parameters_wrap = off
@@ -148,7 +140,7 @@ ij_javascript_catch_on_new_line = false
 ij_javascript_chained_call_dot_on_new_line = true
 ij_javascript_class_brace_style = end_of_line
 ij_javascript_comma_on_new_line = false
-ij_javascript_do_while_brace_force = never
+ij_javascript_do_while_brace_force = always
 ij_javascript_else_on_new_line = true
 ij_javascript_enforce_trailing_comma = keep
 ij_javascript_extends_keyword_wrap = off
@@ -156,7 +148,7 @@ ij_javascript_extends_list_wrap = off
 ij_javascript_field_prefix = _
 ij_javascript_file_name_style = relaxed
 ij_javascript_finally_on_new_line = false
-ij_javascript_for_brace_force = never
+ij_javascript_for_brace_force = always
 ij_javascript_for_statement_new_line_after_left_paren = false
 ij_javascript_for_statement_right_paren_on_new_line = false
 ij_javascript_for_statement_wrap = off
@@ -192,6 +184,9 @@ ij_javascript_parentheses_expression_new_line_after_left_paren = false
 ij_javascript_parentheses_expression_right_paren_on_new_line = false
 ij_javascript_place_assignment_sign_on_next_line = false
 ij_javascript_prefer_as_type_cast = false
+ij_javascript_prefer_explicit_types_function_expression_returns = false
+ij_javascript_prefer_explicit_types_function_returns = false
+ij_javascript_prefer_explicit_types_vars_fields = false
 ij_javascript_prefer_parameters_wrap = false
 ij_javascript_reformat_c_style_comments = false
 ij_javascript_space_after_colon = true
@@ -272,11 +267,11 @@ ij_javascript_use_path_mapping = always
 ij_javascript_use_public_modifier = false
 ij_javascript_use_semicolon_after_statement = true
 ij_javascript_var_declaration_wrap = normal
-ij_javascript_while_brace_force = never
+ij_javascript_while_brace_force = always
 ij_javascript_while_on_new_line = false
 ij_javascript_wrap_comments = false
 
-[{*.module,*.hphp,*.phtml,*.php5,*.php4,*.php,*.ctp,*.inc}]
+[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
 indent_style = tab
 ij_continuation_indent_size = 4
 ij_smart_tabs = true
@@ -296,12 +291,13 @@ ij_php_align_multiline_parameters_in_calls = false
 ij_php_align_multiline_ternary_operation = false
 ij_php_align_phpdoc_comments = false
 ij_php_align_phpdoc_param_names = false
+ij_php_anonymous_brace_style = end_of_line
 ij_php_api_weight = 1
 ij_php_array_initializer_new_line_after_left_brace = true
 ij_php_array_initializer_right_brace_on_new_line = true
 ij_php_array_initializer_wrap = on_every_item
 ij_php_assignment_wrap = off
-ij_php_author_weight = 7
+ij_php_author_weight = 8
 ij_php_binary_operation_sign_on_next_line = false
 ij_php_binary_operation_wrap = off
 ij_php_blank_lines_after_class_header = 0
@@ -318,7 +314,8 @@ ij_php_blank_lines_before_imports = 1
 ij_php_blank_lines_before_method_body = 0
 ij_php_blank_lines_before_package = 1
 ij_php_blank_lines_before_return_statement = 1
-ij_php_block_brace_style = next_line
+ij_php_blank_lines_between_imports = 0
+ij_php_block_brace_style = end_of_line
 ij_php_call_parameters_new_line_after_left_paren = false
 ij_php_call_parameters_right_paren_on_new_line = false
 ij_php_call_parameters_wrap = normal
@@ -328,11 +325,11 @@ ij_php_class_brace_style = next_line
 ij_php_comma_after_last_array_element = true
 ij_php_concat_spaces = false
 ij_php_copyright_weight = 28
-ij_php_deprecated_weight = 28
+ij_php_deprecated_weight = 2
 ij_php_do_while_brace_force = always
 ij_php_else_if_style = as_is
-ij_php_else_on_new_line = true
-ij_php_example_weight = 3
+ij_php_else_on_new_line = false
+ij_php_example_weight = 4
 ij_php_extends_keyword_wrap = off
 ij_php_extends_list_wrap = off
 ij_php_fields_default_visibility = private
@@ -343,6 +340,8 @@ ij_php_for_statement_new_line_after_left_paren = false
 ij_php_for_statement_right_paren_on_new_line = false
 ij_php_for_statement_wrap = off
 ij_php_force_short_declaration_array_style = false
+ij_php_getters_setters_naming_style = camel_case
+ij_php_getters_setters_order_style = getters_first
 ij_php_global_weight = 28
 ij_php_group_use_wrap = on_every_item
 ij_php_if_brace_force = always
@@ -362,7 +361,8 @@ ij_php_keep_control_statement_in_one_line = true
 ij_php_keep_first_column_comment = true
 ij_php_keep_indents_on_empty_lines = false
 ij_php_keep_line_breaks = true
-ij_php_keep_rparen_and_lbrace_on_one_line = true
+ij_php_keep_rparen_and_lbrace_on_one_line = false
+ij_php_keep_simple_classes_in_one_line = false
 ij_php_keep_simple_methods_in_one_line = false
 ij_php_lambda_brace_style = end_of_line
 ij_php_license_weight = 28
@@ -370,6 +370,7 @@ ij_php_line_comment_add_space = false
 ij_php_line_comment_at_first_column = true
 ij_php_link_weight = 28
 ij_php_lower_case_boolean_const = true
+ij_php_lower_case_keywords = true
 ij_php_lower_case_null_const = true
 ij_php_method_brace_style = next_line
 ij_php_method_call_chain_wrap = off
@@ -380,9 +381,10 @@ ij_php_method_weight = 28
 ij_php_modifier_list_wrap = false
 ij_php_multiline_chained_calls_semicolon_on_new_line = false
 ij_php_namespace_brace_style = 1
+ij_php_new_line_after_php_opening_tag = false
 ij_php_null_type_position = in_the_end
 ij_php_package_weight = 28
-ij_php_param_weight = 4
+ij_php_param_weight = 5
 ij_php_parentheses_expression_new_line_after_left_paren = false
 ij_php_parentheses_expression_right_paren_on_new_line = false
 ij_php_phpdoc_blank_line_before_tags = true
@@ -399,8 +401,8 @@ ij_php_property_read_weight = 28
 ij_php_property_weight = 28
 ij_php_property_write_weight = 28
 ij_php_return_type_on_new_line = false
-ij_php_return_weight = 5
-ij_php_see_weight = 2
+ij_php_return_weight = 6
+ij_php_see_weight = 3
 ij_php_since_weight = 28
 ij_php_sort_phpdoc_elements = true
 ij_php_space_after_colon = true
@@ -433,6 +435,7 @@ ij_php_space_before_method_call_parentheses = false
 ij_php_space_before_method_left_brace = true
 ij_php_space_before_method_parentheses = false
 ij_php_space_before_quest = true
+ij_php_space_before_short_closure_left_parenthesis = false
 ij_php_space_before_switch_left_brace = true
 ij_php_space_before_switch_parentheses = true
 ij_php_space_before_try_left_brace = true
@@ -465,11 +468,11 @@ ij_php_spaces_within_parentheses = false
 ij_php_spaces_within_short_echo_tags = true
 ij_php_spaces_within_switch_parentheses = false
 ij_php_spaces_within_while_parentheses = false
-ij_php_special_else_if_treatment = false
+ij_php_special_else_if_treatment = true
 ij_php_subpackage_weight = 28
 ij_php_ternary_operation_signs_on_next_line = false
 ij_php_ternary_operation_wrap = off
-ij_php_throws_weight = 6
+ij_php_throws_weight = 7
 ij_php_todo_weight = 28
 ij_php_unknown_tag_weight = 28
 ij_php_upper_case_boolean_const = false
@@ -481,7 +484,20 @@ ij_php_version_weight = 28
 ij_php_while_brace_force = always
 ij_php_while_on_new_line = false
 
-[{*.sht,*.htm,*.html,*.shtm,*.shtml}]
+[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
+indent_size = 2
+ij_json_keep_blank_lines_in_code = 0
+ij_json_keep_indents_on_empty_lines = false
+ij_json_keep_line_breaks = true
+ij_json_space_after_colon = true
+ij_json_space_after_comma = true
+ij_json_space_before_colon = true
+ij_json_space_before_comma = false
+ij_json_spaces_within_braces = false
+ij_json_spaces_within_brackets = false
+ij_json_wrap_long_lines = false
+
+[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
 indent_style = tab
 ij_smart_tabs = true
 ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
@@ -503,209 +519,18 @@ ij_html_keep_whitespaces_inside = span,pre,textarea
 ij_html_line_comment_at_first_column = true
 ij_html_new_line_after_last_attribute = never
 ij_html_new_line_before_first_attribute = never
-ij_html_quote_style = double
+ij_html_quote_style = none
 ij_html_remove_new_line_before_tags = br
 ij_html_space_after_tag_name = false
 ij_html_space_around_equality_in_attribute = false
 ij_html_space_inside_empty_tag = false
 ij_html_text_wrap = normal
+ij_html_uniform_ident = false
 
-[{*.ts,*.ats}]
-ij_continuation_indent_size = 4
-ij_typescript_align_imports = false
-ij_typescript_align_multiline_array_initializer_expression = false
-ij_typescript_align_multiline_binary_operation = false
-ij_typescript_align_multiline_chained_methods = false
-ij_typescript_align_multiline_extends_list = false
-ij_typescript_align_multiline_for = true
-ij_typescript_align_multiline_parameters = true
-ij_typescript_align_multiline_parameters_in_calls = false
-ij_typescript_align_multiline_ternary_operation = false
-ij_typescript_align_object_properties = 0
-ij_typescript_align_union_types = false
-ij_typescript_align_var_statements = 0
-ij_typescript_array_initializer_new_line_after_left_brace = false
-ij_typescript_array_initializer_right_brace_on_new_line = false
-ij_typescript_array_initializer_wrap = off
-ij_typescript_assignment_wrap = off
-ij_typescript_binary_operation_sign_on_next_line = false
-ij_typescript_binary_operation_wrap = off
-ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**/*
-ij_typescript_blank_lines_after_imports = 1
-ij_typescript_blank_lines_around_class = 1
-ij_typescript_blank_lines_around_field = 0
-ij_typescript_blank_lines_around_field_in_interface = 0
-ij_typescript_blank_lines_around_function = 1
-ij_typescript_blank_lines_around_method = 1
-ij_typescript_blank_lines_around_method_in_interface = 1
-ij_typescript_block_brace_style = end_of_line
-ij_typescript_call_parameters_new_line_after_left_paren = false
-ij_typescript_call_parameters_right_paren_on_new_line = false
-ij_typescript_call_parameters_wrap = off
-ij_typescript_catch_on_new_line = false
-ij_typescript_chained_call_dot_on_new_line = true
-ij_typescript_class_brace_style = end_of_line
-ij_typescript_comma_on_new_line = false
-ij_typescript_do_while_brace_force = never
-ij_typescript_else_on_new_line = false
-ij_typescript_enforce_trailing_comma = keep
-ij_typescript_extends_keyword_wrap = off
-ij_typescript_extends_list_wrap = off
-ij_typescript_field_prefix = _
-ij_typescript_file_name_style = relaxed
-ij_typescript_finally_on_new_line = false
-ij_typescript_for_brace_force = never
-ij_typescript_for_statement_new_line_after_left_paren = false
-ij_typescript_for_statement_right_paren_on_new_line = false
-ij_typescript_for_statement_wrap = off
-ij_typescript_force_quote_style = false
-ij_typescript_force_semicolon_style = false
-ij_typescript_function_expression_brace_style = end_of_line
-ij_typescript_if_brace_force = never
-ij_typescript_import_merge_members = global
-ij_typescript_import_prefer_absolute_path = global
-ij_typescript_import_sort_members = true
-ij_typescript_import_sort_module_name = false
-ij_typescript_import_use_node_resolution = true
-ij_typescript_imports_wrap = on_every_item
-ij_typescript_indent_case_from_switch = true
-ij_typescript_indent_chained_calls = true
-ij_typescript_indent_package_children = 0
-ij_typescript_jsdoc_include_types = false
-ij_typescript_jsx_attribute_value = braces
-ij_typescript_keep_blank_lines_in_code = 2
-ij_typescript_keep_first_column_comment = true
-ij_typescript_keep_indents_on_empty_lines = false
-ij_typescript_keep_line_breaks = true
-ij_typescript_keep_simple_blocks_in_one_line = false
-ij_typescript_keep_simple_methods_in_one_line = false
-ij_typescript_line_comment_add_space = true
-ij_typescript_line_comment_at_first_column = false
-ij_typescript_method_brace_style = end_of_line
-ij_typescript_method_call_chain_wrap = off
-ij_typescript_method_parameters_new_line_after_left_paren = false
-ij_typescript_method_parameters_right_paren_on_new_line = false
-ij_typescript_method_parameters_wrap = off
-ij_typescript_object_literal_wrap = on_every_item
-ij_typescript_parentheses_expression_new_line_after_left_paren = false
-ij_typescript_parentheses_expression_right_paren_on_new_line = false
-ij_typescript_place_assignment_sign_on_next_line = false
-ij_typescript_prefer_as_type_cast = false
-ij_typescript_prefer_parameters_wrap = false
-ij_typescript_reformat_c_style_comments = false
-ij_typescript_space_after_colon = true
-ij_typescript_space_after_comma = true
-ij_typescript_space_after_dots_in_rest_parameter = false
-ij_typescript_space_after_generator_mult = true
-ij_typescript_space_after_property_colon = true
-ij_typescript_space_after_quest = true
-ij_typescript_space_after_type_colon = true
-ij_typescript_space_after_unary_not = false
-ij_typescript_space_before_async_arrow_lparen = true
-ij_typescript_space_before_catch_keyword = true
-ij_typescript_space_before_catch_left_brace = true
-ij_typescript_space_before_catch_parentheses = true
-ij_typescript_space_before_class_lbrace = true
-ij_typescript_space_before_class_left_brace = true
-ij_typescript_space_before_colon = true
-ij_typescript_space_before_comma = false
-ij_typescript_space_before_do_left_brace = true
-ij_typescript_space_before_else_keyword = true
-ij_typescript_space_before_else_left_brace = true
-ij_typescript_space_before_finally_keyword = true
-ij_typescript_space_before_finally_left_brace = true
-ij_typescript_space_before_for_left_brace = true
-ij_typescript_space_before_for_parentheses = true
-ij_typescript_space_before_for_semicolon = false
-ij_typescript_space_before_function_left_parenth = true
-ij_typescript_space_before_generator_mult = false
-ij_typescript_space_before_if_left_brace = true
-ij_typescript_space_before_if_parentheses = true
-ij_typescript_space_before_method_call_parentheses = false
-ij_typescript_space_before_method_left_brace = true
-ij_typescript_space_before_method_parentheses = false
-ij_typescript_space_before_property_colon = false
-ij_typescript_space_before_quest = true
-ij_typescript_space_before_switch_left_brace = true
-ij_typescript_space_before_switch_parentheses = true
-ij_typescript_space_before_try_left_brace = true
-ij_typescript_space_before_type_colon = false
-ij_typescript_space_before_unary_not = false
-ij_typescript_space_before_while_keyword = true
-ij_typescript_space_before_while_left_brace = true
-ij_typescript_space_before_while_parentheses = true
-ij_typescript_spaces_around_additive_operators = true
-ij_typescript_spaces_around_arrow_function_operator = true
-ij_typescript_spaces_around_assignment_operators = true
-ij_typescript_spaces_around_bitwise_operators = true
-ij_typescript_spaces_around_equality_operators = true
-ij_typescript_spaces_around_logical_operators = true
-ij_typescript_spaces_around_multiplicative_operators = true
-ij_typescript_spaces_around_relational_operators = true
-ij_typescript_spaces_around_shift_operators = true
-ij_typescript_spaces_around_unary_operator = false
-ij_typescript_spaces_within_array_initializer_brackets = false
-ij_typescript_spaces_within_brackets = false
-ij_typescript_spaces_within_catch_parentheses = false
-ij_typescript_spaces_within_for_parentheses = false
-ij_typescript_spaces_within_if_parentheses = false
-ij_typescript_spaces_within_imports = false
-ij_typescript_spaces_within_interpolation_expressions = false
-ij_typescript_spaces_within_method_call_parentheses = false
-ij_typescript_spaces_within_method_parentheses = false
-ij_typescript_spaces_within_object_literal_braces = false
-ij_typescript_spaces_within_object_type_braces = true
-ij_typescript_spaces_within_parentheses = false
-ij_typescript_spaces_within_switch_parentheses = false
-ij_typescript_spaces_within_type_assertion = false
-ij_typescript_spaces_within_union_types = true
-ij_typescript_spaces_within_while_parentheses = false
-ij_typescript_special_else_if_treatment = true
-ij_typescript_ternary_operation_signs_on_next_line = false
-ij_typescript_ternary_operation_wrap = off
-ij_typescript_union_types_wrap = on_every_item
-ij_typescript_use_chained_calls_group_indents = false
-ij_typescript_use_double_quotes = true
-ij_typescript_use_explicit_js_extension = global
-ij_typescript_use_path_mapping = always
-ij_typescript_use_public_modifier = false
-ij_typescript_use_semicolon_after_statement = true
-ij_typescript_var_declaration_wrap = normal
-ij_typescript_while_brace_force = never
-ij_typescript_while_on_new_line = false
-ij_typescript_wrap_comments = false
-
-[{*.yml,*.yaml}]
+[{*.yaml,*.yml}]
 indent_size = 2
-ij_continuation_indent_size = 2
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
-
-[{*.zsh,*.bash,*.sh}]
-ij_shell_binary_ops_start_line = false
-ij_shell_keep_column_alignment_padding = false
-ij_shell_minify_program = false
-ij_shell_redirect_followed_by_space = false
-ij_shell_switch_cases_indented = false
-
-[{.stylelintrc,.eslintrc,.babelrc,jest.config,*.bowerrc,*.jsb3,*.jsb2,*.json}]
-indent_size = 2
-ij_json_keep_blank_lines_in_code = 0
-ij_json_keep_indents_on_empty_lines = false
-ij_json_keep_line_breaks = true
-ij_json_space_after_colon = true
-ij_json_space_after_comma = true
-ij_json_space_before_colon = true
-ij_json_space_before_comma = false
-ij_json_spaces_within_braces = false
-ij_json_spaces_within_brackets = false
-ij_json_wrap_long_lines = false
-
-[{phpunit.xml.dist,*.jhm,*.rng,*.wsdl,*.fxml,*.xslt,*.jrxml,*.ant,*.xul,*.xsl,*.xsd,*.tld,*.jnlp,*.xml}]
-indent_size = 2
-indent_style = tab
-tab_width = 2
-ij_smart_tabs = true
-ij_xml_block_comment_at_first_column = true
-ij_xml_keep_indents_on_empty_lines = false
-ij_xml_line_comment_at_first_column = true
+ij_yaml_space_before_colon = true
+ij_yaml_spaces_within_braces = true
+ij_yaml_spaces_within_brackets = true

.gitflow

@@ -1,9 +0,0 @@
-[gitflow "branch"]
-master = master
-develop = develop
-[gitflow "prefix"]
-feature = feature/
-release = release/
-hotfix = hotfix/
-versiontag =
-support = support/

.gitignore

@@ -40,11 +40,6 @@ test/vendor/*
 
 # Jetbrains
 /.idea/**
-!/.idea/encodings.xml
-!/.idea/codeStyles
-!/.idea/codeStyles/*
-!/.idea/inspectionProfiles
-!/.idea/inspectionProfiles/*
 
 # doc. generation
 /.doc/vendor
@@ -139,4 +134,3 @@ local.properties
 .cache-main
 .scala_dependencies
 .worksheet
-

.idea/codeStyles/Project.xml

@@ -1,74 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="140" />
-    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
-    <option name="SOFT_MARGINS" value="140" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,body,thead,tbody,tfoot,style,script,head" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
-    </JSCodeStyleSettings>
-    <PHPCodeStyleSettings>
-      <option name="CONCAT_SPACES" value="false" />
-      <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
-      <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="THROWS_WEIGHT" value="6" />
-      <option name="PARAM_WEIGHT" value="4" />
-      <option name="RETURN_WEIGHT" value="5" />
-      <option name="AUTHOR_WEIGHT" value="7" />
-      <option name="INTERNAL_WEIGHT" value="0" />
-      <option name="API_WEIGHT" value="1" />
-      <option name="EXAMPLE_WEIGHT" value="3" />
-      <option name="SEE_WEIGHT" value="2" />
-      <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>
-    <XML>
-      <option name="XML_TEXT_WRAP" value="0" />
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_KEEP_WHITE_SPACES_INSIDE_CDATA" value="true" />
-    </XML>
-    <codeStyleSettings language="JavaScript">
-      <option name="BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AROUND_ADDITIVE_OPERATORS" value="false" />
-      <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="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" 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>
-    <codeStyleSettings language="XML">
-      <option name="WRAP_ON_TYPING" value="1" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

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

.idea/encodings.xml

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

.idea/inspectionProfiles/Combodo.xml

@@ -1,171 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Combodo" />
-    <inspection_tool class="CascadeStringReplacementInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ForgottenDebugOutputInspection" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="configuration">
-        <list>
-          <option value="\Codeception\Util\Debug::debug" />
-          <option value="\Codeception\Util\Debug::pause" />
-          <option value="\Doctrine\Common\Util\Debug::dump" />
-          <option value="\Doctrine\Common\Util\Debug::export" />
-          <option value="\Illuminate\Support\Debug\Dumper::dump" />
-          <option value="\Symfony\Component\Debug\Debug::enable" />
-          <option value="\Symfony\Component\Debug\DebugClassLoader::enable" />
-          <option value="\Symfony\Component\Debug\ErrorHandler::register" />
-          <option value="\Symfony\Component\Debug\ExceptionHandler::register" />
-          <option value="\TYPO3\CMS\Core\Utility\DebugUtility::debug" />
-          <option value="\Zend\Debug\Debug::dump" />
-          <option value="\Zend\Di\Display\Console::export" />
-          <option value="dd" />
-          <option value="debug_print_backtrace" />
-          <option value="debug_zval_dump" />
-          <option value="dpm" />
-          <option value="dpq" />
-          <option value="dsm" />
-          <option value="dump" />
-          <option value="dvm" />
-          <option value="error_log" />
-          <option value="kpr" />
-          <option value="phpinfo" />
-          <option value="print_r" />
-          <option value="var_dump" />
-          <option value="var_export" />
-          <option value="xdebug_break" />
-          <option value="xdebug_call_class" />
-          <option value="xdebug_call_file" />
-          <option value="xdebug_call_function" />
-          <option value="xdebug_call_line" />
-          <option value="xdebug_code_coverage_started" />
-          <option value="xdebug_debug_zval" />
-          <option value="xdebug_debug_zval_stdout" />
-          <option value="xdebug_dump_superglobals" />
-          <option value="xdebug_enable" />
-          <option value="xdebug_get_code_coverage" />
-          <option value="xdebug_get_collected_errors" />
-          <option value="xdebug_get_declared_vars" />
-          <option value="xdebug_get_function_stack" />
-          <option value="xdebug_get_headers" />
-          <option value="xdebug_get_monitored_functions" />
-          <option value="xdebug_get_profiler_filename" />
-          <option value="xdebug_get_stack_depth" />
-          <option value="xdebug_get_tracefile_name" />
-          <option value="xdebug_is_enabled" />
-          <option value="xdebug_memory_usage" />
-          <option value="xdebug_peak_memory_usage" />
-          <option value="xdebug_print_function_stack" />
-          <option value="xdebug_start_code_coverage" />
-          <option value="xdebug_start_error_collection" />
-          <option value="xdebug_start_function_monitor" />
-          <option value="xdebug_start_trace" />
-          <option value="xdebug_stop_code_coverage" />
-          <option value="xdebug_stop_error_collection" />
-          <option value="xdebug_stop_function_monitor" />
-          <option value="xdebug_stop_trace" />
-          <option value="xdebug_time_index" />
-          <option value="xdebug_var_dump" />
-        </list>
-      </option>
-      <option name="migratedIntoUserSpace" value="true" />
-    </inspection_tool>
-    <inspection_tool class="HtmlRequiredAltAttribute" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="HtmlRequiredLangAttribute" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="IsNullFunctionUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="MysqlParsingInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpComposerExtensionStubsInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpShortOpenTagInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedMethodInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedLocalVariableInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_INSIDE_LIST" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SecurityAdvisoriesInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="optionConfiguration">
-        <list>
-          <option value="barryvdh/laravel-debugbar" />
-          <option value="behat/behat" />
-          <option value="brianium/paratest" />
-          <option value="codeception/codeception" />
-          <option value="codedungeon/phpunit-result-printer" />
-          <option value="composer/composer" />
-          <option value="doctrine/coding-standard" />
-          <option value="filp/whoops" />
-          <option value="friendsofphp/php-cs-fixer" />
-          <option value="humbug/humbug" />
-          <option value="infection/infection" />
-          <option value="jakub-onderka/php-parallel-lint" />
-          <option value="johnkary/phpunit-speedtrap" />
-          <option value="kalessil/production-dependencies-guard" />
-          <option value="mikey179/vfsStream" />
-          <option value="mockery/mockery" />
-          <option value="mybuilder/phpunit-accelerator" />
-          <option value="orchestra/testbench" />
-          <option value="pdepend/pdepend" />
-          <option value="phan/phan" />
-          <option value="phing/phing" />
-          <option value="phpcompatibility/php-compatibility" />
-          <option value="phpmd/phpmd" />
-          <option value="phpro/grumphp" />
-          <option value="phpspec/phpspec" />
-          <option value="phpspec/prophecy" />
-          <option value="phpstan/phpstan" />
-          <option value="phpunit/phpunit" />
-          <option value="povils/phpmnd" />
-          <option value="roave/security-advisories" />
-          <option value="satooshi/php-coveralls" />
-          <option value="sebastian/phpcpd" />
-          <option value="slevomat/coding-standard" />
-          <option value="spatie/phpunit-watcher" />
-          <option value="squizlabs/php_codesniffer" />
-          <option value="sstalle/php7cc" />
-          <option value="symfony/debug" />
-          <option value="symfony/maker-bundle" />
-          <option value="symfony/phpunit-bridge" />
-          <option value="symfony/var-dumper" />
-          <option value="vimeo/psalm" />
-          <option value="wimg/php-compatibility" />
-          <option value="wp-coding-standards/wpcs" />
-          <option value="yiisoft/yii2-coding-standards" />
-          <option value="yiisoft/yii2-debug" />
-          <option value="yiisoft/yii2-gii" />
-          <option value="zendframework/zend-coding-standard" />
-          <option value="zendframework/zend-debug" />
-          <option value="zendframework/zend-test" />
-        </list>
-      </option>
-    </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="SqlSideEffectsInspection" 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" />
-  </profile>
-</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,19 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpIncludeInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpMethodParametersCountMismatchInspection" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PhpTooManyParametersInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="limit" value="7" />
-    </inspection_tool>
-    <inspection_tool class="PhpUndefinedClassInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_MULTI_RESOLVE" value="true" />
-    </inspection_tool>
-    <inspection_tool class="PhpUnhandledExceptionInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PhpUnusedParameterInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="DONT_REPORT_ABSTRACT_CLASS" value="true" />
-    </inspection_tool>
-    <inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Combodo" />
-    <version value="1.0" />
-  </settings>
-</component>

.jenkins/bin/init/append_files.sh

@@ -1,16 +0,0 @@
-#!/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 https://www.combodo.com/documentation/iTopDataModelToolkit-2.3.zip > toolkit.zip
-unzip toolkit.zip
-rm toolkit.zip
-cp -r .jenkins/configuration/default-environment/unattended_install/* toolkit

.jenkins/bin/init/composer_install.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-# on the root dir
-# composer install -a # => Not needed anymore (libs were added to git with N°2435)
-
-
-# under the test dir
-cd test
-composer install

.jenkins/bin/init/debug.sh

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

.jenkins/bin/tests/phpunit.sh

@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-set -x
-
-cd test
-
-export DEBUG_UNIT_TEST=0
-RUN_NONREG_TESTS=0
-
-if [ $# -ge 1 -a "x$1" == "xtrue" ]
-then
-  export DEBUG_UNIT_TEST=1
-else
-  export DEBUG_UNIT_TEST=0
-fi
-
-if [ $# -ge 2 -a "x$2" == "xtrue" ]
-then
-  php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity
-else
-  #echo php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --teamcity
-  php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml --exclude-group OQL --teamcity
-fi

.jenkins/bin/unattended_install/default_env.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-chmod 666 conf/production/config-itop.php
-
-cd toolkit
-php unattended_install.php --response_file=default-params.xml --clean=true

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

@@ -1,284 +0,0 @@
-<?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',
-
-	'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',
-
-	// 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(
-	'authent-local' => array (
-		'password_validation.pattern' => '',
-	),
-	'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/unattended_install.php

@@ -1,208 +0,0 @@
-<?php
-/**
- * Copyright (C) 2013-2019 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
- */
-
-//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 (".$oMysqli->connect_errno . ") ".$oMysqli->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;
-}

.make/build/afterBuild.php

@@ -0,0 +1,90 @@
+<?php
+$iBeginTime = time();
+
+chdir(__DIR__);
+
+$aCommands = [
+	'php composer/rmDeniedTestDir.php',
+	'php build/commands/setupCssCompiler.php',
+//	'bash /tmp/gabuzomeu.sh',
+];
+
+$aFailedCommands=[];
+foreach ($aCommands as $sCommand)
+{
+	if (!ExecCommand($sCommand))
+	{
+		$aFailedCommands[] = $sCommand;
+	}
+}
+
+$iElapsed = time() - $iBeginTime;
+
+if (count($aFailedCommands))
+{
+	fwrite(STDERR, "\nafterBuild execution failed! (in ${iElapsed}s)\n");
+	fwrite(STDERR, "List of failling commands:\n - " . implode("\n - ", $aFailedCommands) . "\n");
+	exit(1);
+}
+
+
+echo "\nDone (${iElapsed}s)\n";
+exit(0);
+
+/**
+ * Executes a command and returns an array with exit code, stdout and stderr content
+ *
+ * @param string $cmd - Command to execute
+ *
+ * @return bool
+ * @throws \Exception
+ */
+function ExecCommand($cmd) {
+	$iBeginTime = time();
+
+
+	echo sprintf("command: %s", str_pad("$cmd ", 50));
+
+	$descriptorspec = array(
+		0 => array("pipe", "r"),  // stdin
+		1 => array("pipe", "w"),  // stdout
+		2 => array("pipe", "w"),  // stderr
+	);
+	$process = proc_open($cmd, $descriptorspec, $pipes, __DIR__ . '/..', null);
+
+	$stdout = stream_get_contents($pipes[1]);
+	fclose($pipes[1]);
+
+	$stderr = stream_get_contents($pipes[2]);
+	fclose($pipes[2]);
+
+	$iCode = proc_close($process);
+	$bSuccess = (0 === $iCode);
+
+	$iElapsed = time() - $iBeginTime;
+	if (!$bSuccess) {
+		fwrite(STDERR, sprintf(
+			"\nCOMMAND FAILED! (%s) \n - status:%s \n - stderr:%s \n - stdout: %s\n - elapsed:%ss\n\n",
+			$cmd,
+			$iCode,
+			rtrim($stderr),
+			rtrim($stdout),
+			$iElapsed
+		));
+	}
+	else
+	{
+		echo "| elapsed:${iElapsed}s \n";
+	}
+
+	if (!empty($stderr))
+	 {
+		 fwrite(STDERR, "$stderr\n");
+	 }
+	 if (!empty($stdout))
+	 {
+		 echo "stdout :$stdout\n\n";
+	 }
+
+	return $bSuccess;
+}

.make/build/commands/setupCssCompiler.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Copyright (C) 2010-2020 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/>
+ *
+ */
+
+use Combodo\iTop\Composer\iTopComposer;
+
+$iTopFolder = __DIR__."/../../../";
+
+require_once("$iTopFolder/approot.inc.php");
+require_once(APPROOT."/application/utils.inc.php");
+
+if (php_sapi_name() !== 'cli')
+{
+	throw new \Exception('This script can only run from CLI');
+}
+
+$sCssFile = APPROOT.'/css/setup.css';
+if (file_exists($sCssFile))
+{
+	fwrite(STDERR, "$sCssFile already exists (it should not), removing it.");
+	if (!unlink($sCssFile))
+	{
+		fwrite(STDERR, "Failed to remove $sCssFile, exiting.");
+		exit(1);
+	}
+}
+$sCssRelPath = utils::GetCSSFromSASS('css/setup.scss');
+
+if (!file_exists($sCssFile))
+{
+	fwrite(STDERR, "Failed to compile $sCssFile, exiting.");
+	exit(1);
+}

Jenkinsfile

@@ -1,70 +1,11 @@
-pipeline {
-  agent any
-    parameters {
-        booleanParam(name: 'debugMode', defaultValue: 'false', description: 'Debug mode?')
-        booleanParam(name: 'runNonRegOQLTests', defaultValue: 'false', description: 'Do You want to run legacy OQL regression tests?')
-    }
-  stages {
+def infra
 
-    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'
-          }
-        }
-      }
-    }
+node(){
+  checkout scm
 
-    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 ${debugMode} ${runNonRegOQLTests}'
-          }
-        }
-      }
-    }
-
-  }
-
-  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_UNESCAPED} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
-    }
-    fixed {
-      slackSend(channel: "#jenkins-itop", color: '#FFa500', message: "Yes! Build repaired! (${currentBuild.result}), Job '${env.JOB_NAME_UNESCAPED} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
-    }
-  }
-
-  environment {
-    DEBUG_UNIT_TEST = '0'
-    JOB_NAME_UNESCAPED = env.JOB_NAME.replaceAll("%2F", "/")
-  }
-  options {
-    timeout(time: 20, unit: 'MINUTES')
-  }
+  infra = load '/var/lib/jenkins/workspace/itop-test-infra_master/src/Infra.groovy'
 }
+
+
+infra.call()
+

addons/userrights/userrightsprofile.class.inc.php

@@ -434,7 +434,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Support drastic data model changes: no organization class (or not writable)!
 		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
 		{
-			$oOrg = new Organization();
+			$oOrg = MetaModel::NewObject('Organization');
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
 			$iOrgId = $oOrg->DBInsertNoReload();
@@ -442,17 +442,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
 			{
-				$oContact = new Person();
+				$oContact = MetaModel::NewObject('Person');
 				$oContact->Set('name', 'My last name');
 				$oContact->Set('first_name', 'My first name');
 				if (MetaModel::IsValidAttCode('Person', 'org_id'))
 				{
 					$oContact->Set('org_id', $iOrgId);
 				}
-				if (MetaModel::IsValidAttCode('Person', 'phone'))
-				{
-					$oContact->Set('phone', '+00 000 000 000');
-				}
 				$oContact->Set('email', 'my.email@foo.org');
 				$iContactId = $oContact->DBInsertNoReload();
 			}
@@ -561,7 +557,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * @param $oUser User
-	 * @return array
+	 * @return bool
 	 */
 	public function IsAdministrator($oUser)
 	{
@@ -571,16 +567,22 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * @param $oUser User
-	 * @return array
+	 * @return bool
 	 */
 	public function IsPortalUser($oUser)
 	{
 		// UserRights caches the list for us
 		return UserRights::HasProfile(PORTAL_PROFILE_NAME, $oUser);
 	}
+
 	/**
 	 * @param $oUser User
-	 * @return bool
+	 *
+	 * @return array
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
 	 */
 	public function ListProfiles($oUser)
 	{

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

@@ -535,7 +535,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 		// Support drastic data model changes: no organization class (or not writable)!
 		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
 		{
-			$oOrg = new Organization();
+			$oOrg = MetaModel::NewObject('Organization');
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
 			$oOrg::SetCurrentChange($oChange);
@@ -544,17 +544,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
 			{
-				$oContact = new Person();
+				$oContact = MetaModel::NewObject('Person');
 				$oContact->Set('name', 'My last name');
 				$oContact->Set('first_name', 'My first name');
 				if (MetaModel::IsValidAttCode('Person', 'org_id'))
 				{
 					$oContact->Set('org_id', $iOrgId);
 				}
-				if (MetaModel::IsValidAttCode('Person', 'phone'))
-				{
-					$oContact->Set('phone', '+00 000 000 000');
-				}
 				$oContact->Set('email', 'my.email@foo.org');
 				$oContact::SetCurrentChange($oChange);
 				$iContactId = $oContact->DBInsertNoReload();
@@ -711,7 +707,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	public function LoadCache()
 	{
-		if (!is_null($this->m_aProfiles)) return;
+		if (!is_null($this->m_aProfiles)) return false;
 		// Could be loaded in a shared memory (?)
 
 		$oKPI = new ExecutionKPI();

application/ajaxwebpage.class.inc.php

@@ -24,31 +24,34 @@ class ajax_page extends WebPage implements iTabbedPage
     /**
      * Jquery style ready script
      * @var array
-     */	  
+     */
 	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)
-    {
+
+	/**
+	 * 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 = "";
+		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->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 		$this->m_oTabs = new TabManager();
 		$this->sContentType = 'text/html';
 		$this->sContentDisposition = 'inline';
 		$this->m_sMenu = "";
 
 		utils::InitArchiveMode();
-    }
+	}
 
 	/**
 	 * @inheritDoc

application/cmdbabstract.class.inc.php

@@ -558,12 +558,6 @@ EOF
 			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());
 
 			$iCount = $oLinkSet->Count();
-			$sCount = '';
-			if ($iCount != 0)
-			{
-				$sCount = " ($iCount)";
-			}
-			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
 			if ($this->IsNew())
 			{
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
@@ -609,6 +603,9 @@ EOF
 				continue;
 			}
 
+			$sCount = ($iCount != 0) ? " ($iCount)" : "";
+			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
+
 			$aArgs = array('this' => $this);
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly))
@@ -3796,19 +3793,24 @@ EOF
 				break;
 
 			case 'Image':
+				$value = null;
 				$oImage = utils::ReadPostedDocument("attr_{$sFormPrefix}{$sAttCode}", 'fcontents');
-				$aSize = utils::GetImageSize($oImage->GetData());
-				$oImage = utils::ResizeImageToFit($oImage, $aSize[0], $aSize[1], $oAttDef->Get('storage_max_width'),
-					$oAttDef->Get('storage_max_height'));
+				if (!is_null($oImage->GetData()))
+				{
+					$aSize = utils::GetImageSize($oImage->GetData());
+					$oImage = utils::ResizeImageToFit(
+						$oImage,
+						$aSize[0],
+						$aSize[1],
+						$oAttDef->Get('storage_max_width'),
+						$oAttDef->Get('storage_max_height')
+					);
+				}
 				$aOtherData = utils::ReadPostedParam("attr_{$sFormPrefix}{$sAttCode}", null, 'raw_data');
 				if (is_array($aOtherData))
 				{
 					$value = array('fcontents' => $oImage, 'remove' => $aOtherData['remove']);
 				}
-				else
-				{
-					$value = null;
-				}
 				break;
 
 			case 'RedundancySetting':

application/csvpage.class.inc.php

@@ -29,13 +29,15 @@ 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=".self::PAGES_CHARSET);
-		$this->add_header("Cache-control: no-cache");
+	function __construct($s_title) {
+		parent::__construct($s_title);
+		$this->add_header("Content-type: text/plain; charset=".self::PAGES_CHARSET);
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 		//$this->add_header("Content-Transfer-Encoding: binary");
-    }	
+	}
 
     public function output()
     {

application/datamodel.application.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
   <portals>
     <portal id="backoffice" _delta="define">
       <url>pages/UI.php</url>

application/itopwebpage.class.inc.php

@@ -71,7 +71,10 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 		$this->m_aMessages = array();
 		$this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
 		$this->add_header("Content-type: text/html; charset=".self::PAGES_CHARSET);
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
 		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
 		$this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");

application/loginwebpage.class.inc.php

@@ -78,14 +78,16 @@ class LoginWebPage extends NiceWebPage
 	
 	public function __construct($sTitle = null)
 	{
-	    if($sTitle === null)
-        {
-            $sTitle = Dict::S('UI:Login:Title');
-        }
+		if ($sTitle === null) {
+			$sTitle = Dict::S('UI:Login:Title');
+		}
 
 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 	}
 	
 	public function SetStyleSheet()

application/startup.inc.php

@@ -35,7 +35,17 @@ register_shutdown_function(function()
 	$sReservedMemory = null;
 	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
 	{
-		IssueLog::error($err['message']);
+		// Remove stack trace from MySQLException
+		$sMessage = $err['message'];
+		if (strpos($sMessage, 'MySQLException') !== false)
+		{
+			$iStackTracePos = strpos($sMessage, 'Stack trace:');
+			if ($iStackTracePos !== false)
+			{
+				$sMessage = substr($sMessage, 0, $iStackTracePos);
+			}
+		}
+		IssueLog::error($sMessage);
 		if (strpos($err['message'], 'Allowed memory size of') !== false)
 		{
 			$sLimit = ini_get('memory_limit');

application/themehandler.class.inc.php

@@ -57,6 +57,10 @@ class ThemeHandler
 	{
 		try
 		{
+			if (is_null(MetaModel::GetConfig()))
+			{
+				throw new CoreException('no config');
+			}
 			$sThemeId = MetaModel::GetConfig()->Get('backoffice_default_theme');
 		}
 		catch(CoreException $oCompileException)

application/transaction.class.inc.php

@@ -234,7 +234,14 @@ class privUITransactionFile
 	 */
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
-		$sFilepath = APPROOT.'data/transactions/'.$id;
+		// Constraint the transaction file within APPROOT.'data/transactions'
+		$sTransactionDir = realpath(APPROOT.'data/transactions');
+		$sFilepath = utils::RealPath($sTransactionDir.'/'.$id, $sTransactionDir);
+		if (($sFilepath === false) || (strlen($sTransactionDir) == strlen($sFilepath)))
+		{
+			return false;
+		}
+
 		clearstatcache(true, $sFilepath);
 		$bResult = file_exists($sFilepath);
 		if ($bResult)

application/utils.inc.php

@@ -307,6 +307,7 @@ class utils
 			case 'context_param':
 			case 'parameter':
 			case 'field_name':
+			case 'transaction_id':
 				if (is_array($value))
 				{
 					$retValue = array();
@@ -2088,6 +2089,41 @@ class utils
 		return COMPILATION_TIMESTAMP;
 	}
 
+	/**
+	 * @return string eg : '2_7_0' ITOP_VERSION is '2.7.1-dev'
+	 */
+	public static function GetItopVersionWikiSyntax()
+	{
+		$sMinorVersion = self::GetItopMinorVersion();
+		return str_replace('.', '_', $sMinorVersion).'_0';
+	}
+
+	/**
+	 * @return string eg 2.7 if ITOP_VERSION is '2.7.0-dev'
+	 * @throws \Exception
+	 */
+	public static function GetItopMinorVersion()
+	{
+		$sPatchVersion = self::GetItopPatchVersion();
+		$aExplodedVersion = explode('.', $sPatchVersion);
+
+		if (empty($aExplodedVersion[0]) || empty($aExplodedVersion[1]))
+		{
+			throw new Exception('iTop version is wrongfully configured!');
+		}
+
+		return sprintf('%d.%d', $aExplodedVersion[0], $aExplodedVersion[1]);
+	}
+
+	/**
+	 * @return string eg '2.7.0' if ITOP_VERSION is '2.7.0-dev'
+	 */
+	public static function GetItopPatchVersion()
+	{
+		$aExplodedVersion = explode('-', ITOP_VERSION);
+		return $aExplodedVersion[0];
+	}
+
 	/**
 	 * Check if the given class if configured as a high cardinality class.
 	 *
@@ -2188,7 +2224,7 @@ class utils
 	 * @param string $sPath for example '/var/www/html/itop/data/backups/manual/itop_27-2019-10-03_15_35.tar.gz'
 	 * @param string $sBasePath for example '/var/www/html/itop/data/'
 	 *
-	 * @return bool false if path :
+	 * @return bool|string false if path :
 	 *      * invalid
 	 *      * not allowed
 	 *      * not contained in base path
@@ -2279,4 +2315,26 @@ class utils
 	{
 		return str_replace(' ', '', ucwords(strtr($sInput, '_-', '  ')));
 	}
+
+	/**
+	 * @param \cmdbAbstractObject $oCmdbAbstract
+	 * @param \Exception $oException
+	 *
+	 * @throws \Exception
+	 * @since 2.7.2/ 2.8.0
+	 */
+	public static function EnrichRaisedException($oCmdbAbstract, $oException)
+	{
+		if (is_null($oCmdbAbstract) ||
+			! is_a($oCmdbAbstract, \cmdbAbstractObject::class))
+		{
+			throw $oException;
+		}
+
+		$sCmdbAbstractInfo = str_replace("\n", '', "" . $oCmdbAbstract);
+		$sMessage = $oException->getMessage() . " (" . $sCmdbAbstractInfo . ")";
+
+		$e = new CoreException($sMessage, null, '', $oException);
+		throw $e;
+	}
 }

application/webpage.class.inc.php

@@ -487,8 +487,10 @@ class WebPage implements Page
 	 */
 	public function no_cache()
 	{
-		$this->add_header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
-		$this->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 	}
 
 	/**
@@ -1546,6 +1548,12 @@ class TabManager
 					{
 						unset($aTabs['tabs'][$sTabCode]);
 					}
+
+					// N°3320: Do not display empty tabs
+					if (empty($aTabData['html']) && empty($aTabData['url']))
+					{
+						unset($aTabs['tabs'][$sTabCode]);
+					}
 				}
 
 				// Render tabs

application/xmlpage.class.inc.php

@@ -43,9 +43,12 @@ class XMLPage extends WebPage
 		$this->m_bPassThrough = $bPassThrough;
 		$this->m_bHeaderSent = false;
 		$this->add_header("Content-type: text/xml; charset=".self::PAGES_CHARSET);
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 		$this->add_header("Content-location: export.xml");
-	}	
+	}
 
 	public function output()
 	{

composer.json

@@ -12,7 +12,7 @@
     "ext-soap": "*",
     "combodo/tcpdf": "6.3.5",
     "nikic/php-parser": "^3.1",
-    "pear/archive_tar": "1.4.9",
+    "pear/archive_tar": "1.4.10",
     "pelago/emogrifier": "2.1.0",
     "scssphp/scssphp": "1.0.6",
     "swiftmailer/swiftmailer": "5.4.12",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ad359769d05acd25a9fc31d69acbe43a",
+    "content-hash": "27af144ea2acf2c138f587052a4ceddc",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-                "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc"
+                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc",
-                "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc",
+                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
                 "shasum": ""
             },
             "require": {
@@ -64,7 +64,7 @@
             ],
             "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
             "homepage": "https://github.com/combodo-itop-libs/TCPDF",
-            "time": "2020-06-05T13:06:44+00:00"
+            "time": "2020-09-28T12:19:09+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -168,16 +168,16 @@
         },
         {
             "name": "pear/archive_tar",
-            "version": "1.4.9",
+            "version": "1.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Archive_Tar.git",
-                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
+                "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
-                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
+                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+                "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
                 "shasum": ""
             },
             "require": {
@@ -230,7 +230,7 @@
                 "archive",
                 "tar"
             ],
-            "time": "2019-12-04T10:17:28+00:00"
+            "time": "2020-09-15T14:13:23+00:00"
         },
         {
             "name": "pear/console_getopt",

core/attributedef.class.inc.php

@@ -18,6 +18,7 @@
  */
 
 use Combodo\iTop\Form\Field\LabelField;
+use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
 use Combodo\iTop\Form\Validator\Validator;
 
@@ -7449,6 +7450,12 @@ class AttributeExternalField extends AttributeDefinition
 			}
 		}
 		parent::MakeFormField($oObject, $oFormField);
+		if ($oFormField instanceof TextAreaField) {
+			if (method_exists($oRemoteAttDef, 'GetFormat')) {
+				/** @var \Combodo\iTop\Form\Field\TextAreaField $oFormField */
+				$oFormField->SetFormat($oRemoteAttDef->GetFormat());
+			}
+		}
 
 		// Manually setting for remote ExternalKey, otherwise, the id would be displayed.
 		if ($oRemoteAttDef instanceof AttributeExternalKey)
@@ -7466,6 +7473,16 @@ class AttributeExternalField extends AttributeDefinition
 	{
 		return false;
 	}
+
+	public function GetFormat()
+	{
+		$oRemoteAttDef = $this->GetExtAttDef();
+		if (method_exists($oRemoteAttDef, 'GetFormat')) {
+			/** @var \Combodo\iTop\Form\Field\TextAreaField $oFormField */
+			return $oRemoteAttDef->GetFormat();
+		}
+		return 'text';
+	}
 }
 
 

core/backgroundtask.class.inc.php

@@ -26,6 +26,24 @@
  */
 class BackgroundTask extends DBObject
 {
+	protected $bDebug = false;
+
+	/**
+	 * @return bool
+	 */
+	public function IsDebug()
+	{
+		return $this->bDebug;
+	}
+
+	/**
+	 * @param bool $bDebug
+	 */
+	public function SetDebug($bDebug)
+	{
+		$this->bDebug = $bDebug;
+	}
+
 	public static function Init()
 	{
 		$aParams = array

core/bulkchange.class.inc.php

@@ -309,7 +309,7 @@ class BulkChange
 				$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
 			}
 			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
-			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+			$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 		}
 
 		$oExtObjects = new CMDBObjectSet($oReconFilter);
@@ -363,6 +363,7 @@ class BulkChange
 				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 				{
 					// Default reporting
+					// $aRowData[$iCol] is always null
 					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
 				if ($oExtKey->IsNullAllowed())
@@ -395,7 +396,7 @@ class BulkChange
 					}
 					$aCacheKeys[] = $value;
 					$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
-					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+					$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 				}
 				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
 				$iForeignKey = null;
@@ -465,7 +466,7 @@ class BulkChange
 						foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 						{
 							// Report the change on reconciliation values as well
-							$aResults[$iCol] = new CellStatus_Modify($aRowData[$iCol]);
+							$aResults[$iCol] = new CellStatus_Modify(utils::HtmlEntities($aRowData[$iCol]));
 						}
 					}
 				}
@@ -538,7 +539,7 @@ class BulkChange
 		{
 			if ($sAttCode == 'id')
 			{
-				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+				$aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 			}
 			else
 			{
@@ -554,7 +555,7 @@ class BulkChange
 				}
 				if (isset($aErrors[$sAttCode]))
 				{
-					$aResults[$iCol]= new CellStatus_Issue($aRowData[$iCol], $sOrigValue, $aErrors[$sAttCode]);
+					$aResults[$iCol]= new CellStatus_Issue(utils::HtmlEntities($aRowData[$iCol]), $sOrigValue, $aErrors[$sAttCode]);
 				}
 				elseif (array_key_exists($sAttCode, $aChangedFields))
 				{
@@ -577,7 +578,7 @@ class BulkChange
 					}
 					else
 					{
-						$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+						$aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 					}
 				}
 			}
@@ -924,7 +925,7 @@ class BulkChange
 								{
 									// Leave the cell unchanged
 									$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-									$aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, $this->m_aData[$iRow][$iCol], Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+									$aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, utils::HtmlEntities($this->m_aData[$iRow][$iCol]), Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
 								}
 							}
 						}
@@ -1082,7 +1083,7 @@ class BulkChange
 			{
 				if (!array_key_exists($iCol, $aResult[$iRow]))
 				{
-					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
+					$aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 				}
 			}
 			foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts)
@@ -1096,7 +1097,7 @@ class BulkChange
 					if (!array_key_exists($iCol, $aResult[$iRow]))
 					{
 						// The foreign attribute is one of our reconciliation key
-						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
+						$aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
 					}
 				}
 			}

core/bulkexport.class.inc.php

@@ -345,10 +345,10 @@ abstract class BulkExport
 			$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('localize_output', $this->bLocalizeOutput);
         }
 		$this->oBulkExportResult->Set('status_info', json_encode($this->GetStatusInfo()));
+		$this->oBulkExportResult->Set('temp_file_path', $this->sTmpFile);
 		utils::PushArchiveMode(false);
 		$ret = $this->oBulkExportResult->DBWrite();
 		utils::PopArchiveMode();
@@ -420,6 +420,11 @@ abstract class BulkExport
 	public function GetStatistics()
 	{
 		
+	}
+
+	public function SetFields($sFields)
+	{
+
 	}
 	
 	public function GetDownloadFileName()

core/cmdbobject.class.inc.php

@@ -95,11 +95,21 @@ abstract class CMDBObject extends DBObject
 	protected static $m_oCurrChange = null;
 	protected static $m_sInfo = null; // null => the information is built in a standard way
 	protected static $m_sOrigin = null; // null => the origin is 'interactive'
-	
+
 	/**
-	 * Specify another change (this is mainly for backward compatibility)
+	 * Specify the change to be used by the API to attach any CMDBChangeOp* object created
+	 *
+	 * @see SetTrackInfo if CurrentChange is null, then a new one will be create using trackinfo
+	 *
+	 * @param CMDBChange|null $oChange use null so that the API will recreate a new CMDBChange using TrackInfo & TrackOrigin
+	 *     If providing a CMDBChange, you should persist it first ! Indeed the API will automatically create CMDBChangeOp (see
+	 *     \CMDBObject::RecordObjCreation / RecordAttChange / RecordObjDeletion for example) and link them to the current change : in
+	 *     consequence this CMDBChange must have a key set !
+	 *
+	 * @since 2.7.2 N°3219 can now reset CMDBChange by passing null
+	 * @since 2.7.2 N°3218 PHPDoc about persisting the $oChange parameter first
 	 */
-	public static function SetCurrentChange(CMDBChange $oChange)
+	public static function SetCurrentChange($oChange)
 	{
 		self::$m_oCurrChange = $oChange;
 	}
@@ -112,7 +122,11 @@ abstract class CMDBObject extends DBObject
 	//			GetCurrentChange to create a default change if not already done in the current context
 	//
 	/**
-	 * Get a change record (create it if not existing)	 
+	 * @param bool $bAutoCreate if true calls {@link CreateChange} to get a new persisted object
+	 *
+	 * @return \CMDBChange
+	 *
+	 * @uses CreateChange
 	 */
 	public static function GetCurrentChange($bAutoCreate = true)
 	{
@@ -126,11 +140,15 @@ abstract class CMDBObject extends DBObject
 	/**
 	 * Override the additional information (defaulting to user name)
 	 * A call to this verb should replace every occurence of
-	 *    $oMyChange = MetaModel::NewObject("CMDBChange");	  	 
+	 *    $oMyChange = MetaModel::NewObject("CMDBChange");
 	 *    $oMyChange->Set("date", time());
 	 *    $oMyChange->Set("userinfo", 'this is done by ... for ...');
 	 *    $iChangeId = $oMyChange->DBInsert();
-	 */	 	
+	 *
+	 * @see SetCurrentChange to specify a CMDBObject instance instead
+	 *
+	 * @param string $sInfo
+	 */
 	public static function SetTrackInfo($sInfo)
 	{
 		self::$m_sInfo = $sInfo;
@@ -138,8 +156,13 @@ abstract class CMDBObject extends DBObject
 
 	/**
 	 * Provides information about the origin of the change
-	 * @param $sOrigin String: one of: interactive, csv-interactive, csv-import.php, webservice-soap, webservice-rest, syncho-data-source, email-processing, custom-extension
-	 */	 	
+	 *
+	 * @see SetTrackInfo
+	 * @see SetCurrentChange to specify a CMDBObject instance instead
+	 *
+	 * @param $sOrigin String: one of: interactive, csv-interactive, csv-import.php, webservice-soap, webservice-rest, syncho-data-source,
+	 *     email-processing, custom-extension
+	 */
 	public static function SetTrackOrigin($sOrigin)
 	{
 		self::$m_sOrigin = $sOrigin;
@@ -174,10 +197,12 @@ abstract class CMDBObject extends DBObject
 			return self::$m_sOrigin;
 		}
 	}
-	
+
 	/**
-	 * Create a standard change record (done here 99% of the time, and nearly once per page)
-	 */	 	
+	 * Set to {@link $m_oCurrChange} a standard change record (done here 99% of the time, and nearly once per page)
+	 *
+	 * The CMDBChange is persisted so that it has a key > 0, and any new CMDBChangeOp can link to it
+	 */
 	protected static function CreateChange()
 	{
 		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");

core/config.class.inc.php

@@ -22,7 +22,7 @@
 
 define('ITOP_APPLICATION', 'iTop');
 define('ITOP_APPLICATION_SHORT', 'iTop');
-define('ITOP_VERSION', '2.7.0-dev');
+define('ITOP_VERSION', '2.7.0-dev'); // @see utils::GetItopVersionShort() and utils::GetItopVersionWikiSyntax()
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');
 define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);

core/coreexception.class.inc.php

@@ -28,31 +28,39 @@
 
 class CoreException extends Exception
 {
-	public function __construct($sIssue, $aContextData = null, $sImpact = '')
+	/**
+	 * CoreException constructor.
+	 *
+	 * @param string $sIssue error message
+	 * @param array|null $aContextData key/value array, value MUST implements _toString
+	 * @param string $sImpact
+	 * @param Exception|null $oPrevious
+	 */
+	public function __construct($sIssue, $aContextData = null, $sImpact = '', $oPrevious = null)
 	{
 		$this->m_sIssue = $sIssue;
 		$this->m_sImpact = $sImpact;
-		$this->m_aContextData = $aContextData ? $aContextData : array();
-		
+
+		if (is_array($aContextData)) {
+			$this->m_aContextData = $aContextData;
+		} else {
+			$this->m_aContextData = [];
+		}
+
 		$sMessage = $sIssue;
-		if (!empty($sImpact)) $sMessage .= "($sImpact)";
-		if (count($this->m_aContextData) > 0)
-		{
+		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))
-				{
+			foreach ($this->m_aContextData as $sKey => $value) {
+				if (is_array($value)) {
 					$aPairs = array();
-					foreach($value as $key => $val)
-					{
-						if (is_array($val))
-						{
+					foreach ($value as $key => $val) {
+						if (is_array($val)) {
 							$aPairs[] = $key.'=>('.implode(', ', $val).')';
-						}
-						else
-						{
+						} else {
 							$aPairs[] = $key.'=>'.$val;
 						}
 					}
@@ -66,7 +74,7 @@ class CoreException extends Exception
 			}
 			$sMessage .= implode(', ', $aContextItems);
 		}
-		parent::__construct($sMessage, 0);
+		parent::__construct($sMessage, 0, $oPrevious);
 	}
 
 	/**
@@ -81,6 +89,16 @@ class CoreException extends Exception
 		return $this->getMessage();
 	}
 
+	/**
+	 * getTraceAsString() cannot be overrided and it is limited as only current exception stack is returned.
+	 * we need stack of all previous exceptions
+	 * @uses __tostring() already does the work.
+	 * @since 2.7.2/ 2.8.0
+	 */
+	public function getFullStackTraceAsString(){
+		return "" . $this;
+	}
+
 	public function getTraceAsHtml()
 	{
 		$aBackTrace = $this->getTrace();

core/datamodel.core.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
   <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 />
+        <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>

core/dbobject.class.php

@@ -856,13 +856,17 @@ abstract class DBObject implements iDisplay
 	}
 
     /**
+     * @see  \DBObject::ListPreviousValuesForUpdatedAttributes() to get previous values anywhere in the CRUD stack
+     * @see https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Asequence_crud iTop CRUD stack documentation
+     *
      * @param string $sAttCode
      *
      * @return mixed|null the value as it was before changed with {@see DBObject::Set()}.
      *        Returns null if the attribute wasn't changed.
+     *        Values are reset during {@see DBObject::DBUpdate()}
      *
-     * @see DBObject::$m_aOrigValues
      * @throws CoreException if the attribute is unknown for the current object
+     * @uses DBObject::$m_aOrigValues
      */
 	public function GetOriginal($sAttCode)
 	{
@@ -2375,14 +2379,16 @@ abstract class DBObject implements iDisplay
 		return $aDelta;
 	}
 
-    /**
-     * @api
-     * @api-advanced
-     *
-     * @return array attname => currentvalue List the attributes that have been changed using {@see DBObject::Set()}. Reset during {@see DBObject::DBUpdate()}
-     * @uses m_aCurrValues
-     * @see \DBObject::ListPreviousValuesForUpdatedAttributes()
-     * @throws Exception
+	/**
+	 * @api
+	 * @api-advanced
+	 *
+	 * @see  \DBObject::ListPreviousValuesForUpdatedAttributes() to get previous values anywhere in the CRUD stack
+	 * @see https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Asequence_crud iTop CRUD stack documentation
+	 * @return array attname => currentvalue List the attributes that have been changed using {@see DBObject::Set()}.
+	 *         Reset during {@see DBObject::DBUpdate()}
+	 * @throws Exception
+	 * @uses m_aCurrValues
      */
 	public function ListChanges()
 	{
@@ -2402,10 +2408,10 @@ abstract class DBObject implements iDisplay
 	 *
 	 * To get values that were set to the changed fields, simply use {@link \DBObject::Get()}
 	 *
+	 * @see  \DBObject::ListChanges() old method, but using data that are reset during DBObject::DBUpdate
 	 * @return array attname => value : value that was present before the last {@see DBObject::Set()} call.
 	 *       This array is set at the beginning of {@see DBObject::DBpdate()} using {@see DBObject::InitPreviousValuesForUpdatedAttributes()}.
 	 * @uses m_aPreviousValuesForUpdatedAttributes
-	 * @see \DBObject::ListChanges()
 	 * @since 2.7.0 N°2293
 	 */
 	public function ListPreviousValuesForUpdatedAttributes()
@@ -2799,7 +2805,14 @@ abstract class DBObject implements iDisplay
 		while ($oTrigger = $oSet->Fetch())
 		{
 			/** @var \Trigger $oTrigger */
-			$oTrigger->DoActivate($this->ToArgs('this'));
+			try
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+			catch(Exception $e)
+			{
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
 		}
 
 		$this->RecordObjCreation();
@@ -3111,7 +3124,14 @@ abstract class DBObject implements iDisplay
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				$oTrigger->DoActivate($this->ToArgs('this'));
+				try
+				{
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch(Exception $e)
+				{
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
 			}
 
 			$bHasANewExternalKeyValue = false;
@@ -3427,7 +3447,14 @@ abstract class DBObject implements iDisplay
 		while ($oTrigger = $oSet->Fetch())
 		{
 			/** @var \Trigger $oTrigger */
-			$oTrigger->DoActivate($this->ToArgs('this'));
+			try
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+			catch(Exception $e)
+			{
+				utils::EnrichRaisedException($oTrigger, $e);
+			}
 		}
 
 		$this->RecordObjDeletion($this->m_iKey); // May cause a reload for storing history information
@@ -3714,16 +3741,14 @@ abstract class DBObject implements iDisplay
 
 		// save current object values in case of an action failure (in memory rollback)
 		$aBackupValues = array();
-		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-		{
-			$value = $this->m_aCurrValues[$sAttCode];
-			if (is_object($value))
-			{
-				$aBackupValues[$sAttCode] = clone $value;
-			}
-			else
-			{
-				$aBackupValues[$sAttCode] = $value;
+		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)	{
+			if (isset($this->m_aCurrValues[$sAttCode])) {
+				$value = $this->m_aCurrValues[$sAttCode];
+				if (is_object($value)) {
+					$aBackupValues[$sAttCode] = clone $value;
+				} else {
+					$aBackupValues[$sAttCode] = $value;
+				}
 			}
 		}
 
@@ -3831,14 +3856,27 @@ abstract class DBObject implements iDisplay
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				$oTrigger->DoActivate($this->ToArgs('this'));
+				try
+				{
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch(Exception $e)
+				{
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
 			}
 
 			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN (:class_list) AND t.state=:new_state"), array(), $aParams);
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				$oTrigger->DoActivate($this->ToArgs('this'));
+				try{
+					$oTrigger->DoActivate($this->ToArgs('this'));
+				}
+				catch(Exception $e)
+				{
+					utils::EnrichRaisedException($oTrigger, $e);
+				}
 			}
 		}
 		else

core/dbobjectsearch.class.php

@@ -63,9 +63,15 @@ class DBObjectSearch extends DBSearch
 	{
 		parent::__construct();
 
-		if (is_null($sClassAlias)) $sClassAlias = $sClass;
-		if(!is_string($sClass)) throw new Exception('DBObjectSearch::__construct called with a non-string parameter: $sClass = '.print_r($sClass, true));
-		if(!MetaModel::IsValidClass($sClass)) throw new Exception('DBObjectSearch::__construct called for an invalid class: "'.$sClass.'"');
+		if (is_null($sClassAlias)) {
+			$sClassAlias = $sClass;
+		}
+		if (!is_string($sClass)) {
+			throw new Exception('DBObjectSearch::__construct called with a non-string parameter: $sClass = '.print_r($sClass, true));
+		}
+		if (!MetaModel::IsValidClass($sClass)) {
+			throw new Exception('DBObjectSearch::__construct called for an invalid class: "'.$sClass.'"');
+		}
 
 		$this->m_aSelectedClasses = array($sClassAlias => $sClass);
 		$this->m_aClasses = array($sClassAlias => $sClass);
@@ -75,30 +81,43 @@ class DBObjectSearch extends DBSearch
 		$this->m_aReferencedBy = array();
 	}
 
-	public function AllowAllData($bAllowAllData = true) {$this->m_bAllowAllData = $bAllowAllData;}
-	public function IsAllDataAllowed() {return $this->m_bAllowAllData;}
-	protected function IsDataFiltered() {return $this->m_bDataFiltered; }
-	protected function SetDataFiltered() {$this->m_bDataFiltered = true;}
+	public function AllowAllData($bAllowAllData = true) {
+		$this->m_bAllowAllData = $bAllowAllData;
+
+		$this->m_oSearchCondition->Browse(function ($oThisExpression) use ($bAllowAllData) {
+			ExpressionHelper::ExpressionAllowAllDataCallback($oThisExpression, $bAllowAllData);
+		});
+	}
+
+	public function IsAllDataAllowed() {
+		return $this->m_bAllowAllData;
+	}
+
+	protected function IsDataFiltered() {
+		return $this->m_bDataFiltered;
+	}
+
+	protected function SetDataFiltered() {
+		$this->m_bDataFiltered = true;
+	}
 
 	// Create a search definition that leads to 0 result, still a valid search object
-	static public function FromEmptySet($sClass)
-	{
+	public static function FromEmptySet($sClass) {
 		$oResultFilter = new DBObjectSearch($sClass);
 		$oResultFilter->m_oSearchCondition = new FalseExpression;
+
 		return $oResultFilter;
 	}
 
 
-	public function GetJoinedClasses() {return $this->m_aClasses;}
+	public function GetJoinedClasses() {
+		return $this->m_aClasses;
+	}
 
-	public function GetClassName($sAlias)
-	{
-		if (array_key_exists($sAlias, $this->m_aSelectedClasses))
-		{
+	public function GetClassName($sAlias) {
+		if (array_key_exists($sAlias, $this->m_aSelectedClasses)) {
 			return $this->m_aSelectedClasses[$sAlias];
-		}
-		else
-		{
+		} else {
 			throw new CoreException("Invalid class alias '$sAlias'");
 		}
 	}
@@ -358,37 +377,35 @@ class DBObjectSearch extends DBSearch
 		}
 		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
 		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator) {
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters) {
+					foreach ($aFilters as $oForeignFilter) {
 						$oForeignFilter->RenameParam($sOldName, $sNewName);
 					}
 				}
 			}
 		}
 	}
-	
-	public function ResetCondition()
-	{
+
+	public function ResetCondition() {
 		$this->m_oSearchCondition = new TrueExpression();
 		// ? is that usefull/enough, do I need to rebuild the list after the subqueries ?
 	}
 
-	public function MergeConditionExpression($oExpression)
-	{
-		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression); 
+	public function MergeConditionExpression($oExpression) {
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression);
 	}
 
-	public function AddConditionExpression($oExpression)
-	{
-		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression); 
+	public function AddConditionExpression($oExpression) {
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression);
+
+		$bRootSearchAllowAllData = $this->IsAllDataAllowed();
+		$oExpression->Browse(function ($oThisExpression) use ($bRootSearchAllowAllData) {
+			ExpressionHelper::ExpressionAllowAllDataCallback($oThisExpression, $bRootSearchAllowAllData);
+		});
 	}
 
-  	public function AddNameCondition($sName)
-	{
+	public function AddNameCondition($sName) {
 		$oValueExpr = new ScalarExpression($sName);
 		$oNameExpr = new FieldExpression('friendlyname', $this->GetClassAlias());
 		$oNewCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
@@ -443,7 +460,6 @@ class DBObjectSearch extends DBSearch
 		case '<|':
 		case '=|':
 			throw new CoreException('Deprecated operator, please consider using OQL (SQL) expressions like "(TO_DAYS(NOW()) - TO_DAYS(x)) AS AgeDays"', array('operator' => $sOpCode));
-			break;
 
 		case 'IN':
 			if (!is_array($value)) $value = array($value);
@@ -625,17 +641,32 @@ class DBObjectSearch extends DBSearch
 	public function AddCondition_FullText($sNeedle)
 	{
 		// Transform the full text condition into additional condition expression
-		$aFullTextFields = array();
-		foreach (MetaModel::ListAttributeDefs($this->GetClass()) as $sAttCode => $oAttDef)
-		{
+		$aAttCodes = [];
+		foreach (MetaModel::ListAttributeDefs($this->GetClass()) as $sAttCode => $oAttDef) {
 			if (!$oAttDef->IsScalar()) continue;
 			if ($oAttDef->IsExternalKey()) continue;
 			if (!$oAttDef->IsSearchable()) continue;
+			$aAttCodes[] = $sAttCode;
+		}
+		$this->AddCondition_FullTextOnAttributes($aAttCodes, $sNeedle);
+	}
+
+	/**
+	 * @param array $aAttCodes array of attCodes to search into
+	 * @param string $sNeedle one word to be searched
+	 *
+	 * @throws \CoreException
+	 */
+	public function AddCondition_FullTextOnAttributes(array $aAttCodes, $sNeedle)
+	{
+		$aFullTextFields = [];
+		foreach ($aAttCodes as $sAttCode) {
 			$aFullTextFields[] = new FieldExpression($sAttCode, $this->GetClassAlias());
 		}
+
 		$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
 
-		$sQueryParam = 'needle';
+		$sQueryParam = str_replace('.', '', uniqid('needle_', true));
 		$oFlexNeedle = new CharConcatExpression(array(new ScalarExpression('%'), new VariableExpression($sQueryParam), new ScalarExpression('%')));
 
 		$oNewCond = new BinaryExpression($oTextFields, 'LIKE', $oFlexNeedle);
@@ -792,10 +823,11 @@ class DBObjectSearch extends DBSearch
 	 * Helper to
 	 * - convert a translation table (format optimized for the translation in an expression tree) into simple hash
 	 * - compile over an eventually existing map
+	 * - accept multiple translations for the same alias for unions
 	 *
 	 * @param array $aRealiasingMap Map to update
 	 * @param array $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
-	 * @return void of <old-alias> => <new-alias>
+	 * @return void of [old-alias][] => new-alias (@since 2.7.2)
 	 */
 	protected function UpdateRealiasingMap(&$aRealiasingMap, $aAliasTranslation)
 	{
@@ -803,17 +835,33 @@ class DBObjectSearch extends DBSearch
 		{
 			foreach ($aAliasTranslation as $sPrevAlias => $aRules)
 			{
-				if (isset($aRules['*']))
+				if (!isset($aRules['*']))
 				{
-					$sNewAlias = $aRules['*'];
-					$sOriginalAlias = array_search($sPrevAlias, $aRealiasingMap);
-					if ($sOriginalAlias !== false)
+					continue;
+				}
+
+				$sNewAlias = $aRules['*'];
+				$bOriginalFound = false;
+				$iIndex = 0;
+				foreach ($aRealiasingMap as $sOriginalAlias => $aAliases)
+				{
+					$iIndex = array_search($sPrevAlias, $aAliases);
+					if ($iIndex !== false)
 					{
-						$aRealiasingMap[$sOriginalAlias] = $sNewAlias;
+						$bOriginalFound = true;
+						break;
 					}
-					else
+
+				}
+				if ($bOriginalFound)
+				{
+					$aRealiasingMap[$sOriginalAlias][$iIndex] = $sNewAlias;
+				}
+				else
+				{
+					if (!isset($aRealiasingMap[$sPrevAlias]) || !in_array($sNewAlias, $aRealiasingMap[$sPrevAlias]))
 					{
-						$aRealiasingMap[$sPrevAlias] = $sNewAlias;
+						$aRealiasingMap[$sPrevAlias][] = $sNewAlias;
 					}
 				}
 			}
@@ -859,7 +907,7 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 * @param DBObjectSearch $oFilter
+	 * @param DBObjectSearch $oFilter (can be modified)
 	 * @param $sExtKeyAttCode
 	 * @param int $iOperatorCode
 	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
@@ -951,7 +999,7 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 * @param DBObjectSearch $oFilter
+	 * @param DBObjectSearch $oFilter (can be modified)
 	 * @param $sForeignExtKeyAttCode
 	 * @param int $iOperatorCode
 	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed

core/dbsearch.class.php

@@ -97,42 +97,40 @@ abstract class DBSearch
 	/**
 	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
 	 *
-     * @internal
-     *
+	 * @internal
+	 *
 	 * @return \DBSearch
-	 **/	 	
+	 **/
 	public function DeepClone()
 	{
 		return unserialize(serialize($this)); // Beware this serializes/unserializes the search and its parameters as well
 	}
 
-    /**
-     * whether or not some information should be hidden to the current user.
-     *
-     * @api
-     * @see IsAllDataAllowed()
-     *
-     * @return mixed
-     */
-	abstract public function AllowAllData();
+	/**
+	 * @api
+	 * @see IsAllDataAllowed()
+	 *
+	 * @param bool $bAllowAllData whether or not some information should be hidden to the current user.
+	 */
+	abstract public function AllowAllData($bAllowAllData = true);
 
-    /**
-     * Current state of AllowAllData
-     *
-     * @internal
-     * @see AllowAllData()
-     *
-     * @return mixed
-     */
+	/**
+	 * Current state of AllowAllData
+	 *
+	 * @internal
+	 * @see AllowAllData()
+	 *
+	 * @return mixed
+	 */
 	abstract public function IsAllDataAllowed();
 
-    /**
-     * Should the archives be fetched
-     *
-     * @internal
-     *
-     * @param $bEnable
-     */
+	/**
+	 * Should the archives be fetched
+	 *
+	 * @internal
+	 *
+	 * @param $bEnable
+	 */
 	public function SetArchiveMode($bEnable)
 	{
 		$this->m_bArchiveMode = $bEnable;
@@ -404,7 +402,9 @@ abstract class DBSearch
      */
 	abstract public function AddCondition_FullText($sFullText);
 
-	/**
+	abstract public function AddCondition_FullTextOnAttributes(array $aAttCodes, $sNeedle);
+
+		/**
      * Perform a join, the remote class being matched by the mean of its primary key
      *
      * The join is performed
@@ -631,7 +631,7 @@ abstract class DBSearch
 		}
 
 		$sOql = $this->ToOql($bDevelopParams, $aContextParams);
-		return json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties));
+		return urlencode(json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties)));
 	}
 
 	/**
@@ -648,7 +648,7 @@ abstract class DBSearch
 	 */
 	static public function unserialize($sValue)
 	{
-		$aData = json_decode($sValue, true);
+		$aData = json_decode(urldecode($sValue), true);
 		if (is_null($aData))
 		{
 			throw new CoreException("Invalid filter parameter");
@@ -1112,6 +1112,8 @@ abstract class DBSearch
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
+	 *
+	 * @since 2.7.0 N°2555
 	 */
 	public function GetFirstResult($bMustHaveOneResultMax = true, $aOrderBy = array(), $aSearchParams = array())
 	{

core/dbunionsearch.class.php

@@ -65,9 +65,7 @@ class DBUnionSearch extends DBSearch
 				{
 					$this->aSearches[] = $oSubSearch->DeepClone();
 				}
-			}
-			else
-			{
+			} else {
 				$this->aSearches[] = $oSearch->DeepClone();
 			}
 		}
@@ -75,17 +73,16 @@ class DBUnionSearch extends DBSearch
 		$this->ComputeSelectedClasses();
 	}
 
-	public function AllowAllData()
+	public function AllowAllData($bAllowAllData = true)
 	{
-		foreach ($this->aSearches as $oSearch)
-		{
+		foreach ($this->aSearches as $oSearch) {
 			$oSearch->AllowAllData();
 		}
 	}
+
 	public function IsAllDataAllowed()
 	{
-		foreach ($this->aSearches as $oSearch)
-		{
+		foreach ($this->aSearches as $oSearch) {
 			if ($oSearch->IsAllDataAllowed() === false) return false;
 		}
 		return true;
@@ -376,19 +373,26 @@ class DBUnionSearch extends DBSearch
 		}
 	}
 
-	/**
+	public function AddCondition_FullTextOnAttributes(array $aAttCodes, $sNeedle)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddCondition_FullTextOnAttributes($aAttCodes, $sNeedle);
+		}
+	}
+
+		/**
 	 * @param DBObjectSearch $oFilter
 	 * @param $sExtKeyAttCode
 	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
-	 * @throws CoreException
-	 * @throws CoreWarning
+	 * @param null $aRealiasingMap array of [old-alias][] => <new-alias>, for each alias that has changed (@since 2.7.2)
 	 */
 	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
 	{
 		foreach ($this->aSearches as $oSearch)
 		{
-			$oSearch->AddCondition_PointingTo($oFilter, $sExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
+			$oConditionFilter = $oFilter->DeepClone();
+			$oSearch->AddCondition_PointingTo($oConditionFilter, $sExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
 		}
 	}
 
@@ -396,13 +400,14 @@ class DBUnionSearch extends DBSearch
 	 * @param DBObjectSearch $oFilter
 	 * @param $sForeignExtKeyAttCode
 	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 * @param null $aRealiasingMap array of [old-alias][] => <new-alias>, for each alias that has changed (@since 2.7.2)
 	 */
 	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
 	{
 		foreach ($this->aSearches as $oSearch)
 		{
-			$oSearch->AddCondition_ReferencedBy($oFilter, $sForeignExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
+			$oConditionFilter = $oFilter->DeepClone();
+			$oSearch->AddCondition_ReferencedBy($oConditionFilter, $sForeignExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
 		}
 	}
 

core/excelbulkexport.class.inc.php

@@ -353,7 +353,8 @@ EOF
 			
 		$fStartExcel = microtime(true);
 		$writer = new XLSXWriter();
-		$oDateTimeFormat = new DateTimeFormat($this->aStatusInfo['date_format']);
+		$sDateFormat = isset($this->aStatusInfo['date_format']) ? $this->aStatusInfo['date_format'] : (string)AttributeDateTime::GetFormat();
+		$oDateTimeFormat = new DateTimeFormat($sDateFormat);
 		$writer->setDateTimeFormat($oDateTimeFormat->ToExcel());
 		$oDateFormat = new DateTimeFormat($oDateTimeFormat->ToDateFormat());
 		$writer->setDateFormat($oDateFormat->ToExcel());

core/oql/expression.class.inc.php

@@ -1,32 +1,52 @@
 <?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/>
-//
+/*
+ * Copyright (C) 2010-2020 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
+ */
 
-class MissingQueryArgument extends CoreException
-{
+class MissingQueryArgument extends CoreException {
+}
+
+
+class ExpressionHelper {
+	/**
+	 * Callback to be used with {@link Expression::Browse}, to update the AllowAllData attribute in the NestedQueryExpression that are
+	 * present in the Expression tree
+	 *
+	 * @param \Expression $oExpression
+	 * @param boolean $bAllowAllData
+	 *
+	 * @uses \DBSearch::AllowAllData()
+	 *
+	 * @since 2.7.2 2.8.0 N°3324
+	 */
+	public static function ExpressionAllowAllDataCallback($oExpression, $bAllowAllData) {
+		if (!($oExpression instanceof NestedQueryExpression)) {
+			return;
+		}
+
+		$oExpression->AllowAllData($bAllowAllData);
+	}
 }
 
 
 /**
  * @method Check($oModelReflection, array $aAliases, $sSourceQuery)
  */
-abstract class Expression
-{
+abstract class Expression {
 	const OPERATOR_BINARY = 'binary';
 	const OPERATOR_BOOLEAN = 'boolean_binary';
 	const OPERATOR_FIELD = 'field';
@@ -139,9 +159,13 @@ abstract class Expression
 	}
 
 	/**
-	 * Recursively browse the expression tree
-	 * @param Closure $callback
-	 * @return mixed
+	 * Recursively browse the expression tree.
+	 *
+	 * To access variables, specify them using the `use` keyword and the `&` to pass by reference if necessary
+	 *
+	 * @see https://www.php.net/manual/fr/functions.anonymous.php
+	 *
+	 * @param Closure $callback with current expression as parameter
 	 */
 	abstract public function Browse(Closure $callback);
 
@@ -153,6 +177,9 @@ abstract class Expression
 	// recursively list field parents ($aTable = array of sParent => dummy)
 	abstract public function CollectUsedParents(&$aTable);
 
+	/**
+	 * @return boolean true if the expression's value is constant and evaluates to true, false otherwise
+	 */
 	abstract public function IsTrue();
 
 	// recursively builds an array of [classAlias][fieldName] => value
@@ -161,8 +188,7 @@ abstract class Expression
 	// recursively builds an array of parameters to give to current request
 	abstract public function ListParameters();
 
-	public function RequiresField($sClass, $sFieldName)
-	{
+	public function RequiresField($sClass, $sFieldName) {
 		// #@# todo - optimize : this is called quite often when building a single query !
 		$aRequired = $this->ListRequiredFields();
 		if (!in_array($sClass.'.'.$sFieldName, $aRequired)) return false;
@@ -839,12 +865,15 @@ class MatchExpression extends BinaryExpression
 	 * MatchExpression constructor.
 	 *
 	 * @param \FieldExpression $oLeftExpr
-	 * @param \ScalarExpression $oRightExpr
+	 * @param \Expression $oRightExpr
 	 *
 	 * @throws \CoreException
 	 */
-	public function __construct(FieldExpression $oLeftExpr, ScalarExpression $oRightExpr)
+	public function __construct(FieldExpression $oLeftExpr, Expression $oRightExpr)
 	{
+		if (!$oRightExpr instanceof ScalarExpression && !$oRightExpr instanceof VariableExpression) {
+			throw new CoreException('Only instance of ScalarExpression or VariableExpression are allowed in MATCHES '.get_class($oRightExpr).' found');
+		}
 		parent::__construct($oLeftExpr, 'MATCHES', $oRightExpr);
 	}
 
@@ -1972,7 +2001,15 @@ class ListExpression extends Expression
 		{
 			if ($oExpr instanceof VariableExpression)
 			{
-				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar($aArgs);
+				$oVarExpr = $oExpr->GetAsScalar($aArgs);
+				if ($oVarExpr instanceof ListExpression)
+				{
+					$this->m_aExpressions = $oVarExpr->GetItems();
+				}
+				else
+				{
+					$this->m_aExpressions[$idx] = $oVarExpr;
+				}
 			}
 			else
 			{
@@ -2146,60 +2183,62 @@ class NestedQueryExpression extends Expression
 	}
 
 	/**/
-	public function ApplyParameters($aArgs)
-	{
+	public function ApplyParameters($aArgs) {
 		$this->m_oNestedQuery->ApplyParameters($aArgs);
 	}
 
 	/**/
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
+	public function GetUnresolvedFields($sAlias, &$aUnresolved) {
 	}
 
 	/**/
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true) {
 		// Check and prepare the select information
-		$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll , $bMarkFieldsAsResolved );
+		$this->m_oNestedQuery->TranslateConditions($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+
 		return clone $this;
 	}
 
-	public function ListRequiredFields()
-	{
+	public function ListRequiredFields() {
 		return array();
 	}
 
-	public function CollectUsedParents(&$aTable)
-	{
+	public function CollectUsedParents(&$aTable) {
 	}
 
-	public function ListConstantFields()
-	{
+	public function ListConstantFields() {
 		return $this->m_oNestedQuery->ListConstantFields();
 	}
 
-	public function ListParameters()
-	{
+	public function ListParameters() {
 		return $this->m_oNestedQuery->ListParameters();
 	}
 
-	public function RenameParam($sOldName, $sNewName)
-	{
+	public function RenameParam($sOldName, $sNewName) {
 		$this->m_oNestedQuery->RenameParam($sOldName, $sNewName);
 	}
 
-	public function RenameAlias($sOldName, $sNewName)
-	{
+	public function RenameAlias($sOldName, $sNewName) {
 		$this->m_oNestedQuery->RenameAlias($sOldName, $sNewName);
 	}
 
 	/**
 	 * @inheritDoc
 	 */
-	public function ToJSON(&$aArgs = null, $bRetrofitParams = false)
-	{
+	public function ToJSON(&$aArgs = null, $bRetrofitParams = false) {
 		return $this->m_oNestedQuery->ToJSON();
 	}
+
+	/**
+	 * Simple indirection to {@link \DBObjectSearch::AllowAllData()}
+	 *
+	 * @param bool $bAllowAllData
+	 *
+	 * @uses \DBSearch::AllowAllData()
+	 */
+	public function AllowAllData($bAllowAllData = true) {
+		$this->m_oNestedQuery->AllowAllData($bAllowAllData);
+	}
 }
 
 class FunctionExpression extends Expression

core/oql/oql-parser.php

@@ -1600,38 +1600,38 @@ static public $yy_action = array(
 	$this->_retvalue = new ListOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
 #line 1606 "..\oql-parser.php"
-#line 132 "..\oql-parser.y"
+#line 131 "..\oql-parser.y"
     function yy_r43(){
 	$this->_retvalue = new NestedQueryOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
 #line 1611 "..\oql-parser.php"
-#line 147 "..\oql-parser.y"
+#line 146 "..\oql-parser.y"
     function yy_r47(){
 	$this->_retvalue = array();
     }
 #line 1616 "..\oql-parser.php"
-#line 158 "..\oql-parser.y"
+#line 157 "..\oql-parser.y"
     function yy_r51(){ $this->_retvalue = new IntervalOqlExpression($this->yystack[$this->yyidx + -1]->minor, $this->yystack[$this->yyidx + 0]->minor);     }
 #line 1619 "..\oql-parser.php"
-#line 171 "..\oql-parser.y"
+#line 170 "..\oql-parser.y"
     function yy_r61(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
 #line 1622 "..\oql-parser.php"
-#line 173 "..\oql-parser.y"
+#line 172 "..\oql-parser.y"
     function yy_r63(){ $this->_retvalue = new ScalarOqlExpression(null);     }
 #line 1625 "..\oql-parser.php"
-#line 175 "..\oql-parser.y"
+#line 174 "..\oql-parser.y"
     function yy_r64(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
 #line 1628 "..\oql-parser.php"
-#line 176 "..\oql-parser.y"
+#line 175 "..\oql-parser.y"
     function yy_r65(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor, $this->yystack[$this->yyidx + -2]->minor);     }
 #line 1631 "..\oql-parser.php"
-#line 177 "..\oql-parser.y"
+#line 176 "..\oql-parser.y"
     function yy_r66(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;     }
 #line 1634 "..\oql-parser.php"
-#line 180 "..\oql-parser.y"
+#line 179 "..\oql-parser.y"
     function yy_r67(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1));     }
 #line 1637 "..\oql-parser.php"
-#line 182 "..\oql-parser.y"
+#line 181 "..\oql-parser.y"
     function yy_r68(){
 	if ($this->yystack[$this->yyidx + 0]->minor[0] == '`')
 	{
@@ -1644,19 +1644,19 @@ static public $yy_action = array(
 	$this->_retvalue = new OqlName($name, $this->m_iColPrev);
     }
 #line 1650 "..\oql-parser.php"
-#line 193 "..\oql-parser.y"
+#line 192 "..\oql-parser.y"
     function yy_r69(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1653 "..\oql-parser.php"
-#line 194 "..\oql-parser.y"
+#line 193 "..\oql-parser.y"
     function yy_r70(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1656 "..\oql-parser.php"
-#line 195 "..\oql-parser.y"
+#line 194 "..\oql-parser.y"
     function yy_r71(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor);    }
 #line 1659 "..\oql-parser.php"
-#line 196 "..\oql-parser.y"
+#line 195 "..\oql-parser.y"
     function yy_r72(){$this->_retvalue=stripslashes(substr($this->yystack[$this->yyidx + 0]->minor, 1, strlen($this->yystack[$this->yyidx + 0]->minor) - 2));    }
 #line 1662 "..\oql-parser.php"
-#line 199 "..\oql-parser.y"
+#line 198 "..\oql-parser.y"
     function yy_r73(){$this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1665 "..\oql-parser.php"
 
@@ -1940,7 +1940,7 @@ throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCo
         } while ($yymajor != self::YYNOCODE && $this->yyidx >= 0);
     }
 }
-#line 264 "..\oql-parser.y"
+#line 263 "..\oql-parser.y"
 
 
 class OQLParserException extends OQLException

core/oql/oqlquery.class.inc.php

@@ -173,7 +173,7 @@ class MatchOqlExpression extends MatchExpression implements CheckableExpression
 			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oLeftExpr->RenderExpression(true), 0));
 		}
 		// Only field MATCHES scalar is allowed
-		if (!$this->m_oRightExpr instanceof ScalarExpression)
+		if (!$this->m_oRightExpr instanceof ScalarExpression && !$this->m_oRightExpr instanceof VariableOqlExpression)
 		{
 			throw new OqlNormalizeException('Only "field MATCHES string" syntax is allowed', $sSourceQuery, new OqlName($this->m_oRightExpr->RenderExpression(true), 0));
 		}

core/oql/version.txt

@@ -1 +1 @@
-2019-12-03
+2020-09-29

core/ormlinkset.class.inc.php

@@ -814,6 +814,17 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 				$oNotObsoleteRemote->AddConditionExpression($oNotObsolete);
 				$oLinkSearch->AddCondition_PointingTo($oNotObsoleteRemote, $sExtKeyToRemote);
 			}
+			if (!utils::IsArchiveMode() && MetaModel::IsArchivable($sTargetClass))
+			{
+				$oNotArchived = new BinaryExpression(
+					new FieldExpression('archive_flag', $sTargetClass),
+					'=',
+					new ScalarExpression(0)
+				);
+				$oNotArchivedRemote = new DBObjectSearch($sTargetClass);
+				$oNotArchivedRemote->AddConditionExpression($oNotArchived);
+				$oLinkSearch->AddCondition_PointingTo($oNotArchivedRemote, $sExtKeyToRemote);
+			}
 		}
 		$oLinkSet = new DBObjectSet($oLinkSearch);
 		$oLinkSet->SetShowObsoleteData($bShowObsolete);
@@ -824,4 +835,4 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 
 		return $oLinkSet;
 	}
-}
+}

core/ormstopwatch.class.inc.php

@@ -607,14 +607,22 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							// Activate any existing trigger
 							// 
 							$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+
 							$oTriggerSet = new DBObjectSet(
-								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code=:stop_watch_code AND threshold_index = :threshold_index"),
+								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code MATCHES :stop_watch_code AND threshold_index = :threshold_index"),
 								array(), // order by
 								array('stop_watch_code' => $sAttCode, 'threshold_index' => $iThreshold)
 							);
 							while ($oTrigger = $oTriggerSet->Fetch())
 							{
-								$oTrigger->DoActivate($oObj->ToArgs('this'));
+								try
+								{
+									$oTrigger->DoActivate($oObj->ToArgs('this'));
+								}
+								catch(Exception $e)
+								{
+									utils::EnrichRaisedException($oTrigger, $e);
+								}
 							}
 						}
 					}

core/tabularbulkexport.class.inc.php

@@ -365,29 +365,37 @@ EOF
 		{
 			throw new BulkExportMissingParameterException('fields');
 		}
-		else if(($sQueryId !== null) && ($sQueryId !== null))
+		else
 		{
-			$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
-			$oQueries = new DBObjectSet($oSearch);
-			if ($oQueries->Count() > 0)
+			if (($sQueryId !== null) && ($sQueryId !== null))
 			{
-				$oQuery = $oQueries->Fetch();
-				if (($sFields === null) || ($sFields === ''))
+				$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
+				$oQueries = new DBObjectSet($oSearch);
+				if ($oQueries->Count() > 0)
 				{
-					// No 'fields' parameter supplied, take the fields from the query phrasebook definition
-					$sFields = trim($oQuery->Get('fields'));
-					if ($sFields === '')
+					$oQuery = $oQueries->Fetch();
+					if (($sFields === null) || ($sFields === ''))
 					{
-						throw new BulkExportMissingParameterException('fields');
+						// No 'fields' parameter supplied, take the fields from the query phrasebook definition
+						$sFields = trim($oQuery->Get('fields'));
+						if ($sFields === '')
+						{
+							throw new BulkExportMissingParameterException('fields');
+						}
 					}
 				}
-			}
-			else
-			{
-				throw BulkExportException('Invalid value for the parameter: query. There is no Query Phrasebook with id = '.$sQueryId, Dict::Format('Core:BulkExport:InvalidParameter_Query', $sQueryId));
+				else
+				{
+					throw BulkExportException('Invalid value for the parameter: query. There is no Query Phrasebook with id = '.$sQueryId, Dict::Format('Core:BulkExport:InvalidParameter_Query', $sQueryId));
+				}
 			}
 		}
 
+		$this->SetFields($sFields);
+	}
+
+	public function SetFields($sFields)
+	{
 		// Interpret (and check) the list of fields
 		//
 		$aSelectedClasses = $this->oSearch->GetSelectedClasses();

core/userrights.class.inc.php

@@ -1344,9 +1344,8 @@ class UserRights
 			// The bug has been fixed in PHP 7.2, but in case session_regenerate_id()
 			// fails we just silently ignore the error and keep the same session id...
 			$old_error_handler = set_error_handler(array(__CLASS__, 'VoidErrorHandler'));
-			session_regenerate_id();
-			if ($old_error_handler !== null)
-			{
+			session_regenerate_id(true);
+			if ($old_error_handler !== null) {
 				set_error_handler($old_error_handler);
 			}
 		}

css/css-variables.scss

@@ -17,7 +17,7 @@
  */
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.7.1";
+$version: "v2.7.2";
 $approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
 
 // Base colors
@@ -127,3 +127,8 @@ $highlight-item-color: $white !default;
 $content-color: #eeeeee !default; 
 $default-font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !default;
 $icons-filter: hue-rotate(0deg) !default;
+
+%font-awesome-prerequisites{
+	font-family: 'Font Awesome 5 Free';
+	font-weight: 600;
+}

css/light-grey.scss

@@ -2874,13 +2874,34 @@ a.summary,  a.summary:hover {
 	height: 12px;
 }
 .sort_none {
-	background: url($approot-relative + "images/bg.gif?v=" + $version) no-repeat center;
+	padding-right: 5px;
+	&::after {
+		@extend %font-awesome-prerequisites;
+		text-align: right;
+		content: '\f0dc';
+		color: $complement-color;
+		float: right;
+	}
 }
 .sort_asc {
-	background: url($approot-relative + "images/desc.gif?v=" + $version) no-repeat center;
+	padding-right: 5px;
+	&::after {
+		@extend %font-awesome-prerequisites;
+		text-align: right;
+		content: '\f0d8';
+		color: $complement-color;
+		float: right;
+	}
 }
 .sort_desc {
-	background: url($approot-relative + "images/asc.gif?v=" + $version) no-repeat center;
+	padding-right: 5px;
+	&::after {
+		@extend %font-awesome-prerequisites;
+		text-align: right;
+		content: '\f0d7';
+		color: $complement-color;
+		float: right;
+	}
 }
 .sort_hidden {
 	display: none;

css/setup.css

@@ -265,3 +265,4 @@ fieldset > legend {
   font-weight: bold;
   color: #e60000b8;
 }
+

css/setup.scss

@@ -16,6 +16,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+/* integrityCheck: begin (do not remove/edit) */
+
 /////////
 // Colors
 $content-border-color: #CBD2D9 !default;
@@ -314,3 +316,4 @@ fieldset{
     }
 }
 
+/* integrityCheck: end (do not remove/edit) */

datamodels/2.x/combodo-db-tools/bin/report.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+use Combodo\iTop\DBTools\Service\DBAnalyzerUtils;
+
+@include_once('../approot.inc.php');
+@include_once('../../approot.inc.php');
+@include_once('../../../approot.inc.php');
+
+require_once(APPROOT.'application/startup.inc.php');
+
+require_once('../db_analyzer.class.inc.php');
+require_once('../src/Service/DBAnalyzerUtils.php');
+
+$oDBAnalyzer = new DatabaseAnalyzer(0);
+$aResults = $oDBAnalyzer->CheckIntegrity([]);
+
+if (empty($aResults))
+{
+	echo "Database OK\n";
+	exit(0);
+}
+
+$sReportFile = DBAnalyzerUtils::GenerateReport($aResults);
+
+echo "Report generated: {$sReportFile}.log\n";

datamodels/2.x/combodo-db-tools/dbtools.php

@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
+use Combodo\iTop\DBTools\Service\DBAnalyzerUtils;
+
 @include_once('../../approot.inc.php');
 require_once(APPROOT.'application/startup.inc.php');
 
@@ -53,7 +55,7 @@ function DisplayDBInconsistencies(iTopWebPage &$oP, ApplicationContext &$oAppCon
 	$bRunAnalysis = intval(utils::ReadParam('run_analysis', '0'));
 	if ($bRunAnalysis)
 	{
-		$oDBAnalyzer = new DatabaseAnalyzer();
+		$oDBAnalyzer = new DatabaseAnalyzer(0);
 		$aResults = $oDBAnalyzer->CheckIntegrity($aClassSelection);
 		if (empty($aResults))
 		{
@@ -199,74 +201,23 @@ function DisplayDBInconsistencies(iTopWebPage &$oP, ApplicationContext &$oAppCon
  */
 function DisplayInconsistenciesReport($aResults)
 {
-	$sDBToolsFolder = str_replace("\\", '/', APPROOT.'log/');
-	$sReportFile = 'dbtools-report-'.date('Y-m-d-H-i-s');
-
-	$fReport = fopen($sDBToolsFolder.$sReportFile.'.txt', 'w');
-	fwrite($fReport, 'Database Maintenance tools: '.date('Y-m-d H:i:s')."\r\n");
-	foreach($aResults as $sClass => $aErrorList)
-	{
-		fwrite($fReport, '');
-		foreach($aErrorList as $sErrorLabel => $aError)
-		{
-			fwrite($fReport, "\r\n----------\r\n");
-			fwrite($fReport, 'Class: '.MetaModel::GetName($sClass).' ('.$sClass.")\r\n");
-			$iCount = $aError['count'];
-			fwrite($fReport, 'Count: '.$iCount."\r\n");
-			fwrite($fReport, 'Error: '.$sErrorLabel."\r\n");
-			$sQuery = $aError['query'];
-			fwrite($fReport, 'Query: '.$sQuery."\r\n");
-
-			if (isset($aError['fixit']))
-			{
-				fwrite($fReport, "\r\nFix it (indication):\r\n\r\n");
-				$aFixitQueries = $aError['fixit'];
-				foreach($aFixitQueries as $sFixitQuery)
-				{
-					fwrite($fReport, "$sFixitQuery\r\n");
-				}
-				fwrite($fReport, "\r\n");
-			}
-
-			$sQueryResult = '';
-			$aIdList = array();
-			foreach($aError['res'] as $aRes)
-			{
-				foreach($aRes as $sKey => $sValue)
-				{
-					$sQueryResult .= "'$sKey'='$sValue' ";
-					if ($sKey == 'id')
-					{
-						$aIdList[] = $sValue;
-					}
-				}
-				$sQueryResult .= "\r\n";
-
-			}
-			fwrite($fReport, "Result: \r\n".$sQueryResult);
-			$sIdList = '('.implode(',', $aIdList).')';
-			fwrite($fReport, 'Ids: '.$sIdList."\r\n");
-		}
-	}
-	fclose($fReport);
+	$sReportFile = DBAnalyzerUtils::GenerateReport($aResults);
 
+	$sZipReport = "{$sReportFile}.zip";
 	$oArchive = new ZipArchive();
-	$oArchive->open($sDBToolsFolder.$sReportFile.'.zip', ZipArchive::CREATE);
-	$oArchive->addFile($sDBToolsFolder.$sReportFile.'.txt', $sReportFile.'.txt');
+	$oArchive->open($sZipReport, ZipArchive::CREATE);
+	$oArchive->addFile($sReportFile.'.log', basename($sReportFile.'.log'));
 	$oArchive->close();
-	unlink($sDBToolsFolder.$sReportFile.'.txt');
-	$sReportFile = $sDBToolsFolder.$sReportFile.'.zip';
-
 
 	header('Content-Description: File Transfer');
 	header('Content-Type: multipart/x-zip');
-	header('Content-Disposition: inline; filename="'.basename($sReportFile).'"');
+	header('Content-Disposition: inline; filename="'.basename($sZipReport).'"');
 	header('Expires: 0');
 	header('Cache-Control: must-revalidate');
 	header('Pragma: public');
-	header('Content-Length: '.filesize($sReportFile));
-	readfile($sReportFile);
-	unlink($sReportFile);
+	header('Content-Length: '.filesize($sZipReport));
+	readfile($sZipReport);
+	unlink($sZipReport);
 	exit(0);
 }
 

datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php

@@ -42,7 +42,8 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'model.combodo-db-tools.php',
-            'src/Service/DBToolsUtils.php'
+			'src/Service/DBToolsUtils.php',
+            'src/Service/DBAnalyzerUtils.php',
 		),
 		'webservice' => array(),
 		'data.struct' => array(),

datamodels/2.x/combodo-db-tools/src/Service/DBAnalyzerUtils.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+namespace Combodo\iTop\DBTools\Service;
+
+use CoreException;
+use DictExceptionMissingString;
+use MetaModel;
+
+class DBAnalyzerUtils
+{
+	/**
+	 * @param $aResults
+	 *
+	 * @return string
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 */
+	public static function GenerateReport($aResults)
+	{
+		$sDBToolsFolder = str_replace("\\", '/', APPROOT.'log/');
+		$sReportFile = 'dbtools-report';
+
+		$fReport = fopen($sDBToolsFolder.$sReportFile.'.log', 'w');
+		fwrite($fReport, 'Database Maintenance tools: '.date('Y-m-d H:i:s')."\r\n");
+		foreach ($aResults as $sClass => $aErrorList)
+		{
+			fwrite($fReport, '');
+			foreach ($aErrorList as $sErrorLabel => $aError)
+			{
+				fwrite($fReport, "\r\n----------\r\n");
+				fwrite($fReport, 'Class: '.MetaModel::GetName($sClass).' ('.$sClass.")\r\n");
+				$iCount = $aError['count'];
+				fwrite($fReport, 'Count: '.$iCount."\r\n");
+				fwrite($fReport, 'Error: '.$sErrorLabel."\r\n");
+				$sQuery = $aError['query'];
+				fwrite($fReport, 'Query: '.$sQuery."\r\n");
+
+				if (isset($aError['fixit']))
+				{
+					fwrite($fReport, "\r\nFix it (indication):\r\n\r\n");
+					$aFixitQueries = $aError['fixit'];
+					foreach ($aFixitQueries as $sFixitQuery)
+					{
+						fwrite($fReport, "$sFixitQuery\r\n");
+					}
+					fwrite($fReport, "\r\n");
+				}
+
+				$sQueryResult = '';
+				$aIdList = array();
+				foreach ($aError['res'] as $aRes)
+				{
+					foreach ($aRes as $sKey => $sValue)
+					{
+						$sQueryResult .= "'$sKey'='$sValue' ";
+						if ($sKey == 'id')
+						{
+							$aIdList[] = $sValue;
+						}
+					}
+					$sQueryResult .= "\r\n";
+
+				}
+				fwrite($fReport, "Result: \r\n".$sQueryResult);
+				$sIdList = '('.implode(',', $aIdList).')';
+				fwrite($fReport, 'Ids: '.$sIdList."\r\n");
+			}
+		}
+		fclose($fReport);
+
+
+		$sReportFile = $sDBToolsFolder.$sReportFile;
+
+		return $sReportFile;
+	}
+}

datamodels/2.x/itop-backup/ajax.backup.php

@@ -213,6 +213,9 @@ JS
 			break;
 
 		case 'download':
+			while (ob_get_level() > 0) {
+				ob_end_clean();
+			}
 			$sFile = utils::ReadParam('file', '', false, 'raw_data');
 			$oBackup = new DBBackupScheduled();
 			$sBackupDir = APPROOT.'data/backups/';

datamodels/2.x/itop-backup/de.dict.itop-backup.php

@@ -31,8 +31,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'bkp-status-title' => 'Geplante Backups',
 	'bkp-status-checks' => 'Einstellungen und Prüfungen',
 	'bkp-mysqldump-ok' => 'mysqldump ist vorhanden: %1$s',
-	'bkp-mysqldump-notfound' => 'mysqldump wurde nicht gefunden: %1$s - Stellen sie sicher, das er eingespielt und im Pfad verfügbar ist oder editieren sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
-	'bkp-mysqldump-issue' => 'mysqldump konnte nicht eingespielt werden (retcode=%1$d): Stellen sie sicher, das es installiert und im Pfad verfügbar ist oder editieren sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
+	'bkp-mysqldump-notfound' => 'mysqldump wurde nicht gefunden: %1$s - Stellen Sie sicher, das er eingespielt und im Pfad verfügbar ist oder editieren Sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
+	'bkp-mysqldump-issue' => 'mysqldump konnte nicht eingespielt werden (retcode=%1$d): Stellen Sie sicher, das es installiert und im Pfad verfügbar ist oder editieren Sie die Konfigurationsdatei um das MySQL bindir anzupassen.',
 	'bkp-missing-dir' => 'Zielverzeichniss %1$s nicht gefunden',
 	'bkp-free-disk-space' => '<b>%1$s frei</b> in %2$s',
 	'bkp-dir-not-writeable' => '%1$s ist nicht schreibbar',
@@ -53,8 +53,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'bkp-next-backup' => 'Das nächste Backup wird am <b>%1$s</b> (%2$s) um %3$s durchgeführt',
 	'bkp-button-backup-now' => 'Starte Backup',
 	'bkp-button-restore-now' => 'Wiederherstellen!',
-	'bkp-confirm-backup' => 'Bitte bestätigen sie, dass sie jetzt ein Backup erstellen wollen now.',
-	'bkp-confirm-restore' => 'Bitte bestätigen sie, dass sie mit Backup %1$s eine Wiederherstellung durchführen wollen.',
+	'bkp-confirm-backup' => 'Bitte bestätigen Sie, dass Sie jetzt ein Backup erstellen wollen.',
+	'bkp-confirm-restore' => 'Bitte bestätigen Sie, dass Sie mit Backup %1$s eine Wiederherstellung durchführen wollen.',
 	'bkp-wait-backup' => 'Bitte warten, bis das Backup abgeschlossen ist ...',
 	'bkp-wait-restore' => 'Bitte warten, bis die Wiederherstellung abgeschlossen ist ...',
 	'bkp-success-restore' => 'Wiederherstellung erfolgreich.',

datamodels/2.x/itop-change-mgmt-itil/fr.dict.itop-change-mgmt-itil.php

@@ -146,11 +146,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Change/Stimulus:ev_assign+' => '',
 	'Class:Change/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Plannifier',
+	'Class:Change/Stimulus:ev_plan' => 'Planifier',
 	'Class:Change/Stimulus:ev_plan+' => '',
 	'Class:Change/Stimulus:ev_approve' => 'Approuver',
 	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Replannifier',
+	'Class:Change/Stimulus:ev_replan' => 'Replanifier',
 	'Class:Change/Stimulus:ev_replan+' => '',
 	'Class:Change/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:Change/Stimulus:ev_notapprove+' => '',
@@ -177,11 +177,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:RoutineChange/Stimulus:ev_assign+' => '',
 	'Class:RoutineChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:RoutineChange/Stimulus:ev_plan+' => '',
 	'Class:RoutineChange/Stimulus:ev_approve' => 'Approver',
 	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:RoutineChange/Stimulus:ev_replan+' => '',
 	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Ne pas approver',
 	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
@@ -212,11 +212,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
 	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
 	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
 	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
@@ -247,11 +247,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:NormalChange/Stimulus:ev_assign+' => '',
 	'Class:NormalChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:NormalChange/Stimulus:ev_plan+' => '',
 	'Class:NormalChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:NormalChange/Stimulus:ev_replan+' => '',
 	'Class:NormalChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
@@ -278,11 +278,11 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
 	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Réouvrir',
 	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Plannifier',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planifier',
 	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
 	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replannifier',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replanifier',
 	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
 	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',

datamodels/2.x/itop-hub-connector/hubconnectorpage.class.inc.php

@@ -5,9 +5,12 @@ class HubConnectorPage extends NiceWebPage
     public function __construct($sTitle)
     {
         parent::__construct($sTitle);
-        
-        $this->add_header("Cache-control: no-cache");
-        
+
+	    $this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+	    $this->add_header('Pragma: no-cache');
+	    $this->add_header('Expires: 0');
+	    $this->add_header('X-Frame-Options: deny');
+
         $sImagesDir = utils::GetAbsoluteUrlAppRoot().'images';
         $sModuleImagesDir = utils::GetAbsoluteUrlModulesRoot().'itop-hub-connector/images';
         

datamodels/2.x/itop-portal-base/portal/config/legacy_silex_compat_layer.php

@@ -34,23 +34,30 @@ $oModuleDesign = new ModuleDesign($_ENV['PORTAL_ID']);
 
 // Load portal conf. such as properties, themes, templates, ...
 // Append into %combodo.portal.instance.conf%
+$oKPI = new ExecutionKPI();
 $oBasicCompat = new Basic($oModuleDesign);
 $oBasicCompat->Process($container);
+$oKPI->ComputeAndReport('Load portal conf. such as properties, themes, templates, ...');
 
 // Load portal forms definition
 // Append into %combodo.portal.instance.conf%
+$oKPI = new ExecutionKPI();
 $oFormsCompat = new Forms($oModuleDesign);
 $oFormsCompat->Process($container);
+$oKPI->ComputeAndReport('Load portal forms definition');
 
 // Load portal lists definition
 // Append into %combodo.portal.instance.conf%
+$oKPI = new ExecutionKPI();
 $oListsCompat = new Lists($oModuleDesign);
 $oListsCompat->Process($container);
+$oKPI->ComputeAndReport('Load portal lists definition');
 
 // Generating CSS files
 // Note: We do this here as it is not user dependent and therefore can be cached for everyone.
 // A dedicated listener 'CssFromSassCompiler' exists to compile files again when by-passing HTTP cache.
 // This is to keep developers comfort when tuning the SCSS files.
+$oKPI = new ExecutionKPI();
 $aImportPaths = array($_ENV['COMBODO_PORTAL_BASE_ABSOLUTE_PATH'].'css/');
 $aPortalConf = $container->getParameter('combodo.portal.instance.conf');
 foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
@@ -71,4 +78,6 @@ foreach ($aPortalConf['properties']['themes'] as $sKey => $value)
 		$aPortalConf['properties']['themes'][$sKey] = $aValues;
 	}
 }
+$oKPI->ComputeAndReport('Generating CSS files');
+
 $container->setParameter('combodo.portal.instance.conf', $aPortalConf);

datamodels/2.x/itop-portal-base/portal/public/css/portal.css

@@ -1014,8 +1014,8 @@ table .group-actions {
 /****************/
 /* Filter brick */
 /****************/
-.tile.tile-filter-brick .tile_decoration .icon {
-  color: #da7014;
+.tile.tile-filter-brick a.tile_decoration {
+  cursor: default;
 }
 .tile.tile-filter-brick .tile_filterbox .form-group:first-child {
   width: 100%;

datamodels/2.x/itop-portal-base/portal/public/css/portal.scss

@@ -1077,8 +1077,8 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
 /****************/
 /* Filter brick */
 /****************/
-.tile.tile-filter-brick .tile_decoration .icon {
-	color: $link-color;
+.tile.tile-filter-brick a.tile_decoration {
+	cursor: default;
 }
 
 .tile.tile-filter-brick .tile_filterbox .form-group:first-child{

datamodels/2.x/itop-portal-base/portal/public/index.php

@@ -24,23 +24,38 @@ require_once MODULESROOT.'itop-portal-base/portal/config/bootstrap.php';
 
 // Stacking context tag so it knows we are in the portal
 $oContext = new ContextTag(ContextTag::TAG_PORTAL);
-$oContext2 = new ContextTag('Portal:' . $_ENV['PORTAL_ID']);
+$oContext2 = new ContextTag('Portal:'.$_ENV['PORTAL_ID']);
+
+
+$oKPI = new ExecutionKPI();
 
 // Note: Manually refactored ternary condition to be PHP 5.x compatible
-if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false))
-{
+if ($trustedProxies = isset($_SERVER['TRUSTED_PROXIES']) ? $_SERVER['TRUSTED_PROXIES'] : (isset($_ENV['TRUSTED_PROXIES']) ? $_ENV['TRUSTED_PROXIES'] : false)) {
 	Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
 }
 
 // Note: Manually refactored ternary condition to be PHP 5.x compatible
-if ($trustedHosts = isset($_SERVER['TRUSTED_HOSTS']) ? $_SERVER['TRUSTED_HOSTS'] : (isset($_ENV['TRUSTED_HOSTS']) ? $_ENV['TRUSTED_HOSTS'] : false))
-{
+if ($trustedHosts = isset($_SERVER['TRUSTED_HOSTS']) ? $_SERVER['TRUSTED_HOSTS'] : (isset($_ENV['TRUSTED_HOSTS']) ? $_ENV['TRUSTED_HOSTS'] : false)) {
 	Request::setTrustedHosts([$trustedHosts]);
 }
 
 $oKernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']);
+$oKPI->ComputeAndReport('Symfony kernel init');
+
+$oKPI = new ExecutionKPI();
 $oRequest = Request::createFromGlobals();
+$oKPI->ComputeAndReport('Symfony request parsing/creation');
+
+$oKPI = new ExecutionKPI();
 /** @noinspection PhpUnhandledExceptionInspection */
 $oResponse = $oKernel->handle($oRequest);
 $oResponse->send();
+$oKPI->ComputeAndReport('Page execution and rendering');
+
+
+$oKPI = new ExecutionKPI();
 $oKernel->terminate($oRequest, $oResponse);
+$oKPI->ComputeAndReport('Symfony kernel termination');
+
+
+ExecutionKPI::ReportStats();

datamodels/2.x/itop-portal-base/portal/public/js/export.js

@@ -20,8 +20,8 @@ function ExportStartExport() {
     var oParams = {};
     oParams.operation = 'export_build';
     oParams.format = sFormat;
-    oParams.expression = sOQL;
-    oParams.fields = sFields;
+    oParams.token = sToken;
+    oParams.start = 1;
     $.post(GetAbsoluteUrlAppRoot() + 'pages/ajax.render.php', oParams, function (data) {
         if (data == null) {
             ExportError('Export failed (no data provided), please contact your administrator');

datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php

@@ -20,22 +20,22 @@
 
 namespace Combodo\iTop\Portal\Controller;
 
+use AttributeExternalKey;
 use AttributeLinkedSetIndirect;
+use BinaryExpression;
+use Combodo\iTop\Portal\Brick\AbstractBrick;
+use Combodo\iTop\Portal\Brick\BrowseBrick;
 use Combodo\iTop\Portal\Helper\BrowseBrickHelper;
 use DBObjectSearch;
+use DBObjectSet;
+use DBSearch;
+use FieldExpression;
+use MetaModel;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use MetaModel;
-use DBSearch;
-use DBObjectSet;
-use BinaryExpression;
-use FieldExpression;
 use VariableExpression;
-use AttributeExternalKey;
-use Combodo\iTop\Portal\Brick\AbstractBrick;
-use Combodo\iTop\Portal\Brick\BrowseBrick;
 
 /**
  * Class BrowseBrickController
@@ -84,8 +84,9 @@ class BrowseBrickController extends BrickController
 		$sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $oRequestManipulator->ReadParam('sDataLoading',
 			$oBrick->GetDataLoading());
 		// Getting search value
-		$sSearchValue = $oRequestManipulator->ReadParam('sSearchValue', '');
-		if (!empty($sSearchValue))
+		$sRawSearchValue = $oRequestManipulator->ReadParam('sSearchValue', '');
+		$sSearchValue = html_entity_decode($sRawSearchValue);
+		if (strlen($sSearchValue) > 0)
 		{
 			$sDataLoading = AbstractBrick::ENUM_DATA_LOADING_LAZY;
 		}
@@ -156,21 +157,27 @@ class BrowseBrickController extends BrickController
 					{
 						if (array_key_exists($sLevelAlias, $aRealiasingMap))
 						{
-							$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->RenameAlias($aRealiasingMap[$sLevelAlias],
-								$sLevelAlias);
+							/** @since 2.7.2 */
+							foreach ($aRealiasingMap[$sLevelAlias] as $sAliasToChange)
+							{
+								$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->RenameAlias($sAliasToChange, $sLevelAlias);
+							}
 						}
 					}
 				}
 
 				// Adding search clause
 				// Note : For know the search is naive and looks only for the exact match. It doesn't search for words separately
-				if (!empty($sSearchValue))
+				if (strlen($sSearchValue) > 0)
 				{
 					// - Cleaning the search value by exploding and trimming spaces
-					$aSearchValues = explode(' ', $sSearchValue);
-					array_walk($aSearchValues, function (&$sSearchValue /*, $sKey*/) {
-						trim($sSearchValue);
-					});
+					$aExplodedSearchValues = explode(' ', $sSearchValue);
+					$aSearchValues = [];
+					foreach ($aExplodedSearchValues as $sValue) {
+						if (strlen($sValue) > 0) {
+							$aSearchValues[] = $sValue;
+						}
+					}
 
 					// - Retrieving fields to search
 					$aSearchFields = array($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['name_att']);
@@ -254,7 +261,7 @@ class BrowseBrickController extends BrickController
 				{
 					$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->SetSelectedClasses($aLevelsClasses);
 
-					if (!empty($sSearchValue))
+					if (strlen($sSearchValue) > 0)
 					{
 						// Note : This could be way more simpler if we had a SetInternalParam($sParam, $value) verb
 						$aQueryParams = $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->GetInternalParams();
@@ -449,7 +456,7 @@ class BrowseBrickController extends BrickController
 					'sBrickId' => $sBrickId,
 					'sBrowseMode' => $sBrowseMode,
 					'aBrowseButtons' => $aBrowseButtons,
-					'sSearchValue' => $sSearchValue,
+					'sSearchValue' => $sRawSearchValue,
 					'sDataLoading' => $sDataLoading,
 					'aItems' => json_encode($aItems),
 					'iItemsCount' => count($aItems),

datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php

@@ -28,6 +28,7 @@ use AttributeImage;
 use AttributeSet;
 use AttributeTagSet;
 use BinaryExpression;
+use BulkExport;
 use CMDBSource;
 use Combodo\iTop\Portal\Brick\AbstractBrick;
 use Combodo\iTop\Portal\Brick\ManageBrick;
@@ -245,11 +246,18 @@ class ManageBrickController extends BrickController
 		}
 
 		$sFields = implode(',', $aFields);
+		$sFormat = 'xlsx';
+		$oSearch->UpdateContextFromUser();
+		$oExporter = BulkExport::FindExporter($sFormat, $oSearch);
+		$oExporter->SetObjectList($oSearch);
+		$oExporter->SetFormat($sFormat);
+		$oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE);
+		$oExporter->SetFields($sFields);
+
 		$aData = array(
 			'oBrick' => $oBrick,
 			'sBrickId' => $sBrickId,
-			'sFields' => $sFields,
-			'sOQL' => $oSearch->ToOQL(),
+			'sToken' => $oExporter->SaveState(),
 		);
 
 		return $this->render(static::EXCEL_EXPORT_TEMPLATE_PATH, $aData);
@@ -886,64 +894,50 @@ class ManageBrickController extends BrickController
 		$oRequestManipulator = $this->get('request_manipulator');
 
 		// Getting search value
-		$sSearchValue = $oRequestManipulator->ReadParam('sSearchValue', '');
+		$sRawSearchValue = trim($oRequestManipulator->ReadParam('sSearchValue', ''));
+		$sSearchValue = html_entity_decode($sRawSearchValue);
 
 		// - Adding search clause if necessary
 		// Note : This is a very naive search at the moment
-		if (!empty($sSearchValue))
-		{
+		if (strlen($sSearchValue) > 0) {
 			// Putting only valid attributes as one can define attributes of leaf classes in the brick definition (<fields>), but at this stage we are working on the abstract class.
 			// Note: This won't fix everything as the search will not be looking in all fields.
-			$aSearchListItems = array();
-			foreach ($aColumnsAttrs as $sColumnAttr)
-			{
-				// Skip invalid attcodes
-				if (!MetaModel::IsValidAttCode($sClass, $sColumnAttr))
-				{
+			$aSearchListItems = [];
+			foreach ($aColumnsAttrs as $sColumnAttr) {
+				// Skip invalid attCodes
+				if (!MetaModel::IsValidAttCode($sClass, $sColumnAttr)) {
 					continue;
 				}
 
 				// For external key, force search on the friendlyname instead of the ID.
 				// This should be addressed more globally with the bigger issue, see N°1970
 				$oAttDef = MetaModel::GetAttributeDef($sClass, $sColumnAttr);
-				if($oAttDef instanceof AttributeExternalKey)
-				{
+				if ($oAttDef instanceof AttributeExternalKey) {
 					$sColumnAttr .= '_friendlyname';
 				}
 
 				$aSearchListItems[] = $sColumnAttr;
 			}
 
-			$oFullBinExpr = null;
-			foreach ($aSearchListItems as $sSearchItemAttr)
-			{
-				$oBinExpr = new BinaryExpression(new FieldExpression($sSearchItemAttr, $oQuery->GetClassAlias()),
-					'LIKE', new VariableExpression('search_value'));
-				// At each iteration we build the complete expression for the search like ( (field1 LIKE %search%) OR (field2 LIKE %search%) OR (field3 LIKE %search%) ...)
-				if (is_null($oFullBinExpr))
-				{
-					$oFullBinExpr = $oBinExpr;
-				}
-				else
-				{
-					$oFullBinExpr = new BinaryExpression($oFullBinExpr, 'OR', $oBinExpr);
+			if (preg_match('/^"(.*)"$/', $sSearchValue, $aMatches)) {
+				// The text is surrounded by double-quotes, remove the quotes and treat it as one single expression
+				$aSearchNeedles = [$aMatches[1]];
+			} else {
+				// Split the text on the blanks and treat this as a search for <word1> AND <word2> AND <word3>
+				$aExplodedSearchNeedles = explode(' ', $sSearchValue);
+				$aSearchNeedles = [];
+				foreach ($aExplodedSearchNeedles as $sValue) {
+					if (strlen($sValue) > 0) {
+						$aSearchNeedles[] = $sValue;
+					}
 				}
 			}
-
-			// Then add the complete expression to the query
-			if (!is_null($oFullBinExpr))
-			{
-				// - Adding expression to the query
-				$oQuery->AddConditionExpression($oFullBinExpr);
-				// - Setting expression parameters
-				// Note : This could be way more simpler if we had a SetInternalParam($sParam, $value) verb
-				$aQueryParams = $oQuery->GetInternalParams();
-				$aQueryParams['search_value'] = '%'.$sSearchValue.'%';
-				$oQuery->SetInternalParams($aQueryParams);
+			foreach ($aSearchNeedles as $sSearchWord) {
+				$oQuery->AddCondition_FullTextOnAttributes($aSearchListItems, $sSearchWord);
 			}
 		}
 
-		$aData['sSearchValue'] = $sSearchValue;
+		$aData['sSearchValue'] = $sRawSearchValue;
 	}
 
 	/**

datamodels/2.x/itop-portal-base/portal/src/Controller/UserProfileBrickController.php

@@ -373,7 +373,7 @@ class UserProfileBrickController extends BrickController
 					$aFormData['error'] = $e->GetMessage();
 				}
 
-				// TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8
+				// TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 3.0
 				$aFormData['picture_url'] = $oUrlGenerator->generate('p_object_document_display', array('sObjectClass' => get_class($oCurContact), 'sObjectId' => $oCurContact->GetKey(), 'sObjectField' => $sPictureAttCode, 'cache' => 86400, 't' => time()));
 				$aFormData['validation'] = array(
 					'valid' => true,

datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php

@@ -93,7 +93,7 @@ class ExceptionListener implements ContainerAwareInterface
 			'exception' => $oFlattenException,
 			'code' => $iStatusCode,
 			'error_title' => $sErrorTitle,
-			'error_message' => $sErrorMessage,
+			'error_message' => '',
 		);
 
 		// Generate the response

datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php

@@ -1139,7 +1139,14 @@ class ObjectFormManager extends FormManager
 						/** @var \Trigger $oTrigger */
 						while ($oTrigger = $oTriggerSet->Fetch())
 						{
-							$oTrigger->DoActivate($this->oObject->ToArgs('this'));
+							try
+							{
+								$oTrigger->DoActivate($this->oObject->ToArgs('this'));
+							}
+							catch(Exception $e)
+							{
+								utils::EnrichRaisedException($oTrigger, $e);
+							}
 						}
 					}
 				}

datamodels/2.x/itop-portal-base/portal/src/Routing/ItopExtensionsExtraRoutes.php

@@ -25,7 +25,6 @@ use Exception;
 /**
  * Class ItopExtensionsExtraRoutes
  *
- * @deprecated Compatibility layer for migrating brick's routes to iTop 2.7+
  * @package    Combodo\iTop\Portal\Routing
  * @since      2.7.0
  * @author     Bruno Da Silva <bruno.dasilva@combodo.com>
@@ -39,8 +38,6 @@ class ItopExtensionsExtraRoutes
 	 * @param array $extraRoutes
 	 *
 	 * @throws Exception
-	 * @deprecated Since 2.7.0
-	 *
 	 */
 	public static function AddRoutes($extraRoutes)
 	{

datamodels/2.x/itop-portal-base/portal/src/VariableAccessor/CombodoCurrentContactPhotoUrl.php

@@ -111,7 +111,7 @@ class CombodoCurrentContactPhotoUrl
 				$oImage = $oContact->Get($sPictureAttCode);
 				if (is_object($oImage) && !$oImage->IsEmpty())
 				{
-					// TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 2.8
+					// TODO: This should be changed when refactoring the ormDocument GetDisplayUrl() and GetDownloadUrl() in iTop 3.0
 					$sContactPhotoUrl = $this->oContainer->get('url_generator')->generate('p_object_document_display', array('sObjectClass' => get_class($oContact), 'sObjectId' => $oContact->GetKey(), 'sObjectField' => $sPictureAttCode, 'cache' => 86400));
 				}
 				else

datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig

@@ -44,140 +44,148 @@
 					"defaultContent": "",
 					"type": "html",
 					"data": oLevelsProperties[sKey].alias,
-					"render": function(data, type, row){
-						var cellElem;
-						var levelAltId = data.level_alias+'_'+data.id;
-						var levelActions;
-						var levelActionsKeys;
-						var drilldownActionIndex;
-						var levelPrimaryAction;
-						var url = '';
-						
-						// Preparing actions on the cell
-						levelActions = oLevelsProperties[data.level_alias].actions;
-						// - Removing explicit (not default) drilldown action as it has no prupose on that browse mode
-						delete levelActions['{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}'];
-						// - Removing implciit (default) drilldown action
-						if( (levelActions['default'] !== undefined) && (levelActions['default'].type === '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}') ) 
-						{
-							delete levelActions['default'];
-						}
-						levelActionsKeys = Object.keys(levelActions);
-						
-						// Preparing the cell data
-						cellElem = (levelActionsKeys.length > 0) ? $('<a></a>') : $('<span></span>');
-						cellElem.attr('data-item-id', data.id).attr('data-level-alias', data.level_alias);
+					"render":
+						{_: function(data, type, row){
+							var cellElem;
+							var levelAltId = data.level_alias+'_'+data.id;
+							var levelActions;
+							var levelActionsKeys;
+							var drilldownActionIndex;
+							var levelPrimaryAction;
+							var url = '';
 
-						// Building metadata
-						for(var sPropName in data.metadata)
-						{
-							var propValue = data.metadata[sPropName];
-							cellElem.attr('data-'+sPropName.replace('_', '-'), propValue);
-						}
-
-						// Building tooltip for the node
-						// We have to concatenate the HTML as we return the raw HTML of the cell. If we did a jQuery.insertAfter, the tooltip would not be returned.
-						// For the same reason, tooltip widget is created in "drawCallback" instead of here.
-						if( (data.tooltip !== undefined) && (data.tooltip !== ''))
-						{
-							cellElem.html( $('<span></span>').attr('title', data.tooltip).attr('data-toggle', 'tooltip').html(data.name).prop('outerHTML') );
-						}
-						else
-						{
-							cellElem.html(data.name);
-						}
-						
-						// Building actions
-						if(levelActionsKeys.length > 0)
-						{
-							// - Primary action (click on item)
-							levelPrimaryAction = levelActions[levelActionsKeys[0]];
-							switch(levelPrimaryAction.type)
+							// Preparing actions on the cell
+							levelActions = oLevelsProperties[data.level_alias].actions;
+							// - Removing explicit (not default) drilldown action as it has no prupose on that browse mode
+							delete levelActions['{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}'];
+							// - Removing implciit (default) drilldown action
+							if( (levelActions['default'] !== undefined) && (levelActions['default'].type === '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}') )
 							{
-								case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_VIEW') }}':
-									url = '{{ app.url_generator.generate('p_object_view', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
-                                    break;
-								case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_EDIT') }}':
-									url = '{{ app.url_generator.generate('p_object_edit', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
-									break;
-								case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS') }}':
-									url = levelPrimaryAction.url.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
-									url = AddParameterToUrl(url, 'ar_token', data.action_rules_token[levelPrimaryAction.type]);
-									break;
-								default:
-								    url = '#';
-									//console.log('Action "'+levelPrimaryAction.type+'" not implemented');
-									break;
+								delete levelActions['default'];
 							}
-                            SetActionUrl(cellElem, url);
-                            SetActionOpeningTarget(cellElem, levelPrimaryAction.opening_target);
+							levelActionsKeys = Object.keys(levelActions);
 
-							// - Secondary actions
-							if(levelActionsKeys.length > 1)
+							// Preparing the cell data
+							cellElem = (levelActionsKeys.length > 0) ? $('<a></a>') : $('<span></span>');
+							cellElem.attr('data-item-id', data.id).attr('data-level-alias', data.level_alias);
+
+							// Building metadata
+							for(var sPropName in data.metadata)
 							{
-								// Retrieving secondary action (Now we also display primary action)
-								var actionsButtons = {};
-								for(j = 0; j < levelActionsKeys.length; j++)
-								{
-									actionsButtons[levelActionsKeys[j]] = levelActions[levelActionsKeys[j]];
-								}
-								
-								// Preparing secondary actions container
-								var actionsElem = $('<div></div>').addClass('pull-right group-actions');
-								cellElem.append(actionsElem);
-								// Preparing secondary actions
-								var actionsSSTogglerElem = $('<a class="glyphicon glyphicon-menu-hamburger" data-toggle="collapse" data-target="#item-actions-menu-'+levelAltId+'"></a>');
-								var actionsSSMenuElem = $('<div id="item-actions-menu-'+levelAltId+'" class="item-action-wrapper panel panel-default"></div>');
-								var actionsSSMenuContainerElem = $('<div class="panel-body"></div>');
-								actionsSSMenuElem.append(actionsSSMenuContainerElem);
-								actionsElem.append(actionsSSTogglerElem);
-								actionsElem.append(actionsSSMenuElem);
+								var propValue = data.metadata[sPropName];
+								cellElem.attr('data-'+sPropName.replace('_', '-'), propValue);
+							}
 
-								// Adding secondary actions
-								for(j in actionsButtons)
+							// Building tooltip for the node
+							// We have to concatenate the HTML as we return the raw HTML of the cell. If we did a jQuery.insertAfter, the tooltip would not be returned.
+							// For the same reason, tooltip widget is created in "drawCallback" instead of here.
+							if( (data.tooltip !== undefined) && (data.tooltip !== ''))
+							{
+								cellElem.html( $('<span></span>').attr('title', data.tooltip).attr('data-toggle', 'tooltip').html(data.name).prop('outerHTML') );
+							}
+							else
+							{
+								cellElem.html(data.name);
+							}
+
+							// Building actions
+							if(levelActionsKeys.length > 0)
+							{
+								// - Primary action (click on item)
+								levelPrimaryAction = levelActions[levelActionsKeys[0]];
+								switch(levelPrimaryAction.type)
 								{
-									var action = actionsButtons[j];
-									var actionElem = $('<a></a>');
-									var actionIconElem = $('<span></span>').appendTo(actionElem);
-									
-									switch(action.type)
+									case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_VIEW') }}':
+										url = '{{ app.url_generator.generate('p_object_view', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
+	                                    break;
+									case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_EDIT') }}':
+										url = '{{ app.url_generator.generate('p_object_edit', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
+										break;
+									case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS') }}':
+										url = levelPrimaryAction.url.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
+										url = AddParameterToUrl(url, 'ar_token', data.action_rules_token[levelPrimaryAction.type]);
+										break;
+									default:
+									    url = '#';
+										//console.log('Action "'+levelPrimaryAction.type+'" not implemented');
+										break;
+								}
+	                            SetActionUrl(cellElem, url);
+	                            SetActionOpeningTarget(cellElem, levelPrimaryAction.opening_target);
+
+								// - Secondary actions
+								if(levelActionsKeys.length > 1)
+								{
+									// Retrieving secondary action (Now we also display primary action)
+									var actionsButtons = {};
+									for(j = 0; j < levelActionsKeys.length; j++)
 									{
-										case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_VIEW') }}':
-											url = '{{ app.url_generator.generate('p_object_view', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
-											break;
-										case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_EDIT') }}':
-											url = '{{ app.url_generator.generate('p_object_edit', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
-											break;
-										case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS') }}':
-											url = action.url.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
-											url = AddParameterToUrl(url, 'ar_token', data.action_rules_token[action.type]);
-											break;
-										default:
-										    url = '#';
-											//console.log('Action "'+action.type+'" not implemented for secondary action');
-											break;
+										actionsButtons[levelActionsKeys[j]] = levelActions[levelActionsKeys[j]];
 									}
-                                    SetActionUrl(actionElem, url);
-                                    SetActionOpeningTarget(actionElem, action.opening_target);
-									
-									// Adding title if present
-									if(action.title !== undefined)
+
+									// Preparing secondary actions container
+									var actionsElem = $('<div></div>').addClass('pull-right group-actions');
+									cellElem.append(actionsElem);
+									// Preparing secondary actions
+									var actionsSSTogglerElem = $('<a class="glyphicon glyphicon-menu-hamburger" data-toggle="collapse" data-target="#item-actions-menu-'+levelAltId+'"></a>');
+									var actionsSSMenuElem = $('<div id="item-actions-menu-'+levelAltId+'" class="item-action-wrapper panel panel-default"></div>');
+									var actionsSSMenuContainerElem = $('<div class="panel-body"></div>');
+									actionsSSMenuElem.append(actionsSSMenuContainerElem);
+									actionsElem.append(actionsSSTogglerElem);
+									actionsElem.append(actionsSSMenuElem);
+
+									// Adding secondary actions
+									for(j in actionsButtons)
 									{
-										actionElem.attr('title', action.title);
+										var action = actionsButtons[j];
+										var actionElem = $('<a></a>');
+										var actionIconElem = $('<span></span>').appendTo(actionElem);
+
+										switch(action.type)
+										{
+											case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_VIEW') }}':
+												url = '{{ app.url_generator.generate('p_object_view', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
+												break;
+											case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_EDIT') }}':
+												url = '{{ app.url_generator.generate('p_object_edit', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
+												break;
+											case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS') }}':
+												url = action.url.replace(/-objectClass-/, data.class).replace(/-objectId-/, data.id);
+												url = AddParameterToUrl(url, 'ar_token', data.action_rules_token[action.type]);
+												break;
+											default:
+											    url = '#';
+												//console.log('Action "'+action.type+'" not implemented for secondary action');
+												break;
+										}
+	                                    SetActionUrl(actionElem, url);
+	                                    SetActionOpeningTarget(actionElem, action.opening_target);
+
+										// Adding title if present
+										if(action.title !== undefined)
+										{
+											actionElem.attr('title', action.title);
+										}
+										// Adding icon class if present
+										if(action.icon_class !== undefined)
+										{
+											actionIconElem.addClass(action.icon_class);
+										}
+
+										actionElem.append(action.title);
+										actionsSSMenuContainerElem.append( $('<p></p>').append(actionElem) );
 									}
-									// Adding icon class if present
-									if(action.icon_class !== undefined)
-									{
-										actionIconElem.addClass(action.icon_class);
-									}
-						
-									actionElem.append(action.title);
-									actionsSSMenuContainerElem.append( $('<p></p>').append(actionElem) );
 								}
 							}
-						}
-						
-						return cellElem.prop('outerHTML');
+
+							return cellElem.prop('outerHTML');
+						},
+						filter:function (data, type, row) {
+                        	return $.text($.parseHTML(data.name));
+						},
+						sort:function (data, type, row) {
+							return $.text($.parseHTML(data.name));
+						},
 					},
 				});
 				
@@ -195,25 +203,29 @@
 							"defaultContent": "",
 							"type": "html",
 							"data": oLevelsProperties[sKey].alias+".fields."+oLevelsProperties[sKey].fields[i].code,
-							"render": function(data, type, row){
-								var cellElem = $('<span></span>');
-
-								// Building value and metadata
-								for(var sPropName in data)
+							"render":
 								{
-									var sPropValue = data[sPropName];
-									if(sPropName === 'value_html')
-									{
-										cellElem.html(sPropValue);
-									}
-									else
-									{
-										cellElem.attr('data-'+sPropName.replace('_', '-'), sPropValue);
-									}
-								}
+									_: function (data, type, row) {
+										var cellElem = $('<span></span>');
 
-								return cellElem.prop('outerHTML');
-							},
+										// Building value and metadata
+										for (var sPropName in data) {
+											var sPropValue = data[sPropName];
+											if (sPropName === 'value_html') {
+												cellElem.html(sPropValue);
+											} else {
+												cellElem.attr('data-' + sPropName.replace('_', '-'), sPropValue);
+											}
+										}
+										return cellElem.prop('outerHTML');
+									},
+									sort: function (data, type, row) {
+										return $.text($.parseHTML(data['value_html']));
+									},
+									filter: function (data, type, row) {
+                        				return $.text($.parseHTML(data['value_html']));
+									},
+								},
 						});
 					}
 				}

datamodels/2.x/itop-portal-base/portal/templates/bricks/filter/tile.html.twig

@@ -10,10 +10,9 @@
 <div class="col-xs-12 col-sm-{{ brick.GetWidth }}">
 	{% block pTileWrapper %}
 		<div class="tile tile-filter-brick" id="brick-{{ brick.GetId }}" data-brick-id="{{ brick.GetId }}">
-			<div class="tile_decoration">
+			<a href="#" onclick="return false;" class="tile_decoration">
 				<span class="icon {{ brick.GetDecorationClassHome }}"></span>
-
-			</div>
+			</a>
 			<div class="tile_body">
 				<div class="tile_title">{{ brick.GetTitleHome|dict_s }}</div>
 				{% if brick.HasDescription %}

datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig

@@ -158,8 +158,11 @@
 								return cellElem.prop('outerHTML');
 							},
 	                        sort: function (attribute_code, type, row) {
-                        		return row.attributes[attribute_code].sort_value;
+		                        return row.attributes[attribute_code].sort_value;
 							},
+	                        filter: function (attribute_code, type, row) {
+                        		return $.text($.parseHTML(row.attributes[attribute_code]['value_html']));
+	                        },
 						},
                     });
                 }

datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/popup-export-excel.html.twig

@@ -27,9 +27,8 @@
 
 <script type="text/javascript">
     var sDataState = 'not-yet-started';
-    var sOQL = {{ sOQL|json_encode|raw }};
+    var sToken = {{ sToken|raw }};
     var sFormat = 'xlsx';
-    var sFields = "{{ sFields }}";
 
     $(document).ready(function () {
         window.setTimeout(function () {

datamodels/2.x/itop-tickets/module.itop-tickets.php

@@ -55,9 +55,16 @@ class TicketsInstaller extends ModuleInstallerAPI
 		$oSet = new DBObjectSet($oSearch);
 		while($oTrigger = $oSet->Fetch())
 		{
-			if (!MetaModel::IsValidClass($oTrigger->Get('target_class')))
+			try
 			{
-				$oTrigger->DBDelete();
+				if (!MetaModel::IsValidClass($oTrigger->Get('target_class')))
+				{
+					$oTrigger->DBDelete();
+				}
+			}
+			catch(Exception $e)
+			{
+				utils::EnrichRaisedException($oTrigger, $e);
 			}
 		}
 	}

datamodels/2.x/version.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <information>
-  <version>2.7.1</version>
+  <version>2.7.2</version>
 </information>

dictionaries/fr.dictionary.itop.ui.php

@@ -339,7 +339,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 	'UI:WelcomeMenu:LeftBlock' => '<p>iTop est un portail opérationnel complet et libre pour gérer votre SI.</p>
 <ul>il contient:
-<li>Une base de gestion des configuration (CMDB - Configuration management database) pour documenter et gérer votre parc informatique.</li>
+<li>Une base de gestion des configurations (CMDB - Configuration management database) pour documenter et gérer votre parc informatique.</li>
 <li>Un module de gestion des incidents pour suivre les incidents d\'exploitation et gérer la communication à propos de ces incidents.</li>
 <li>Un module de gestion des changements pour planifier et suivre les modifications de votre SI.</li>
 <li>Une base des erreurs connues, pour accélérer la résolution des incidents.</li>
@@ -355,7 +355,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 <li>Améliorer la satisfaction client et fournir aux responsables des vues sur la performance interne du SI.</li>
 </ul>
 </p>
-<p>iTop est complètement ouvert pour s\'intéger avec votre environnement informatique.</p>
+<p>iTop est complètement ouvert pour s\'intégrer avec votre environnement informatique.</p>
 <p>
 <ul>Grâce à ce portail opérationnel de nouvelle génération:
 <li>Gérez un environnement informatique de plus en plus complexe.</li>

dictionaries/nl.dictionary.itop.ui.php

@@ -349,14 +349,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'BooleanLabel:yes' => 'Ja',
 	'BooleanLabel:no' => 'Nee',
-	'UI:Login:Title' => 'Aanmelden in ITOP_APPLICATION_SHORT',
+	'UI:Login:Title' => 'Aanmelden in '.ITOP_APPLICATION_SHORT,
 	'Menu:WelcomeMenu' => 'Welkom', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Welkom in ITOP_APPLICATION_SHORT', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Welkom in '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
 	'Menu:WelcomeMenuPage' => 'Welkom', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Welkom in ITOP_APPLICATION_SHORT', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => 'Welkom in ITOP_APPLICATION_SHORT',
+	'Menu:WelcomeMenuPage+' => 'Welkom in '.ITOP_APPLICATION_SHORT, // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => 'Welkom in '.ITOP_APPLICATION_SHORT,
 
-	'UI:WelcomeMenu:LeftBlock' => '<p>ITOP_APPLICATION_SHORT is een compleet en open source portaal voor IT-operaties.</p>
+	'UI:WelcomeMenu:LeftBlock' => '<p>'.ITOP_APPLICATION_SHORT.' is een compleet en open source portaal voor IT-operaties.</p>
 <ul>Op maat van jouw IT-omgeving:
 <li>Complete CMDB (Configuration Management Database) voor het documenteren en beheren van de IT-inventaris.</li>
 <li>Incident Management-module voor het vinden van en communiceren over alle problemen die optreden .</li>
@@ -367,14 +367,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 </ul>
 <p>Alle modules kunnen volledig onafhankelijk van elkaar worden opgezet, stap voor stap.</p>',
 
-	'UI:WelcomeMenu:RightBlock' => '<p>ITOP_APPLICATION_SHORT is gericht op serviceproviders. Het zorgt ervoor dat IT-engineers gemakkelijk meerdere klanten of organisaties kunnen beheren.
-<ul>ITOP_APPLICATION_SHORT zorgt dankzij een uitgebreide set van bedrijfsprocessen voor een reeks voordelen:
+	'UI:WelcomeMenu:RightBlock' => '<p>'.ITOP_APPLICATION_SHORT.' is gericht op serviceproviders. Het zorgt ervoor dat IT-engineers gemakkelijk meerdere klanten of organisaties kunnen beheren.
+<ul>'.ITOP_APPLICATION_SHORT.' zorgt dankzij een uitgebreide set van bedrijfsprocessen voor een reeks voordelen:
 <li>De efficientië van het IT-management versterkt.</li> 
 <li>De prestaties van IT-operaties verbetert.</li> 
 <li>De klanttevredenheid verhoogt en leidinggevenden inzicht biedt in hun bedrijfsperformantie.</li>
 </ul>
 </p>
-<p>ITOP_APPLICATION_SHORT is klaar om geïntegreerd te worden met jouw huidige infrastructuur rond IT-management.</p>
+<p>'.ITOP_APPLICATION_SHORT.' is klaar om geïntegreerd te worden met jouw huidige infrastructuur rond IT-management.</p>
 <p>
 <ul>De adoptie van dit IT-operationele portaal zal je helpen met:
 <li>Het beter beheren van een steeds complexere IT-omgeving.</li>
@@ -441,7 +441,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrecte linkdefinitie: de klasse %1$s om objecten te beheren werd niet gevonden als externe sleutel (key) in de klasse %2$s',
 	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d niet gevonden',
 	'UI:Error:WizardCircularReferenceInDependencies' => 'Fout: cirkelverwijzing in de afhankelijke variabelen tussen de velden. Controleer het datamodel.',
-	'UI:Error:UploadedFileTooBig' => 'Het geüploade bestand is te groot. De maximale grootte is %1$s. Contacteer jouw ITOP_APPLICATION_SHORT-beheerder om deze limiet aan te passen. (Controleer de PHP-configuratie voor "upload_max_filesize" en "post_max_size" op de server).',
+	'UI:Error:UploadedFileTooBig' => 'Het geüploade bestand is te groot. De maximale grootte is %1$s. Contacteer jouw '.ITOP_APPLICATION_SHORT.'-beheerder om deze limiet aan te passen. (Controleer de PHP-configuratie voor "upload_max_filesize" en "post_max_size" op de server).',
 	'UI:Error:UploadedFileTruncated.' => 'Het geüploade bestand is ingekort!',
 	'UI:Error:NoTmpDir' => 'De tijdelijke opslagruimte is niet gedefinieerd.',
 	'UI:Error:CannotWriteToTmp_Dir' => 'Niet mogelijk om het tijdelijke bestand naar een tijdelijke map weg te schrijven. upload_tmp_dir = "%1$s".',
@@ -523,14 +523,14 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:SearchValue:CheckAll' => 'Vink alles aan',
 	'UI:SearchValue:UncheckAll' => 'Vink alles uit',
 	'UI:SelectOne' => '-- selecteer --',
-	'UI:Login:Welcome' => 'Welkom in ITOP_APPLICATION_SHORT!',
+	'UI:Login:Welcome' => 'Welkom in '.ITOP_APPLICATION_SHORT.'!',
 	'UI:Login:IncorrectLoginPassword' => 'Ongeldige gebruikersnaam of wachtwoord, probeer opnieuw.',
 	'UI:Login:IdentifyYourself' => 'Identificeer jezelf voordat je verder gaat',
 	'UI:Login:UserNamePrompt' => 'Gebruikersnaam',
 	'UI:Login:PasswordPrompt' => 'Wachtwoord',
 	'UI:Login:ForgotPwd' => 'Wachtwoord vergeten?',
 	'UI:Login:ForgotPwdForm' => 'Wachtwoord vergeten',
-	'UI:Login:ForgotPwdForm+' => 'ITOP_APPLICATION_SHORT kan je een e-mail sturen waarin de instructies voor het resetten van jouw account staan.',
+	'UI:Login:ForgotPwdForm+' => ITOP_APPLICATION_SHORT.' kan je een e-mail sturen waarin de instructies voor het resetten van jouw account staan.',
 	'UI:Login:ResetPassword' => 'Stuur nu!',
 	'UI:Login:ResetPwdFailed' => 'E-mail sturen mislukt: %1$s',
 	'UI:Login:SeparatorOr' => 'Of',
@@ -543,8 +543,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:ResetPwd-Error-NoEmail' => 'Er ontbreekt een e-mailadres. Neem contact op met jouw beheerder.',
 	'UI:ResetPwd-Error-Send' => 'Er is een technisch probleem bij het verzenden van de e-mail. Neem contact op met jouw beheerder.',
 	'UI:ResetPwd-EmailSent' => 'Kijk in jouw mailbox (eventueel bij ongewenste mail) en volg de instructies...',
-	'UI:ResetPwd-EmailSubject' => 'Reset jouw ITOP_APPLICATION_SHORT-wachtwoord',
-	'UI:ResetPwd-EmailBody' => '<body><p>Je hebt een reset van jouw ITOP_APPLICATION_SHORT-wachtwoord aangevraagd.</p><p>Klik op deze link (eenmalig te gebruiken) om <a href="%1$s">een nieuw wachtwoord in te voeren</a></p>.',
+	'UI:ResetPwd-EmailSubject' => 'Reset jouw '.ITOP_APPLICATION_SHORT.'-wachtwoord',
+	'UI:ResetPwd-EmailBody' => '<body><p>Je hebt een reset van jouw '.ITOP_APPLICATION_SHORT.'-wachtwoord aangevraagd.</p><p>Klik op deze link (eenmalig te gebruiken) om <a href="%1$s">een nieuw wachtwoord in te voeren</a></p>.',
 
 	'UI:ResetPwd-Title' => 'Reset wachtwoord',
 	'UI:ResetPwd-Error-InvalidToken' => 'Sorry. Jouw wachtwoord is al gereset, of je hebt al meerdere e-mails ontvangen. Zorg ervoor dat je de link in de laatst ontvangen e-mail gebruikt.',
@@ -552,24 +552,24 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:ResetPwd-Ready' => 'Het wachtwoord is veranderd',
 	'UI:ResetPwd-Login' => 'Klik hier om in te loggen',
 
-	'UI:Login:About' => 'ITOP_APPLICATION',
+	'UI:Login:About' => ITOP_APPLICATION,
 	'UI:Login:ChangeYourPassword' => 'Verander jouw wachtwoord',
 	'UI:Login:OldPasswordPrompt' => 'Oud wachtwoord',
 	'UI:Login:NewPasswordPrompt' => 'Nieuw wachtwoord',
 	'UI:Login:RetypeNewPasswordPrompt' => 'Herhaal nieuwe wachtwoord',
 	'UI:Login:IncorrectOldPassword' => 'Fout: het oude wachtwoord is incorrect',
 	'UI:LogOffMenu' => 'Log uit',
-	'UI:LogOff:ThankYou' => 'Bedankt voor het gebruiken van ITOP_APPLICATION',
+	'UI:LogOff:ThankYou' => 'Bedankt voor het gebruiken van '.ITOP_APPLICATION,
 	'UI:LogOff:ClickHereToLoginAgain' => 'Klik hier om in te loggen',
 	'UI:ChangePwdMenu' => 'Verander wachtwoord',
 	'UI:Login:PasswordChanged' => 'Wachtwoord met succes aangepast',
-	'UI:AccessRO-All' => 'ITOP_APPLICATION is alleen-lezen',
-	'UI:AccessRO-Users' => 'ITOP_APPLICATION is alleen-lezen voor eindgebruikers',
+	'UI:AccessRO-All' => ITOP_APPLICATION.' is alleen-lezen',
+	'UI:AccessRO-Users' => ITOP_APPLICATION.' is alleen-lezen voor eindgebruikers',
 	'UI:ApplicationEnvironment' => 'Omgeving van de applicatie: %1$s',
 	'UI:Login:RetypePwdDoesNotMatch' => 'Het nieuwe wachtwoord en de herhaling van het nieuwe wachtwoord komen niet overeen',
-	'UI:Button:Login' => 'Ga naar ITOP_APPLICATION',
-	'UI:Login:Error:AccessRestricted' => 'Geen toegang tot ITOP_APPLICATION_SHORT. Neem contact op met een ITOP_APPLICATION_SHORT-beheerder.',
-	'UI:Login:Error:AccessAdmin' => 'Alleen toegankelijk voor mensen met beheerdersrechten. Neem contact op met een ITOP_APPLICATION_SHORT-beheerder',
+	'UI:Button:Login' => 'Ga naar '.ITOP_APPLICATION,
+	'UI:Login:Error:AccessRestricted' => 'Geen toegang tot '.ITOP_APPLICATION_SHORT.'. Neem contact op met een '.ITOP_APPLICATION_SHORT.'-beheerder.',
+	'UI:Login:Error:AccessAdmin' => 'Alleen toegankelijk voor mensen met beheerdersrechten. Neem contact op met een '.ITOP_APPLICATION_SHORT.'-beheerder',
 	'UI:Login:Error:WrongOrganizationName' => 'Onbekende organisatie',
 	'UI:Login:Error:MultipleContactsHaveSameEmail' => 'Meerdere contacten hebben hetzelfde e-mailadres',
 	'UI:Login:Error:NoValidProfiles' => 'Geen geldig profiel opgegeven',
@@ -582,7 +582,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:CSVImport:DataLine1' => 'Dataregel 1',
 	'UI:CSVImport:DataLine2' => 'Dataregel 2',
 	'UI:CSVImport:idField' => 'id (Primaire sleutel (key))',
-	'UI:Title:BulkImport' => 'ITOP_APPLICATION_SHORT - Bulk import',
+	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - Bulk import',
 	'UI:Title:BulkImport+' => 'CSV Import Wizard',
 	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisatie van %1$d objecten van klasse "%2$s"',
 	'UI:CSVImport:ClassesSelectOne' => '-- selecteer een --',
@@ -679,9 +679,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:CSVExport:AdvancedMode' => 'Geavanceerde mode',
 	'UI:CSVExport:AdvancedMode+' => 'In geavanceerde mode worden verscheidene kolommen toegevoegd aan de export: id van het object, id van de externe codes en hun reconciliation-attributen.',
 	'UI:CSVExport:LostChars' => 'Tekstcoderingsprobleem',
-	'UI:CSVExport:LostChars+' => 'Het gedownloade bestand zal worden gecodeerd in %1$s. ITOP_APPLICATION_SHORT heeft een aantal karakters gedetecteerd die niet compatibel zijn met dit formaat. Deze karakters zullen worden vervangen door een ander karakter (bijvoorbeeld karakters met accent kunnen het accent verliezen), of ze zullen worden verwijderd. Je kan data kopiëren en plakken van jouw webbrowser. Ook kan je de beheerder contacteren om de codes te veranderen (Zie parameter \'csv_file_default_charset\').',
+	'UI:CSVExport:LostChars+' => 'Het gedownloade bestand zal worden gecodeerd in %1$s. '.ITOP_APPLICATION_SHORT.' heeft een aantal karakters gedetecteerd die niet compatibel zijn met dit formaat. Deze karakters zullen worden vervangen door een ander karakter (bijvoorbeeld karakters met accent kunnen het accent verliezen), of ze zullen worden verwijderd. Je kan data kopiëren en plakken van jouw webbrowser. Ook kan je de beheerder contacteren om de codes te veranderen (Zie parameter \'csv_file_default_charset\').',
 
-	'UI:Audit:Title' => 'ITOP_APPLICATION_SHORT - CMDB Audit',
+	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
 	'UI:Audit:InteractiveAudit' => 'Interactieve Audit',
 	'UI:Audit:HeaderAuditRule' => 'Auditregel',
 	'UI:Audit:HeaderNbObjects' => '# objecten',
@@ -690,7 +690,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL-fout in de regel %1$s: %2$s.',
 	'UI:Audit:ErrorIn_Category_Reason' => 'OQL-fout in de categorie %1$s: %2$s.',
 
-	'UI:RunQuery:Title' => 'ITOP_APPLICATION_SHORT - Evaluatie van OQL-query',
+	'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Evaluatie van OQL-query',
 	'UI:RunQuery:QueryExamples' => 'Voorbeelden van query\'s',
 	'UI:RunQuery:HeaderPurpose' => 'Doel',
 	'UI:RunQuery:HeaderPurpose+' => 'Uitleg over de query',
@@ -707,7 +707,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:RunQuery:Error' => 'Er trad een fout op tijdens het uitvoeren van deze query: %1$s',
 	'UI:Query:UrlForExcel' => 'URL om te gebruiken voor MS Excel-webquery\'s',
 	'UI:Query:UrlV1' => 'De lijst van velden is leeg gelaten. De pagina <em>export-V2.php</em> kan niet aangeroepen worden zonder deze informatie.Daarom verwijst de onderstaande link naar de oude export-pagina: <em>export.php</em>. Deze verouderde versie heeft enkele beperkingen: de lijst van geëxporteerde velden kan verschillen afhankelijk van het gekozen export-formaat en het datamodel van iTop. Als je wil dat de lijst van geëxporteerde kolommen hetzelfde blijft over lange tijd, dan moet je een waarde opgeven voor het attribuut "Velden" en de pagina <em>export-V2.php</em> gebruiken.',
-	'UI:Schema:Title' => 'ITOP_APPLICATION_SHORT objecten-schema',
+	'UI:Schema:Title' => ITOP_APPLICATION_SHORT.' objecten-schema',
 	'UI:Schema:CategoryMenuItem' => 'Categorie <b>%1$s</b>',
 	'UI:Schema:Relationships' => 'Relaties',
 	'UI:Schema:AbstractClass' => 'Abstracte klasse: objecten van deze klasse kunnen niet worden geïnstantieerd.',
@@ -822,9 +822,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Delete:PleaseDoTheManualOperations' => 'Verricht eerst de handmatige handelingen die hierboven staan voordat je dit object verwijdert',
 	'UI:Delect:Confirm_Object' => 'Bevestig dat je  %1$s wil verwijderen.',
 	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Bevestig dat je de volgende %1$d objecten van klasse %2$s wilt verwijderen.',
-	'UI:WelcomeToITop' => 'Welkom in ITOP_APPLICATION',
-	'UI:DetailsPageTitle' => 'ITOP_APPLICATION_SHORT - %1$s - %2$s details',
-	'UI:ErrorPageTitle' => 'ITOP_APPLICATION_SHORT - Fout',
+	'UI:WelcomeToITop' => 'Welkom in '.ITOP_APPLICATION,
+	'UI:DetailsPageTitle' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s details',
+	'UI:ErrorPageTitle' => ITOP_APPLICATION_SHORT.' - Fout',
 	'UI:ObjectDoesNotExist' => 'Sorry, dit object bestaat niet (of je bent niet gemachtigd het te bekijken).',
 	'UI:ObjectArchived' => 'Dit object werd gearchiveerd. Gelieve de Archief-mode in te schakelen of je beheerder te contacteren.',
 	'Tag:Archived' => 'Gearchiveerd',
@@ -834,7 +834,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Tag:Synchronized' => 'Gesynchroniseerd',
 	'ObjectRef:Archived' => 'Gearchiveerd',
 	'ObjectRef:Obsolete' => 'Buiten dienst',
-	'UI:SearchResultsPageTitle' => 'ITOP_APPLICATION_SHORT - Zoekresultaten',
+	'UI:SearchResultsPageTitle' => ITOP_APPLICATION_SHORT.' - Zoekresultaten',
 	'UI:SearchResultsTitle' => 'Zoekresultaten',
 	'UI:SearchResultsTitle+' => 'Volledige tekst - zoekresultaten',
 	'UI:Search:NoSearch' => 'Geen zoekopdracht',
@@ -844,28 +844,28 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:FullTextSearchTitle_Text' => 'Resultaten voor "%1$s":',
 	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d object(en) van klasse %2$s gevonden.',
 	'UI:Search:NoObjectFound' => 'Geen object gevonden.',
-	'UI:ModificationPageTitle_Object_Class' => 'ITOP_APPLICATION_SHORT - %1$s - %2$s aanpassing',
+	'UI:ModificationPageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - %1$s - %2$s aanpassing',
 	'UI:ModificationTitle_Class_Object' => 'Aanpassen van %1$s: <span class="hilite">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'ITOP_APPLICATION_SHORT - Kloon %1$s - %2$s aanpassing',
+	'UI:ClonePageTitle_Object_Class' => ITOP_APPLICATION_SHORT.' - Kloon %1$s - %2$s aanpassing',
 	'UI:CloneTitle_Class_Object' => 'Klonen van %1$s: <span class="hilite">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'ITOP_APPLICATION_SHORT - %1$s aanmaken',
+	'UI:CreationPageTitle_Class' => ITOP_APPLICATION_SHORT.' - %1$s aanmaken',
 	'UI:CreationTitle_Class' => '%1$s aanmaken',
 	'UI:SelectTheTypeOf_Class_ToCreate' => 'Selecteer het type %1$s dat moet worden aangemaakt:',
 	'UI:Class_Object_NotUpdated' => 'Geen verandering waargenomen, %1$s (%2$s) is <strong>niet</strong> aangepast.',
 	'UI:Class_Object_Updated' => '%1$s (%2$s) aangepast.',
-	'UI:BulkDeletePageTitle' => 'ITOP_APPLICATION_SHORT - Meerdere objecten verwijderen',
+	'UI:BulkDeletePageTitle' => ITOP_APPLICATION_SHORT.' - Meerdere objecten verwijderen',
 	'UI:BulkDeleteTitle' => 'Selecteer de objecten die je wilt verwijderen:',
 	'UI:PageTitle:ObjectCreated' => 'Object Aangemaakt.',
 	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s aangemaakt.',
 	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Bezig met het toepassen van %1$s op object: %2$s in fase %3$s tot doelfase: %4$s.',
 	'UI:ObjectCouldNotBeWritten' => 'Het object kon niet geschreven worden: %1$s',
-	'UI:PageTitle:FatalError' => 'ITOP_APPLICATION_SHORT - Fatale Fout',
+	'UI:PageTitle:FatalError' => ITOP_APPLICATION_SHORT.' - Fatale Fout',
 	'UI:SystemIntrusion' => 'Toegang geweigerd. Je hebt een actie aangevraagd waarvoor je niet gemachtigd bent.',
-	'UI:FatalErrorMessage' => 'Fatale fout, ITOP_APPLICATION_SHORT kan niet doorgaan.',
+	'UI:FatalErrorMessage' => 'Fatale fout, '.ITOP_APPLICATION_SHORT.' kan niet doorgaan.',
 	'UI:Error_Details' => 'Fout: %1$s.',
 
-	'UI:PageTitle:ClassProjections' => 'ITOP_APPLICATION_SHORT gebruikersbeheer - klasse-projecties',
-	'UI:PageTitle:ProfileProjections' => 'ITOP_APPLICATION_SHORT gebruikersbeheer - profiel-projecties',
+	'UI:PageTitle:ClassProjections' => ITOP_APPLICATION_SHORT.' gebruikersbeheer - klasse-projecties',
+	'UI:PageTitle:ProfileProjections' => ITOP_APPLICATION_SHORT.' gebruikersbeheer - profiel-projecties',
 	'UI:UserManagement:Class' => 'Klasse',
 	'UI:UserManagement:Class+' => 'Klasse van objecten',
 	'UI:UserManagement:ProjectedObject' => 'Object',
@@ -966,8 +966,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:NotificationsMenu+' => 'Configuratie van de meldingen', // Duplicated into itop-welcome-itil (will be removed from here...)
 	'UI:NotificationsMenu:Title' => 'Configuratie van <span class="hilite">Meldingen</span>',
 	'UI:NotificationsMenu:Help' => 'Help',
-	'UI:NotificationsMenu:HelpContent' => '<p>In ITOP_APPLICATION_SHORT zijn de meldingen volledig aan te passen. Ze zijn gebaseerd op twee sets van objecten: <i>triggers and actions</i>.</p>
-<p><i><b>Triggers</b></i> bepalen wanneer er een melding is. Er zijn verschillende triggers als onderdeel van ITOP_APPLICATION_SHORT core, maar andere kunnen door middel van uitbreidingen worden toegevoegd.
+	'UI:NotificationsMenu:HelpContent' => '<p>In '.ITOP_APPLICATION_SHORT.' zijn de meldingen volledig aan te passen. Ze zijn gebaseerd op twee sets van objecten: <i>triggers and actions</i>.</p>
+<p><i><b>Triggers</b></i> bepalen wanneer er een melding is. Er zijn verschillende triggers als onderdeel van '.ITOP_APPLICATION_SHORT.' core, maar andere kunnen door middel van uitbreidingen worden toegevoegd.
 
 <p>Sommige triggers worden uitgevoerd:</p>
 
@@ -1074,9 +1074,9 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:PageOrientation_Landscape' => 'Landschap',
 	'UI:RelationTooltip:Redundancy' => 'Redundantie',
 	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# geïmpacteerde items: %1$d / %2$d',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Kritische drempelwaarde: %1$d / %2$d',
-	'Portal:Title' => 'ITOP_APPLICATION_SHORT gebruikersportaal',
-	'Portal:NoRequestMgmt' => 'Beste %1$s, je bent naar deze pagina doorverwezen omdat jouw account is geconfigureerd met het profiel "Portal user". Helaas is ITOP_APPLICATION_SHORT niet geïnstalleerd met de optie "Request Management". Neem contact op met jouw beheerder.',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Kritieke drempelwaarde: %1$d / %2$d',
+	'Portal:Title' => ITOP_APPLICATION_SHORT.' gebruikersportaal',
+	'Portal:NoRequestMgmt' => 'Beste %1$s, je bent naar deze pagina doorverwezen omdat jouw account is geconfigureerd met het profiel "Portal user". Helaas is '.ITOP_APPLICATION_SHORT.' niet geïnstalleerd met de optie "Request Management". Neem contact op met jouw beheerder.',
 	'Portal:Refresh' => 'Herlaad',
 	'Portal:Back' => 'Vorige',
 	'Portal:WelcomeUserOrg' => 'Welkom %1$s, van %2$s',
@@ -1160,7 +1160,7 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:Favorites:ShowObsoleteData+' => 'Toon "Buiten dienst"-data in zoekresultaten en in keuzelijsten.',
 	'UI:NavigateAwayConfirmationMessage' => 'Bewerkingen zullen worden genegeerd.',
 	'UI:CancelConfirmationMessage' => 'Je zult jouw aanpassingen verliezen. Wil je toch doorgaan?',
-	'UI:AutoApplyConfirmationMessage' => 'Sommige veranderingen zijn nog niet doorgevoerd. Wil je dat ITOP_APPLICATION_SHORT deze meeneemt?',
+	'UI:AutoApplyConfirmationMessage' => 'Sommige veranderingen zijn nog niet doorgevoerd. Wil je dat '.ITOP_APPLICATION_SHORT.' deze meeneemt?',
 	'UI:Create_Class_InState' => 'Maak %1$s aan in deze fase: ',
 	'UI:OrderByHint_Values' => 'Sorteervolgorde: %1$s',
 	'UI:Menu:AddToDashboard' => 'Voeg toe aan dashboard...',
@@ -1224,7 +1224,7 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:DashletUnknown:Label' => 'Onbekend',
 	'UI:DashletUnknown:Description' => 'Onbekende dashlet (mogelijk verwijderd)',
 	'UI:DashletUnknown:RenderText:View' => 'Kan deze dashlet niet weergeven.',
-	'UI:DashletUnknown:RenderText:Edit' => 'Kan deze dashlet niet weergeven (klasse "%1$s"). Controleer bij je ITOP_APPLICATION_SHORT-beheerder of dit nog beschikbaar is.',
+	'UI:DashletUnknown:RenderText:Edit' => 'Kan deze dashlet niet weergeven (klasse "%1$s"). Controleer bij je '.ITOP_APPLICATION_SHORT.'-beheerder of dit nog beschikbaar is.',
 	'UI:DashletUnknown:RenderNoDataText:Edit' => 'Geen voorbeeld mogelijk van deze dashlet (klasse "%1$s").',
 	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuratie (getoond als ruwe XML)',
 
@@ -1404,8 +1404,8 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI:AddAnExisting_Class' => 'Voeg objecten van type %1$s toe...',
 	'UI:SelectionOf_Class' => 'Selectie van objecten van type %1$s',
 
-	'UI:AboutBox' => 'Over ITOP_APPLICATION_SHORT...',
-	'UI:About:Title' => 'Over ITOP_APPLICATION_SHORT',
+	'UI:AboutBox' => 'Over '.ITOP_APPLICATION_SHORT.'...',
+	'UI:About:Title' => 'Over '.ITOP_APPLICATION_SHORT,
 	'UI:About:DataModel' => 'Datamodel',
 	'UI:About:Support' => 'Support informatie',
 	'UI:About:Licenses' => 'Licenties',
@@ -1430,7 +1430,7 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'ExcelExport:PreparingExport' => 'Export aan het voorbereiden...',
 	'ExcelExport:Statistics' => 'Statistieken',
 	'portal:legacy_portal' => 'Portaal voor eindgebruikers',
-	'portal:backoffice' => 'ITOP_APPLICATION_SHORT Back-Office User Interface',
+	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface',
 
 	'UI:CurrentObjectIsLockedBy_User' => 'Het object is vergrendeld omdat het momenteel aangepast wordt door %1$s.',
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'Het object wordt aangepast door %1$s. Jouw wijzigingen kunnen niet opgeslagen worden omdat ze een conflict kunnen veroorzaken.',

js/breadcrumb.js

@@ -59,24 +59,25 @@ $(function()
 					var oEntry = aBreadCrumb[iEntry];
 					if (oEntry['label'].length > 0)
 					{
-                        var sIconSpec = '';
-                        if (oEntry['icon'].length > 0)
-                        {
-                            sIconSpec = '<span class="icon"><img src="'+oEntry['icon']+'"/></span>';
-                        }
-						var sTitle = oEntry['description'];
+						var sIconSpec = '';
+						if (oEntry['icon'].length > 0) {
+							sIconSpec = '<span class="icon"><img src="'+oEntry['icon']+'"/></span>';
+						}
+
+						var sTitle = oEntry['description'],
+							sLabel = oEntry['label'];
 						if (sTitle.length == 0) {
 							sTitle = oEntry['label'];
 						}
-						if ((this.options.new_entry !== null) && (iEntry == aBreadCrumb.length - 1))
-						{
+						sTitle = EncodeHtml(sTitle, false);
+						sLabel = EncodeHtml(sLabel, false);
+
+						if ((this.options.new_entry !== null) && (iEntry == aBreadCrumb.length-1)) {
 							// Last entry is the current page
-							sBreadCrumbHtml += '<div class="breadcrumb-item breadcrumb-current" breadcrumb-entry="'+iEntry+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+oEntry['label']+'</span></div>';
-						}
-						else
-						{
+							sBreadCrumbHtml += '<div class="breadcrumb-item breadcrumb-current" breadcrumb-entry="'+iEntry+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+sLabel+'</span></div>';
+						} else {
 							var sSanitizedUrl = StripArchiveArgument(oEntry['url']);
-							sBreadCrumbHtml += '<div class="breadcrumb-item"><a class="breadcrumb-link" breadcrumb-entry="'+iEntry+'" href="'+sSanitizedUrl+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+oEntry['label']+'</span></a></div>';
+							sBreadCrumbHtml += '<div class="breadcrumb-item"><a class="breadcrumb-link" breadcrumb-entry="'+iEntry+'" href="'+sSanitizedUrl+'" title="'+sTitle+'">'+sIconSpec+'<span class="truncate">'+sLabel+'</span></a></div>';
 						}
 					}
 				}

js/jquery.blockUI.js

@@ -231,6 +231,8 @@
 			css = $.extend({}, $.blockUI.defaults.css, opts.css || {});
 			if (opts.onOverlayClick)
 				opts.overlayCSS.cursor = 'pointer';
+			if (opts.enableValidation)
+				opts.overlayCSS.cursor = 'not-allowed';
 
 			themedCSS = $.extend({}, $.blockUI.defaults.themedCSS, opts.themedCSS || {});
 			msg = msg === undefined ? opts.message : msg;
@@ -292,7 +294,12 @@
 				s = '<div class="blockUI ' + opts.blockMsgClass + ' blockPage" style="z-index:'+(z+10)+';display:none;position:fixed"></div>';
 			}
 			else {
-				s = '<div class="blockUI ' + opts.blockMsgClass + ' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>';
+				if (opts.enableValidation) {
+					s = '<div class="blockUI blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>';
+				}
+				else{
+					s = '<div class="blockUI '+opts.blockMsgClass+' blockElement" style="z-index:'+(z+10)+';display:none;position:absolute"></div>';
+				}
 			}
 			lyr3 = $(s);
 

js/jquery.treeview.js

@@ -179,19 +179,19 @@
 				else
 				{
 					$(this)
-					.parent()
+						.parent()
 						// swap classes for hitarea
 						.find(">.hitarea")
-							.replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-							.replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
+						.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
+						.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
 						.end()
 						// swap classes for parent li
-						.replaceClass( CLASSES.collapsable, CLASSES.expandable )
-						.replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+						.swapClass( CLASSES.collapsable, CLASSES.expandable )
+						.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
 						// find child lists
 						.find( ">ul" )
-							// toggle them
-							.heightToggleHide( settings.animated, settings.toggle );
+						// toggle them
+						.heightToggle( settings.animated, settings.toggle );
 				}
 
 				if ( settings.unique ) {
@@ -295,4 +295,4 @@
 	// provide backwards compability
 	$.fn.Treeview = $.fn.treeview;
 	
-})(jQuery);
+})(jQuery);

js/table-selectable-lines.js

@@ -101,7 +101,7 @@ $(document).ready(function () {
 		if ($eventTarget.is("a, button")) {
 			return true;
 		}
-		if ($eventTarget.parent().is('a, button')) {
+		if ($eventTarget.parent().is("a, button")) {
 			return true;
 		}
 		if ($eventTarget.is("input, select, option")) {

js/utils.js

@@ -388,13 +388,12 @@ function ToggleField(value, field_id) {
  */
 function BlockField(field_id, bBlocked) {
 	if (bBlocked) {
-		$('#'+field_id).block({message: ' ** disabled ** '});
+		$('#'+field_id).block({message: ' ** disabled ** ', enableValidation : true});
 	}
 	else {
 		$('#'+field_id).unblock();
 	}
 }
-
 /**
  * Updates (enables/disables) a "duration" field
  */
@@ -680,6 +679,31 @@ function DisplayHistory(sSelector, sFilter, iCount, iStart) {
 	);
 }
 
+/**
+ * @param sValue value to escape
+ * @param bReplaceAmp if false don't replace "&" (can be useful when sValue contrains html entities we want to keep)
+ * @returns {string} escaped value, ready to insert in the DOM without XSS risk
+ *
+ * @since 2.6.5, 2.7.2, 3.0.0 N°3332
+ * @see https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html#rule-1-html-encode-before-inserting-untrusted-data-into-html-element-content
+ * @see https://stackoverflow.com/questions/295566/sanitize-rewrite-html-on-the-client-side/430240#430240 why inserting in the DOM (for
+ *        example the text() JQuery way) isn't safe
+ */
+function EncodeHtml(sValue, bReplaceAmp) {
+	var sEncodedValue = (sValue+'')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;')
+		.replace(/"/g, '&quot;')
+		.replace(/'/g, '&#x27;')
+		.replace(/\//g, '&#x2F;');
+
+	if (bReplaceAmp) {
+		sEncodedValue = sEncodedValue.replace(/&/g, '&amp;');
+	}
+
+	return sEncodedValue;
+}
+
 // Very simple equivalent to format: placeholders are %1$s %2$d ...
 function Format() {
 	var args = [];
@@ -687,8 +711,7 @@ function Format() {
 	if (arguments[0] instanceof Array) {
 		str = arguments[0][0].toString();
 		args = arguments[0];
-	}
-	else {
+	} else {
 		str = arguments[0].toString();
 		if (arguments.length > 1) {
 			var t = typeof arguments[1];

lib/combodo/tcpdf/composer.json

@@ -6,8 +6,13 @@
   "homepage": "https://github.com/combodo-itop-libs/TCPDF",
   "type": "library",
   "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-only",
   "authors": [
+    {
+      "name": "Nicola Asuni",
+      "email": "info@tecnick.com",
+      "role": "lead"
+    },
     {
       "name": "Combodo",
       "email": "contact@combodo.com"

lib/composer/autoload_real.php

@@ -13,9 +13,6 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
         }
     }
 
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
     public static function getLoader()
     {
         if (null !== self::$loader) {

lib/composer/installed.json

@@ -6,12 +6,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-            "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc"
+            "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc",
-            "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc",
+            "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+            "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
             "shasum": ""
         },
         "require": {
@@ -20,7 +20,7 @@
         "replace": {
             "tecnickcom/tcpdf": "self.version"
         },
-        "time": "2020-06-05T13:06:44+00:00",
+        "time": "2020-09-28T12:19:09+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -45,22 +45,21 @@
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "LGPL-3.0"
+            "LGPL-3.0-only"
         ],
         "authors": [
+            {
+                "name": "Nicola Asuni",
+                "email": "info@tecnick.com",
+                "role": "lead"
+            },
             {
                 "name": "Combodo",
                 "email": "contact@combodo.com"
             }
         ],
         "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
-        "homepage": "https://github.com/combodo-itop-libs/TCPDF",
-        "funding": [
-            {
-                "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
-                "type": "custom"
-            }
-        ]
+        "homepage": "https://github.com/combodo-itop-libs/TCPDF"
     },
     {
         "name": "nikic/php-parser",
@@ -168,17 +167,17 @@
     },
     {
         "name": "pear/archive_tar",
-        "version": "1.4.9",
-        "version_normalized": "1.4.9.0",
+        "version": "1.4.10",
+        "version_normalized": "1.4.10.0",
         "source": {
             "type": "git",
             "url": "https://github.com/pear/Archive_Tar.git",
-            "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
+            "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
-            "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
+            "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+            "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
             "shasum": ""
         },
         "require": {
@@ -193,7 +192,7 @@
             "ext-xz": "Lzma2 compression support.",
             "ext-zlib": "Gzip compression support."
         },
-        "time": "2019-12-04T10:17:28+00:00",
+        "time": "2020-09-15T14:13:23+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {