Changeset 48502 in spip-zone

Timestamp:

Jun 6, 2011, 11:31:22 AM (10 years ago)

Author:

eric@…

Message:

Correction partielle de la fonction de comptage: seul le critère de compatibilité par branche est admis pour l'instant.

File:

• _plugins_/svp/svp_fonctions.php (modified) (5 diffs)

_plugins_/svp/svp_fonctions.php

@@ -121 +121 @@
 }
 
-function svp_compter_telechargements($id_depot=0, $categorie='', $branche_spip=''){
-        $total = svp_compter('paquet', $id_depot, $categorie, $branche_spip);
+function svp_compter_telechargements($id_depot=0, $categorie='', $compatible_spip=''){
+        $total = svp_compter('paquet', $id_depot, $categorie, $compatible_spip);
         $info = _T('svp:info_paquets_disponibles', array('total_paquets'=>$total['paquet']));
         return $info;
@@ -148 +148 @@
 }
 
-function svp_compter_plugins($id_depot=0, $categorie='', $branche_spip='') {
-        $total = svp_compter('plugin', $id_depot, $categorie, $branche_spip);
+function svp_compter_plugins($id_depot=0, $categorie='', $compatible_spip='') {
+        $total = svp_compter('plugin', $id_depot, $categorie, $compatible_spip);
         $info = _T('svp:info_plugins_disponibles', array('total_plugins'=>$total['plugin']));
         return $info;
 }
 
-function svp_compter($entite, $id_depot=0, $categorie='', $branche_spip=''){
+// Attention le criter de compatibilite spip pris en compte est uniquement celui d'une branche SPIP
+function svp_compter($entite, $id_depot=0, $categorie='', $compatible_spip=''){
         $compteurs = array();
 
@@ -167 +168 @@
                 if ($categorie)
                         $where[] = "t2.categorie=" . sql_quote($categorie);
-                if ($branche_spip) {
-                        $lister_compatibles = charger_fonction('svp_lister_compatibles', 'inc');
-                        $where[] = sql_in('t2.id_plugin', $lister_compatibles($branche_spip, 'plugins', 'id_plugin', 'tableau'));
+                if ($compatible_spip) {
+                        $where[] = "LOCATE($compatible_spip, t2.branches_spip)>0";
                 }
                 $compteurs['plugin'] = sql_count(sql_select('t2.id_plugin', $from, $where));
@@ -179 +179 @@
                         $where[] = sql_in('t1.id_plugin', $ids);
                 }
-                if ($branche_spip) {
-                        $lister_compatibles = charger_fonction('svp_lister_compatibles', 'inc');
-                        $ids = $lister_compatibles($branche_spip, 'paquets', 'id_paquet', 'tableau');
-                        $where[] = sql_in('t1.id_paquet', $ids);
+                if ($compatible_spip) {
+                        $where[] = "LOCATE($compatible_spip, t1.branches_spip)>0";
                 }
                 $compteurs['paquet'] = sql_countsel('spip_paquets AS t1', $where);
@@ -198 +196 @@
                         $ids = sql_allfetsel('id_plugin', 'spip_depots_plugins AS t1', $where);
                         $ids = array_map('reset', $ids);
-                }
-                if ($branche_spip) {
-                        $lister_compatibles = charger_fonction('svp_lister_compatibles', 'inc');
-                        $ids_compat = $lister_compatibles($branche_spip, 'plugins', 'id_plugin', 'tableau');
-                        $ids = $ids ? array_intersect($ids, $ids_compat) : $ids_compat;
-                }
-                if ($id_depot OR $branche_spip)
                         $where[] = sql_in('t2.id_plugin', $ids);
-
+                }
+                if ($compatible_spip) {
+                        $where[] = "LOCATE($compatible_spip, t2.branches_spip)>0";
+                }
                 if ($categorie)
                         $where[] = "t2.categorie=" . sql_quote($categorie);