diff --git a/dist/modeles/pagination.html b/dist/modeles/pagination.html index 1b283be6c132de1a812f0c3f6ab9a08c8150f73a..c96500a237f05f4c96d4fdc83340448146f57496 100644 --- a/dist/modeles/pagination.html +++ b/dist/modeles/pagination.html @@ -1,5 +1,5 @@ -#ENV*{bloc_ancre} -#SET{bornes,#ENV{page_courante}|calcul_bornes_pagination{#ENV{nombre_pages},10}} +#ENV*{bloc_ancrebornes_pagination} +#SET{bornes,#ENV{page_courante}|bornes_pagination{#ENV{nombre_pages},10}} #SET{premiere, #GET{bornes}|reset} #SET{derniere, #GET{bornes}|end} #SET{separateur,'|'} diff --git a/dist/modeles/pagination_page.html b/dist/modeles/pagination_page.html index 44e8f00b446b97a2abc57357229d7f7d7a079a11..09a43e449f34475dd7f7ccb6e78526267d0a05f5 100644 --- a/dist/modeles/pagination_page.html +++ b/dist/modeles/pagination_page.html @@ -1,5 +1,5 @@ #ENV*{bloc_ancre} -#SET{bornes,#ENV{page_courante}|calcul_bornes_pagination{#ENV{nombre_pages},10}} +#SET{bornes,#ENV{page_courante}|bornes_pagination{#ENV{nombre_pages},10}} #SET{premiere, #GET{bornes}|reset} #SET{derniere, #GET{bornes}|end} #SET{separateur,'|'} diff --git a/dist/modeles/pagination_page_precedent_suivant.html b/dist/modeles/pagination_page_precedent_suivant.html index b72124d7f4cf602540567489dbaa90b396b0f853..be7e3260e571b9baf824df9ce16537a6e064fe83 100644 --- a/dist/modeles/pagination_page_precedent_suivant.html +++ b/dist/modeles/pagination_page_precedent_suivant.html @@ -1,5 +1,5 @@ #ENV*{bloc_ancre} -#SET{bornes,#ENV{page_courante}|calcul_bornes_pagination{#ENV{nombre_pages},10}} +#SET{bornes,#ENV{page_courante}|bornes_pagination{#ENV{nombre_pages},10}} #SET{premiere, #GET{bornes}|reset} #SET{derniere, #GET{bornes}|end} #SET{separateur,'|'} diff --git a/dist/modeles/pagination_precedent_suivant.html b/dist/modeles/pagination_precedent_suivant.html index d2a76beea475e53d7931ac4e526e15e11ca7dcc3..6a2f5a6bfa03efd4f506da00443fb56d8a10ffe1 100644 --- a/dist/modeles/pagination_precedent_suivant.html +++ b/dist/modeles/pagination_precedent_suivant.html @@ -1,5 +1,5 @@ #ENV*{bloc_ancre} -#SET{bornes,#ENV{page_courante}|calcul_bornes_pagination{#ENV{nombre_pages},10}} +#SET{bornes,#ENV{page_courante}|bornes_pagination{#ENV{nombre_pages},10}} #SET{premiere, #GET{bornes}|reset} #SET{derniere, #GET{bornes}|end} #SET{separateur,'|'} diff --git a/ecrire/inc/filtres.php b/ecrire/inc/filtres.php index 8153facc57c87dfee2efede7a4c499982c2069cd..9dd13ea6da0516363837b73a978ae0a0090018b2 100644 --- a/ecrire/inc/filtres.php +++ b/ecrire/inc/filtres.php @@ -1665,11 +1665,7 @@ function form_hidden($action) { return $hidden; } -// http://doc.spip.org/@calcul_bornes_pagination -function calcul_bornes_pagination($courante, $nombre, $max = 10) { - if (function_exists("bornes_pagination")) - return bornes_pagination($max, $nombre, $courante); - +function filtre_bornes_pagination_dist($courante, $nombre, $max = 10) { if($max<=0 OR $max>=$nombre) return array(1, $nombre); @@ -1716,8 +1712,7 @@ function filtre_find($array, $val) { // function pagination($total, $nom, $pas, $liste) {...} // -// http://doc.spip.org/@calcul_pagination -function calcul_pagination($total, $nom, $position, $pas, $liste = true, $modele='', $connect='') { +function filtre_pagination_dist($total, $nom, $position, $pas, $liste = true, $modele='', $connect='') { static $ancres = array(); $bloc_ancre = ""; @@ -1733,9 +1728,6 @@ function calcul_pagination($total, $nom, $position, $pas, $liste = true, $modele if ($position === NULL) $position = _request($debut); - if (function_exists("pagination")) - return pagination($total, $nom, $position, $pas, $liste); - // n'afficher l'ancre qu'une fois if (!isset($ancres[$ancre])) $bloc_ancre = $ancres[$ancre] = "<a name='$ancre' id='$ancre'></a>"; @@ -2174,12 +2166,7 @@ function filtre_foreach_dist($balise_deserializee, $modele = 'foreach') { // la valeur du second parametre si celui-ci renvoie a une information connue // cf liste_plugin_actifs() pour connaitre les informations affichables // appelee par la balise #PLUGIN -// http://doc.spip.org/@calcul_info_plugin -function calcul_info_plugin($plugin, $type_info) { - //surcharge possible pour afficher des donnees plus complexes - if(function_exists('info_plugin')) - return info_plugin($plugin, $type_info); - +function filtre_info_plugin_dist($plugin, $type_info) { include_spip('inc/plugin'); $plugin = strtoupper($plugin); $plugins_actifs = liste_plugin_actifs(); diff --git a/ecrire/public/balises.php b/ecrire/public/balises.php index 2bad7d9b324521fdc95a7563fb968523537dbfe3..d42991db34a294f36d2fd5a6a42792182f758877 100644 --- a/ecrire/public/balises.php +++ b/ecrire/public/balises.php @@ -472,7 +472,8 @@ function balise_INTRODUCTION_dist ($p) { $_chapo = "''"; $_descriptif = "''"; } - $p->code = "calcul_introduction('$type', $_texte, $_chapo, $_descriptif)"; + $f = chercher_filtre('introduction'); + $p->code = $f."('$type', $_texte, $_chapo, $_descriptif)"; #$p->interdire_scripts = true; return $p; @@ -605,7 +606,8 @@ function balise_PAGINATION_dist($p, $liste='true') { $p->boucles[$b]->numrows = true; $connect = $p->boucles[$b]->sql_serveur; - $p->code = "calcul_pagination( + $f_pagination = chercher_filtre('pagination'); + $p->code = $f_pagination."( (isset(\$Numrows['$b']['grand_total']) ? \$Numrows['$b']['grand_total'] : \$Numrows['$b']['total'] ), ".$p->boucles[$b]->modificateur['debut_nom'].", @@ -1433,7 +1435,8 @@ function balise_PLUGIN_dist($p) { $type_info = interprete_argument_balise(2,$p); $type_info = isset($type_info) ? str_replace('\'', '"', $type_info) : '"est_actif"'; - $p->code = 'calcul_info_plugin('.$plugin.', '.$type_info.')'; + $f = chercher_filtre('info_plugin'); + $p->code = $f.'('.$plugin.', '.$type_info.')'; return $p; } diff --git a/ecrire/public/composer.php b/ecrire/public/composer.php index 86986cf630f46a33a7b62519ddd13e1e07cd5c2c..efce56381a104c7852b8cb31502c6a43af02fb8e 100644 --- a/ecrire/public/composer.php +++ b/ecrire/public/composer.php @@ -180,11 +180,7 @@ function calcule_logo($type, $onoff, $id, $id_rubrique, $flag_fichier) { // on peut la surcharger en definissant dans mes_fonctions : // function introduction($type,$texte,$chapo,$descriptif) {...} // -// http://doc.spip.org/@calcul_introduction -function calcul_introduction ($type, $texte, $chapo='', $descriptif='') { - if (function_exists("introduction")) - return introduction ($type, $texte, $chapo, $descriptif); - +function filtre_introduction_dist($type, $texte, $chapo='', $descriptif='') { define('_INTRODUCTION_SUITE', ' (...)'); switch ($type) {