X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprofile%2Fjobs.inc.php;h=37b8f3d9da9e556fdb78c4f2ec6afc3c3400c956;hb=f9a8c549deebf96792c3ba423e01545dc7caf95b;hp=8e2b35db5818a7699d0fa461527a4bcd9a0594e8;hpb=ce0d7be772306674fadaf020511871aba1683816;p=platal.git

diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php
index 8e2b35d..37b8f3d 100644
--- a/modules/profile/jobs.inc.php
+++ b/modules/profile/jobs.inc.php
@@ -68,7 +68,7 @@ class ProfileSettingJob implements ProfileSetting
         $jobs  = XDB::fetchAllAssoc('SELECT  j.id, j.jobid, je.name,
                                              j.description, j.email AS w_email,
                                              j.email_pub AS w_email_pub,
-                                             j.url AS w_url, j.pub
+                                             j.url AS w_url, j.pub, j.entry_year AS w_entry_year
                                        FROM  profile_job      AS j
                                   LEFT JOIN  profile_job_enum AS je ON (j.jobid = je.id)
                                       WHERE  j.pid = {?}
@@ -131,7 +131,7 @@ class ProfileSettingJob implements ProfileSetting
         return $jobs;
     }
 
-    private function cleanJob(ProfilePage &$page, $jobid, array &$job, &$success, $maxPublicity)
+    private function cleanJob(ProfilePage $page, $jobid, array &$job, &$success, $maxPublicity)
     {
         if ($job['w_email'] == "new@example.org") {
             $job['w_email'] = $job['w_email_new'];
@@ -172,11 +172,7 @@ class ProfileSettingJob implements ProfileSetting
                                 WHERE  name = {?}",
                               $job['name']);
             if ($res->numRows() != 1) {
-                $req = new EntrReq(S::user(), $page->profile, $jobid, $job['name'], $job['hq_acronym'], $job['hq_url'],
-                                   $job['hq_email'], $job['hq_fixed'], $job['hq_fax'], $job['hq_address']);
-                $req->submit();
                 $job['jobid'] = null;
-                sleep(1);
             } else {
                 $job['jobid'] = $res->fetchOneCell();
             }
@@ -187,13 +183,18 @@ class ProfileSettingJob implements ProfileSetting
         }
         $job['w_phone'] = Phone::formatFormArray($job['w_phone'], $s, $maxPublicity);
 
+        if ($job['w_entry_year'] && strlen($job['w_entry_year']) != 4) {
+            $job['w_entry_year_error'] = true;
+            $success = false;
+        }
+
         unset($job['removed']);
         unset($job['new']);
     }
 
 
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $entreprise = ProfileValidate::get_typed_requests($page->pid(), 'entreprise');
         $entr_val = 0;
@@ -224,11 +225,16 @@ class ProfileSettingJob implements ProfileSetting
             }
 
             if (isset($job['removed']) && $job['removed']) {
-                if ($job['name'] == '' && $entreprise) {
-                    $entreprise[$entr_val - 1]->clean();
+                if (!S::user()->checkPerms('directory_private')
+                    && (Phone::hasPrivate($job['w_phone']) || Address::hasPrivate($job['w_address']) || $job['w_email_pub'] == 'private')) {
+                    Platal::page()->trigWarning("L'entreprise ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez pas le droit d'édition.");
+                } else {
+                    if ($job['name'] == '' && $entreprise && isset($entreprise[$entr_val - 1])) {
+                        $entreprise[$entr_val - 1]->clean();
+                    }
+                    unset($value[$key]);
+                    continue;
                 }
-                unset($value[$key]);
-                continue;
             }
             if (!isset($job['pub']) || !$job['pub']) {
                 $job['pub'] = 'private';
@@ -248,34 +254,44 @@ class ProfileSettingJob implements ProfileSetting
                 $success = ($success && $s);
             }
         }
+        usort($value, 'ProfileVisibility::comparePublicity');
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
+
         $deletePrivate = S::user()->isMe($page->owner) || S::admin();
         XDB::execute('DELETE FROM  pj, pjt
                             USING  profile_job      AS pj
                         LEFT JOIN  profile_job_term AS pjt ON (pj.pid = pjt.pid AND pj.id = pjt.jid)
                             WHERE  pj.pid = {?}' . (($deletePrivate) ? '' : ' AND pj.pub IN (\'public\', \'ax\')'),
                      $page->pid());
-        Address::deleteAddresses($page->pid(), Address::LINK_JOB, null, $deletePrivate);
+        Address::deleteAddresses($page->pid(), Address::LINK_JOB, null, null, $deletePrivate);
         Phone::deletePhones($page->pid(), Phone::LINK_JOB, null, $deletePrivate);
+        $previous_requests = EntrReq::get_typed_requests($page->pid(), 'entreprise');
+        foreach ($previous_requests as $request) {
+            $request->clean();
+        }
         $terms_values = array();
         foreach ($value as $id => &$job) {
-            if (isset($job['name']) && $job['name']) {
+            if (($job['pub'] != 'private' || $deletePrivate) && (isset($job['name']) && $job['name'])) {
                 if (isset($job['jobid']) && $job['jobid']) {
-                    XDB::execute('INSERT INTO  profile_job (pid, id, description, email,
+                    XDB::execute('INSERT INTO  profile_job (pid, id, description, email, entry_year,
                                                             url, pub, email_pub, jobid)
-                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
-                                 $page->pid(), $id, $job['description'], $job['w_email'],
+                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+                                 $page->pid(), $id, $job['description'], $job['w_email'], $job['w_entry_year'],
                                  $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']);
                 } else {
-                    XDB::execute('INSERT INTO  profile_job (pid, id, description, email,
+                    XDB::execute('INSERT INTO  profile_job (pid, id, description, email, entry_year,
                                                             url, pub, email_pub)
-                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
-                                 $page->pid(), $id, $job['description'], $job['w_email'],
+                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+                                 $page->pid(), $id, $job['description'], $job['w_email'], $job['w_entry_year'],
                                  $job['w_url'], $job['pub'], $job['w_email_pub']);
+                    $request = new EntrReq(S::user(), $page->profile, $id, $job['name'], $job['hq_acronym'], $job['hq_url'],
+                                           $job['hq_email'], $job['hq_fixed'], $job['hq_fax'], $job['hq_address']);
+                    $request->submit();
+                    sleep(1);
                 }
                 $address = new Address(array_merge($job['w_address'],
                                                    array('pid' => $page->pid(),
@@ -296,6 +312,9 @@ class ProfileSettingJob implements ProfileSetting
                                   VALUES  ' . implode(', ', $terms_values) . '
                  ON DUPLICATE KEY UPDATE  computed = VALUES(computed)');
         }
+        if (S::user()->isMe($page->owner) && count($value) > 1) {
+            Platal::page()->trigWarning('Attention, tu as plusieurs emplois sur ton profil. Pense à supprimer ceux qui sont obsolètes.');
+        }
     }
 
     public function getText($value)
@@ -335,7 +354,7 @@ class ProfileSettingJob implements ProfileSetting
 
 class ProfileSettingCorps implements ProfileSetting
 {
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    public function value(ProfilePage $page, $field, $value, &$success)
     {
         $success = true;
         if (is_null($value)) {
@@ -350,7 +369,7 @@ class ProfileSettingCorps implements ProfileSetting
         return $value;
     }
 
-    public function save(ProfilePage &$page, $field, $value)
+    public function save(ProfilePage $page, $field, $value)
     {
         if (!S::user()->isMe($page->owner)) {
             XDB::execute('INSERT INTO  profile_corps (original_corpsid, current_corpsid, rankid, corps_pub, pid)
@@ -381,7 +400,7 @@ class ProfilePageJobs extends ProfilePage
 {
     protected $pg_template = 'profile/jobs.tpl';
 
-    public function __construct(PlWizard &$wiz)
+    public function __construct(PlWizard $wiz)
     {
         parent::__construct($wiz);
         if (S::user()->checkPerms(User::PERM_DIRECTORY_PRIVATE)) {
@@ -416,10 +435,10 @@ class ProfilePageJobs extends ProfilePage
         }
     }
 
-    public function _prepare(PlPage &$page, $id)
+    public function _prepare(PlPage $page, $id)
     {
         require_once 'emails.combobox.inc.php';
-        fill_email_combobox($page, $this->owner);
+        fill_email_combobox($page, array('redirect', 'job', 'stripped_directory'), $this->owner);
 
         if (!S::user()->isMe($this->owner)) {
             $res = XDB::iterator('SELECT  id, name