N°1649 - Support blobs and images as external fields

The cherry picks resulted in an out of order apply of the commits, the result was that the wrong code was keeped

.editorconfig

@@ -1,30 +1,26 @@
-root = true
-
 [*]
 charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
-max_line_length = 300
+max_line_length = 140
 tab_width = 4
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = false
 ij_smart_tabs = false
-ij_visual_guides = 300
+ij_visual_guides = 80, 120, 140
 ij_wrap_on_typing = true
 
 [*.css]
 indent_style = tab
 ij_smart_tabs = true
-ij_visual_guides = none
 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 = end_of_line
-ij_css_enforce_quotes_on_format = false
+ij_css_brace_placement = 0
 ij_css_hex_color_long_format = false
 ij_css_hex_color_lower_case = false
 ij_css_hex_color_short_format = false
@@ -35,18 +31,59 @@ 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_use_double_quotes = true
-ij_css_value_alignment = do_not_align
+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
 
 [*.scss]
-indent_size = 2
-tab_width = 2
-ij_visual_guides = none
+indent_style = tab
 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
@@ -57,20 +94,17 @@ 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]
+indent_style = tab
 ij_smart_tabs = true
-ij_visual_guides = none
 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
 
 [.editorconfig]
-ij_visual_guides = none
 ij_editorconfig_align_group_field_declarations = false
 ij_editorconfig_space_after_colon = false
 ij_editorconfig_space_after_comma = true
@@ -78,44 +112,10 @@ 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_visual_guides = none
-ij_wrap_on_typing = false
-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 = off
-
-[{*.bash,*.sh,*.zsh}]
-indent_size = 2
-tab_width = 2
-ij_visual_guides = none
-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
 ij_smart_tabs = true
-ij_visual_guides = none
 ij_javascript_align_imports = false
 ij_javascript_align_multiline_array_initializer_expression = false
 ij_javascript_align_multiline_binary_operation = false
@@ -134,13 +134,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/**,**/node_modules/**,@angular/material,@angular/material/typings/**
+ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**/*
 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 = end_of_line
+ij_javascript_block_brace_style = next_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,15 +148,15 @@ 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 = always
-ij_javascript_else_on_new_line = false
+ij_javascript_do_while_brace_force = never
+ij_javascript_else_on_new_line = true
 ij_javascript_enforce_trailing_comma = keep
 ij_javascript_extends_keyword_wrap = off
 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 = always
+ij_javascript_for_brace_force = never
 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,9 +192,6 @@ 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
@@ -275,11 +272,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 = always
+ij_javascript_while_brace_force = never
 ij_javascript_while_on_new_line = false
 ij_javascript_wrap_comments = false
 
-[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}]
+[{*.module,*.hphp,*.phtml,*.php5,*.php4,*.php,*.ctp,*.inc}]
 indent_style = tab
 ij_continuation_indent_size = 4
 ij_smart_tabs = true
@@ -299,14 +296,12 @@ 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_attributes_wrap = off
-ij_php_author_weight = 8
+ij_php_author_weight = 7
 ij_php_binary_operation_sign_on_next_line = false
 ij_php_binary_operation_wrap = off
 ij_php_blank_lines_after_class_header = 0
@@ -323,8 +318,7 @@ 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_blank_lines_between_imports = 0
-ij_php_block_brace_style = end_of_line
+ij_php_block_brace_style = next_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
@@ -334,11 +328,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 = 2
+ij_php_deprecated_weight = 28
 ij_php_do_while_brace_force = always
 ij_php_else_if_style = as_is
-ij_php_else_on_new_line = false
-ij_php_example_weight = 4
+ij_php_else_on_new_line = true
+ij_php_example_weight = 3
 ij_php_extends_keyword_wrap = off
 ij_php_extends_list_wrap = off
 ij_php_fields_default_visibility = private
@@ -349,8 +343,6 @@ 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
@@ -370,8 +362,7 @@ 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 = false
-ij_php_keep_simple_classes_in_one_line = false
+ij_php_keep_rparen_and_lbrace_on_one_line = true
 ij_php_keep_simple_methods_in_one_line = false
 ij_php_lambda_brace_style = end_of_line
 ij_php_license_weight = 28
@@ -379,7 +370,6 @@ 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
@@ -390,11 +380,9 @@ 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 = 5
-ij_php_parameters_attributes_wrap = off
+ij_php_param_weight = 4
 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
@@ -411,12 +399,11 @@ 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 = 6
-ij_php_see_weight = 3
+ij_php_return_weight = 5
+ij_php_see_weight = 2
 ij_php_since_weight = 28
 ij_php_sort_phpdoc_elements = true
 ij_php_space_after_colon = true
-ij_php_space_after_colon_in_named_argument = true
 ij_php_space_after_colon_in_return_type = true
 ij_php_space_after_comma = true
 ij_php_space_after_for_semicolon = true
@@ -430,7 +417,6 @@ ij_php_space_before_catch_parentheses = true
 ij_php_space_before_class_left_brace = true
 ij_php_space_before_closure_left_parenthesis = true
 ij_php_space_before_colon = true
-ij_php_space_before_colon_in_named_argument = false
 ij_php_space_before_colon_in_return_type = false
 ij_php_space_before_comma = false
 ij_php_space_before_do_left_brace = true
@@ -447,7 +433,6 @@ 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
@@ -480,11 +465,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 = true
+ij_php_special_else_if_treatment = false
 ij_php_subpackage_weight = 28
 ij_php_ternary_operation_signs_on_next_line = false
 ij_php_ternary_operation_wrap = off
-ij_php_throws_weight = 7
+ij_php_throws_weight = 6
 ij_php_todo_weight = 28
 ij_php_unknown_tag_weight = 28
 ij_php_upper_case_boolean_const = false
@@ -496,25 +481,10 @@ ij_php_version_weight = 28
 ij_php_while_brace_force = always
 ij_php_while_on_new_line = false
 
-[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}]
-indent_size = 2
-ij_visual_guides = none
-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}]
+[{*.sht,*.htm,*.html,*.shtm,*.shtml}]
 indent_style = tab
 ij_smart_tabs = true
-ij_visual_guides = none
-ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3
+ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
 ij_html_align_attributes = true
 ij_html_align_text = false
 ij_html_attribute_wrap = normal
@@ -533,24 +503,209 @@ 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 = none
+ij_html_quote_style = double
 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
 
-[{*.yaml, *.yml}]
+[{*.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}]
 indent_size = 2
-ij_visual_guides = none
-ij_yaml_align_values_properties = do_not_align
-ij_yaml_autoinsert_sequence_marker = true
-ij_yaml_block_mapping_on_new_line = false
-ij_yaml_indent_sequence_value = true
+ij_continuation_indent_size = 2
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true
-ij_yaml_sequence_on_new_line = false
-ij_yaml_space_before_colon = false
-ij_yaml_spaces_within_braces = true
-ij_yaml_spaces_within_brackets = 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

.gitflow

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

.gitignore

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

.idea/codeStyles/Project.xml

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

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

.idea/encodings.xml

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

.idea/inspectionProfiles/Combodo.xml

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

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

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

.jenkins/bin/init/append_files.sh

@@ -0,0 +1,16 @@
+#!/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

@@ -0,0 +1,11 @@
+#!/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

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

.jenkins/bin/tests/phpunit.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+set -x
+
+cd test
+
+export DEBUG_UNIT_TEST=0
+RUN_NONREG_TESTS=0
+
+#USAGE ${debugMode} ${runNonRegOQLTests} "${coverture}" "${testFile}"
+
+if [ $# -ge 1 -a "x$1" == "xtrue" ]
+then
+  export DEBUG_UNIT_TEST=1
+else
+  export DEBUG_UNIT_TEST=0
+fi
+
+set -x
+OPTION=""
+if [ $# -ge 3 -a "x$3" == "xtrue" ]
+then
+  ##coverture
+  OPTION="-dxdebug.coverage_enable=1 --coverage-clover ../var/test/coverage.xml"
+fi
+
+TESTFILE="$4"
+if [ "x$TESTFILE" != "x" ]
+then
+  # shellcheck disable=SC2001
+  TESTFILE=$(echo "$TESTFILE" | sed 's|test/||1')
+  php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml $OPTION $TESTFILE --teamcity
+  exit 0
+fi
+
+if [ $# -ge 2 -a "x$2" == "xtrue" ]
+then
+  php vendor/bin/phpunit  --log-junit ../var/test/phpunit-log.junit.xml $OPTION --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 $OPTION --exclude-group OQL --teamcity
+fi

.jenkins/bin/unattended_install/default_env.sh

@@ -0,0 +1,8 @@
+#!/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

@@ -0,0 +1,284 @@
+<?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/default-params.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installation>
 <!-- On manual installs, this file is generated in setup/install-*.xml -->
-    <mode>install</mode>
+    <mode>upgrade</mode>
     <preinstall>
         <copies type="array"/>
     </preinstall>
@@ -20,7 +20,7 @@
         <db_tls_ca></db_tls_ca>
         <prefix></prefix>
     </database>
-    <url>http://localhost/iTop/</url>
+    <url>http://127.0.0.1/itop/svn/trunk/</url>
     <graphviz_path>/usr/bin/dot</graphviz_path>
     <admin_account>
         <user>admin</user>

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

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

@@ -1,90 +0,0 @@
-<?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;
-}

CONTRIBUTING.md

@@ -60,7 +60,7 @@ For example, if no version is currently prepared for shipping we could have:
 In this example, when 2.8.0-beta is shipped that will become:
 
 - `develop`: future 2.9.0 version
-- `release/2.8`: 2.8.0-beta
+- `release/2.8.0`: 2.8.0-beta
 - `support/2.7`: 2.7.x maintenance version
 - `support/2.6`: 2.6.x maintenance version
 - `support/2.5`: 2.5.x maintenance version

Jenkinsfile

@@ -1,11 +1,73 @@
-def infra
+pipeline {
+  agent any
+    parameters {
+        booleanParam(name: 'debugMode', defaultValue: 'false', description: 'Debug mode?')
+        string(name: 'testFile', defaultValue: '', description: 'Provide test file to execute. Example: test/core/LogAPITest.php')
+        booleanParam(name: 'coverture', defaultValue: 'false', description: 'Test coverture?')
+        booleanParam(name: 'runNonRegOQLTests', defaultValue: 'false', description: 'Do You want to run legacy OQL regression tests?')
+    }
+  stages {
 
-node(){
-  checkout scm
+    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'
+          }
+        }
+      }
+    }
 
-  infra = load '/var/lib/jenkins/workspace/itop-test-infra_master/src/Infra.groovy'
+    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} "${coverture}" "${testFile}"'
+          }
+        }
+      }
+    }
+
+  }
+
+  post {
+    always {
+      archiveArtifacts allowEmptyArchive:true, excludes: '.gitkeep', artifacts: 'var/test/*.xml'
+      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.call()
-

README.md

@@ -21,21 +21,35 @@ iTop also offers mass import tools and web services to integrate with your IT
 - [Data synchronization][18] (for data federation)
 
 
+## Latest release
+
+ - [Changes since the previous version][62]
+ - [New features][63]
+ - [Installation notes][64]
+ - [Download][65]
+
+[62]: https://www.itophub.io/wiki/page?id=latest:release:change_log
+[63]: https://www.itophub.io/wiki/page?id=latest:release:start
+[64]: https://www.itophub.io/wiki/page?id=latest:install:start
+[65]: https://sourceforge.net/projects/itop/files/latest/download
+
+
 ## Resources
 
  - [iTop Forums][1]: community support
  - [iTop Tickets][2]: for feature requests and bug reports
  - [Releases download][3]
- - [Documentation][4] covering both iTop and its official extensions
- - [iTop Hub][5] : discover and install extensions !
-
+ - [Software requirements][4]
+ - [Documentation][5] covering both iTop and its official extensions
+ - [iTop Hub][6] : discover and install extensions !
 
 
 [1]: https://sourceforge.net/p/itop/discussion/
 [2]: https://sourceforge.net/p/itop/tickets/
 [3]: https://sourceforge.net/projects/itop/files/itop/
-[4]: https://www.itophub.io/wiki
-[5]: https://store.itophub.io/en_US/
+[4]: https://www.itophub.io/wiki/page?id=latest:install:upgrading_itop
+[5]: https://www.itophub.io/wiki
+[6]: https://store.itophub.io/en_US/
 
 [10]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#configuration_management_cmdb
 [11]: https://www.itophub.io/wiki/page?id=latest%3Adatamodel%3Astart#ticketing
@@ -49,47 +63,6 @@ iTop also offers mass import tools and web services to integrate with your IT
 
 
 
-## Last releases
-
-### Versions 2.7.*
- - 2.7.1 published on April 8, 2020
- - [Changes since the previous version][62]
- - [New features][63]
- - [Migration notes][64]
- - [Download iTop 2.7.0-2][65]
-
-[62]: https://www.itophub.io/wiki/page?id=2_7_0:release:change_log
-[63]: https://www.itophub.io/wiki/page?id=2_7_0:release:2_7_whats_new
-[64]: https://www.itophub.io/wiki/page?id=2_7_0:install:260_to_270_migration_notes
-[65]: https://sourceforge.net/projects/itop/files/itop/2.7.0-2
-
-
-### Versions 2.6.*
- - 2.6.0 published on January 9, 2019
- - [Changes since the previous version][58]
- - [New features][59]
- - [Migration notes][60]
- - [Download iTop 2.6.3][61]
-
-[58]: https://www.itophub.io/wiki/page?id=2_6_0:release:change_log
-[59]: https://www.itophub.io/wiki/page?id=2_6_0:release:2_6_whats_new
-[60]: https://www.itophub.io/wiki/page?id=2_6_0:install:250_to_260_migration_notes
-[61]: https://sourceforge.net/projects/itop/files/itop/2.6.3
-
-
-### Versions 2.5.*
- - 2.5.0 published on July 11, 2018
- - [Changes since the previous version][54]
- - [New features][55]
- - [Migration notes][56]
- - [Download iTop 2.5.1][57]
-
-[54]: https://www.itophub.io/wiki/page?id=2_5_0:release:change_log
-[55]: https://www.itophub.io/wiki/page?id=2_5_0:release:2_5_whats_new
-[56]: https://www.itophub.io/wiki/page?id=2_5_0:install:240_to_250_migration_notes
-[57]: https://sourceforge.net/projects/itop/files/itop/2.5.1
-
-
 ## About Us
 
 iTop development is sponsored, led and supported by [Combodo][0].

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 = MetaModel::NewObject('Organization');
+			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
 			$iOrgId = $oOrg->DBInsertNoReload();
@@ -442,13 +442,17 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
 			{
-				$oContact = MetaModel::NewObject('Person');
+				$oContact = new 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();
 			}
@@ -557,7 +561,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * @param $oUser User
-	 * @return bool
+	 * @return array
 	 */
 	public function IsAdministrator($oUser)
 	{
@@ -567,22 +571,16 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	/**
 	 * @param $oUser User
-	 * @return bool
+	 * @return array
 	 */
 	public function IsPortalUser($oUser)
 	{
 		// UserRights caches the list for us
 		return UserRights::HasProfile(PORTAL_PROFILE_NAME, $oUser);
 	}
-
 	/**
 	 * @param $oUser User
-	 *
-	 * @return array
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \MySQLException
+	 * @return bool
 	 */
 	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 = MetaModel::NewObject('Organization');
+			$oOrg = new Organization();
 			$oOrg->Set('name', 'My Company/Department');
 			$oOrg->Set('code', 'SOMECODE');
 			$oOrg::SetCurrentChange($oChange);
@@ -544,13 +544,17 @@ class UserRightsProfile extends UserRightsAddOnAPI
 			// Support drastic data model changes: no Person class  (or not writable)!
 			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
 			{
-				$oContact = MetaModel::NewObject('Person');
+				$oContact = new 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();
@@ -707,7 +711,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
 
 	public function LoadCache()
 	{
-		if (!is_null($this->m_aProfiles)) return false;
+		if (!is_null($this->m_aProfiles)) return;
 		// Could be loaded in a shared memory (?)
 
 		$oKPI = new ExecutionKPI();

application/ajaxwebpage.class.inc.php

@@ -24,32 +24,31 @@ 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->no_cache();
-		$this->add_xframe_options();
+		$this->add_header("Cache-control: no-cache");
 		$this->m_oTabs = new TabManager();
 		$this->sContentType = 'text/html';
 		$this->sContentDisposition = 'inline';
 		$this->m_sMenu = "";
 
 		utils::InitArchiveMode();
-	}
+    }
 
 	/**
 	 * @inheritDoc

application/clipage.class.inc.php

@@ -29,9 +29,13 @@ require_once(APPROOT."/application/webpage.class.inc.php");
 
 class CLIPage implements Page
 {
-    function __construct($s_title)
+	/** @var string */
+	public $s_title;
+
+	function __construct($s_title)
     {
-    }	
+	    $this->s_title = $s_title;
+    }
 
     public function output()
     {
@@ -48,22 +52,22 @@ class CLIPage implements Page
 	public function add($sText)
 	{
 		echo $sText;
-	}	
+	}
 
 	public function p($sText)
 	{
 		echo $sText."\n";
-	}	
+	}
 
 	public function pre($sText)
 	{
 		echo $sText."\n";
-	}	
+	}
 
 	public function add_comment($sText)
 	{
 		echo "#".$sText."\n";
-	}	
+	}
 
 	public function table($aConfig, $aData, $aParams = array())
 	{
@@ -93,5 +97,3 @@ class CLIPage implements Page
 		}
 	}
 }
-
-?>

application/cmdbabstract.class.inc.php

@@ -558,6 +558,12 @@ 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);
@@ -603,9 +609,6 @@ 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))
@@ -3256,15 +3259,16 @@ EOF
 	 */
 	public function DisplayDocumentInline(WebPage $oPage, $sAttCode)
 	{
-		/** @var \ormDocument $oDoc */
 		$oDoc = $this->Get($sAttCode);
 		$sClass = get_class($this);
 		$Id = $this->GetKey();
-		switch ($oDoc->GetMainMimeType()) {
+		switch ($oDoc->GetMainMimeType())
+		{
 			case 'text':
 			case 'html':
 				$data = $oDoc->GetData();
-				switch ($oDoc->GetMimeType()) {
+				switch ($oDoc->GetMimeType())
+				{
 					case 'text/xml':
 						$oPage->add("<iframe id='preview_$sAttCode' src=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode\" width=\"100%\" height=\"400\">Loading...</iframe>\n");
 						break;
@@ -3792,24 +3796,19 @@ EOF
 				break;
 
 			case 'Image':
-				$value = null;
 				$oImage = utils::ReadPostedDocument("attr_{$sFormPrefix}{$sAttCode}", 'fcontents');
-				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')
-					);
-				}
+				$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,13 @@ 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->no_cache();
-		$this->add_xframe_options();
+    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");
 		//$this->add_header("Content-Transfer-Encoding: binary");
-	}
+    }	
 
     public function output()
     {

application/dashlet.class.inc.php

@@ -459,21 +459,17 @@ EOF
 					$sAttType = $aTargetAttCodes[$sTargetAttCode];
 					$sExtFieldAttCode = $sTargetAttCode;
 				}
-
-				$aForbidenAttType = [
-					'AttributeLinkedSet',
-					'AttributeFriendlyName',
-
-					'iAttributeNoGroupBy', //we cannot only use iAttributeNoGroupBy since this method is also used by the designer who do not have access to the classes' PHP reflection API. So the known classes has to be listed altogether
-					'AttributeOneWayPassword',
-					'AttributeEncryptedString',
-					'AttributePassword',
-				];
-				foreach ($aForbidenAttType as $sForbidenAttType) {
-					if (is_a($sAttType, $sForbidenAttType, true))
-					{
-						continue 2;
-					}
+				if (is_a($sAttType, 'AttributeLinkedSet', true))
+				{
+					continue;
+				}
+				if (is_a($sAttType, 'AttributeFriendlyName', true))
+				{
+					continue;
+				}
+				if (is_a($sAttType, 'AttributeOneWayPassword', true))
+				{
+					continue;
 				}
 
 				$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);

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.7">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
   <portals>
     <portal id="backoffice" _delta="define">
       <url>pages/UI.php</url>

application/displayblock.class.inc.php

@@ -446,21 +446,8 @@ class DisplayBlock
 			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, $aOrderBy, $aQueryParams);
 		}
 		$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
-
-		switch($this->m_sStyle) {
-			case 'list_search':
-			case 'list':
-				break;
-			default:
-				// N°3473: except for 'list_search' and 'list' (which have more granularity, see the other switch below),
-				// refuse to render if the user is not allowed to see the class.
-				if (! UserRights::IsActionAllowed($this->m_oSet->GetClass(), UR_ACTION_READ, $this->m_oSet) == UR_ALLOWED_YES) {
-					$sHtml .= $oPage->GetP(Dict::Format('UI:Error:ReadNotAllowedOn_Class', $this->m_oSet->GetClass()));
-					return $sHtml;
-				}
-		}
-
-		switch ($this->m_sStyle) {
+		switch($this->m_sStyle)
+		{
 			case 'count':
 			if (isset($aExtraParams['group_by']))
 			{

application/itopwebpage.class.inc.php

@@ -60,7 +60,8 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage
 			// Create a breadcrumb entry for the current page, but get its title as late as possible (page title could be changed later)
 			$this->bBreadCrumbEnabled = true;
 		}
-		else {
+		else
+		{
 			$this->bBreadCrumbEnabled = false;
 		}
 
@@ -70,22 +71,18 @@ 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->no_cache();
-		$this->add_xframe_options();
+		$this->add_header("Cache-control: no-cache");
 		$this->add_linked_stylesheet("../css/jquery.treeview.css");
-		$this->add_linked_stylesheet("../css/jquery.autocomplete.css");
 		$this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");
 		$this->add_linked_stylesheet("../css/jquery.multiselect.css");
 		$this->add_linked_stylesheet("../css/magnific-popup.css");
 		$this->add_linked_stylesheet("../css/c3.min.css");
 		$this->add_linked_stylesheet("../css/font-awesome/css/all.min.css");
-		$this->add_linked_stylesheet("../css/font-awesome/css/v4-shims.min.css");
 		$this->add_linked_stylesheet("../js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css");
 
 		$this->add_linked_script('../js/jquery.layout.min.js');
 		$this->add_linked_script('../js/jquery.ba-bbq.min.js');
 		$this->add_linked_script("../js/jquery.treeview.js");
-		$this->add_linked_script("../js/jquery.autocomplete.js");
 		$this->add_linked_script("../js/date.js");
 		$this->add_linked_script("../js/jquery-ui-timepicker-addon.js");
 		$this->add_linked_script("../js/jquery-ui-timepicker-addon-i18n.min.js");

application/loginwebpage.class.inc.php

@@ -78,21 +78,20 @@ 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->no_cache();
-		$this->add_xframe_options();
+		$this->add_header("Cache-control: no-cache");
 	}
 	
 	public function SetStyleSheet()
 	{
 		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css');
 		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css');
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/v4-shims.min.css');
 	}
 
 	public static function SetLoginFailedMessage($sMessage)
@@ -100,6 +99,44 @@ class LoginWebPage extends NiceWebPage
 		self::$m_sLoginFailedMessage = $sMessage;
 	}
 
+	/**
+	 * @param $oUser
+	 * @param array $aProfiles
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 */
+	public static function SynchroniseProfiles(&$oUser, array $aProfiles, $sOrigin)
+	{
+		$oProfilesSet = $oUser->Get(‘profile_list’);
+		//delete old profiles
+		$aExistingProfiles = [];
+		while ($oProfile = $oProfilesSet->Fetch())
+		{
+			array_push($aExistingProfiles, $oProfile->Get('profileid'));
+			$iArrayKey = array_search($oProfile->Get('profileid'), $aProfiles);
+			if (!$iArrayKey)
+			{
+				$oProfilesSet->RemoveItem($oProfile->Get('profileid'));
+			}
+			else
+			{
+				unset($aProfiles[$iArrayKey]);
+			}
+		}
+		//add profiles not already linked with user
+		foreach ($aProfiles as $iProfileId)
+		{
+			$oLink = new URP_UserProfile();
+			$oLink->Set('profileid', $iProfileId);
+			$oLink->Set('reason', $sOrigin);
+
+			$oProfilesSet->AddItem(MetaModel::NewObject('URP_UserProfile', array('profileid' => $iProfileId, 'reason' => $sOrigin)));
+		}
+		$oUser->Set('profile_list', $oProfilesSet);
+	}
+
 	public function DisplayLoginHeader($bMainAppLogo = false)
 	{
 		$sLogo = 'itop-logo-external.png';
@@ -685,7 +722,7 @@ class LoginWebPage extends NiceWebPage
 
 	public static function HTTPReload()
 	{
-		$sOriginURL = utils::GetCurrentAbsoluteUrl();
+		$sOriginURL = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 		if (!utils::StartsWith($sOriginURL, utils::GetAbsoluteUrlAppRoot()))
 		{
 			// If the found URL does not start with the configured AppRoot URL
@@ -886,20 +923,12 @@ class LoginWebPage extends NiceWebPage
 			}
 
 			// Now synchronize the profiles
-			$oProfilesSet = DBObjectSet::FromScratch('URP_UserProfile');
 			$sOrigin = 'External User provisioning';
 			if (isset($_SESSION['login_mode']))
 			{
 				$sOrigin .= " ({$_SESSION['login_mode']})";
 			}
-			foreach ($aProfiles as $iProfileId)
-			{
-				$oLink = new URP_UserProfile();
-				$oLink->Set('profileid', $iProfileId);
-				$oLink->Set('reason', $sOrigin);
-				$oProfilesSet->AddObject($oLink);
-			}
-			$oUser->Set('profile_list', $oProfilesSet);
+			$aExistingProfiles = self::SynchroniseProfiles($oUser, $aProfiles, $sOrigin);
 			if ($oUser->IsModified())
 			{
 				$oUser->DBWrite();

application/startup.inc.php

@@ -35,17 +35,7 @@ register_shutdown_function(function()
 	$sReservedMemory = null;
 	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
 	{
-		// 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);
+		IssueLog::error($err['message']);
 		if (strpos($err['message'], 'Allowed memory size of') !== false)
 		{
 			$sLimit = ini_get('memory_limit');

application/themehandler.class.inc.php

@@ -57,10 +57,6 @@ 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,14 +234,7 @@ class privUITransactionFile
 	 */
 	public static function IsTransactionValid($id, $bRemoveTransaction = true)
 	{
-		// 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;
-		}
-
+		$sFilepath = APPROOT.'data/transactions/'.$id;
 		clearstatcache(true, $sFilepath);
 		$bResult = file_exists($sFilepath);
 		if ($bResult)
@@ -297,19 +290,11 @@ class privUITransactionFile
 	 * Cleanup old transactions which have been pending since more than 24 hours
 	 * Use filemtime instead of filectime since filectime may be affected by operations on the directory (like changing the access rights)
 	 */
-	protected static function CleanupOldTransactions($sTransactionDir = null)
+	protected static function CleanupOldTransactions()
 	{
-		$iThreshold = (int) MetaModel::GetConfig()->Get('transactions_gc_threshold');
-		$iThreshold = min(100, $iThreshold);
-		$iThreshold = max(1, $iThreshold);
-		if ((100 != $iThreshold) && (rand(1, 100) > $iThreshold)) {
-			return;
-		}
-
-		clearstatcache();
 		$iLimit = time() - 24*3600;
-		$sPattern = $sTransactionDir ? "$sTransactionDir/*" : APPROOT.'data/transactions/*';
-		$aTransactions = glob($sPattern);
+		clearstatcache();
+		$aTransactions = glob(APPROOT.'data/transactions/*-*');
 		foreach($aTransactions as $sFileName)
 		{
 			if (filemtime($sFileName) < $iLimit)

application/ui.extkeywidget.class.inc.php

@@ -272,7 +272,7 @@ EOF
 			$iMinChars = isset($aArgs['iMinChars']) ? $aArgs['iMinChars'] : 3; //@@@ $this->oAttDef->GetMinAutoCompleteChars();
 
 			// the input for the auto-complete
-			$sHTMLValue .= "<input class=\"field_autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
+			$sHTMLValue .= "<input id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
 			$sHTMLValue .= "<span class=\"field_input_btn\"><div class=\"mini_button\"  id=\"mini_search_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.Search();\"><i class=\"fas fa-search\"></i></div></span>";
 
 			// another hidden input to store & pass the object's Id
@@ -281,18 +281,53 @@ EOF
 			$JSSearchMode = $this->bSearchMode ? 'true' : 'false';
 			// Scripts to start the autocomplete and bind some events to it
 			$oPage->add_ready_script(
-<<<EOF
-		oACWidget_{$this->iId} = new ExtKeyWidget('{$this->iId}', '{$this->sTargetClass}', '$sFilter', '$sTitle', false, $sWizHelper, '{$this->sAttCode}', $sJSSearchMode, $sJSDoSearch);
-		oACWidget_{$this->iId}.emptyHtml = "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>$sMessage</p></div>";
-		$('#label_$this->iId').autocomplete(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', { scroll:true, minChars:{$iMinChars}, autoFill:false, matchContains:true, mustMatch: true, keyHolder:'#{$this->iId}', extraParams:{operation:'ac_extkey', sTargetClass:'{$this->sTargetClass}',sFilter:'$sFilter',bSearchMode:$JSSearchMode, json: function() { return $sWizHelperJSON; } }});
-		$('#label_$this->iId').keyup(function() { if ($(this).val() == '') { $('#$this->iId').val(''); } } ); // Useful for search forms: empty value in the "label", means no value, immediatly !
-		$('#label_$this->iId').result( function(event, data, formatted) { OnAutoComplete('{$this->iId}', event, data, formatted); } );
-		$('#$this->iId').bind('update', function() { oACWidget_{$this->iId}.Update(); } );
+<<<JS
+		$('#label_$this->iId').autocomplete({
+			source: function( request, response ) {
+		        $.post( {
+		          url: GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+		          dataType: "json",
+		          data: {
+		          	q:request.term,
+	                operation:'ac_extkey', 
+					sTargetClass:'{$this->sTargetClass}',
+					sFilter:'$sFilter',
+					bSearchMode:$JSSearchMode, 
+					sOutputFormat:'json',
+					json: function() { return $sWizHelperJSON; } 
+		          },
+		          success: function( data ) {
+		          	response( data );
+		          }
+		        } );
+		    },
+			autoFocus: true,    
+			minLength:{$iMinChars}, 			 
+		    select: function( event, ui ) {
+		        $('#$this->iId').val( ui.item.value );
+		        $('#label_$this->iId').val( ui.item.label );		        
+				$('#$this->iId').trigger('validate');
+				$('#$this->iId').trigger('extkeychange');
+				$('#$this->iId').trigger('change');
+		        return false;
+		    }			 
+		})
+		.autocomplete( "instance" )._renderItem = function( ul, item ) {
+		  var term = this.term.replace("/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi", "\\$1");
+		  var val = item.label.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>");
+		  if (item.obsolete == 'yes'){ 
+		  	val = val + ' <b>old</b>';
+		  }
+	      return $( "<li>" )
+	        .append( val )
+	        .appendTo( ul );
+	    };
+		
 		if ($('#ac_dlg_{$this->iId}').length == 0)
 		{
 			$('body').append('<div id="ac_dlg_{$this->iId}"></div>');
 		}
-EOF
+JS
 );
 		}
 		if ($bExtensions && MetaModel::IsHierarchicalClass($this->sTargetClass) !== false)
@@ -441,10 +476,12 @@ EOF
 		$iMax = 150;
 		$oValuesSet->SetLimit($iMax);
 		$oValuesSet->SetSort(false);
+		$aOrder = array('friendlyname'=>true);
+		$oValuesSet->SetOrderBy($aOrder);
+		$oValuesSet->SetSort(true);
 		$oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode);
 		$oValuesSet->SetLimit($iMax);
-		$aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains');
-		asort($aValuesContains);
+		$aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with');
 		$aValues = array();
 		foreach($aValuesContains as $sKey => $sFriendlyName)
 		{
@@ -453,6 +490,24 @@ EOF
 				$aValues[$sKey] = $sFriendlyName;
 			}
 		}
+		if (sizeof($aValuesContains) < $iMax)
+		{
+			$aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains,
+				'contains');
+			//asort($aValuesContains);
+			$iSize=sizeof($aValuesContains);
+			foreach($aValuesContains as $sKey => $sFriendlyName)
+			{
+				if (!isset($aValues[$sKey]))
+				{
+					$aValues[$sKey] = $sFriendlyName;
+					if (++$iSize >= $iMax)
+					{
+						break;
+					}
+				}
+			}
+		}
 
 		switch($sOutputFormat)
 		{

application/utils.inc.php

@@ -307,7 +307,6 @@ class utils
 			case 'context_param':
 			case 'parameter':
 			case 'field_name':
-			case 'transaction_id':
 				if (is_array($value))
 				{
 					$retValue = array();
@@ -782,42 +781,22 @@ class utils
 		}
 	}
 
-	/**
-	 * @return bool The boolean value of the conf. "behind_reverse_proxy" (except if there is no REMOTE_ADDR int his case, it return false)
-	 *
-	 * @since 2.7.4
-	 */
-	public static function IsProxyTrusted()
-	{
-		if (empty($_SERVER['REMOTE_ADDR'])) {
-			return false;
-		}
-
-		$bTrustProxies = (bool) self::GetConfig()->Get('behind_reverse_proxy');
-
-		return $bTrustProxies;
-	}
-
     /**
      * Returns the absolute URL to the application root path
      *
-     * @param bool $bForceTrustProxy
-     *
      * @return string The absolute URL to the application root, without the first slash
      *
      * @throws \Exception
-     *
-     * @since 2.7.4 $bForceTrustProxy param added
      */
-	public static function GetAbsoluteUrlAppRoot($bForceTrustProxy = false)
+	public static function GetAbsoluteUrlAppRoot()
 	{
 		static $sUrl = null;
-		if ($sUrl === null || $bForceTrustProxy)
+		if ($sUrl === null)
 		{
 			$sUrl = self::GetConfig()->Get('app_root_url');
 			if ($sUrl == '')
 			{
-				$sUrl = self::GetDefaultUrlAppRoot($bForceTrustProxy);
+				$sUrl = self::GetDefaultUrlAppRoot();
 			}
 			elseif (strpos($sUrl, SERVER_NAME_PLACEHOLDER) > -1)
 			{
@@ -841,116 +820,31 @@ class utils
 	 * For most usages, when an root url is needed, use utils::GetAbsoluteUrlAppRoot() instead as uses this only as a fallback when the
 	 * app_root_url conf parameter is not defined.
 	 *
-	 * @param bool $bForceTrustProxy
-	 *
 	 * @return string
 	 *
 	 * @throws \Exception
-	 *
-	 * @since 2.7.4 $bForceTrustProxy param added
-	 */
-	public static function GetDefaultUrlAppRoot($bForceTrustProxy = false)
-	{
-		$sAbsoluteUrl = self::GetCurrentAbsoluteUrl($bForceTrustProxy, true);
-
-		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
-		$sAppRoot       = realpath(APPROOT);
-
-		return self::GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl);
-	}
-
-
-	/**
-	 * Build the current absolute URL from the server's variables.
-	 *
-	 * For almost every usage, you should use the more secure utils::GetAbsoluteUrlAppRoot() : instead of reading the current uri, it provide you the configured application's root URL (this is done during the setup and chn be changed in the configuration file)
-	 *
-	 * @see utils::GetAbsoluteUrlAppRoot
-	 *
-	 * @param bool $bForceTrustProxy
-	 * @param bool $bTrimQueryString
-	 *
-	 * @return string
-	 *
-	 * @since 2.7.4
-	 */
-	public static function GetCurrentAbsoluteUrl($bForceTrustProxy = false, $bTrimQueryString = false)
+     */
+    public static function GetDefaultUrlAppRoot()
 	{
 		// Build an absolute URL to this page on this server/port
-		$sServerName = self::GetServerName($bForceTrustProxy);
-		$bIsSecure = self::IsConnectionSecure($bForceTrustProxy);
-		$sProtocol = $bIsSecure ? 'https' : 'http';
-		$iPort = self::GetServerPort($bForceTrustProxy);
-		if ($bIsSecure) {
-			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
-		} else {
+		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
+		$sProtocol = self::IsConnectionSecure() ? 'https' : 'http';
+		$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
+		if ($sProtocol == 'http')
+		{
 			$sPort = ($iPort == 80) ? '' : ':'.$iPort;
 		}
-
-		$sPath = self::GetRequestUri($bForceTrustProxy);
-
-		if ($bTrimQueryString) {
-			// remove all the parameters from the query string
-			$iQuestionMarkPos = strpos($sPath, '?');
-			if ($iQuestionMarkPos !== false) {
-				$sPath = substr($sPath, 0, $iQuestionMarkPos);
-			}
+		else
+		{
+			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
 		}
-
-		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
-
-		return $sAbsoluteUrl;
-	}
-
-	/**
-	 * @param bool $bForceTrustProxy
-	 *
-	 * @return string
-	 *
-	 * @since 2.7.4
-	 */
-	public static function GetServerName($bForceTrustProxy = false)
-	{
-		$bTrustProxy = $bForceTrustProxy || self::IsProxyTrusted();
-
-		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-
-		if ($bTrustProxy) {
-			$sServerName = isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $sServerName;
-		}
-
-		return $sServerName;
-	}
-
-	/**
-	 * @param bool $bForceTrustProxy
-	 *
-	 * @return int|mixed
-	 * @since 2.7.4
-	 */
-	public static function GetServerPort($bForceTrustProxy = false)
-	{
-		$bTrustProxy = $bForceTrustProxy || self::IsProxyTrusted();
-
-		$sServerPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
-
-		if ($bTrustProxy) {
-			$sServerPort = isset($_SERVER['HTTP_X_FORWARDED_PORT']) ? $_SERVER['HTTP_X_FORWARDED_PORT'] : $sServerPort;
-		}
-
-		return $sServerPort;
-	}
-
-	/**
-	 * @return string
-	 *
-	 * @since 2.7.4
-	 */
-	public static function GetRequestUri()
-	{
 		// $_SERVER['REQUEST_URI'] is empty when running on IIS
 		// Let's use Ivan Tcholakov's fix (found on www.dokeos.com)
-		if (empty($_SERVER['REQUEST_URI']))
+		if (!empty($_SERVER['REQUEST_URI']))
+		{
+			$sPath = $_SERVER['REQUEST_URI'];
+		}
+		else
 		{
 			$sPath = $_SERVER['SCRIPT_NAME'];
 			if (!empty($_SERVER['QUERY_STRING']))
@@ -961,7 +855,18 @@ class utils
 		}
 		$sPath = $_SERVER['REQUEST_URI'];
 
-		return $sPath;
+		// remove all the parameters from the query string
+		$iQuestionMarkPos = strpos($sPath, '?');
+		if ($iQuestionMarkPos !== false)
+		{
+			$sPath = substr($sPath, 0, $iQuestionMarkPos);
+		}
+		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
+
+		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
+		$sAppRoot       = realpath(APPROOT);
+
+		return self::GetAppRootUrl($sCurrentScript, $sAppRoot, $sAbsoluteUrl);
 	}
 
 	/**
@@ -1005,36 +910,19 @@ class utils
 	/**
 	 * Helper to handle the variety of HTTP servers
 	 * See N°286 (fixed in [896]), and N°634 (this fix)
-	 *
+	 * 	 
 	 * Though the official specs says 'a non empty string', some servers like IIS do set it to 'off' !
 	 * nginx set it to an empty string
-	 * Others might leave it unset (no array entry)
-	 *
-	 * @param bool $bForceTrustProxy
-	 *
-	 * @return bool
-	 *
-	 * @since 2.7.4 reverse proxies handling
-	 */
-	public static function IsConnectionSecure($bForceTrustProxy = false)
+	 * Others might leave it unset (no array entry)	 
+	 */	 	
+	public static function IsConnectionSecure()
 	{
 		$bSecured = false;
 
-		$bTrustProxy = $bForceTrustProxy || self::IsProxyTrusted();
-
-		if ($bTrustProxy && !empty($_SERVER['HTTP_X_FORWARDED_PROTO']))
-		{
-			$bSecured = ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');
-		}
-		elseif ($bTrustProxy && !empty($_SERVER['HTTP_X_FORWARDED_PROTOCOL']))
-		{
-			$bSecured = ($_SERVER['HTTP_X_FORWARDED_PROTOCOL'] === 'https');
-		}
-		elseif ((!empty($_SERVER['HTTPS'])) && (strtolower($_SERVER['HTTPS']) != 'off'))
+		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off'))
 		{
 			$bSecured = true;
 		}
-
 		return $bSecured;
 	}
 
@@ -2200,41 +2088,6 @@ 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.
 	 *
@@ -2335,7 +2188,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|string false if path :
+	 * @return bool false if path :
 	 *      * invalid
 	 *      * not allowed
 	 *      * not contained in base path
@@ -2426,35 +2279,4 @@ 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;
-	}
-
-	/**
-	 * @return bool : indicate whether we run under a windows environnement or not
-	 * @since 2.7.4 : N°3412
-	 */
-	public static function IsWindowsEnvironment(){
-		return (substr(PHP_OS,0,3) === 'WIN');
-	}
-
 }

application/webpage.class.inc.php

@@ -482,31 +482,13 @@ class WebPage implements Page
 		$this->a_headers[] = $s_header;
 	}
 
-	/**
-	 * @param string|null $sHeaderValue for example `SAMESITE`. If null will set the header using the config parameter value.
-	 *
-	 * @since 2.7.3 3.0.0 N°3416
-	 * @uses security_header_xframe config parameter
-	 * @uses \utils::GetConfig()
-	 * @link https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options
-	 */
-	public function add_xframe_options($sHeaderValue = null)
-	{
-		if (is_null($sHeaderValue)) {
-			$sHeaderValue = utils::GetConfig()->Get('security_header_xframe');
-		}
-
-		$this->add_header('X-Frame-Options: '.$sHeaderValue);
-	}
-
 	/**
 	 * Add needed headers to the page so that it will no be cached
 	 */
 	public function 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("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
 	}
 
 	/**
@@ -1564,12 +1546,6 @@ 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,10 +43,9 @@ class XMLPage extends WebPage
 		$this->m_bPassThrough = $bPassThrough;
 		$this->m_bHeaderSent = false;
 		$this->add_header("Content-type: text/xml; charset=".self::PAGES_CHARSET);
-		$this->no_cache();
-		$this->add_xframe_options();
+		$this->add_header("Cache-control: no-cache");
 		$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.10",
+    "pear/archive_tar": "1.4.9",
     "pelago/emogrifier": "2.1.0",
     "scssphp/scssphp": "1.0.6",
     "swiftmailer/swiftmailer": "5.4.12",
@@ -51,8 +51,7 @@
       "core",
       "application",
       "sources/application",
-      "sources/Composer",
-      "sources/Controller"
+      "sources/Composer"
     ],
     "exclude-from-classmap": [
       "core/dbobjectsearch.class.php",

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": "27af144ea2acf2c138f587052a4ceddc",
+    "content-hash": "ad359769d05acd25a9fc31d69acbe43a",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
+                "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
-                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/abbfedb8ca59843dec11c97ca3f308742265c3fc",
+                "reference": "abbfedb8ca59843dec11c97ca3f308742265c3fc",
                 "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-09-28T12:19:09+00:00"
+            "time": "2020-06-05T13:06:44+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -168,16 +168,16 @@
         },
         {
             "name": "pear/archive_tar",
-            "version": "1.4.10",
+            "version": "1.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Archive_Tar.git",
-                "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b"
+                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
-                "reference": "bbb4f10f71a1da2715ec6d9a683f4f23c507a49b",
+                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",
+                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",
                 "shasum": ""
             },
             "require": {
@@ -230,7 +230,7 @@
                 "archive",
                 "tar"
             ],
-            "time": "2020-09-15T14:13:23+00:00"
+            "time": "2019-12-04T10:17:28+00:00"
         },
         {
             "name": "pear/console_getopt",

core/action.class.inc.php

@@ -35,6 +35,10 @@ require_once(APPROOT.'/core/email.class.inc.php');
  */
 abstract class Action extends cmdbAbstractObject
 {
+	/**
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -57,15 +61,32 @@ abstract class Action extends cmdbAbstractObject
 		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// - Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
+		// - Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status'));
 		// Search criteria
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		// - Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status'));
+		// - Criteria of the advanced search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name'));
 	}
 
+	/**
+	 * Encapsulate the execution of the action and handle failure & logging
+	 *
+	 * @param \Trigger $oTrigger
+	 * @param array $aContextArgs
+	 *
+	 * @return mixed
+	 */
 	abstract public function DoExecute($oTrigger, $aContextArgs);
 
+	/**
+	 * @return bool
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function IsActive()
 	{
 		switch($this->Get('status'))
@@ -79,6 +100,13 @@ abstract class Action extends cmdbAbstractObject
 		}
 	}
 
+	/**
+	 * Return true if the current action status is set on "test"
+	 *
+	 * @return bool
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function IsBeingTested()
 	{
 		switch($this->Get('status'))
@@ -99,6 +127,10 @@ abstract class Action extends cmdbAbstractObject
  */
 abstract class ActionNotification extends Action
 {
+	/**
+	 * @inheritDoc
+	 * @throws \CoreException
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -117,11 +149,15 @@ abstract class ActionNotification extends Action
 		MetaModel::Init_InheritAttributes();
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// - Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list'));
+		// - Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status'));
 		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		// - Criteria of the std search form
+//		MetaModel::Init_SetZListItems('standard_search', array('name'));
+		// - Criteria of the advanced search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name'));
 	}
 }
 
@@ -132,6 +168,9 @@ abstract class ActionNotification extends Action
  */
 class ActionEmail extends ActionNotification
 {
+	/**
+	 * @inheritDoc
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -161,11 +200,15 @@ class ActionEmail extends ActionNotification
 		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array())));
 
 		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
+		// - Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list'));
+		// - Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject'));
 		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+		// - Criteria of the std search form
+		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject'));
+		// - Criteria of the advanced search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name'));
 	}
 
 	// count the recipients found
@@ -175,7 +218,18 @@ class ActionEmail extends ActionNotification
 	// executed in the background, while making sure that any issue would be reported clearly
 	protected $m_aMailErrors; //array of strings explaining the issue
 
-	// returns a the list of emails as a string, or a detailed error description
+	/**
+	 * Return a the list of emails as a string, or a detailed error description
+	 *
+	 * @param string $sRecipAttCode
+	 * @param array $aArgs
+	 *
+	 * @return string
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \MySQLException
+	 */
 	protected function FindRecipients($sRecipAttCode, $aArgs)
 	{
 		$sOQL = $this->Get($sRecipAttCode);
@@ -224,9 +278,7 @@ class ActionEmail extends ActionNotification
 	}
 
 	/**
-	 * @param \Trigger $oTrigger
-	 * @param array $aContextArgs
-	 *
+	 * @inheritDoc
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
 	 * @throws \CoreWarning
@@ -306,6 +358,7 @@ class ActionEmail extends ActionNotification
 	 *
 	 * @return string
 	 * @throws \CoreException
+	 * @throws \Exception
 	 */
 	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
 	{
@@ -316,7 +369,7 @@ class ActionEmail extends ActionNotification
 			$this->m_aMailErrors = array();
 			$bRes = false; // until we do succeed in sending the email
 	
-			// Determine recicipients
+			// Determine recipients
 			//
 			$sTo = $this->FindRecipients('to', $aContextArgs);
 			$sCC = $this->FindRecipients('cc', $aContextArgs);
@@ -439,4 +492,3 @@ class ActionEmail extends ActionNotification
 		}
 	}
 }
-?>

core/asynctask.class.inc.php

@@ -65,6 +65,10 @@ class ExecAsyncTask implements iBackgroundProcess
  */
 abstract class AsyncTask extends DBObject
 {
+	/**
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
 	public static function Init()
 	{
 		$aParams = array
@@ -285,11 +289,13 @@ abstract class AsyncTask extends DBObject
 
 	/**
 	 * Throws an exception (message and code)
+	 *
+	 * @return string
 	 */	 	
 	abstract public function DoProcess();
 
 	/**
-	 * Describes the error codes that DoProcess can return by the mean of exceptions	
+	 * Describes the error codes that DoProcess can return by the mean of exceptions
 	 */	
 	static public function EnumErrorCodes()
 	{
@@ -352,6 +358,11 @@ class AsyncSendEmail extends AsyncTask
 		$oNew->DBInsert();
 	}
 
+	/**
+	 * @inheritDoc
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
 	public function DoProcess()
 	{
 		$sMessage = $this->Get('message');

core/attributedef.class.inc.php

@@ -18,7 +18,6 @@
  */
 
 use Combodo\iTop\Form\Field\LabelField;
-use Combodo\iTop\Form\Field\TextAreaField;
 use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
 use Combodo\iTop\Form\Validator\Validator;
 
@@ -103,14 +102,6 @@ define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
 define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
 define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
 
-/**
- * Attributes implementing this interface won't be accepted as `group by` field
- * @since 2.7.4 N°3473
- */
-interface iAttributeNoGroupBy
-{
-	//no method, just a contract on implement
-}
 
 /**
  * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.)
@@ -751,7 +742,7 @@ abstract class AttributeDefinition
 	 *
 	 * @return mixed a value out of suffix/value pairs, for SELECT result interpretation
 	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		return null;
 	}
@@ -2411,9 +2402,9 @@ class AttributeDBFieldVoid extends AttributeDefinition
 		return $aColumns;
 	}
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
-		$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+		$value = $this->MakeRealValue($aCols[$sPrefix.''], $oHostObject);
 
 		return $value;
 	}
@@ -3769,7 +3760,7 @@ class AttributeFinalClass extends AttributeString
  *
  * @package     iTopORM
  */
-class AttributePassword extends AttributeString implements iAttributeNoGroupBy
+class AttributePassword extends AttributeString
 {
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -3845,7 +3836,7 @@ class AttributePassword extends AttributeString implements iAttributeNoGroupBy
  *
  * @package     iTopORM
  */
-class AttributeEncryptedString extends AttributeString implements iAttributeNoGroupBy
+class AttributeEncryptedString extends AttributeString
 {
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -3922,7 +3913,7 @@ class AttributeEncryptedString extends AttributeString implements iAttributeNoGr
 	 * @return string
 	 * @throws \Exception
 	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$oSimpleCrypt = new SimpleCrypt(self::$sLibrary);
 		$sValue = $oSimpleCrypt->Decrypt(self::$sKey, $aCols[$sPrefix]);
@@ -4292,7 +4283,7 @@ class AttributeText extends AttributeString
 	 *
 	 * @return string
 	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$value = $aCols[$sPrefix.''];
 		if ($this->GetOptional('format', null) != null)
@@ -4586,7 +4577,7 @@ class AttributeCaseLog extends AttributeLongText
 	 * @return \ormCaseLog
 	 * @throws \MissingColumnException
 	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		if (!array_key_exists($sPrefix, $aCols))
 		{
@@ -7387,18 +7378,18 @@ class AttributeExternalField extends AttributeDefinition
 	//public function GetSQLExpressions($sPrefix = '') {return array();}
 
 	// Here, we get the data...
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$oExtAttDef = $this->GetExtAttDef();
 
-		return $oExtAttDef->FromSQLToValue($aCols, $sPrefix);
+		return $oExtAttDef->FromSQLToValue($aCols, $sPrefix, $oHostObject, $sHostAttCode);
 	}
 
 	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
 	{
 		$oExtAttDef = $this->GetExtAttDef();
 
-		return $oExtAttDef->GetAsHTML($value, null, $bLocalize);
+		return $oExtAttDef->GetAsHTML($value, $oHostObject, $bLocalize);
 	}
 
 	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
@@ -7458,12 +7449,6 @@ 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)
@@ -7481,16 +7466,6 @@ 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';
-	}
 }
 
 
@@ -7670,6 +7645,10 @@ class AttributeBlob extends AttributeDefinition
 
 		if (is_object($proposedValue))
 		{
+			if (!$proposedValue instanceof ormDocument)
+			{
+				throw new Exception(__METHOD__.": unexpected class ".get_class($proposedValue));
+			}
 			$proposedValue = clone $proposedValue;
 		}
 		else
@@ -7686,6 +7665,7 @@ class AttributeBlob extends AttributeDefinition
 			}
 		}
 
+		$proposedValue->SetHostObject($oHostObj, $this->GetCode());
 		return $proposedValue;
 	}
 
@@ -7704,7 +7684,7 @@ class AttributeBlob extends AttributeDefinition
 		return $aColumns;
 	}
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		if (!array_key_exists($sPrefix, $aCols))
 		{
@@ -7728,7 +7708,7 @@ class AttributeBlob extends AttributeDefinition
 		$sFileName = isset($aCols[$sPrefix.'_filename']) ? $aCols[$sPrefix.'_filename'] : '';
 
 		$value = new ormDocument($data, $sMimeType, $sFileName);
-
+		$value->SetHostObject($oHostObject, $sHostAttCode);
 		return $value;
 	}
 
@@ -7970,18 +7950,6 @@ class AttributeImage extends AttributeBlob
 		return "Image";
 	}
 
-	/**
-	 * {@inheritDoc}
-	 * @see AttributeBlob::MakeRealValue()
-	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oDoc = parent::MakeRealValue($proposedValue, $oHostObj);
-
-		// The validation of the MIME Type is done by CheckFormat below
-		return $oDoc;
-	}
-
 	/**
 	 * Check that the supplied ormDocument actually contains an image
 	 * {@inheritDoc}
@@ -8256,7 +8224,7 @@ class AttributeStopWatch extends AttributeDefinition
 		return date("Y-m-d H:i:s", $iSeconds);
 	}
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$aExpectedCols = array($sPrefix, $sPrefix.'_started', $sPrefix.'_laststart', $sPrefix.'_stopped');
 		foreach($this->ListThresholds() as $iThreshold => $aFoo)
@@ -9093,7 +9061,7 @@ class AttributeSubItem extends AttributeDefinition
 	// 
 //	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 	}
 
@@ -9225,7 +9193,7 @@ class AttributeSubItem extends AttributeDefinition
 /**
  * One way encrypted (hashed) password
  */
-class AttributeOneWayPassword extends AttributeDefinition implements iAttributeNoGroupBy
+class AttributeOneWayPassword extends AttributeDefinition
 {
 	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
 
@@ -9311,7 +9279,7 @@ class AttributeOneWayPassword extends AttributeDefinition implements iAttributeN
 		return $aColumns;
 	}
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		if (!array_key_exists($sPrefix, $aCols))
 		{
@@ -9508,7 +9476,7 @@ class AttributeTable extends AttributeDBField
 		return $proposedValue;
 	}
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		try
 		{
@@ -9523,11 +9491,11 @@ class AttributeTable extends AttributeDBField
 			}
 			if ($value === false)
 			{
-				$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+				$value = $this->MakeRealValue($aCols[$sPrefix.''], $oHostObject);
 			}
 		} catch (Exception $e)
 		{
-			$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+			$value = $this->MakeRealValue($aCols[$sPrefix.''], $oHostObject);
 		}
 
 		return $value;
@@ -9922,11 +9890,11 @@ abstract class AttributeSet extends AttributeDBFieldVoid
 	 * @return mixed
 	 * @throws \Exception
 	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$sValue = $aCols["$sPrefix"];
 
-		return $this->MakeRealValue($sValue, null, true);
+		return $this->MakeRealValue($sValue, $oHostObject, true);
 	}
 
 	/**
@@ -11071,7 +11039,7 @@ class AttributeTagSet extends AttributeSet
 	 * @throws \CoreException
 	 * @throws \Exception
 	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$sValue = $aCols["$sPrefix"];
 
@@ -11653,7 +11621,7 @@ class AttributeFriendlyName extends AttributeDefinition
 		return $sLabel;
 	}
 
-	public function FromSQLToValue($aCols, $sPrefix = '')
+	public function FromSQLToValue($aCols, $sPrefix = '', $oHostObject = null, $sHostAttCode = null)
 	{
 		$sValue = $aCols[$sPrefix];
 

core/backgroundtask.class.inc.php

@@ -26,24 +26,6 @@
  */
 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(utils::HtmlEntities($aRowData[$iCol]));
+			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 		}
 
 		$oExtObjects = new CMDBObjectSet($oReconFilter);
@@ -363,7 +363,6 @@ class BulkChange
 				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 				{
 					// Default reporting
-					// $aRowData[$iCol] is always null
 					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
 				if ($oExtKey->IsNullAllowed())
@@ -396,7 +395,7 @@ class BulkChange
 					}
 					$aCacheKeys[] = $value;
 					$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
-					$aResults[$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
+					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
 				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
 				$iForeignKey = null;
@@ -466,7 +465,7 @@ class BulkChange
 						foreach ($aKeyConfig as $sForeignAttCode => $iCol)
 						{
 							// Report the change on reconciliation values as well
-							$aResults[$iCol] = new CellStatus_Modify(utils::HtmlEntities($aRowData[$iCol]));
+							$aResults[$iCol] = new CellStatus_Modify($aRowData[$iCol]);
 						}
 					}
 				}
@@ -539,7 +538,7 @@ class BulkChange
 		{
 			if ($sAttCode == 'id')
 			{
-				$aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
+				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
 			}
 			else
 			{
@@ -555,7 +554,7 @@ class BulkChange
 				}
 				if (isset($aErrors[$sAttCode]))
 				{
-					$aResults[$iCol]= new CellStatus_Issue(utils::HtmlEntities($aRowData[$iCol]), $sOrigValue, $aErrors[$sAttCode]);
+					$aResults[$iCol]= new CellStatus_Issue($aRowData[$iCol], $sOrigValue, $aErrors[$sAttCode]);
 				}
 				elseif (array_key_exists($sAttCode, $aChangedFields))
 				{
@@ -578,7 +577,7 @@ class BulkChange
 					}
 					else
 					{
-						$aResults[$iCol]= new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
+						$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
 					}
 				}
 			}
@@ -925,7 +924,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, utils::HtmlEntities($this->m_aData[$iRow][$iCol]), 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'));
 								}
 							}
 						}
@@ -1083,7 +1082,7 @@ class BulkChange
 			{
 				if (!array_key_exists($iCol, $aResult[$iRow]))
 				{
-					$aResult[$iRow][$iCol] = new CellStatus_Void(utils::HtmlEntities($aRowData[$iCol]));
+					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
 				}
 			}
 			foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts)
@@ -1097,7 +1096,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(utils::HtmlEntities($aRowData[$iCol]));
+						$aResult[$iRow][$iCol] = new CellStatus_Void($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,11 +420,6 @@ abstract class BulkExport
 	public function GetStatistics()
 	{
 		
-	}
-
-	public function SetFields($sFields)
-	{
-
 	}
 	
 	public function GetDownloadFileName()

core/cmdbobject.class.inc.php

@@ -95,21 +95,11 @@ 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 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
+	 * Specify another change (this is mainly for backward compatibility)
 	 */
-	public static function SetCurrentChange($oChange)
+	public static function SetCurrentChange(CMDBChange $oChange)
 	{
 		self::$m_oCurrChange = $oChange;
 	}
@@ -122,11 +112,7 @@ abstract class CMDBObject extends DBObject
 	//			GetCurrentChange to create a default change if not already done in the current context
 	//
 	/**
-	 * @param bool $bAutoCreate if true calls {@link CreateChange} to get a new persisted object
-	 *
-	 * @return \CMDBChange
-	 *
-	 * @uses CreateChange
+	 * Get a change record (create it if not existing)	 
 	 */
 	public static function GetCurrentChange($bAutoCreate = true)
 	{
@@ -140,15 +126,11 @@ 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;
@@ -156,13 +138,8 @@ abstract class CMDBObject extends DBObject
 
 	/**
 	 * Provides information about the origin of the change
-	 *
-	 * @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
-	 */
+	 * @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;
@@ -197,12 +174,10 @@ abstract class CMDBObject extends DBObject
 			return self::$m_sOrigin;
 		}
 	}
-
+	
 	/**
-	 * 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
-	 */
+	 * Create a standard change record (done here 99% of the time, and nearly once per page)
+	 */	 	
 	protected static function CreateChange()
 	{
 		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");
@@ -538,83 +513,6 @@ abstract class CMDBObject extends DBObject
 		}
 	}
 
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBInsert} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 *
-	 * @return int|null
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 * @throws \SecurityException
-	 */
-	public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$ret = $this->DBInsertTracked_Internal();
-		return $ret;
-	}
-
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBInsertNoReload} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 *
-	 * @return int
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 * @throws \SecurityException
-	 */
-	public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$ret = $this->DBInsertTracked_Internal(true);
-		return $ret;
-	}
-
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBInsert} or {@link DBInsertNoReload} instead
-	 *
-	 * @param bool $bDoNotReload
-	 *
-	 * @return integer Identifier of the created object
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \CoreWarning
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	protected function DBInsertTracked_Internal($bDoNotReload = false)
-	{
-		if ($bDoNotReload)
-		{
-			$ret = $this->DBInsertNoReload();
-		}
-		else
-		{
-			$ret = $this->DBInsert();
-		}
-		return $ret;
-	}
-
 	public function DBClone($newKey = null)
 	{
 		return $this->DBCloneTracked_Internal();
@@ -647,24 +545,6 @@ abstract class CMDBObject extends DBObject
 		return $ret;
 	}
 
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBUpdate} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 *
-	 * @return int|void
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \SecurityException
-	 */
-	public function DBUpdateTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$this->DBUpdate();
-	}
 
 	/**
 	 * @param null $oDeletionPlan
@@ -684,31 +564,6 @@ abstract class CMDBObject extends DBObject
 		return $this->DBDeleteTracked_Internal($oDeletionPlan);
 	}
 
-	/**
-	 * @deprecated 2.7.0 N°2361 simply use {@link DBDelete} instead, that will automatically create and persist a CMDBChange object.
-	 *    If you need to persist your own, call {@link CMDBObject::SetCurrentChange} before.
-	 *
-	 * @param \CMDBChange $oChange
-	 * @param null $bSkipStrongSecurity
-	 * @param null $oDeletionPlan
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreCannotSaveObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \DeleteException
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 * @throws \OQLException
-	 * @throws \SecurityException
-	 */
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE);
-		$this->DBDeleteTracked_Internal($oDeletionPlan);
-	}
-
 	/**
 	 * @param null $oDeletionPlan
 	 *

core/cmdbsource.class.inc.php

@@ -859,25 +859,6 @@ class CMDBSource
 		self::$m_iTransactionLevel = 0;
 	}
 
-	/**
-	 *
-	 * @deprecated 2.7.0 N°1627 use ItopCounter instead
-	 *
-	 * @param string $sTable
-	 *
-	 * @return int
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public static function GetNextInsertId($sTable)
-	{
-		$sSQL = "SHOW TABLE STATUS LIKE '$sTable'";
-		$oResult = self::Query($sSQL);
-		$aRow = $oResult->fetch_assoc();
-
-		return $aRow['Auto_increment'];
-	}
-
 	public static function GetInsertId()
 	{
 		$iRes = self::$m_oMysqli->insert_id;
@@ -1181,24 +1162,17 @@ class CMDBSource
 	}
 
 	/**
-	 * There may have some differences between DB ! For example in :
-	 *   * MySQL 5.7 we have `INT`
-	 *   * MariaDB >= 10.2 you get `int DEFAULT 'NULL'`
+	 * There may have some differences between DB : for example in MySQL 5.7 we have "INT", while in MariaDB >= 10.2 you get "int DEFAULT 'NULL'"
 	 *
-	 * We still need to do a case sensitive comparison for enum values !
+	 * We still do a case sensitive comparison for enum values !
 	 *
 	 * A better solution would be to generate SQL field definitions ({@link GetFieldSpec} method) based on the DB used... But for
 	 * now (N°2490 / SF #1756 / PR #91) we did implement this simpler solution
 	 *
-	 * @see GetFieldDataTypeAndOptions extracts all info from the SQL field definition
-	 *
+	 * @param string $sItopGeneratedFieldType
 	 * @param string $sDbFieldType
 	 *
-	 * @param string $sItopGeneratedFieldType
-	 *
 	 * @return bool true if same type and options (case sensitive comparison only for type options), false otherwise
-	 *
-	 * @throws \CoreException
 	 * @since 2.7.0 N°2490
 	 */
 	public static function IsSameFieldTypes($sItopGeneratedFieldType, $sDbFieldType)
@@ -1246,68 +1220,24 @@ class CMDBSource
 	}
 
 	/**
-	 * @see \self::GetEnumOptions() specific processing for ENUM fields
-	 *
-	 * @param string $sCompleteFieldType sql field type, for example `VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0`
+	 * @param string $sCompleteFieldType sql field type, for example 'VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0'
 	 *
 	 * @return string[] consisting of 3 items :
-	 *      1. data type : for example `VARCHAR`
-	 *      2. type value : for example `255`
-	 *      3. other options : for example `CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0`
-	 *
-	 * @throws \CoreException
+	 *      1. data type : for example 'VARCHAR'
+	 *      2. type value : for example '255'
+	 *      3. other options : for example ' CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0'
 	 */
 	private static function GetFieldDataTypeAndOptions($sCompleteFieldType)
 	{
 		preg_match('/^([a-zA-Z]+)(\(([^\)]+)\))?( .+)?/', $sCompleteFieldType, $aMatches);
 
 		$sDataType = isset($aMatches[1]) ? $aMatches[1] : '';
-
-		if (strcasecmp($sDataType, 'ENUM') === 0){
-			try{
-				return self::GetEnumOptions($sDataType, $sCompleteFieldType);
-			}catch(CoreException $e){
-				//do nothing ; especially do not block setup.
-				IssueLog::Warning("enum was not parsed properly: $sCompleteFieldType. it should not happen during setup.");
-			}
-		}
-
 		$sTypeOptions = isset($aMatches[2]) ? $aMatches[3] : '';
 		$sOtherOptions = isset($aMatches[4]) ? $aMatches[4] : '';
 
 		return array($sDataType, $sTypeOptions, $sOtherOptions);
 	}
 
-	/**
-	 * @param string $sDataType for example `ENUM`
-	 * @param string $sCompleteFieldType Example:
-	 *     `ENUM('CSP A','CSP (aaaa) M','NA','OEM(ROC)','OPEN(VL)','RETAIL (Boite)') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci`
-	 *
-	 * @return string[] consisting of 3 items :
-	 *      1. data type : ENUM or enum here
-	 *      2. type value : in-between EUM parenthesis
-	 *      3. other options : for example ' CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT 0'
-	 * @throws \CoreException
-	 * @since 2.7.4 N°3065 specific processing for enum fields : fix no alter table when enum values containing parenthesis
-	 * Handle ENUM options
-	 */
-	private static function GetEnumOptions($sDataType, $sCompleteFieldType)
-	{
-		$iFirstOpeningParenthesis = strpos($sCompleteFieldType, '(');
-		$iLastEndingParenthesis = strrpos($sCompleteFieldType, ')');
-
-		if ($iFirstOpeningParenthesis === false || $iLastEndingParenthesis === false ){
-			//should never happen as GetFieldDataTypeAndOptions regexp matched.
-			//except if regexp is modiied/broken somehow one day...
-			throw new CoreException("GetEnumOptions issue with $sDataType parsing : " . $sCompleteFieldType);
-		}
-
-		$sTypeOptions = substr($sCompleteFieldType, $iFirstOpeningParenthesis + 1, $iLastEndingParenthesis - 1);
-		$sOtherOptions = substr($sCompleteFieldType, $iLastEndingParenthesis + 1);
-
-		return array($sDataType, $sTypeOptions, $sOtherOptions);
-	}
-
 	/**
 	 * @param string $sTable
 	 * @param string $sField

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'); // @see utils::GetItopVersionShort() and utils::GetItopVersionWikiSyntax()
+define('ITOP_VERSION', '2.7.0-dev');
 define('ITOP_REVISION', 'svn');
 define('ITOP_BUILD_DATE', '$WCNOW$');
 define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);
@@ -1065,14 +1065,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
-		'transactions_gc_threshold' => array(
-			'type' => 'integer',
-			'description' => 'probability in percent for the garbage collector to be triggered (100 mean always)',
-			'default' => 10, // added in itop 2.7.4, before the GC was always called
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
 		'log_transactions' => array(
 			'type' => 'bool',
 			'description' => 'Whether or not to enable the debug log for the transactions.',
@@ -1257,22 +1249,6 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		),
-		'security_header_xframe' => [
-			'type' => 'string',
-			'description' => 'Value of the X-Frame-Options HTTP header sent by iTop. Possible values : DENY, SAMEORIGIN, or empty string.',
-			'default' => 'SAMEORIGIN',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		],
-		'behind_reverse_proxy' => [
-			'type' => 'bool',
-			'description' => 'If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		],
 	);
 
 

core/coreexception.class.inc.php

@@ -28,39 +28,31 @@
 
 class CoreException extends Exception
 {
-	/**
-	 * 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)
+	public function __construct($sIssue, $aContextData = null, $sImpact = '')
 	{
 		$this->m_sIssue = $sIssue;
 		$this->m_sImpact = $sImpact;
-
-		if (is_array($aContextData)) {
-			$this->m_aContextData = $aContextData;
-		} else {
-			$this->m_aContextData = [];
-		}
-
+		$this->m_aContextData = $aContextData ? $aContextData : array();
+		
 		$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;
 						}
 					}
@@ -74,7 +66,7 @@ class CoreException extends Exception
 			}
 			$sMessage .= implode(', ', $aContextItems);
 		}
-		parent::__construct($sMessage, 0, $oPrevious);
+		parent::__construct($sMessage, 0);
 	}
 
 	/**
@@ -89,16 +81,6 @@ 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,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
   <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

@@ -461,7 +461,7 @@ abstract class DBObject implements iDisplay
 
 				if (array_key_exists($sAttRef, $aRow))
 				{
-					$value = $oAttDef->FromSQLToValue($aRow, $sAttRef);
+					$value = $oAttDef->FromSQLToValue($aRow, $sAttRef, $this, $sAttCode);
 					$bIsDefined = true;
 				}
 			}
@@ -856,17 +856,13 @@ 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)
 	{
@@ -2379,16 +2375,14 @@ abstract class DBObject implements iDisplay
 		return $aDelta;
 	}
 
-	/**
-	 * @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
+    /**
+     * @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
      */
 	public function ListChanges()
 	{
@@ -2408,10 +2402,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()
@@ -2805,14 +2799,7 @@ abstract class DBObject implements iDisplay
 		while ($oTrigger = $oSet->Fetch())
 		{
 			/** @var \Trigger $oTrigger */
-			try
-			{
-				$oTrigger->DoActivate($this->ToArgs('this'));
-			}
-			catch(Exception $e)
-			{
-				utils::EnrichRaisedException($oTrigger, $e);
-			}
+			$oTrigger->DoActivate($this->ToArgs('this'));
 		}
 
 		$this->RecordObjCreation();
@@ -2960,46 +2947,6 @@ abstract class DBObject implements iDisplay
 		return $this->m_iKey;
 	}
 
-    /**
-     * @internal
-     *
-     * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBInsert()} instead, that will automatically create and persist a CMDBChange object.
-     *    If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
-     *
-     * @param CMDBChange $oChange
-     *
-     * @return int|null
-     * @throws CoreException
-     */
-	public function DBInsertTracked(CMDBChange $oChange)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		return $this->DBInsert();
-	}
-
-    /**
-     * @internal
-     *
-     * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBInsertNoReload()} instead, that will automatically create and persist a CMDBChange object.
-     *    If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
-     *
-     * @param CMDBChange $oChange
-     *
-     * @return int
-     * @throws ArchivedObjectException
-     * @throws CoreCannotSaveObjectException
-     * @throws CoreException
-     * @throws CoreUnexpectedValue
-     * @throws CoreWarning
-     * @throws MySQLException
-     * @throws OQLException
-     */
-	public function DBInsertTrackedNoReload(CMDBChange $oChange)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		return $this->DBInsertNoReload();
-	}
-
     /**
      * Creates a copy of the current object into the database
      *
@@ -3124,14 +3071,7 @@ abstract class DBObject implements iDisplay
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				try
-				{
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch(Exception $e)
-				{
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
+				$oTrigger->DoActivate($this->ToArgs('this'));
 			}
 
 			$bHasANewExternalKeyValue = false;
@@ -3358,25 +3298,6 @@ abstract class DBObject implements iDisplay
 		$this->m_aPreviousValuesForUpdatedAttributes = $aPreviousValuesForUpdatedAttributes;
 	}
 
-    /**
-     *
-     * @internal
-     *
-     * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBUpdate()} instead, that will automatically create and persist a CMDBChange object.
-     *    If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
-     *
-     * @param CMDBChange $oChange
-     *
-     * @return int
-     * @throws CoreCannotSaveObjectException
-     * @throws CoreException
-     */
-	public function DBUpdateTracked(CMDBChange $oChange)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		return $this->DBUpdate();
-	}
-
 	/**
 	 * Make the current changes persistent - clever wrapper for Insert or Update
      *
@@ -3447,14 +3368,7 @@ abstract class DBObject implements iDisplay
 		while ($oTrigger = $oSet->Fetch())
 		{
 			/** @var \Trigger $oTrigger */
-			try
-			{
-				$oTrigger->DoActivate($this->ToArgs('this'));
-			}
-			catch(Exception $e)
-			{
-				utils::EnrichRaisedException($oTrigger, $e);
-			}
+			$oTrigger->DoActivate($this->ToArgs('this'));
 		}
 
 		$this->RecordObjDeletion($this->m_iKey); // May cause a reload for storing history information
@@ -3638,32 +3552,7 @@ abstract class DBObject implements iDisplay
 		return $oDeletionPlan;
 	}
 
-    /**
-     * @internal
-     *
-     * @deprecated 2.7.0 N°2361 simply use {@see DBObject::DBDelete()} instead.
-     *    If you need to persist your own, call {@see CMDBObject::SetCurrentChange()} before.
-     *
-     * @param CMDBChange $oChange
-     * @param boolean $bSkipStrongSecurity
-     * @param \DeletionPlan $oDeletionPlan
-     *
-     * @throws ArchivedObjectException
-     * @throws CoreCannotSaveObjectException
-     * @throws CoreException
-     * @throws CoreUnexpectedValue
-     * @throws DeleteException
-     * @throws MySQLException
-     * @throws MySQLHasGoneAwayException
-     * @throws OQLException
-     */
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		$this->DBDelete($oDeletionPlan);
-	}
-
-    /**
+     /**
      * @internal
      *
      * @return array
@@ -3741,14 +3630,16 @@ 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)	{
-			if (isset($this->m_aCurrValues[$sAttCode])) {
-				$value = $this->m_aCurrValues[$sAttCode];
-				if (is_object($value)) {
-					$aBackupValues[$sAttCode] = clone $value;
-				} else {
-					$aBackupValues[$sAttCode] = $value;
-				}
+		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+		{
+			$value = $this->m_aCurrValues[$sAttCode];
+			if (is_object($value))
+			{
+				$aBackupValues[$sAttCode] = clone $value;
+			}
+			else
+			{
+				$aBackupValues[$sAttCode] = $value;
 			}
 		}
 
@@ -3856,27 +3747,14 @@ abstract class DBObject implements iDisplay
 			while ($oTrigger = $oSet->Fetch())
 			{
 				/** @var \Trigger $oTrigger */
-				try
-				{
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch(Exception $e)
-				{
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
+				$oTrigger->DoActivate($this->ToArgs('this'));
 			}
 
 			$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 */
-				try{
-					$oTrigger->DoActivate($this->ToArgs('this'));
-				}
-				catch(Exception $e)
-				{
-					utils::EnrichRaisedException($oTrigger, $e);
-				}
+				$oTrigger->DoActivate($this->ToArgs('this'));
 			}
 		}
 		else
@@ -4458,22 +4336,7 @@ abstract class DBObject implements iDisplay
 	}
 
 
-    /**
-     * implement relations
-     *
-     * Return an empty set for the parent of all
-     *
-     * this way of implementing the relations suffers limitations (not handling the redundancy)
-     * and you should consider defining those things in XML
-     *
-     * @internal
-     * @deprecated
-     */
-	public static function GetRelationQueries($sRelCode)
-	{
-		return array();
-	}
-	
+
     /**
      * Reserved: do not overload
      *
@@ -4484,72 +4347,6 @@ abstract class DBObject implements iDisplay
 		return array();
 	}
 
-	/**
-	 * Use GetRelatedObjectsDown/Up instead to take redundancy into account
-     *
-     * @internal
-     * @deprecated
-	 */
-	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99, &$aResults = array())
-	{
-		// Temporary patch: until the impact analysis GUI gets rewritten,
-		// let's consider that "depends on" is equivalent to "impacts/up"
-		// The current patch has been implemented in DBObject and MetaModel
-		$sHackedRelCode = $sRelCode;
-		$bDown = true;
-		if ($sRelCode == 'depends on')
-		{
-			$sHackedRelCode = 'impacts';
-			$bDown = false;
-		}
-		foreach (MetaModel::EnumRelationQueries(get_class($this), $sHackedRelCode, $bDown) as $sDummy => $aQueryInfo)
-		{
-			$sQuery = $bDown ? $aQueryInfo['sQueryDown'] : $aQueryInfo['sQueryUp'];
-			//$bPropagate = $aQueryInfo["bPropagate"];
-			//$iDepth = $bPropagate ? $iMaxDepth - 1 : 0;
-			$iDepth = $iMaxDepth - 1;
-
-			// Note: the loop over the result set has been written in an unusual way for error reporting purposes
-			// In the case of a wrong query parameter name, the error occurs on the first call to Fetch,
-			// thus we need to have this first call into the try/catch, but
-			// we do NOT want to nest the try/catch for the error message to be clear
-			try
-			{
-				$oFlt = DBObjectSearch::FromOQL($sQuery);
-				$oObjSet = new DBObjectSet($oFlt, array(), $this->ToArgsForQuery());
-				$oObj = $oObjSet->Fetch();
-			}
-			catch (Exception $e)
-			{
-				$sClassOfDefinition = $aQueryInfo['_legacy_'] ? get_class($this).'(or a parent)::GetRelationQueries()' : $aQueryInfo['sDefinedInClass'];
-				throw new Exception("Wrong query for the relation $sRelCode/$sClassOfDefinition/{$aQueryInfo['sNeighbour']}: ".$e->getMessage());
-			}
-			if ($oObj)
-			{
-				do
-				{
-					$sRootClass = MetaModel::GetRootClass(get_class($oObj));
-					$sObjKey = $oObj->GetKey();
-					if (array_key_exists($sRootClass, $aResults))
-					{
-						if (array_key_exists($sObjKey, $aResults[$sRootClass]))
-						{
-							continue; // already visited, skip
-						}
-					}
-	
-					$aResults[$sRootClass][$sObjKey] = $oObj;
-					if ($iDepth > 0)
-					{
-						$oObj->GetRelatedObjects($sRelCode, $iDepth, $aResults);
-					}
-				}
-				while ($oObj = $oObjSet->Fetch());
-			}
-		}
-		return $aResults;
-	}
-
     /**
      * Compute the "RelatedObjects" (forward or "down" direction) for the object
      * for the specified relation

core/dbobjectsearch.class.php

@@ -63,15 +63,9 @@ 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);
@@ -81,43 +75,30 @@ class DBObjectSearch extends DBSearch
 		$this->m_aReferencedBy = array();
 	}
 
-	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;
-	}
+	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;}
 
 	// Create a search definition that leads to 0 result, still a valid search object
-	public static function FromEmptySet($sClass) {
+	static public 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'");
 		}
 	}
@@ -377,35 +358,37 @@ 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);
-
-		$bRootSearchAllowAllData = $this->IsAllDataAllowed();
-		$oExpression->Browse(function ($oThisExpression) use ($bRootSearchAllowAllData) {
-			ExpressionHelper::ExpressionAllowAllDataCallback($oThisExpression, $bRootSearchAllowAllData);
-		});
+	public function AddConditionExpression($oExpression)
+	{
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression); 
 	}
 
-	public function AddNameCondition($sName) {
+  	public function AddNameCondition($sName)
+	{
 		$oValueExpr = new ScalarExpression($sName);
 		$oNameExpr = new FieldExpression('friendlyname', $this->GetClassAlias());
 		$oNewCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
@@ -460,6 +443,7 @@ 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);
@@ -641,32 +625,17 @@ class DBObjectSearch extends DBSearch
 	public function AddCondition_FullText($sNeedle)
 	{
 		// Transform the full text condition into additional condition expression
-		$aAttCodes = [];
-		foreach (MetaModel::ListAttributeDefs($this->GetClass()) as $sAttCode => $oAttDef) {
+		$aFullTextFields = array();
+		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 = str_replace('.', '', uniqid('needle_', true));
+		$sQueryParam = 'needle';
 		$oFlexNeedle = new CharConcatExpression(array(new ScalarExpression('%'), new VariableExpression($sQueryParam), new ScalarExpression('%')));
 
 		$oNewCond = new BinaryExpression($oTextFields, 'LIKE', $oFlexNeedle);
@@ -823,11 +792,10 @@ 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 (@since 2.7.2)
+	 * @return void of <old-alias> => <new-alias>
 	 */
 	protected function UpdateRealiasingMap(&$aRealiasingMap, $aAliasTranslation)
 	{
@@ -835,33 +803,17 @@ class DBObjectSearch extends DBSearch
 		{
 			foreach ($aAliasTranslation as $sPrevAlias => $aRules)
 			{
-				if (!isset($aRules['*']))
+				if (isset($aRules['*']))
 				{
-					continue;
-				}
-
-				$sNewAlias = $aRules['*'];
-				$bOriginalFound = false;
-				$iIndex = 0;
-				foreach ($aRealiasingMap as $sOriginalAlias => $aAliases)
-				{
-					$iIndex = array_search($sPrevAlias, $aAliases);
-					if ($iIndex !== false)
+					$sNewAlias = $aRules['*'];
+					$sOriginalAlias = array_search($sPrevAlias, $aRealiasingMap);
+					if ($sOriginalAlias !== false)
 					{
-						$bOriginalFound = true;
-						break;
+						$aRealiasingMap[$sOriginalAlias] = $sNewAlias;
 					}
-
-				}
-				if ($bOriginalFound)
-				{
-					$aRealiasingMap[$sOriginalAlias][$iIndex] = $sNewAlias;
-				}
-				else
-				{
-					if (!isset($aRealiasingMap[$sPrevAlias]) || !in_array($sNewAlias, $aRealiasingMap[$sPrevAlias]))
+					else
 					{
-						$aRealiasingMap[$sPrevAlias][] = $sNewAlias;
+						$aRealiasingMap[$sPrevAlias] = $sNewAlias;
 					}
 				}
 			}
@@ -907,7 +859,7 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 * @param DBObjectSearch $oFilter (can be modified)
+	 * @param DBObjectSearch $oFilter
 	 * @param $sExtKeyAttCode
 	 * @param int $iOperatorCode
 	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
@@ -999,7 +951,7 @@ class DBObjectSearch extends DBSearch
 	}
 
 	/**
-	 * @param DBObjectSearch $oFilter (can be modified)
+	 * @param DBObjectSearch $oFilter
 	 * @param $sForeignExtKeyAttCode
 	 * @param int $iOperatorCode
 	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
@@ -1372,7 +1324,7 @@ class DBObjectSearch extends DBSearch
 
 			// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams($bExclude magic params)
 			$aNakedMagicArguments = array();
-			foreach (MetaModel::PrepareQueryArguments(array()) as $sArgName => $value)
+			foreach (MetaModel::PrepareQueryArguments(array(),array(), $this->GetExpectedArguments()) as $sArgName => $value)
 			{
 				$iPos = strpos($sArgName, '->object()');
 				if ($iPos === false)
@@ -1435,7 +1387,7 @@ class DBObjectSearch extends DBSearch
 			{
 				$aParams = array_merge($aContextParams, $this->m_aParams);
 			}
-			$aParams = MetaModel::PrepareQueryArguments($aParams);
+			$aParams = MetaModel::PrepareQueryArguments($aParams,array(), $this->GetExpectedArguments());
 		}
 		else
 		{
@@ -1628,7 +1580,7 @@ class DBObjectSearch extends DBSearch
 		$aRet = array('selects' => array(), 'joins' => array(), 'where' => array());
 
 		$aParams = array_merge($this->m_aParams);
-		$aParams = MetaModel::PrepareQueryArguments($aParams);
+		$aParams = MetaModel::PrepareQueryArguments($aParams, array(), $this->GetExpectedArguments());
 
 		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
 		{
@@ -1835,7 +1787,7 @@ class DBObjectSearch extends DBSearch
 	{
 		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
 		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectDeleteQuery();
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams(), $this->GetExpectedArguments());
 		$sRet = $oSQLQuery->RenderDelete($aScalarArgs);
 		return $sRet;
 	}
@@ -1851,7 +1803,7 @@ class DBObjectSearch extends DBSearch
 	{
 		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
 		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectUpdateQuery($aValues);
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams(), $this->GetExpectedArguments());
 		$sRet = $oSQLQuery->RenderUpdate($aScalarArgs);
 		return $sRet;
 	}
@@ -1870,7 +1822,7 @@ class DBObjectSearch extends DBSearch
 	{
 		$oSQLObjectQueryBuilder = new SQLObjectQueryBuilder($this);
 		$oSQLQuery = $oSQLObjectQueryBuilder->MakeSQLObjectUpdateQuery($aValues);
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams(), $this->GetExpectedArguments());
 		$sRet = $oSQLQuery->RenderInsert($aScalarArgs);
 		return $sRet;
 	}

core/dbobjectset.class.php

@@ -1312,34 +1312,6 @@ class DBObjectSet implements iDBObjectSetIterator
 		return $oNewSet;
 	}
 
-    /**
-     * Will be deprecated soon - use MetaModel::GetRelatedObjectsDown/Up instead to take redundancy into account
-     *
-     * @throws \Exception
-     */
-	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
-	{
-		$aRelatedObjs = array();
-
-		$aVisited = array(); // optimization for consecutive calls of MetaModel::GetRelatedObjects
-		$this->Seek(0);
-		while ($oObject = $this->Fetch())
-		{
-			$aMore = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
-			foreach ($aMore as $sClass => $aRelated)
-			{
-				foreach ($aRelated as $iObj => $oObj)
-				{
-					if (!isset($aRelatedObjs[$sClass][$iObj]))
-					{
-						$aRelatedObjs[$sClass][$iObj] = $oObj;
-					}
-				}
-			}
-		}
-		return $aRelatedObjs;
-	}
-
     /**
      * Compute the "RelatedObjects" (forward or "down" direction) for the set
      * for the specified relation
@@ -1496,7 +1468,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	public function ListConstantFields()
 	{
 		// The complete list of arguments will include magic arguments (e.g. current_user->attcode)
-		$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
+		$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs, $this->m_oFilter->ListParameters());
 		$aConst = $this->m_oFilter->ListConstantFields();
 				
 		foreach($aConst as $sClassAlias => $aVals)
@@ -1515,7 +1487,7 @@ class DBObjectSet implements iDBObjectSetIterator
 	
 	public function ApplyParameters()
 	{
-		$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
+		$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs, $this->m_oFilter->GetExpectedArguments());
 		$this->m_oFilter->ApplyParameters($aAllArgs);
 	}
 }

core/dbsearch.class.php

@@ -97,40 +97,42 @@ 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
 	}
 
-	/**
-	 * @api
-	 * @see IsAllDataAllowed()
-	 *
-	 * @param bool $bAllowAllData whether or not some information should be hidden to the current user.
-	 */
-	abstract public function AllowAllData($bAllowAllData = true);
+    /**
+     * whether or not some information should be hidden to the current user.
+     *
+     * @api
+     * @see IsAllDataAllowed()
+     *
+     * @return mixed
+     */
+	abstract public function AllowAllData();
 
-	/**
-	 * 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;
@@ -402,9 +404,7 @@ 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 urlencode(json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties)));
+		return json_encode(array($sOql, $aQueryParams, $this->m_aModifierProperties));
 	}
 
 	/**
@@ -648,7 +648,7 @@ abstract class DBSearch
 	 */
 	static public function unserialize($sValue)
 	{
-		$aData = json_decode(urldecode($sValue), true);
+		$aData = json_decode($sValue, true);
 		if (is_null($aData))
 		{
 			throw new CoreException("Invalid filter parameter");
@@ -1112,8 +1112,6 @@ abstract class DBSearch
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MySQLException
-	 *
-	 * @since 2.7.0 N°2555
 	 */
 	public function GetFirstResult($bMustHaveOneResultMax = true, $aOrderBy = array(), $aSearchParams = array())
 	{
@@ -1186,30 +1184,6 @@ abstract class DBSearch
 				}
 			}
 		}
-
-		if (is_array($aGroupByExpr))
-		{
-			foreach($aGroupByExpr as $sAlias => $oGroupByExp)
-			{
-				/** @var \Expression $oGroupByExp */
-
-				$aFields = $oGroupByExp->ListRequiredFields();
-				foreach($aFields as $sFieldAlias)
-				{
-					$aMatches = array();
-					if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
-					{
-						$sFieldClass = $this->GetClassName($aMatches[1]);
-						$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
-						if ( $oAttDef instanceof iAttributeNoGroupBy)
-						{
-							throw new Exception("Grouping on '$sFieldClass' fields is not supported.");
-						}
-					}
-				}
-			}
-		}
-
 		$oSQLQuery = $oSearch->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, null, $aSelectExpr);
 		$oSQLQuery->SetSourceOQL($oSearch->ToOQL());
 

core/dbunionsearch.class.php

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

core/excelbulkexport.class.inc.php

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

core/htmlsanitizer.class.inc.php

@@ -24,14 +24,14 @@ abstract class HTMLSanitizer
 	{
 		// Do nothing..
 	}
-	
+
 	/**
 	 * Sanitizes the given HTML document
 	 * @param string $sHTML
 	 * @return string
 	 */
 	abstract public function DoSanitize($sHTML);
-	
+
 	/**
 	 * Sanitize an HTML string with the configured sanitizer, falling back to HTMLDOMSanitizer in case of Exception or invalid configuration
 	 * @param string $sHTML
@@ -50,7 +50,7 @@ abstract class HTMLSanitizer
 			IssueLog::Warning('The configured "html_sanitizer" class "'.$sSanitizerClass.'" is not a subclass of HTMLSanitizer. Will use HTMLDOMSanitizer as the default sanitizer.');
 			$sSanitizerClass = 'HTMLDOMSanitizer';
 		}
-		
+
 		try
 		{
 			$oSanitizer = new $sSanitizerClass();
@@ -70,7 +70,7 @@ abstract class HTMLSanitizer
 			{
 				IssueLog::Error('Failed to sanitize an HTML string with "HTMLDOMSanitizer". The following exception occured: '.$e->getMessage());
 				IssueLog::Error('The HTML will NOT be sanitized.');
-				$sCleanHTML = $sHTML;	
+				$sCleanHTML = $sHTML;
 			}
 		}
 		return $sCleanHTML;
@@ -97,7 +97,7 @@ class HTMLNullSanitizer extends HTMLSanitizer
 	{
 		return $sHTML;
 	}
-	
+
 }
 
 /**
@@ -109,7 +109,7 @@ class HTMLNullSanitizer extends HTMLSanitizer
 class HTMLPurifierSanitizer extends HTMLSanitizer
 {
 	protected static $oPurifier = null;
-	
+
 	public function __construct()
 	{
 		if (self::$oPurifier == null)
@@ -120,7 +120,7 @@ class HTMLPurifierSanitizer extends HTMLSanitizer
 				throw new Exception("Missing library '$sLibPath', cannot use HTMLPurifierSanitizer.");
 			}
 			require_once($sLibPath);
-			
+
 			$oPurifierConfig = HTMLPurifier_Config::createDefault();
 			$oPurifierConfig->set('Core.Encoding', 'UTF-8'); // defaults to 'UTF-8'
 			$oPurifierConfig->set('HTML.Doctype', 'XHTML 1.0 Strict'); // defaults to 'XHTML 1.0 Transitional'
@@ -142,11 +142,11 @@ class HTMLPurifierSanitizer extends HTMLSanitizer
 			self::$oPurifier = new HTMLPurifier($oPurifierConfig);
 		}
 	}
-	
+
 	public function DoSanitize($sHTML)
 	{
 		$sCleanHtml = self::$oPurifier->purify($sHTML);
-		return $sCleanHtml;		
+		return $sCleanHtml;
 	}
 }
 */
@@ -278,13 +278,13 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		$sHTML = preg_replace('~\xc2\xa0~', ' ', $sHTML);
 
 		@$this->oDoc->loadHTML('<?xml encoding="UTF-8"?>'.$sHTML); // For loading HTML chunks where the character set is not specified
-		
+
 		$this->CleanNode($this->oDoc);
-		
+
 		$oXPath = new DOMXPath($this->oDoc);
 		$sXPath = "//body";
 		$oNodesList = $oXPath->query($sXPath);
-		
+
 		if ($oNodesList->length == 0)
 		{
 			// No body, save the whole document
@@ -297,10 +297,10 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 			// remove the body tag itself
 			$sCleanHtml = str_replace( array('<body>', '</body>'), '', $sCleanHtml);
 		}
-		
+
 		return $sCleanHtml;
 	}
-	
+
 	protected function CleanNode(DOMNode $oElement)
 	{
 		$aAttrToRemove = array();
@@ -341,7 +341,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 				$oElement->removeAttribute($sName);
 			}
 		}
-		
+
 		if ($oElement->hasChildNodes())
 		{
 			$aChildElementsToRemove = array();
@@ -390,7 +390,7 @@ class HTMLDOMSanitizer extends HTMLSanitizer
 		}
 		return implode(';', $aAllowedStyles);
 	}
-	
+
 	protected function IsValidAttributeContent($sAttributeName, $sValue)
 	{
 		if (array_key_exists($sAttributeName, self::$aAttrsWhiteList))

core/legacy/dbobjectsearchlegacy.class.php

@@ -2602,18 +2602,5 @@ class DBObjectSearch extends DBSearch
 		return $oExpression;
 	}
 
-	/**
-	 * @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)
-	{
-	}
 
-	public function ListParameters()
-	{
-		return $this->GetCriteria()->ListParameters();
-	}
 }

core/oql/expression.class.inc.php

@@ -1,52 +1,32 @@
 <?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
- */
+// 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/>
+//
 
-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);
-	}
+class MissingQueryArgument extends CoreException
+{
 }
 
 
 /**
  * @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';
@@ -159,13 +139,9 @@ abstract class Expression {
 	}
 
 	/**
-	 * 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
+	 * Recursively browse the expression tree
+	 * @param Closure $callback
+	 * @return mixed
 	 */
 	abstract public function Browse(Closure $callback);
 
@@ -177,9 +153,6 @@ 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
@@ -188,7 +161,8 @@ 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;
@@ -865,15 +839,12 @@ class MatchExpression extends BinaryExpression
 	 * MatchExpression constructor.
 	 *
 	 * @param \FieldExpression $oLeftExpr
-	 * @param \Expression $oRightExpr
+	 * @param \ScalarExpression $oRightExpr
 	 *
 	 * @throws \CoreException
 	 */
-	public function __construct(FieldExpression $oLeftExpr, Expression $oRightExpr)
+	public function __construct(FieldExpression $oLeftExpr, ScalarExpression $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);
 	}
 
@@ -1696,10 +1667,6 @@ class FieldExpressionResolved extends FieldExpression
 		parent::__construct($sName, $sParent);
 	}
 
-	/**
-	 * @return array of additional expressions for muti-column attributes
-	 * @since 2.7.4
-	 */
 	public function AdditionalExpressions()
 	{
 		return $this->m_aAdditionalExpressions;
@@ -2034,15 +2001,7 @@ class ListExpression extends Expression
 		{
 			if ($oExpr instanceof VariableExpression)
 			{
-				$oVarExpr = $oExpr->GetAsScalar($aArgs);
-				if ($oVarExpr instanceof ListExpression)
-				{
-					$this->m_aExpressions = $oVarExpr->GetItems();
-				}
-				else
-				{
-					$this->m_aExpressions[$idx] = $oVarExpr;
-				}
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar($aArgs);
 			}
 			else
 			{
@@ -2216,62 +2175,60 @@ 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 131 "..\oql-parser.y"
+#line 132 "..\oql-parser.y"
     function yy_r43(){
 	$this->_retvalue = new NestedQueryOqlExpression($this->yystack[$this->yyidx + -1]->minor);
     }
 #line 1611 "..\oql-parser.php"
-#line 146 "..\oql-parser.y"
+#line 147 "..\oql-parser.y"
     function yy_r47(){
 	$this->_retvalue = array();
     }
 #line 1616 "..\oql-parser.php"
-#line 157 "..\oql-parser.y"
+#line 158 "..\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 170 "..\oql-parser.y"
+#line 171 "..\oql-parser.y"
     function yy_r61(){ $this->_retvalue = new ScalarOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
 #line 1622 "..\oql-parser.php"
-#line 172 "..\oql-parser.y"
+#line 173 "..\oql-parser.y"
     function yy_r63(){ $this->_retvalue = new ScalarOqlExpression(null);     }
 #line 1625 "..\oql-parser.php"
-#line 174 "..\oql-parser.y"
+#line 175 "..\oql-parser.y"
     function yy_r64(){ $this->_retvalue = new FieldOqlExpression($this->yystack[$this->yyidx + 0]->minor);     }
 #line 1628 "..\oql-parser.php"
-#line 175 "..\oql-parser.y"
+#line 176 "..\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 176 "..\oql-parser.y"
+#line 177 "..\oql-parser.y"
     function yy_r66(){ $this->_retvalue=$this->yystack[$this->yyidx + 0]->minor;     }
 #line 1634 "..\oql-parser.php"
-#line 179 "..\oql-parser.y"
+#line 180 "..\oql-parser.y"
     function yy_r67(){ $this->_retvalue = new VariableOqlExpression(substr($this->yystack[$this->yyidx + 0]->minor, 1));     }
 #line 1637 "..\oql-parser.php"
-#line 181 "..\oql-parser.y"
+#line 182 "..\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 192 "..\oql-parser.y"
+#line 193 "..\oql-parser.y"
     function yy_r69(){$this->_retvalue=(int)$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1653 "..\oql-parser.php"
-#line 193 "..\oql-parser.y"
+#line 194 "..\oql-parser.y"
     function yy_r70(){$this->_retvalue=(int)-$this->yystack[$this->yyidx + 0]->minor;    }
 #line 1656 "..\oql-parser.php"
-#line 194 "..\oql-parser.y"
+#line 195 "..\oql-parser.y"
     function yy_r71(){$this->_retvalue=new OqlHexValue($this->yystack[$this->yyidx + 0]->minor);    }
 #line 1659 "..\oql-parser.php"
-#line 195 "..\oql-parser.y"
+#line 196 "..\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 198 "..\oql-parser.y"
+#line 199 "..\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 263 "..\oql-parser.y"
+#line 264 "..\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 && !$this->m_oRightExpr instanceof VariableOqlExpression)
+		if (!$this->m_oRightExpr instanceof ScalarExpression)
 		{
 			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 @@
-2020-09-29
+2019-12-03

core/oqlclassnode.class.inc.php

@@ -331,12 +331,4 @@ class OQLJoin
 		return $this->sRightField;
 	}
 
-	/**
-	 * @return string
-	 */
-	public function GetLeftField()
-	{
-		return $this->sLeftField;
-	}
-
 }

core/oqlclasstreeoptimizer.class.inc.php

@@ -50,15 +50,8 @@ class OQLClassTreeOptimizer
 				{
 					if ($oJoin->IsOutbound())
 					{
-						// If joined class in not the same class than the external key target class
-						// then the join cannot be removed because it is used to filter the request
-						$sJoinedClass = $oJoin->GetOOQLClassNode()->GetNodeClass();
-						$sExtKeyAttCode = $oJoin->GetLeftField();
-						$oExtKeyAttDef = MetaModel::GetAttributeDef($oCurrentClassNode->GetNodeClass(), $sExtKeyAttCode);
-						if ($sJoinedClass == $oExtKeyAttDef->GetTargetClass()) {
-							// The join is not used, remove from tree
-							$oCurrentClassNode->RemoveJoin($sLeftKey, $index);
-						}
+						// The join is not used, remove from tree
+						$oCurrentClassNode->RemoveJoin($sLeftKey, $index);
 					}
 					else
 					{

core/ormdocument.class.inc.php

@@ -38,6 +38,8 @@ class ormDocument
 	protected $m_data;
 	protected $m_sMimeType;
 	protected $m_sFileName;
+	protected $m_oHostObject;
+	protected $m_sHostObjectAttcode;
 	
 	/**
 	 * Constructor
@@ -47,6 +49,15 @@ class ormDocument
 		$this->m_data = $data;
 		$this->m_sMimeType = $sMimeType;
 		$this->m_sFileName = $sFileName;
+
+		$this->m_oHostObject = null;
+		$this->m_sHostObjectAttcode = null;
+	}
+
+	public function SetHostObject(DBObject $oHostObject, $sAttCode)
+	{
+		$this->m_oHostObject = $oHostObject;
+		$this->m_sHostObjectAttcode = $sAttCode;
 	}
 
 	public function __toString()
@@ -138,6 +149,12 @@ class ormDocument
 	 */	 	 	
 	public function GetDownloadLink($sClass, $Id, $sAttCode)
 	{
+		if ($this->m_oHostObject)
+		{
+			$sClass = get_class($this->m_oHostObject);
+			$Id = $this->m_oHostObject->GetKey();
+			$sAttCode = $this->m_sHostObjectAttcode;
+		}
 		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.document.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode\">".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
 	}
 
@@ -147,6 +164,12 @@ class ormDocument
 	 */
 	public function GetDisplayURL($sClass, $Id, $sAttCode)
 	{
+		if ($this->m_oHostObject)
+		{
+			$sClass = get_class($this->m_oHostObject);
+			$Id = $this->m_oHostObject->GetKey();
+			$sAttCode = $this->m_sHostObjectAttcode;
+		}
 		// TODO: When refactoring this with the URLMaker system, mind to also change calls in the portal (look for the "p_object_document_display" route)
 		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode";
 	}
@@ -157,6 +180,12 @@ class ormDocument
 	 */
 	public function GetDownloadURL($sClass, $Id, $sAttCode)
 	{
+		if ($this->m_oHostObject)
+		{
+			$sClass = get_class($this->m_oHostObject);
+			$Id = $this->m_oHostObject->GetKey();
+			$sAttCode = $this->m_sHostObjectAttcode;
+		}
 		// Compute a signature to reset the cache anytime the data changes (this is acceptable if used only with icon files)
 		$sSignature = md5($this->GetData());
 		// TODO: When refactoring this with the URLMaker system, mind to also change calls in the portal (look for the "p_object_document_display" route)

core/ormlinkset.class.inc.php

@@ -814,17 +814,6 @@ 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);
@@ -835,4 +824,4 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 
 		return $oLinkSet;
 	}
-}
+}

core/ormstopwatch.class.inc.php

@@ -607,22 +607,14 @@ 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 MATCHES :stop_watch_code AND threshold_index = :threshold_index"),
+								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code=:stop_watch_code AND threshold_index = :threshold_index"),
 								array(), // order by
 								array('stop_watch_code' => $sAttCode, 'threshold_index' => $iThreshold)
 							);
 							while ($oTrigger = $oTriggerSet->Fetch())
 							{
-								try
-								{
-									$oTrigger->DoActivate($oObj->ToArgs('this'));
-								}
-								catch(Exception $e)
-								{
-									utils::EnrichRaisedException($oTrigger, $e);
-								}
+								$oTrigger->DoActivate($oObj->ToArgs('this'));
 							}
 						}
 					}

core/spreadsheetbulkexport.class.inc.php

@@ -199,8 +199,8 @@ EOF
 		// Integration within MS-Excel web queries + HTTPS + IIS:
 		// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
 		// Then the fix is to force the reset of header values Pragma and Cache-control
-		$oPage->add_header("Pragma:");
-		$oPage->add_header("Cache-control:");
+		$oPage->add_header("Pragma:", true);
+		$oPage->add_header("Cache-control:", true);
 	}
 
 	public function GetHeader()

core/tabularbulkexport.class.inc.php

@@ -365,37 +365,29 @@ EOF
 		{
 			throw new BulkExportMissingParameterException('fields');
 		}
-		else
+		else if(($sQueryId !== null) && ($sQueryId !== null))
 		{
-			if (($sQueryId !== null) && ($sQueryId !== null))
+			$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
+			$oQueries = new DBObjectSet($oSearch);
+			if ($oQueries->Count() > 0)
 			{
-				$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
-				$oQueries = new DBObjectSet($oSearch);
-				if ($oQueries->Count() > 0)
+				$oQuery = $oQueries->Fetch();
+				if (($sFields === null) || ($sFields === ''))
 				{
-					$oQuery = $oQueries->Fetch();
-					if (($sFields === null) || ($sFields === ''))
+					// No 'fields' parameter supplied, take the fields from the query phrasebook definition
+					$sFields = trim($oQuery->Get('fields'));
+					if ($sFields === '')
 					{
-						// No 'fields' parameter supplied, take the fields from the query phrasebook definition
-						$sFields = trim($oQuery->Get('fields'));
-						if ($sFields === '')
-						{
-							throw new BulkExportMissingParameterException('fields');
-						}
+						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,8 +1344,9 @@ 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(true);
-			if ($old_error_handler !== null) {
+			session_regenerate_id();
+			if ($old_error_handler !== null)
+			{
 				set_error_handler($old_error_handler);
 			}
 		}

core/valuesetdef.class.inc.php

@@ -141,7 +141,10 @@ class ValueSetObjects extends ValueSetDefinition
 		$this->m_oExtraCondition = $oFilter;
 		$this->m_bIsLoaded = false;
 	}
-
+	public function SetOrderBy(array $aOrderBy)
+	{
+		$this->m_aOrderBy = $aOrderBy;
+	}
 	public function ToObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
 	{
 		if ($this->m_bAllowAllData)
@@ -243,7 +246,7 @@ class ValueSetObjects extends ValueSetDefinition
 		$oExpression = DBObjectSearch::GetPolymorphicExpression($oFilter->GetClass(), 'friendlyname');
 		$aFields = $oExpression->ListRequiredFields();
 		$sClass = $oFilter->GetClass();
-		foreach($aFields as $sField)
+		/*foreach($aFields as $sField)
 		{
 			$aFieldItems = explode('.', $sField);
 			if ($aFieldItems[0] != $sClass)
@@ -251,7 +254,7 @@ class ValueSetObjects extends ValueSetDefinition
 				$sOperation = 'contains';
 				break;
 			}
-		}
+		}*/
 
 		switch ($sOperation)
 		{

css/css-variables.scss

@@ -17,17 +17,17 @@
  */
 
 // Beware the version number MUST be enclosed with quotes otherwise v2.3.0 becomes v2 0.3 .0
-$version: "v2.7.4";
+$version: "v2.7.1";
 $approot-relative: "../../../../../" !default; // relative to env-***/branding/themes/***/main.css
 
 // Base colors
-$gray-base: #000 !default;
-$gray-darker: lighten($gray-base, 13.5%) !default; // #222
-$gray-dark: #444 !default;
-$gray: #777 !default;
-$gray-light: #808080 !default;
-$gray-lighter: #ddd !default;
-$gray-extra-light: #F1F1F1 !default;
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              #444 !default;
+$gray:                   #777 !default;
+$gray-light:             #808080 !default;
+$gray-lighter:           #ddd !default;
+$gray-extra-light:       #F1F1F1 !default;
 
 $white:					#FFFFFF !default;
 
@@ -127,8 +127,3 @@ $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/font-awesome/css/font-awesome.min.css

@@ -1,7 +0,0 @@
-/**
- This was the file containing the rules of Font Awesome v4. Kept for scripts that included it directly.
- @deprecated 2.7.0 N°2269, use /css/font-awesome/css/all.min.css instead (Font Awesome v5)
- */
-
-@import "all.min.css";
-@import "v4-shims.min.css";

css/light-grey.scss

@@ -2874,34 +2874,13 @@ a.summary,  a.summary:hover {
 	height: 12px;
 }
 .sort_none {
-	padding-right: 5px;
-	&::after {
-		@extend %font-awesome-prerequisites;
-		text-align: right;
-		content: '\f0dc';
-		color: $complement-color;
-		float: right;
-	}
+	background: url($approot-relative + "images/bg.gif?v=" + $version) no-repeat center;
 }
 .sort_asc {
-	padding-right: 5px;
-	&::after {
-		@extend %font-awesome-prerequisites;
-		text-align: right;
-		content: '\f0d8';
-		color: $complement-color;
-		float: right;
-	}
+	background: url($approot-relative + "images/desc.gif?v=" + $version) no-repeat center;
 }
 .sort_desc {
-	padding-right: 5px;
-	&::after {
-		@extend %font-awesome-prerequisites;
-		text-align: right;
-		content: '\f0d7';
-		color: $complement-color;
-		float: right;
-	}
+	background: url($approot-relative + "images/asc.gif?v=" + $version) no-repeat center;
 }
 .sort_hidden {
 	display: none;
@@ -3924,4 +3903,52 @@ input:checked + .slider:before {
 }
 .ui-dialog .ui-dialog-content .treecontrol a {
 	font-size: small;
-}
+}
+/*for autocomplete*/
+.ui-autocomplete {
+	padding: 0px;
+	border: 1px solid black;
+	background-color: white;
+	overflow: hidden;
+	z-index: 99999;
+
+	ul {
+		width: 100%;
+		list-style-position: outside;
+		list-style: none;
+		padding: 0;
+		margin: 0;
+	}
+
+	li.ui-menu-item {
+		margin: 0px;
+		padding: 2px 5px;
+		white-space: nowrap;
+		padding-right: 20px; /* Space for the scrollbar */
+		cursor: default;
+		display: block;
+		/*
+		if width will be 100% horizontal scrollbar will apear
+		when scroll mode will be used
+		*/
+		/*width: 100%;*/
+		font: menu;
+		font-size: 12px;
+		/*
+		it is very important, if line-height not setted or setted
+		in relative units scroll will be broken in firefox
+		*/
+		line-height: 16px;
+		overflow: hidden;
+
+		&:nth-child(odd) {
+			background-color: #eee;
+		}
+
+		&.ui-state-focus {
+			background-color: #0A246A;
+			border-color: #0A246A;
+			color: white;
+		}
+	}
+}

css/setup.css

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

css/setup.scss

@@ -16,8 +16,6 @@
  * 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;
@@ -316,4 +314,3 @@ fieldset{
     }
 }
 
-/* integrityCheck: end (do not remove/edit) */

datamodels/2.x/authent-cas/module.authent-cas.php

@@ -5,7 +5,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/2.7.4',
+	'authent-cas/2.7.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-cas/src/CASLoginExtension.php

@@ -156,7 +156,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 		{
 			phpCAS::setDebug(APPROOT.'log/cas.log');
 		}
-		
+
 		// Initialize phpCAS
 		$sCASVersion = Config::Get('cas_version');
 		$sCASHost = Config::Get('cas_host');
@@ -500,15 +500,8 @@ class CASUserProvisioning
 		}
 
 		// Now synchronize the profiles
-		$oProfilesSet = DBObjectSet::FromScratch('URP_UserProfile');
-		foreach($aProfiles as $iProfileId)
-		{
-			$oLink = new URP_UserProfile();
-			$oLink->Set('profileid', $iProfileId);
-			$oLink->Set('reason', 'CAS/LDAP Synchro');
-			$oProfilesSet->AddObject($oLink);
-		}
-		$oUser->Set('profile_list', $oProfilesSet);
+		LoginWebPage::SynchroniseProfiles($oUser, $aProfiles, 'CAS/LDAP Synchro');
+
 		phpCAS::log("Info: the user '".$oUser->GetName()."' (id=".$oUser->GetKey().") now has the following profiles: '".implode("', '", $aProfiles)."'.");
 		if ($oUser->IsModified())
 		{

datamodels/2.x/authent-external/module.authent-external.php

@@ -27,7 +27,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/2.7.4',
+	'authent-external/2.7.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-ldap/module.authent-ldap.php

@@ -9,7 +9,7 @@ if (function_exists('ldap_connect'))
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/2.7.4',
+	'authent-ldap/2.7.0',
 	array(
 		// Identification
 		//

datamodels/2.x/authent-local/module.authent-local.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/2.7.4',
+	'authent-local/2.7.1',
 	array(
 		// Identification
 		//

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

@@ -1,29 +0,0 @@
-<?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,8 +17,6 @@
  * 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');
 
@@ -55,7 +53,7 @@ function DisplayDBInconsistencies(iTopWebPage &$oP, ApplicationContext &$oAppCon
 	$bRunAnalysis = intval(utils::ReadParam('run_analysis', '0'));
 	if ($bRunAnalysis)
 	{
-		$oDBAnalyzer = new DatabaseAnalyzer(0);
+		$oDBAnalyzer = new DatabaseAnalyzer();
 		$aResults = $oDBAnalyzer->CheckIntegrity($aClassSelection);
 		if (empty($aResults))
 		{
@@ -201,23 +199,74 @@ function DisplayDBInconsistencies(iTopWebPage &$oP, ApplicationContext &$oAppCon
  */
 function DisplayInconsistenciesReport($aResults)
 {
-	$sReportFile = DBAnalyzerUtils::GenerateReport($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);
 
-	$sZipReport = "{$sReportFile}.zip";
 	$oArchive = new ZipArchive();
-	$oArchive->open($sZipReport, ZipArchive::CREATE);
-	$oArchive->addFile($sReportFile.'.log', basename($sReportFile.'.log'));
+	$oArchive->open($sDBToolsFolder.$sReportFile.'.zip', ZipArchive::CREATE);
+	$oArchive->addFile($sDBToolsFolder.$sReportFile.'.txt', $sReportFile.'.txt');
 	$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($sZipReport).'"');
+	header('Content-Disposition: inline; filename="'.basename($sReportFile).'"');
+	header('Expires: 0');
 	header('Cache-Control: must-revalidate');
 	header('Pragma: public');
-	header('Expires: 0');
-	header('Content-Length: '.filesize($sZipReport));
-	readfile($sZipReport);
-	unlink($sZipReport);
+	header('Content-Length: '.filesize($sReportFile));
+	readfile($sReportFile);
+	unlink($sReportFile);
 	exit(0);
 }
 

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

@@ -24,7 +24,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/2.7.4',
+	'combodo-db-tools/2.7.1',
 	array(
 		// Identification
 		//
@@ -42,8 +42,7 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'model.combodo-db-tools.php',
-			'src/Service/DBToolsUtils.php',
-            'src/Service/DBAnalyzerUtils.php',
+            'src/Service/DBToolsUtils.php'
 		),
 		'webservice' => array(),
 		'data.struct' => array(),

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

@@ -1,81 +0,0 @@
-<?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-attachments/ajax.itop-attachment.php

@@ -61,6 +61,7 @@ try
 	LoginWebPage::DoLoginEx(null /* any portal */, false);
 
 	$oPage = new ajax_page("");
+	$oPage->no_cache();
 
 	$sOperation = utils::ReadParam('operation', '');
 

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

@@ -19,7 +19,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/2.7.4',
+	'itop-attachments/2.7.1',
 	array(
 		// Identification
 		//
@@ -80,31 +80,6 @@ if (!class_exists('AttachmentInstaller'))
 			return $oConfiguration;
 		}
 
-		/**
-		 * @since 2.7.4 N°3788
-		 * @param string $sTableName
-		 * @param int $iBulkSize
-		 *
-		 * @return array
-		 * @throws \CoreException
-		 * @throws \MySQLException
-		 * @throws \MySQLHasGoneAwayException
-		 */
-		public static function GetOrphanAttachmentIds($sTableName, $iBulkSize){
-			$sSqlQuery = <<<SQL
-SELECT id as attachment_id FROM `$sTableName` WHERE (`item_id`='' OR `item_id` IS NULL) LIMIT {$iBulkSize};
-SQL;
-			/** @var \mysqli_result $oQueryResult */
-			$oQueryResult = CMDBSource::Query($sSqlQuery);
-
-			$aIds = [];
-			while($aRow = $oQueryResult->fetch_array()){
-				$aIds[] = $aRow['attachment_id'];
-			}
-
-			return $aIds;
-		}
-
 		/**
 		 * Handler called before creating or upgrading the database schema
 		 * @param $oConfiguration Config The new configuration of the application
@@ -122,32 +97,10 @@ SQL;
 				$iCount = CMDBSource::QueryToScalar($sCountQuery);
 				if ($iCount > 0)
 				{
-					SetupPage::log_info("Cleanup of orphan attachments that cannot be migrated to the new ObjKey model: $iCount record(s) must be deleted.");
-
-					$iBulkSize = 100;
-					$iMaxDuration = 30;
-					$iDeletedCount = 0;
-					$fStartTime = microtime(true);
-					$aIds = self::GetOrphanAttachmentIds($sTableName, $iBulkSize);
-
-					while (count($aIds) !== 0) {
-						$sCleanupQuery = sprintf("DELETE FROM `$sTableName` WHERE `id` IN (%s)", implode(",", $aIds));
-						CMDBSource::Query($sCleanupQuery); // Throws an exception in case of error
-
-						$iDeletedCount += count($aIds);
-						$fElapsed = microtime(true) - $fStartTime;
-
-						if ($fElapsed > $iMaxDuration){
-							SetupPage::log_info(sprintf("Cleanup of orphan attachments interrupted after %.3f s. $iDeletedCount records were deleted among $iCount.", $fElapsed));
-							break;
-						}
-
-						$aIds = self::GetOrphanAttachmentIds($sTableName, $iBulkSize);
-					}
-
-					if (count($aIds) === 0){
-						SetupPage::log_info("Cleanup of orphan attachments successfully completed.");
-					}
+					SetupPage::log_info("Cleanup of orphan attachments that cannot be migrated to the new ObjKey model: $iCount record(s) must be deleted."); 
+					$sRepairQuery = "DELETE FROM `$sTableName` WHERE (`item_id`='' OR `item_id` IS NULL)";
+					$iRet = CMDBSource::Query($sRepairQuery); // Throws an exception in case of error
+					SetupPage::log_info("Cleanup of orphan attachments successfully completed.");
 				}
 				else
 				{
@@ -155,7 +108,7 @@ SQL;
 				}
 			}
 		}
-
+		
 		/**
 		 * Handler called after the creation/update of the database schema
 		 * @param $oConfiguration Config The new configuration of the application
@@ -170,7 +123,6 @@ SQL;
 			// Prerequisite: change null into 0 (workaround to the fact that we cannot use IS NULL in OQL)
 			SetupPage::log_info("Initializing attachment/item_org_id - null to zero"); 
 			$sTableName = MetaModel::DBGetTable('Attachment');
-
 			$sRepair = "UPDATE `$sTableName` SET `item_org_id` = 0 WHERE `item_org_id` IS NULL";
 			CMDBSource::Query($sRepair);
 
@@ -180,13 +132,7 @@ SQL;
 			$iUpdated = 0;
 			while ($oAttachment = $oSet->Fetch())
 			{
-				if (empty($oAttachment->Get('item_class'))) {
-					//do not treat orphan attachment
-					continue;
-				}
-
 				$oContainer = MetaModel::GetObject($oAttachment->Get('item_class'), $oAttachment->Get('item_id'), false /* must be found */, true /* allow all data */);
-
 				if ($oContainer)
 				{
 					$oAttachment->SetItem($oContainer, true /*updateonchange*/);

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

@@ -51,6 +51,7 @@ function DisplayErrorAndDie($oPage, $sHtmlErrorMessage, $exitCode = null)
 $sOperation = utils::ReadParam('operation', '');
 
 $oPage = new ajax_page('');
+$oPage->no_cache();
 $oPage->SetContentType('text/html');
 
 
@@ -212,9 +213,6 @@ 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/backup.php

@@ -134,6 +134,8 @@ set_time_limit(0);
 if (utils::IsModeCLI())
 {
 	$oP = new CLIPage("iTop - Database Backup");
+
+	SetupUtils::CheckPhpAndExtensionsForCli($oP);
 }
 else
 {

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

@@ -250,6 +250,8 @@ catch(Exception $e)
 
 if (utils::IsModeCLI())
 {
+	SetupUtils::CheckPhpAndExtensionsForCli(new CLIPage('Check backup utility'));
+
 	echo date('Y-m-d H:i:s')." - running check-backup utility\n";
 	try
 	{

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.',
-	'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 now.',
+	'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-backup/module.itop-backup.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/2.7.4',
+	'itop-backup/2.7.1',
 	array(
 		// Identification
 		//

datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/2.7.4',
+	'itop-bridge-virtualization-storage/2.7.0',
 	array(
 		// Identification
 		//

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' => 'Planifier',
+	'Class:Change/Stimulus:ev_plan' => 'Plannifier',
 	'Class:Change/Stimulus:ev_plan+' => '',
 	'Class:Change/Stimulus:ev_approve' => 'Approuver',
 	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Replanifier',
+	'Class:Change/Stimulus:ev_replan' => 'Replannifier',
 	'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' => 'Planifier',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Plannifier',
 	'Class:RoutineChange/Stimulus:ev_plan+' => '',
 	'Class:RoutineChange/Stimulus:ev_approve' => 'Approver',
 	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Replanifier',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Replannifier',
 	'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' => 'Planifier',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Plannifier',
 	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
 	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replanifier',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replannifier',
 	'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' => 'Planifier',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Plannifier',
 	'Class:NormalChange/Stimulus:ev_plan+' => '',
 	'Class:NormalChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Replanifier',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Replannifier',
 	'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' => 'Planifier',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Plannifier',
 	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
 	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approuver',
 	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replanifier',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replannifier',
 	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
 	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Ne pas approuver',
 	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',

datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php

@@ -3,7 +3,7 @@
 
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/2.7.4',
+	'itop-change-mgmt-itil/2.7.0',
 	array(
 		// Identification
 		//