X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fcarnet.php;h=944b8a8f1b5d12585d588a2bf5fa2a3803017cbf;hb=6ccad32e53df0b30d5d5a063744bf19770289178;hp=2125cf92ec132cabaa6c9a85848daf9859465c75;hpb=9f52839d4a55c6b59ab80af35026a064e007ac72;p=platal.git

diff --git a/modules/carnet.php b/modules/carnet.php
index 2125cf9..944b8a8 100644
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -39,7 +39,7 @@ class CarnetModule extends PLModule
         );
     }
 
-    function _add_rss_link(&$page)
+    function _add_rss_link($page)
     {
         if (!S::hasAuthToken()) {
             return;
@@ -48,14 +48,14 @@ class CarnetModule extends PLModule
                           '/carnet/rss/' . S::v('hruid') . '/' . S::user()->token . '/rss.xml');
     }
 
-    function handler_index(&$page)
+    function handler_index($page)
     {
         $page->changeTpl('carnet/index.tpl');
         $page->setTitle('Mon carnet');
         $this->_add_rss_link($page);
     }
 
-    function handler_panel(&$page)
+    function handler_panel($page)
     {
         $page->changeTpl('carnet/panel.tpl');
 
@@ -79,7 +79,7 @@ class CarnetModule extends PLModule
         $this->_add_rss_link($page);
     }
 
-    private function getSinglePromotion(PlPage &$page, $promo)
+    private function getSinglePromotion(PlPage $page, $promo)
     {
         if (!(is_int($promo) || ctype_digit($promo)) || $promo < 1920 || $promo > date('Y')) {
             $page->trigError('Promotion invalide&nbsp;: ' . $promo . '.');
@@ -88,7 +88,7 @@ class CarnetModule extends PLModule
         return (int)$promo;
     }
 
-    private function getPromo(PlPage &$page, $promo)
+    private function getPromo(PlPage $page, $promo)
     {
         if (strpos($promo, '-') === false) {
             $promo = $this->getSinglePromotion($page, $promo);
@@ -119,7 +119,7 @@ class CarnetModule extends PLModule
         return $array;
     }
 
-    private function addPromo(PlPage &$page, $promo)
+    private function addPromo(PlPage $page, $promo)
     {
         $promos = $this->getPromo($page, $promo);
         if (!$promos || count($promos) == 0) {
@@ -135,7 +135,7 @@ class CarnetModule extends PLModule
         Platal::session()->updateNbNotifs();
     }
 
-    private function delPromo(PlPage &$page, $promo)
+    private function delPromo(PlPage $page, $promo)
     {
         $promos = $this->getPromo($page, $promo);
         if (!$promos || count($promos) == 0) {
@@ -152,7 +152,7 @@ class CarnetModule extends PLModule
         Platal::session()->updateNbNotifs();
     }
 
-    public function addNonRegistered(PlPage &$page, PlUser &$user)
+    public function addNonRegistered(PlPage $page, PlUser $user)
     {
         XDB::execute('INSERT IGNORE INTO  watch_nonins (uid, ni_id)
                                   VALUES  ({?}, {?})', S::i('uid'), $user->id());
@@ -160,7 +160,7 @@ class CarnetModule extends PLModule
         Platal::session()->updateNbNotifs();
     }
 
-    public function delNonRegistered(PlPage &$page, PlUser &$user)
+    public function delNonRegistered(PlPage $page, PlUser $user)
     {
         XDB::execute('DELETE FROM  watch_nonins
                             WHERE  uid = {?} AND ni_id = {?}',
@@ -169,7 +169,7 @@ class CarnetModule extends PLModule
         Platal::session()->updateNbNotifs();
     }
 
-    public function handler_notifs(&$page, $action = null, $arg = null)
+    public function handler_notifs($page, $action = null, $arg = null)
     {
         $page->changeTpl('carnet/notifs.tpl');
 
@@ -265,7 +265,7 @@ class CarnetModule extends PLModule
         $page->assign('actions', $actions);
     }
 
-    function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null)
+    function handler_contacts($page, $action = null, $subaction = null, $ssaction = null)
     {
         $page->setTitle('Mes contacts');
         $this->_add_rss_link($page);
@@ -292,9 +292,10 @@ class CarnetModule extends PLModule
 
             case 'ajouter':
                 if (($contact = User::get(Env::v('user')))) {
-                    if (XDB::execute("REPLACE INTO  contacts (uid, contact)
-                                            VALUES  ({?}, {?})",
-                                     $uid, $contact->id())) {
+                    XDB::execute('INSERT IGNORE INTO  contacts (uid, contact)
+                                              VALUES  ({?}, {?})',
+                                 $uid, $contact->id());
+                    if (XDB::affectedRows() > 0) {
                         Platal::session()->updateNbNotifs();
                         $page->trigSuccess('Contact ajouté&nbsp;!');
                     } else {
@@ -315,7 +316,7 @@ class CarnetModule extends PLModule
         }
         if ($search && trim(Env::v('quick'))) {
             $base = 'carnet/contacts/search';
-            $view = new SearchSet(true, false, new UFC_Contact($user));
+            $view = new QuickSearchSet(new UFC_Contact($user));
         } else {
             $base = 'carnet/contacts';
             $view = new ProfileSet(new UFC_Contact($user));
@@ -331,7 +332,7 @@ class CarnetModule extends PLModule
         //}
     }
 
-    function handler_pdf(&$page, $arg0 = null, $arg1 = null)
+    function handler_pdf($page, $arg0 = null, $arg1 = null)
     {
         $this->load('contacts.pdf.inc.php');
         $user = S::user();
@@ -357,7 +358,7 @@ class CarnetModule extends PLModule
         exit;
     }
 
-    function handler_rss(&$page, $user = null, $hash = null)
+    function handler_rss($page, $user = null, $hash = null)
     {
         $this->load('feed.inc.php');
         $feed = new CarnetFeed();
@@ -377,12 +378,12 @@ class CarnetModule extends PLModule
         );
     }
 
-    function handler_csv_birthday(&$page, $alias = null, $hash = null)
+    function handler_csv_birthday($page, $alias = null, $hash = null)
     {
         $user = Platal::session()->tokenAuth($alias, $hash);
         if (is_null($user)) {
             if (S::logged()) {
-                $user == S::user();
+                $user = S::user();
             } else {
                 return PL_FORBIDDEN;
             }
@@ -410,12 +411,12 @@ class CarnetModule extends PLModule
         pl_content_headers("text/comma-separated-values;charset=".$encoding);
     }
 
-    function handler_ical(&$page, $alias = null, $hash = null)
+    function handler_ical($page, $alias = null, $hash = null)
     {
         $user = Platal::session()->tokenAuth($alias, $hash);
         if (is_null($user)) {
             if (S::logged()) {
-                $user == S::user();
+                $user = S::user();
             } else {
                 return PL_FORBIDDEN;
             }
@@ -432,7 +433,7 @@ class CarnetModule extends PLModule
         pl_content_headers("text/calendar");
     }
 
-    function handler_vcard(&$page, $photos = null)
+    function handler_vcard($page, $photos = null)
     {
         $pf = new ProfileFilter(new UFC_Contact(S::user()));
         $vcard = new VCard($photos == 'photos');
@@ -440,12 +441,12 @@ class CarnetModule extends PLModule
         $vcard->show();
     }
 
-    function handler_csv(&$page, $alias = null, $hash = null)
+    function handler_csv($page, $alias = null, $hash = null)
     {
         $user = Platal::session()->tokenAuth($alias, $hash);
         if (is_null($user)) {
             if (S::logged()) {
-                $user == S::user();
+                $user = S::user();
             } else {
                 return PL_FORBIDDEN;
             }