marche avec MySql, SQLite ou XML

[mw_sourceml] / app / controllers / users / sources_invitations.php

diff --git a/app/controllers/users/sources_invitations.php b/app/controllers/users/sources_invitations.php
index 247c00b..6691283 100644 (file)
--- a/app/controllers/users/sources_invitations.php
+++ b/app/controllers/users/sources_invitations.php
@@ -45,25 +45,9 @@
         $env->erreur("Impossible de lire la liste des groupes");
         return;
       }
-      $groupes_in = "";
-      foreach($groupes["list"] as $id_groupe => $groupe) $groupes_in .= ($groupes_in ? "," : "").$id_groupe;
-      $invitations = array("list" => array(), "total" => 0);
-      if($groupes_in){
-        if(
-          (
-            $invitations = $data->list_sml_sources_invitations(
-              array(
-                "index_name" => "id",
-                "where"=> "id_author IN(".$groupes_in.") OR id_user=".$this->user["id"],
-                "order_by" => "date_invitation",
-                "order" => "DESC"
-              )
-            )
-          ) === false
-        ){
-          $env->erreur("Impossible de lire la liste des invitations");
-          return;
-        }
+      if(($invitations = $data->sources_invitations($groupes["list"], $this->user["id"])) === false){
+        $env->erreur("Impossible de lire la liste des invitations");
+        return;
       }
       foreach($invitations["list"] as $id_invitation => $invitation){
         if(!($user = $data->user_by_id($invitation["id_user"]))){
@@ -108,7 +92,18 @@
         $env->erreur("Impossible de lire la liste des groupes");
         return;
       }
-      if(($invitations = $data->list_sml_sources_invitations(array("index_name" => "id", "where"=> "id_source=".$source["id"]))) === false){
+      if(
+        (
+          $invitations = $data->list_sml_sources_invitations(
+            array(
+              "index_name" => "id",
+              "filters" => array(
+                array("id_source", "eq", $source["id"])
+              )
+            )
+          )
+        ) === false
+      ){
         $env->erreur("Impossible de lire la liste des invitations pour cette source");
         return;
       }