X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fgroup.php;h=1268ded7d9f87702c1ec9a42423f4ff64e8b1009;hb=864957c1022d432cb0351e47d5286e181183de9e;hp=c75191b5db01475f6d048cd322545982462ad711;hpb=89cb2025f5f2aed0be3994c89ac473aa11535853;p=platal.git

diff --git a/classes/group.php b/classes/group.php
index c75191b..1268ded 100644
--- a/classes/group.php
+++ b/classes/group.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   *
@@ -56,7 +56,7 @@ class Group
     {
         $cond = new UFC_Group($this->id, $admin);
         if (!is_null($extra_cond)) {
-            $cond = new UFC_And($cond, $extra_cond);
+            $cond = new PFC_And($cond, $extra_cond);
         }
         return new UserFilter($cond, $sort);
     }
@@ -71,6 +71,16 @@ class Group
         return $this->getUF(true, $extra_cond, $sort);
     }
 
+    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)
     {
         if (!$id) {
@@ -84,8 +94,8 @@ class Group
         $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) {
             return null;