aurel's bugs

[platal.git] / modules / carnet.php

diff --git a/modules/carnet.php b/modules/carnet.php
index 69b29b9..6d79e6d 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -79,7 +79,7 @@ class CarnetModule extends PLModule
         if(preg_match('!^ *(\d{4}) *$!', $arg, $matches)) {
             $p = intval($matches[1]);
             if($p<1900 || $p>2100) {
-                $page->trig("la promo entrée est invalide");
+                $page->trig("la promo entrée est invalide");
             } else {
                 if ($action == 'add_promo') {
                     $watch->_promos->add($p);
@@ -91,9 +91,9 @@ class CarnetModule extends PLModule
             $p1 = intval($matches[1]);
             $p2 = intval($matches[2]);
             if($p1<1900 || $p1>2100) {
-                $page->trig('la première promo de la plage entrée est invalide');
+                $page->trig('la première promo de la plage entrée est invalide');
             } elseif($p2<1900 || $p2>2100) {
-                $page->trig('la seconde promo de la plage entrée est invalide');
+                $page->trig('la seconde promo de la plage entrée est invalide');
             } else {
                 if ($action == 'add_promo') {
                     $watch->_promos->addRange($p1, $p2);
@@ -102,7 +102,7 @@ class CarnetModule extends PLModule
                 }
             }
         } else {
-            $page->trig("La promo (ou la plage de promo) entrée est dans un format incorrect.");
+            $page->trig("La promo (ou la plage de promo) entrée est dans un format incorrect.");
         }
     }
 
@@ -194,7 +194,7 @@ class CarnetModule extends PLModule
                                                       WHERE uid = {?} AND contact = {?}',
                                                $uid, $user))
                     {
-                        $page->trig("Contact retiré !");
+                        $page->trig("Contact retiré !");
                     }
                 } else {
                     if (XDB::execute(
@@ -203,7 +203,7 @@ class CarnetModule extends PLModule
                                   INNER JOIN  aliases  AS a ON (c.contact=a.id and a.type!="homonyme")
                                        WHERE  c.uid = {?} AND a.alias={?}', $uid, $user))
                     {
-                        $page->trig("Contact retiré !");
+                        $page->trig("Contact retiré !");
                     }
                 }
                 break;
@@ -217,9 +217,9 @@ class CarnetModule extends PLModule
                                         FROM  aliases
                                        WHERE  alias = {?}', $uid, $login))
                     {
-                        $page->trig('Contact ajouté !');
+                        $page->trig('Contact ajouté !');
                     } else {
-                        $page->trig('Contact déjà dans la liste !');
+                        $page->trig('Contact déjà dans la liste !');
                     }
                 }
         }
@@ -326,46 +326,37 @@ class CarnetModule extends PLModule
         $page->assign('notifs', $notifs);
     }
 
-    function handler_ical(&$page, $user = null, $hash = null, $all = null)
+    function handler_ical(&$page)
     {
         $page->changeTpl('carnet/calendar.tpl', NO_SKIN);
 
-        if ($alias && $hash) {
-            $res = XDB::query(
-                'SELECT  a.id
-                   FROM  aliases         AS a
-             INNER JOIN  auth_user_quick AS q ON ( a.id = q.user_id AND q.core_rss_hash = {?} )
-                  WHERE  a.alias = {?} AND a.type != "homonyme"', $hash, $alias);
-            $uid = $res->fetchOneCell();
-        }
-
-        require_once 'notifs.inc.php';
-        $notifs = new Notifs($uid, true);
-
-        $annivcat = false;
-        foreach ($notifs->_cats as $cat) {
-            if (preg_match('/anniv/i', $cat['short']))
-                $annivcat = $cat['id'];
-        }
-
-        if ($annivcat !== false) {
-            $annivs = array();
-            foreach ($notifs->_data[$annivcat] as $promo) {
-                foreach ($promo as $notif) {
-                    if ($all == 'all' || $notif['contact']) {
-                        $annivs[] = array(
-                            'timestamp' => $notif['known'],
-                            'date'      => strtotime($notif['date']),
-                            'tomorrow'  => strtotime("+1 day", strtotime($notif['date'])),
-                            'bestalias' => $notif['bestalias'],
-                            'summary'   => 'Anniversaire de '.$notif['prenom']
-                                           .' '.$notif['nom'].' - x '.$notif['promo'],
-                         );
-                    }
-                }
-            }
-            $page->assign('events', $annivs);
+        $res = XDB::iterRow(
+                'SELECT u.prenom,
+                        IF(u.nom_usage = \'\',u.nom,u.nom_usage) AS nom,
+                        u.promo,
+                        u.naissance,
+                        DATE_ADD(u.naissance, INTERVAL 1 DAY) AS end,
+                        u.date_ins,
+                        a.alias AS forlife
+                   FROM contacts      AS c
+             INNER JOIN auth_user_md5 AS u ON (u.user_id = c.contact)
+             INNER JOIN aliases       AS a ON (u.user_id = a.id AND a.type = \'a_vie\')
+                  WHERE c.uid = {?}', S::v('uid'));
+
+        $annivs = Array();
+        while (list($prenom, $nom, $promo, $naissance, $end, $ts, $forlife) = $res->next()) {
+            $naissance = str_replace('-', '', $naissance);
+            $end       = str_replace('-', '', $end);
+            $annivs[] = array(
+                'timestamp' => strtotime($ts),
+                'date'      => $naissance,
+                'tomorrow'  => $end,
+                'forlife'   => $forlife,
+                'summary'   => 'Anniversaire de '.$prenom
+                                .' '.$nom.' - x '.$promo,
+            );
         }
+        $page->assign('events', $annivs);
 
         header('Content-Type: text/calendar; charset=utf-8');
     }