Refactoring : sécurité (XSS), découpage en modules inc/* et js/admin/*, IDs résolus par slug, perf (caches, cron Gravatar, assets auto-hébergés), tests
This commit is contained in:
@@ -1,15 +1,16 @@
|
||||
<?php
|
||||
$context = Timber::context();
|
||||
|
||||
$excluded_cat_ids = [12, 31]; // Séance de séminaire, Non classé
|
||||
if ( ! is_user_logged_in() ) $excluded_cat_ids[] = 9; // Vie du labo
|
||||
// Séance de séminaire, Non classé (+ Vie du labo pour les non-connectés)
|
||||
$excluded_cat_ids = thalim_archive_excluded_cat_ids();
|
||||
|
||||
// Read filter query params
|
||||
$active_axe = isset($_GET['axe']) ? intval($_GET['axe']) : 0;
|
||||
$active_date_from = isset($_GET['date_from']) ? sanitize_text_field($_GET['date_from']) : '';
|
||||
$active_date_to = isset($_GET['date_to']) ? sanitize_text_field($_GET['date_to']) : '';
|
||||
$active_cat_id = isset($_GET['filter_cat']) ? intval($_GET['filter_cat']) : 0;
|
||||
$filter_autres = isset($_GET['filter_autres']) ? 1 : 0;
|
||||
$f = thalim_archive_read_filters();
|
||||
$active_axe = $f['axe'];
|
||||
$active_date_from = $f['date_from'];
|
||||
$active_date_to = $f['date_to'];
|
||||
$active_cat_id = $f['cat_id'];
|
||||
$filter_autres = $f['filter_autres'];
|
||||
|
||||
$context['active_axe'] = $active_axe;
|
||||
$context['active_date_from'] = $active_date_from;
|
||||
@@ -36,13 +37,7 @@ if ( $active_cat_id && ! $filter_autres ) {
|
||||
}
|
||||
|
||||
// Determine active rubrique
|
||||
$active_rubrique_id = 0;
|
||||
if ($active_cat_id) {
|
||||
$active_cat_obj = get_category($active_cat_id);
|
||||
$active_rubrique_id = ($active_cat_obj && $active_cat_obj->parent)
|
||||
? $active_cat_obj->parent
|
||||
: $active_cat_id;
|
||||
}
|
||||
$active_rubrique_id = thalim_archive_active_rubrique($active_cat_id);
|
||||
$context['active_rubrique'] = $active_rubrique_id;
|
||||
|
||||
// Base filter params preserved across all filter links
|
||||
@@ -76,7 +71,6 @@ $query_args = [
|
||||
'posts_per_page' => 12,
|
||||
'orderby' => 'date',
|
||||
'order' => 'DESC',
|
||||
'lang' => '',
|
||||
'tax_query' => $tax_query,
|
||||
'thalim_event_date_order' => true,
|
||||
];
|
||||
@@ -100,61 +94,20 @@ $context['filter_axes'] = $current_axes;
|
||||
$page_url = get_permalink();
|
||||
$all_cats = get_categories(['taxonomy' => 'category', 'hide_empty' => false, 'exclude' => $excluded_cat_ids]);
|
||||
|
||||
$filter_parents = [];
|
||||
foreach ($all_cats as $cat) {
|
||||
if ($cat->parent == 0) {
|
||||
$filter_parents[] = [
|
||||
'id' => $cat->term_id,
|
||||
'name' => thalim_cat_name($cat),
|
||||
'slug' => $cat->slug,
|
||||
'link' => $base_filter_params
|
||||
? add_query_arg($base_filter_params, get_category_link($cat->term_id))
|
||||
: get_category_link($cat->term_id),
|
||||
];
|
||||
}
|
||||
}
|
||||
$context['filter_parents'] = $filter_parents;
|
||||
// Liens de filtre : navigation vers la page de catégorie, en conservant axe/dates
|
||||
$make_cat_link = function ($cat) use ($base_filter_params) {
|
||||
return $base_filter_params
|
||||
? add_query_arg($base_filter_params, get_category_link($cat->term_id))
|
||||
: get_category_link($cat->term_id);
|
||||
};
|
||||
$context['filter_parents'] = thalim_archive_filter_parents($all_cats, $make_cat_link);
|
||||
|
||||
$filter_categories = thalim_archive_filter_children($all_cats, $active_rubrique_id, $make_cat_link);
|
||||
|
||||
$filter_categories = [];
|
||||
if ($active_rubrique_id) {
|
||||
foreach ($all_cats as $cat) {
|
||||
if ($cat->parent == $active_rubrique_id) {
|
||||
$filter_categories[] = [
|
||||
'id' => $cat->term_id,
|
||||
'name' => thalim_cat_name($cat),
|
||||
'slug' => $cat->slug,
|
||||
'link' => $base_filter_params
|
||||
? add_query_arg($base_filter_params, get_category_link($cat->term_id))
|
||||
: get_category_link($cat->term_id),
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
// Add "Autres" entry if active rubrique has posts directly assigned to it
|
||||
if ($active_rubrique_id && !empty($filter_categories)) {
|
||||
$lang = thalim_current_language();
|
||||
$direct_check = new WP_Query([
|
||||
'post_type' => 'post',
|
||||
'posts_per_page' => 1,
|
||||
'fields' => 'ids',
|
||||
'no_found_rows' => true,
|
||||
'lang' => '',
|
||||
'tax_query' => [[
|
||||
'taxonomy' => 'category',
|
||||
'field' => 'term_id',
|
||||
'terms' => [$active_rubrique_id],
|
||||
'include_children' => false,
|
||||
]],
|
||||
]);
|
||||
if ($direct_check->have_posts()) {
|
||||
$params = array_filter(array_merge($base_filter_params, ['filter_cat' => $active_rubrique_id, 'filter_autres' => 1]));
|
||||
$filter_categories[] = [
|
||||
'id' => 'autres',
|
||||
'name' => $lang === 'en' ? 'Other' : 'Autres',
|
||||
'slug' => 'autres',
|
||||
'link' => add_query_arg($params, $page_url),
|
||||
];
|
||||
}
|
||||
if ($active_rubrique_id && !empty($filter_categories) && thalim_rubrique_has_direct_posts($active_rubrique_id)) {
|
||||
$params = array_filter(array_merge($base_filter_params, ['filter_cat' => $active_rubrique_id, 'filter_autres' => 1]));
|
||||
$filter_categories[] = thalim_archive_autres_entry(add_query_arg($params, $page_url));
|
||||
}
|
||||
$context['filter_categories'] = $filter_categories;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user