X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fgroup.php;h=63ca84b0938867520d22472f4e7e4ba4781d70c1;hb=0c9edc89377266444fa06b77104dc5781eae1698;hp=c75191b5db01475f6d048cd322545982462ad711;hpb=d865c29631a10f492218a0ec4b6232b273cee3a9;p=platal.git

diff --git a/classes/group.php b/classes/group.php
index c75191b..63ca84b 100644
--- a/classes/group.php
+++ b/classes/group.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,6 +21,11 @@
 
 class Group
 {
+    const CAT_GROUPESX     = "GroupesX";
+    const CAT_BINETS       = "Binets";
+    const CAT_PROMOTIONS   = "Promotions";
+    const CAT_INSTITUTIONS = "Institutions";
+
     public $id;
     public $shortname;
     private $data = array();
@@ -32,6 +37,9 @@ class Group
         }
         $this->id = intval($this->data['id']);
         $this->shortname = $this->data['diminutif'];
+        if (!is_null($this->axDate)) {
+            $this->axDate = format_datetime($this->axDate, '%d/%m/%Y');
+        }
     }
 
     public function __get($name)
@@ -54,43 +62,77 @@ class Group
 
     private function getUF($admin = false, $extra_cond = null, $sort = null)
     {
-        $cond = new UFC_Group($this->id, $admin);
+        $cond = new PFC_And(new UFC_Group($this->id, $admin), new PFC_Not(new UFC_Dead()));
         if (!is_null($extra_cond)) {
-            $cond = new UFC_And($cond, $extra_cond);
+            $cond->addChild($extra_cond);
+        }
+        if ($this->cat == self::CAT_PROMOTIONS) {
+            $cond->addChild(new UFC_Registered());
         }
         return new UserFilter($cond, $sort);
     }
 
-    public function getMembers($extra_cond = null, $sort = null)
+    public function getMembersFilter($extra_cond = null, $sort = null)
     {
         return $this->getUF(false, $extra_cond, $sort);
     }
 
-    public function getAdmins($extra_cond = null, $sort = null)
+    public function getAdminsFilter($extra_cond = null, $sort = null)
     {
         return $this->getUF(true, $extra_cond, $sort);
     }
 
-    static public function get($id)
+    public function iterMembers($extra_cond = null, $sort = null, $limit = null)
+    {
+        $uf = $this->getMembersFilter($extra_cond, $sort);
+        return $uf->iterUsers($limit);
+    }
+
+    public function iterAdmins($extra_cond = null, $sort = null, $limit = null)
+    {
+        $uf = $this->getAdminsFilter($extra_cond, $sort);
+        return $uf->iterUsers($limit);
+    }
+
+    public function getLogo($fallback = true)
+    {
+        if (!empty($this->logo)) {
+            return PlImage::fromData($this->logo, $this->logo_mime);
+        } else if ($fallback) {
+            return PlImage::fromFile(dirname(__FILE__).'/../htdocs/images/dflt_carre.jpg', 'image/jpeg');
+        }
+        return null;
+    }
+
+    static public function get($id, $can_be_shortname = true)
     {
         if (!$id) {
             return null;
         }
-        if (ctype_digit($id)) {
-            $where = XDB::format('id = {?}', $id);
+        if (!$can_be_shortname) {
+            $where = XDB::format('a.id = {?}', $id);
         } else {
-            $where = XDB::format('diminutif = {?}', $id);
+            $where = XDB::format('a.diminutif = {?}', $id);
         }
         $res = XDB::query('SELECT  a.*, d.nom AS domnom,
                                    FIND_IN_SET(\'wiki_desc\', a.flags) AS wiki_desc,
                                    FIND_IN_SET(\'notif_unsub\', a.flags) AS notif_unsub
-                             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  ' . $where);
         if ($res->numRows() != 1) {
+            if ($can_be_shortname && (is_int($id) || ctype_digit($id))) {
+                return Group::get($id, false);
+            }
             return null;
         }
-        return new Group($res->fetchOneAssoc());
+        $data = $res->fetchOneAssoc();
+        $positions = XDB::fetchAllAssoc('SELECT  position, uid
+                                           FROM  group_members
+                                          WHERE  asso_id = {?} AND position IS NOT NULL
+                                       ORDER BY  position',
+                                        $data['id']);
+        return new Group(array_merge($data, array('positions' => $positions)));
     }
 }