X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fgroup.php;h=b5f45007b879f5ceff6697d276be76e0eb8a752a;hb=abd508e0a9df441fa1dac740013c8e2ab09d54cc;hp=ce93e92add4571ea02baaf76ae513613bada57c5;hpb=184b012d1fb4d02b6f5e5ed9e11fcd6457a36b06;p=platal.git

diff --git a/classes/group.php b/classes/group.php
index ce93e92..b5f4500 100644
--- a/classes/group.php
+++ b/classes/group.php
@@ -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();
@@ -54,9 +59,12 @@ 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 PFC_And($cond, $extra_cond);
+            $cond->addChild($extra_cond);
+        }
+        if ($this->cat == self::CAT_PROMOTIONS) {
+            $cond->addChild(new UFC_Registered());
         }
         return new UserFilter($cond, $sort);
     }
@@ -73,13 +81,13 @@ class Group
 
     public function iterMembers($extra_cond = null, $sort = null, $limit = null)
     {
-        $uf = getMembersFilter($extra_cond, $sort);
+        $uf = $this->getMembersFilter($extra_cond, $sort);
         return $uf->iterUsers($limit);
     }
 
     public function iterAdmins($extra_cond = null, $sort = null, $limit = null)
     {
-        $uf = getAdminsFilter($extra_cond, $sort);
+        $uf = $this->getAdminsFilter($extra_cond, $sort);
         return $uf->iterUsers($limit);
     }
 
@@ -93,15 +101,15 @@ class Group
         return null;
     }
 
-    static public function get($id)
+    static public function get($id, $can_be_shortname = true)
     {
         if (!$id) {
             return null;
         }
-        if (is_int($id) || 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,
@@ -110,6 +118,9 @@ class Group
                         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());