Merge branch 'platal-0.10.2'

[platal.git] / include / validations / photos.inc.php

diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php
index 0f2d109..f78607d 100644 (file)
--- a/include/validations/photos.inc.php
+++ b/include/validations/photos.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -34,7 +34,7 @@ class PhotoReq extends Validate
     public $valid  = false;
 
     public $rules = "Refuser les photos copyrightées, de mineurs, ou ayant
-        un caractère pornographique, violent, etc... Si une photo est mal
+        un caractère pornographique, violent&hellip; Si une photo est mal
         cadrée (20% de photo et 80% de blanc par exemple), si c'est un
         camarade antique, on lui arrange sinon on lui
         refuse en lui expliquant gentiment le problème. Idem si les dimensions de
@@ -43,9 +43,9 @@ class PhotoReq extends Validate
     // }}}
     // {{{ constructor
 
-    public function __construct($_uid, PlUpload &$upload, $_stamp=0)
+    public function __construct(User &$_user, PlUpload &$upload, $_stamp=0)
     {
-        parent::__construct($_uid, true, 'photo', $_stamp);
+        parent::__construct($_user, true, 'photo', $_stamp);
         $this->read($upload);
     }
 
@@ -76,7 +76,7 @@ class PhotoReq extends Validate
 
     static public function get_request($uid)
     {
-        return parent::get_typed_request($uid,'photo');
+        return parent::get_typed_request($uid, 'photo');
     }
 
     // }}}
@@ -101,7 +101,7 @@ class PhotoReq extends Validate
     protected function handle_editor()
     {
         if (isset($_FILES['userfile'])) {
-            $upload =& PlUpload::get($_FILES['userfile'], S::v('forlife'), 'photo');
+            $upload =& PlUpload::get($_FILES['userfile'], S::user()->login(), 'photo');
             if (!$upload) {
                 $this->trigError('Une erreur est survenue lors du téléchargement du fichier');
                 return false;
@@ -137,11 +137,10 @@ class PhotoReq extends Validate
 
     public function commit()
     {
-        require_once 'notifs.inc.php';
-        XDB::execute('REPLACE INTO  photo (uid, attachmime, attach, x, y)
+        XDB::execute('REPLACE INTO  profile_photos (pid, attachmime, attach, x, y)
                             VALUES  ({?},{?},{?},{?},{?})',
-                     $this->uid, $this->mimetype, $this->data, $this->x, $this->y);
-        register_watch_op($this->uid, WATCH_FICHE, '', 'photo');
+                     $this->user->profile()->id(), $this->mimetype, $this->data, $this->x, $this->y);
+
         return true;
     }