X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fvalidations%2Fentreprises.inc.php;h=cff4801a2c05a4606fa6a0eb93a18358e2ce838d;hb=71db1043b2c252f7c836bc41ddcc7b009dda908b;hp=6d269d8963b78c3a792879daa5eb9f755620546d;hpb=ecad8a08350703f181e1e11b822d1faf381fb51f;p=platal.git

diff --git a/include/validations/entreprises.inc.php b/include/validations/entreprises.inc.php
index 6d269d8..cff4801 100644
--- a/include/validations/entreprises.inc.php
+++ b/include/validations/entreprises.inc.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   *
@@ -21,7 +21,7 @@
 
 // {{{ class EntrReq
 
-class EntrReq extends Validate
+class EntrReq extends ProfileValidate
 {
     // {{{ properties
 
@@ -43,9 +43,9 @@ class EntrReq extends Validate
     // }}}
     // {{{ constructor
 
-    public function __construct(User &$_user, $_id, $_name, $_acronym, $_url, $_email, $_tel, $_fax, $_address, $_stamp = 0)
+    public function __construct(User &$_user, Profile &$_profile, $_id, $_name, $_acronym, $_url, $_email, $_tel, $_fax, $_address, $_stamp = 0)
     {
-        parent::__construct($_user, false, 'entreprise', $_stamp);
+        parent::__construct($_user, $_profile, false, 'entreprise', $_stamp);
         $this->id       = $_id;
         $this->name     = $_name;
         $this->acronym  = $_acronym;
@@ -99,18 +99,18 @@ class EntrReq extends Validate
     protected function handle_editor()
     {
         if (Env::has('holdingid')) {
-            $this->holdingid = trim(Env::v('holdingid'));
+            $this->holdingid = Env::t('holdingid');
         }
         if (Env::has('name')) {
-            $this->name = trim(Env::v('name'));
+            $this->name = Env::t('name');
             if (Env::has('acronym')) {
-                $this->acronym = trim(Env::v('acronym'));
+                $this->acronym = Env::t('acronym');
                 if (Env::has('url')) {
-                    $this->url = trim(Env::v('url'));
+                    $this->url = Env::t('url');
                     if (Env::has('NAF_code')) {
-                        $this->NAF_code = trim(Env::v('NAF_code'));
+                        $this->NAF_code = Env::t('NAF_code');
                         if (Env::has('AX_code')) {
-                            $this->AX_code = trim(Env::v('AX_code'));
+                            $this->AX_code = Env::t('AX_code');
                             return true;
                         }
                     }
@@ -164,7 +164,7 @@ class EntrReq extends Validate
             $jobid = XDB::insertId();
             $display_tel = format_display_number($this->tel, $error_tel);
             $display_fax = format_display_number($this->fax, $error_fax);
-            XDB::execute("INSERT INTO  profile_phones (uid, link_type, link_id, tel_id, tel_type,
+            XDB::execute("INSERT INTO  profile_phones (pid, link_type, link_id, tel_id, tel_type,
                                        search_tel, display_tel, pub)
                                VALUES  ({?}, 'hq', 0, 0, 'fixed', {?}, {?}, 'public'),
                                        ({?}, 'hq', 0, 1, 'fax', {?}, {?}, 'public')",
@@ -191,12 +191,17 @@ class EntrReq extends Validate
                          $this->address['east'], $this->address['west']);
         } else {
             $jobid = $res->fetchOneCell();
-            $success = true;
         }
-        return XDB::execute('UPDATE  profile_job
-                                SET  jobid = {?}
-                              WHERE  uid = {?} AND id = {?}',
-                            $jobid, $this->user->id(), $this->id);
+        XDB::execute('UPDATE  profile_job
+                         SET  jobid = {?}
+                       WHERE  pid = {?} AND id = {?}',
+                     $jobid, $this->profile->id(), $this->id);
+        if (XDB::affectedRows() == 0) {
+            return XDB::execute('INSERT INTO  profile_job (jobid, pid, id)
+                                      VALUES  ({?}, {?}, {?})',
+                                $jobid, $this->profile->id(), $this->id);
+        }
+        return true;
     }
 
     // }}}