" . lang("export_job_import") . " -
"; $html .= "" . lang("export_job_status_update") . " -
"; - $initjs .= <" . $tt->error() . "
"; return $html_tab; } $template_data_ref_display->{display_tab_product_picture} - = display_input_tabs($product_ref, "front_image", $product_ref->{sorted_langs}, \%Langs, ["front_image"]); + = display_input_tabs($product_ref, "front_image", $product_ref->{sorted_langs}, + \%Langs, ["front_image"], $request_ref); $template_data_ref_display->{display_tab_product_characteristics} = display_input_tabs($product_ref, "product", $product_ref->{sorted_langs}, - \%Langs, ["product_name", "generic_name"]); + \%Langs, ["product_name", "generic_name"], $request_ref); my @display_fields_arr; foreach my $field (@fields) { # hide packaging field & origins are now displayed below allergens and traces in the ingredients section next if $field eq "origins" || $field eq "packaging"; $log->debug("display_field", {field_name => $field, field_value => $product_ref->{$field}}) if $log->is_debug(); - my $display_field = display_input_field($product_ref, $field, undef); + my $display_field = display_input_field($product_ref, $field, undef, $request_ref); push(@display_fields_arr, $display_field); } @@ -1035,16 +1043,20 @@ ($product_ref, $field, $language) $template_data_ref_display->{nutrition_checked} = $checked; $template_data_ref_display->{display_tab_ingredients_image} = display_input_tabs($product_ref, "ingredients_image", $product_ref->{sorted_langs}, - \%Langs, \@ingredients_fields); - $template_data_ref_display->{display_field_allergens} = display_input_field($product_ref, "allergens", undef); - $template_data_ref_display->{display_field_traces} = display_input_field($product_ref, "traces", undef); - $template_data_ref_display->{display_field_origins} = display_input_field($product_ref, "origins", undef); + \%Langs, \@ingredients_fields, $request_ref); + $template_data_ref_display->{display_field_allergens} + = display_input_field($product_ref, "allergens", undef, $request_ref); + $template_data_ref_display->{display_field_traces} + = display_input_field($product_ref, "traces", undef, $request_ref); + $template_data_ref_display->{display_field_origins} + = display_input_field($product_ref, "origins", undef, $request_ref); $template_data_ref_display->{display_tab_nutrition_image} - = display_input_tabs($product_ref, "nutrition_image", $product_ref->{sorted_langs}, \%Langs, - ["nutrition_image"]); - $template_data_ref_display->{display_field_serving_size} = display_input_field($product_ref, "serving_size", undef); + = display_input_tabs($product_ref, "nutrition_image", $product_ref->{sorted_langs}, + \%Langs, ["nutrition_image"], $request_ref); + $template_data_ref_display->{display_field_serving_size} + = display_input_field($product_ref, "serving_size", undef, $request_ref); - $initjs .= display_select_crop_init($product_ref); + $request_ref->{initjs} .= display_select_crop_init($product_ref); my $hidden_inputs = ''; @@ -1142,7 +1154,7 @@ ($product_ref, $field, $language) if (exists_taxonomy_tag("nutrients", "zz:$nid")) { $nutriment_ref->{name} = display_taxonomy_tag($lc, "nutrients", "zz:$nid"); # We may have a unit specific to the country (e.g. US nutrition facts table using the International Unit for this nutrient, and Europe using mg) - $unit = get_nutrient_unit($nid, $cc); + $unit = get_nutrient_unit($nid, $request_ref->{cc}); } else { if (defined $product_ref->{nutriments}{$nid . "_unit"}) { @@ -1481,7 +1493,7 @@ ($product_ref, $field, $language) $nutriments =~ s/,\n$//s; $other_nutriments =~ s/,\n$//s; - $scripts .= <{scripts} .= < var nutriments = { $nutriments @@ -1499,8 +1511,8 @@ ($product_ref, $field, $language) my @packaging_fields = ("packaging_image", "packaging_text"); $template_data_ref_display->{display_tab_packaging} - = display_input_tabs($product_ref, "packaging_image", $product_ref->{sorted_langs}, \%Langs, - \@packaging_fields); + = display_input_tabs($product_ref, "packaging_image", $product_ref->{sorted_langs}, + \%Langs, \@packaging_fields, $request_ref); # Add an empty packaging element to the form, that will be hidden and duplicated when the user adds new packaging items, # and another empty packaging element at the end @@ -1536,7 +1548,8 @@ ($product_ref, $field, $language) $template_data_ref_display->{display_product_history} = display_product_history($request_ref, $code, $product_ref); $template_data_ref_display->{product} = $product_ref; - process_template('web/pages/product_edit/product_edit_form_display.tt.html', $template_data_ref_display, \$html) + process_template('web/pages/product_edit/product_edit_form_display.tt.html', + $template_data_ref_display, \$html, $request_ref) or $html = "" . $tt->error() . "
"; $request_ref->{page_type} = "product_edit"; @@ -1554,7 +1567,7 @@ ($product_ref, $field, $language) $template_data_ref_moderator->{code} = $code; process_template('web/pages/product_edit/product_edit_form_display_user-moderator.tt.html', - $template_data_ref_moderator, \$html) + $template_data_ref_moderator, \$html, $request_ref) or $html = "" . $tt->error() . "
"; } @@ -1634,12 +1647,13 @@ ($product_ref, $field, $language) $knowledge_panels_options_ref = {}; initialize_knowledge_panels_options($knowledge_panels_options_ref, $request_ref); $knowledge_panels_options_ref->{knowledge_panels_client} = "web"; - create_contribution_card_panel($product_ref, $lc, $cc, $knowledge_panels_options_ref); + create_contribution_card_panel($product_ref, $lc, $request_ref->{cc}, $knowledge_panels_options_ref); $template_data_ref_process->{contribution_card_panel} = display_knowledge_panel($product_ref, $product_ref->{"knowledge_panels_" . $lc}, "contribution_card"); } $template_data_ref_process->{code} = $product_ref->{code}; - process_template('web/pages/product_edit/product_edit_form_process.tt.html', $template_data_ref_process, \$html) + process_template('web/pages/product_edit/product_edit_form_process.tt.html', + $template_data_ref_process, \$html, $request_ref) or $html = "" . $tt->error() . "
"; } diff --git a/cgi/search.pl b/cgi/search.pl index b77a2eca6db00..332638f9202f0 100755 --- a/cgi/search.pl +++ b/cgi/search.pl @@ -112,7 +112,7 @@ = qw(brands categories packaging labels origins manufacturing_places emb_codes purchase_places stores countries ingredients additives allergens traces nutrition_grades nova_groups ecoscore languages creator editors states); -$admin and push @search_fields, "lang"; +$request_ref->{admin} and push @search_fields, "lang"; my %search_tags_fields = ( packaging => 1, @@ -474,19 +474,19 @@ } - $styles .= <" . $tt->error() . "
"; - process_template('web/pages/user_form/user_form.tt.js', $template_data_ref, \$js); + process_template('web/pages/user_form/user_form.tt.js', $template_data_ref, \$js, $request_ref); - $initjs .= $js; + $request_ref->{initjs} .= $js; $request_ref->{title} = lang($type . '_user_' . $action); $request_ref->{content_ref} = \$html; diff --git a/lib/ProductOpener/API.pm b/lib/ProductOpener/API.pm index 4118e2c723503..caee01ea7de41 100644 --- a/lib/ProductOpener/API.pm +++ b/lib/ProductOpener/API.pm @@ -711,7 +711,7 @@ sub customize_response_for_product ($request_ref, $product_ref, $fields_comma_se } # Localize the Eco-Score fields that depend on the country of the request - localize_ecoscore($cc, $product_ref); + localize_ecoscore($request_ref->{cc}, $product_ref); # lets compute each requested field foreach my $field (@fields) { @@ -742,7 +742,7 @@ sub customize_response_for_product ($request_ref, $product_ref, $fields_comma_se # Allow apps to request a HTML nutrition table by passing &fields=nutrition_table_html if ($field eq "nutrition_table_html") { - $customized_product_ref->{$field} = display_nutrition_table($product_ref, undef); + $customized_product_ref->{$field} = display_nutrition_table($product_ref, undef, $request_ref); next; } @@ -750,7 +750,8 @@ sub customize_response_for_product ($request_ref, $product_ref, $fields_comma_se if ($field eq "ecoscore_details_simple_html") { if ((1 or $show_ecoscore) and (defined $product_ref->{ecoscore_data})) { $customized_product_ref->{$field} - = display_ecoscore_calculation_details_simple_html($cc, $product_ref->{ecoscore_data}); + = display_ecoscore_calculation_details_simple_html($request_ref->{cc}, + $product_ref->{ecoscore_data}); } next; } @@ -828,14 +829,14 @@ sub customize_response_for_product ($request_ref, $product_ref, $fields_comma_se # Product attributes requested in a specific language (or data only) if ($field =~ /^attribute_groups_([a-z]{2}|data)$/) { my $target_lc = $1; - compute_attributes($product_ref, $target_lc, $cc, $attributes_options_ref); + compute_attributes($product_ref, $target_lc, $request_ref->{cc}, $attributes_options_ref); $customized_product_ref->{$field} = $product_ref->{$field}; next; } # Product attributes in the $lc language if ($field eq "attribute_groups") { - compute_attributes($product_ref, $lc, $cc, $attributes_options_ref); + compute_attributes($product_ref, $lc, $request_ref->{cc}, $attributes_options_ref); $customized_product_ref->{$field} = $product_ref->{"attribute_groups_" . $lc}; next; } @@ -843,7 +844,7 @@ sub customize_response_for_product ($request_ref, $product_ref, $fields_comma_se # Knowledge panels in the $lc language if ($field eq "knowledge_panels") { initialize_knowledge_panels_options($knowledge_panels_options_ref, $request_ref); - create_knowledge_panels($product_ref, $lc, $cc, $knowledge_panels_options_ref); + create_knowledge_panels($product_ref, $lc, $request_ref->{cc}, $knowledge_panels_options_ref, $request_ref); $customized_product_ref->{$field} = $product_ref->{"knowledge_panels_" . $lc}; next; } diff --git a/lib/ProductOpener/APIProductRevert.pm b/lib/ProductOpener/APIProductRevert.pm index 71cc4c75a332d..2ecb0cff974ac 100644 --- a/lib/ProductOpener/APIProductRevert.pm +++ b/lib/ProductOpener/APIProductRevert.pm @@ -55,7 +55,7 @@ use ProductOpener::Mail qw/send_email_to_admin/; use Encode; -=head2 revert_product_api() +=head2 revert_product_api($request_ref) Process API v3 requests to revert a product to a specific revision. diff --git a/lib/ProductOpener/APIProductServices.pm b/lib/ProductOpener/APIProductServices.pm index 0e49e0281c4db..e70ccbc068195 100644 --- a/lib/ProductOpener/APIProductServices.pm +++ b/lib/ProductOpener/APIProductServices.pm @@ -170,7 +170,7 @@ sub check_product_services_api_input ($request_ref) { return $error; } -=head2 product_services_api() +=head2 product_services_api($request_ref) Process API v3 product services requests. diff --git a/lib/ProductOpener/APIProductWrite.pm b/lib/ProductOpener/APIProductWrite.pm index cd0ebd337b921..abe224347b228 100644 --- a/lib/ProductOpener/APIProductWrite.pm +++ b/lib/ProductOpener/APIProductWrite.pm @@ -353,7 +353,7 @@ sub update_product_fields ($request_ref, $product_ref, $response_ref) { return; } -=head2 write_product_api() +=head2 write_product_api($request_ref) Process API v3 WRITE product requests. diff --git a/lib/ProductOpener/APITagRead.pm b/lib/ProductOpener/APITagRead.pm index 62f9d7b9238cb..7ac927654a2b1 100644 --- a/lib/ProductOpener/APITagRead.pm +++ b/lib/ProductOpener/APITagRead.pm @@ -44,7 +44,7 @@ BEGIN { use vars @EXPORT_OK; use ProductOpener::Config qw/:all/; -use ProductOpener::Display qw/$cc $knowledge_panels_options_ref/; +use ProductOpener::Display qw/$knowledge_panels_options_ref/; use ProductOpener::Users qw/:all/; use ProductOpener::Lang qw/$lc lang/; use ProductOpener::API qw/add_error/; @@ -130,7 +130,8 @@ sub read_tag_api ($request_ref) { initialize_knowledge_panels_options($knowledge_panels_options_ref, $request_ref); my $tag_ref = {}; # Object to store the knowledge panels my $panels_created - = create_tag_knowledge_panels($tag_ref, $lc, $cc, $knowledge_panels_options_ref, $tagtype, $canon_tagid); + = create_tag_knowledge_panels($tag_ref, $lc, $request_ref->{cc}, $knowledge_panels_options_ref, $tagtype, + $canon_tagid); if ($panels_created) { $response_ref->{tag}{knowledge_panels} = $tag_ref->{"knowledge_panels" . "_" . $lc}; diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm index 376bf578bbed9..95db6fa3be7c9 100644 --- a/lib/ProductOpener/Display.pm +++ b/lib/ProductOpener/Display.pm @@ -108,13 +108,6 @@ BEGIN { @search_series - $admin - - $scripts - $initjs - $styles - $header - $original_subdomain $subdomain $formatted_subdomain @@ -123,7 +116,6 @@ BEGIN { $producers_platform_url $test @lcs - $cc $country $tt @@ -220,8 +212,6 @@ use Apache2::Const qw(:http :common); use URI::Find; -my $bodyabout; - my $uri_finder = URI::Find->new( sub ($uri, $orig_uri) { if ($uri =~ /\http/) { @@ -251,7 +241,7 @@ in order to make sure the browser will not serve an old cached version. =head3 Synopsis - $scripts .= <{scripts} .= < HTML ; @@ -377,13 +367,13 @@ sub url_for_text ($textid) { } } -=head2 process_template ( $template_filename , $template_data_ref , $result_content_ref ) +=head2 process_template ( $template_filename , $template_data_ref , $result_content_ref, $request_ref = {} ) Add some functions and variables needed by many templates and process the template with template toolkit. =cut -sub process_template ($template_filename, $template_data_ref, $result_content_ref) { +sub process_template ($template_filename, $template_data_ref, $result_content_ref, $request_ref = {}) { # Add functions and values that are passed to all templates @@ -404,7 +394,7 @@ sub process_template ($template_filename, $template_data_ref, $result_content_re $template_data_ref->{flavor} = $flavor; $template_data_ref->{options} = \%options; $template_data_ref->{product_type} = $options{product_type}; - $template_data_ref->{admin} = $admin; + $template_data_ref->{admin} = $request_ref->{admin}; $template_data_ref->{moderator} = $User{moderator}; $template_data_ref->{pro_moderator} = $User{pro_moderator}; $template_data_ref->{sep} = separator_before_colon($lc); @@ -424,7 +414,7 @@ sub process_template ($template_filename, $template_data_ref, $result_content_re $template_data_ref->{edq} = sub {escape_char(@_, '"')}; # edq as escape_double_quote $template_data_ref->{lang_sprintf} = \&lang_sprintf; $template_data_ref->{lc} = $lc; - $template_data_ref->{cc} = $cc; + $template_data_ref->{cc} = $request_ref->{cc}; $template_data_ref->{display_icon} = \&display_icon; $template_data_ref->{time_t} = time(); $template_data_ref->{display_date_without_time} = \&display_date_without_time; @@ -435,12 +425,15 @@ sub process_template ($template_filename, $template_data_ref, $result_content_re $template_data_ref->{product_action_url} = \&product_action_url; $template_data_ref->{product_name_brand_quantity} = \&product_name_brand_quantity; $template_data_ref->{has_permission} = sub ($permission) { - # Note: we pass a fake $request_ref object with only the fields admin, moderator and pro_moderator - # an alternative would be to pass the $request_ref object to process_template() calls - return has_permission({admin => $admin, moderator => $User{moderator}, pro_moderator => $User{pro_moderator}}, - $permission); + return has_permission($request_ref, $permission); }; + $template_data_ref->{scripts} = $request_ref->{scripts}; + $template_data_ref->{initjs} = $request_ref->{initjs}; + $template_data_ref->{header} = $request_ref->{header}; + $template_data_ref->{styles} = $request_ref->{styles}; + $template_data_ref->{bodyabout} = $request_ref->{bodyabout}; + # Return a link to one taxonomy entry in the target language $template_data_ref->{canonicalize_taxonomy_tag_link} = sub ($tagtype, $tag) { return canonicalize_taxonomy_tag_link($lc, $tagtype, $tag); @@ -635,17 +628,16 @@ sub init_request ($request_ref = {}) { } # TODO: global variables should be moved to $request_ref - $styles = ''; - $scripts = ''; - $initjs = ''; - $header = ''; - $bodyabout = ''; - $admin = 0; + $request_ref->{styles} = ''; + $request_ref->{scripts} = ''; + $request_ref->{initjs} = ''; + $request_ref->{header} = ''; + $request_ref->{bodyabout} = ''; my $r = Apache2::RequestUtil->request(); $request_ref->{method} = $r->method(); - $cc = 'world'; + my $cc = 'world'; $lc = 'en'; @lcs = (); $country = 'en:world'; @@ -887,13 +879,12 @@ sub init_request ($request_ref = {}) { $request_ref->{user_id} = $User_id; + $request_ref->{admin} = 0; # %admin is defined in Config.pm # admins can change permissions for all users if (is_admin_user($User_id)) { - $admin = 1; + $request_ref->{admin} = 1; } - $request_ref->{admin} = $admin; - # TODO: remove the $admin global variable, and use $request_ref->{admin} instead. $request_ref->{moderator} = $User{moderator}; $request_ref->{pro_moderator} = $User{pro_moderator}; @@ -903,13 +894,13 @@ sub init_request ($request_ref = {}) { if (($server_options{producers_platform}) and not((defined $Owner_id) and (($Owner_id =~ /^org-/) or ($User{moderator}) or $User{pro_moderator}))) { - $styles .= <web/pages/org_profile/org_profile.tt.html template error: " . $tt->error() . "
"; } @@ -4178,7 +4174,7 @@ HTML # Display the user profile - if (($tagid eq $User_id) or $admin) { + if (($tagid eq $User_id) or $request_ref->{admin}) { $user_template_data_ref->{edit_profile} = 1; $user_template_data_ref->{userid} = $tagid; } @@ -4216,10 +4212,10 @@ HTML and ($tagtype eq 'categories')) { - my $categories_nutriments_ref = $categories_nutriments_per_country{$cc}; + my $categories_nutriments_ref = $categories_nutriments_per_country{$request_ref->{cc}}; $log->debug("checking if this category has stored statistics", - {cc => $cc, tagtype => $tagtype, tagid => $tagid}) + {cc => $request_ref->{cc}, tagtype => $tagtype, tagid => $tagid}) if $log->is_debug(); if ( (defined $categories_nutriments_ref) and (defined $categories_nutriments_ref->{$canon_tagid}) @@ -4227,7 +4223,7 @@ HTML { $log->debug( "statistics found for the tag, addind stats to description", - {cc => $cc, tagtype => $tagtype, tagid => $tagid} + {cc => $request_ref->{cc}, tagtype => $tagtype, tagid => $tagid} ) if $log->is_debug(); $description @@ -4239,7 +4235,7 @@ HTML $display_tag, $categories_nutriments_ref->{$canon_tagid}{count} ) . "" - . display_nutrition_table($categories_nutriments_ref->{$canon_tagid}, undef); + . display_nutrition_table($categories_nutriments_ref->{$canon_tagid}, undef, $request_ref); } } @@ -4288,8 +4284,8 @@ HTML initialize_knowledge_panels_options($knowledge_panels_options_ref, $request_ref); my $tag_ref = {}; # Object to store the knowledge panels my $panels_created - = create_tag_knowledge_panels($tag_ref, $lc, $cc, $knowledge_panels_options_ref, $tagtype, - $canon_tagid); + = create_tag_knowledge_panels($tag_ref, $lc, $request_ref->{cc}, $knowledge_panels_options_ref, + $tagtype, $canon_tagid); if ($panels_created) { $tag_template_data_ref->{tag_panels} = display_knowledge_panel($tag_ref, $tag_ref->{"knowledge_panels_" . $lc}, "root"); @@ -4299,7 +4295,7 @@ HTML } # end of if (defined $tagtype) $tag_template_data_ref->{country} = $country; - $tag_template_data_ref->{country_code} = $cc; + $tag_template_data_ref->{country_code} = $request_ref->{cc}; $tag_template_data_ref->{facets_kp_url} = $facets_kp_url; if ($country ne 'en:world') { @@ -4494,7 +4490,7 @@ sub display_search_results ($request_ref) { my $preferences_text = lang("classify_products_according_to_your_preferences"); - $scripts .= <"; @@ -6379,7 +6375,7 @@ HTML } -=head2 display_histogram ($graph_ref, $products_ref) +=head2 display_histogram ($graph_ref, $products_ref, $request_ref) Called by search_and_graph_products() to display an histogram of products on 1 axis @@ -6395,7 +6391,7 @@ List of search results from search_and_graph_products() =cut -sub display_histogram ($graph_ref, $products_ref) { +sub display_histogram ($graph_ref, $products_ref, $request_ref) { my @products = @{$products_ref}; my $count = @products; @@ -6730,11 +6726,11 @@ JS }); JS ; - $initjs .= $js; + $request_ref->{initjs} .= $js; my $count_string = sprintf(lang("graph_count"), $count, $i); - $scripts .= <