X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgroups.inc.php;h=461ba139c799a79752fa89a2b12da8aa512a4ad1;hb=f280f651c1ea4059896655b132ddaec1e39cbd1b;hp=97f85f5d3bbb4afac5d217ffcfd60edf31e983b8;hpb=d2100923749766ffcf61745b0145cf82a3886716;p=platal.git

diff --git a/modules/profile/groups.inc.php b/modules/profile/groups.inc.php
index 97f85f5..461ba13 100644
--- a/modules/profile/groups.inc.php
+++ b/modules/profile/groups.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -43,17 +43,10 @@ class ProfileSection implements ProfileSetting
     }
 }
 
-class ProfileGroup implements ProfileSetting
+class ProfileBinets implements ProfileSetting
 {
-    private $table;
-    private $user_field;
-    private $group_field;
-
-    public function __construct($table, $user, $group)
+    public function __construct()
     {
-        $this->table       = $table;
-        $this->user_field  = $user;
-        $this->group_field = $group;
     }
 
     public function value(ProfilePage &$page, $field, $value, &$success)
@@ -61,9 +54,9 @@ class ProfileGroup implements ProfileSetting
         if (is_null($value)) {
             $value = array();
             $res = XDB::iterRow("SELECT  g.id, g.text
-                                   FROM  {$this->table}_def AS g
-                             INNER JOIN  {$this->table}_ins AS i ON (i.{$this->group_field} = g.id)
-                                  WHERE  i.{$this->user_field} = {?}",
+                                   FROM  profile_binet_enum AS g
+                             INNER JOIN  profile_binets AS i ON (i.binet_id = g.id)
+                                  WHERE  i.pid = {?}",
                                 $page->pid());
             while (list($gid, $text) = $res->next()) {
                 $value[intval($gid)] = $text;
@@ -79,8 +72,8 @@ class ProfileGroup implements ProfileSetting
 
     public function save(ProfilePage &$page, $field, $value)
     {
-        XDB::execute("DELETE FROM  {$this->table}_ins
-                            WHERE  {$this->user_field} = {?}",
+        XDB::execute("DELETE FROM  profile_binets
+                            WHERE  pid = {?}",
                      $page->pid());
         if (!count($value)) {
             return;
@@ -89,7 +82,7 @@ class ProfileGroup implements ProfileSetting
         foreach ($value as $id=>$text) {
             $insert[] = XDB::format('({?}, {?})', $page->pid(), $id);
         }
-        XDB::execute("INSERT INTO  {$this->table}_ins ({$this->user_field}, {$this->group_field})
+        XDB::execute("INSERT INTO  profile_binets (pid, binet_id)
                            VALUES  " . implode(',', $insert));
     }
 }
@@ -102,21 +95,21 @@ class ProfileGroups extends ProfilePage
     {
         parent::__construct($wiz);
         $this->settings['section']  = new ProfileSection();
-        $this->settings['binets']   = new ProfileGroup('binets', 'user_id', 'binet_id');
+        $this->settings['binets']   = new ProfileBinets();
         $this->watched['section'] = $this->watched['binets'] = true;
     }
 
     public function _prepare(PlPage &$page, $id)
     {
         $page->assign('mygroups', XDB::iterator("SELECT  a.nom, a.site, a.diminutif, a.unsub_url, a.pub, m.perms
-                                                   FROM  groupex.asso    AS a
-                                             INNER JOIN  groupex.membres AS m ON (m.asso_id = a.id)
+                                                   FROM  groups    AS a
+                                             INNER JOIN  group_members AS m ON (m.asso_id = a.id)
                                                   WHERE  m.uid = {?} AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')",
                                                 $this->pid()));
         $page->assign('listgroups', XDB::iterator("SELECT  a.nom, a.diminutif, a.sub_url,
                                                            IF (a.cat = 'Institutions', a.cat, d.nom) AS dom
-                                                     FROM  groupex.asso  AS a
-                                                LEFT JOIN  groupex.dom   AS d ON (d.id = a.dom)
+                                                     FROM  groups  AS a
+                                                LEFT JOIN  group_dom   AS d ON (d.id = a.dom)
                                                     WHERE  a.inscriptible != 0
                                                            AND (a.cat = 'GroupesX' OR a.cat = 'Institutions')
                                                  ORDER BY  a.cat, a.dom, a.nom"));