Fixes job edition: only notifies a job modification if it is actually modified.

diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php
index b098012..c376f12 100644 (file)
--- a/modules/profile/jobs.inc.php
+++ b/modules/profile/jobs.inc.php
@@ -42,6 +42,77 @@ class ProfileJob extends ProfileGeocoding
                              );
     }
 
+    public function emptyJob()
+    {
+        return array(
+            'id'               => '0',
+            'jobid'            => '',
+            'pub'              => 'private',
+            'name'             => '',
+            'hq_acronym'       => '',
+            'hq_url'           => '',
+            'hq_email'         => '',
+            'hq_address'       => array(
+                'text'                    => '',
+                'accuracy'                => '',
+                'postalText'              => '',
+                'postalCode'              => '',
+                'administrativeAreaId'    => '',
+                'subAdministrativeAreaId' => '',
+                'localityId'              => '',
+                'countryId'               => '',
+                'latitude'                => '',
+                'longitude'               => '',
+                'north'                   => '',
+                'south'                   => '',
+                'east'                    => '',
+                'west'                    => '',
+                'cedex'                   => '',
+                'updateTime'              => '',
+                'changed'                 => '0',
+                'removed'                 => '0',
+            ),
+            'hq_phone'         => '',
+            'hq_fax'           => '',
+            'subSubSectorName' => null,
+            'sector'           => '0',
+            'subSector'        => '0',
+            'subSubSector'     => '0',
+            'description'      => '',
+            'w_url'            => '',
+            'w_address'        => array(
+                'pub'                     => 'private',
+                'text'                    => '',
+                'accuracy'                => '',
+                'postalText'              => '',
+                'postalCode'              => '',
+                'administrativeAreaId'    => '',
+                'subAdministrativeAreaId' => '',
+                'localityId'              => '',
+                'countryId'               => '',
+                'latitude'                => '',
+                'longitude'               => '',
+                'north'                   => '',
+                'south'                   => '',
+                'east'                    => '',
+                'west'                    => '',
+                'cedex'                   => '',
+                'updateTime'              => '',
+                'changed'                 => '0',
+                'removed'                 => '0',
+            ),
+            'w_email'          => '',
+            'w_email_pub'      => 'private',
+            'w_email_new'      => '',
+            'w_phone'          => array(0 => array(
+                'type'    => 'fixed',
+                'tel'     => '',
+                'pub'     => 'private',
+                'comment' => '',
+            )),
+        );
+    }
+
     private function cleanJob(ProfilePage &$page, $jobid, array &$job, &$success)
     {
         $success = true;
@@ -102,6 +173,7 @@ class ProfileJob extends ProfileGeocoding
         }
         $profiletel = new ProfilePhones('pro', $jobid);
         $job['w_phone'] = $profiletel->value($page, 'tel', $job['w_phone'], $s);
+
         unset($job['removed']);
         unset($job['new']);
     }
@@ -158,23 +230,25 @@ class ProfileJob extends ProfileGeocoding
                             WHERE  uid = {?} AND link_type = 'pro'",
                      S::i('uid'));
         foreach ($value as $id=>&$job) {
-            if (isset($job['jobid']) && $job['jobid']) {
-                XDB::execute("INSERT INTO  profile_job (uid, id, description, sectorid, subsectorid,
-                                                        subsubsectorid, email, url, pub, email_pub, jobid)
-                                   VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
-                             S::i('uid'), $id, $job['description'], $job['sector'], $job['subSector'],
-                             $job['subSubSector'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']);
-            } else {
-                XDB::execute("INSERT INTO  profile_job (uid, id, description, sectorid, subsectorid,
-                                                        subsubsectorid, email, url, pub, email_pub)
-                                   VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
-                             S::i('uid'), $id, $job['description'], $job['sector'], $job['subSector'],
-                             $job['subSubSector'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub']);
+            if (isset($job['name']) && $job['name']) {
+                if (isset($job['jobid']) && $job['jobid']) {
+                    XDB::execute("INSERT INTO  profile_job (uid, id, description, sectorid, subsectorid,
+                                                            subsubsectorid, email, url, pub, email_pub, jobid)
+                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
+                                 S::i('uid'), $id, $job['description'], $job['sector'], $job['subSector'],
+                                 $job['subSubSector'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub'], $job['jobid']);
+                } else {
+                    XDB::execute("INSERT INTO  profile_job (uid, id, description, sectorid, subsectorid,
+                                                            subsubsectorid, email, url, pub, email_pub)
+                                       VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})",
+                                 S::i('uid'), $id, $job['description'], $job['sector'], $job['subSector'],
+                                 $job['subSubSector'], $job['w_email'], $job['w_url'], $job['pub'], $job['w_email_pub']);
+                }
+                $address = new ProfileAddress();
+                $address->saveAddress($id, $job['w_address'], 'job');
+                $profiletel = new ProfilePhones('pro', $id);
+                $profiletel->saveTels('tel', $job['w_phone']);
             }
-            $address = new ProfileAddress();
-            $address->saveAddress($id, $job['w_address'], 'job');
-            $profiletel = new ProfilePhones('pro', $id);
-            $profiletel->saveTels('tel', $job['w_phone']);
         }
     }
 }
@@ -231,97 +305,148 @@ class ProfileJobs extends ProfilePage
                            ORDER BY  j.id",
                             S::i('uid'));
         $this->values['jobs'] = array();
-        while (list($id, $jobid, $name, $sector, $subSector, $subSubSector,
-                    $subSubSectorName, $description, $w_email, $w_emailPub, $w_url, $pub,
-                    $hq_acronym, $hq_url, $hq_email,
-                    $w_accuracy, $w_text, $w_postalText, $w_postalCode, $w_localityId,
-                    $w_subAdministrativeAreaId, $w_administrativeAreaId, $w_countryId,
-                    $w_latitude, $w_longitude, $w_pub, $w_updateTime,
-                    $w_north, $w_south, $w_east, $w_west,
-                    $hq_accuracy, $hq_text, $hq_postalText, $hq_postalCode, $hq_localityId,
-                    $hq_subAdministrativeAreaId, $hq_administrativeAreaId, $hq_countryId,
-                    $hq_latitude, $hq_longitude, $hq_pub, $hq_updateTime,
-                    $hq_north, $hq_south, $hq_east, $hq_west,
-                   ) = $res->next()) {
-            $this->values['jobs'][] = array('id'               => $id,
-                                            'jobid'            => $jobid,
-                                            'name'             => $name,
-                                            'sector'           => $sector,
-                                            'subSector'        => $subSector,
-                                            'subSubSector'     => $subSubSector,
-                                            'subSubSectorName' => $subSubSectorName,
-                                            'description'      => $description,
-                                            'pub'              => $pub,
-                                            'w_email'          => $w_email,
-                                            'w_email_pub'      => $w_email_pub,
-                                            'w_url'            => $w_url,
-                                            'hq_acronym'       => $hq_acronym,
-                                            'hq_url'           => $hq_url,
-                                            'hq_email'         => $hq_email,
-                                            'w_address'        => array('accuracy'                => $w_accuracy,
-                                                                        'text'                    => $w_text,
-                                                                        'postalText'              => $w_postalText,
-                                                                        'postalCode'              => $w_postalCode,
-                                                                        'localityId'              => $w_localityId,
-                                                                        'subAdministrativeAreaId' => $w_subAdministrativeAreaId,
-                                                                        'administrativeAreaId'    => $w_administrativeAreaId,
-                                                                        'countryId'               => $w_countryId,
-                                                                        'latitude'                => $w_latitude,
-                                                                        'longitude'               => $w_longitude,
-                                                                        'pub'                     => $w_pub,
-                                                                        'updateTime'              => $w_update,
-                                                                        'north'                   => $w_north,
-                                                                        'south'                   => $w_south,
-                                                                        'east'                    => $w_east,
-                                                                        'west'                    => $w_west,
-                                                                       ),
-                                            'hq_address'       => array('accuracy'                => $hq_accuracy,
-                                                                        'text'                    => $hq_text,
-                                                                        'postalText'              => $hq_postalText,
-                                                                        'postalCode'              => $hq_postalCode,
-                                                                        'localityId'              => $hq_localityId,
-                                                                        'subAdministrativeAreaId' => $hq_subAdministrativeAreaId,
-                                                                        'administrativeAreaId'    => $hq_administrativeAreaId,
-                                                                        'countryId'               => $hq_countryId,
-                                                                        'latitude'                => $hq_latitude,
-                                                                        'longitude'               => $hq_longitude,
-                                                                        'pub'                     => $hq_pub,
-                                                                        'updateTime'              => $hq_update,
-                                                                        'north'                   => $hq_north,
-                                                                        'south'                   => $hq_south,
-                                                                        'east'                    => $hq_east,
-                                                                        'west'                    => $hq_west,
-                                                                       ),
-                                           );
-        }
 
-        $res = XDB::iterator("SELECT  link_id AS jobid, tel_type AS type, pub, display_tel AS tel, comment
-                                FROM  profile_phones
-                               WHERE  uid = {?} AND link_type = 'pro'
-                            ORDER BY  link_id",
-                             S::i('uid'));
-        $i = 0;
-        $jobNb = count($this->values['jobs']);
-        while ($phone = $res->next()) {
-            $jobid = $phone['jobid'];
-            while ($i < $jobNb && $this->values['jobs'][$i]['id'] < $jobid) {
-                $i++;
+        if ($res->numRows() > 0) {
+            while (list($id, $jobid, $name, $sector, $subSector, $subSubSector,
+                        $subSubSectorName, $description, $w_email, $w_emailPub, $w_url, $pub,
+                        $hq_acronym, $hq_url, $hq_email,
+                        $w_accuracy, $w_text, $w_postalText, $w_postalCode, $w_localityId,
+                        $w_subAdministrativeAreaId, $w_administrativeAreaId, $w_countryId,
+                        $w_latitude, $w_longitude, $w_pub, $w_updateTime,
+                        $w_north, $w_south, $w_east, $w_west,
+                        $hq_accuracy, $hq_text, $hq_postalText, $hq_postalCode, $hq_localityId,
+                        $hq_subAdministrativeAreaId, $hq_administrativeAreaId, $hq_countryId,
+                        $hq_latitude, $hq_longitude, $hq_pub, $hq_updateTime,
+                        $hq_north, $hq_south, $hq_east, $hq_west,
+                       ) = $res->next()) {
+                $this->values['jobs'][] = array(
+                    'id'               => $id,
+                    'jobid'            => $jobid,
+                    'name'             => $name,
+                    'sector'           => $sector,
+                    'subSector'        => $subSector,
+                    'subSubSector'     => $subSubSector,
+                    'subSubSectorName' => $subSubSectorName,
+                    'description'      => $description,
+                    'pub'              => $pub,
+                    'w_email'          => $w_email,
+                    'w_email_pub'      => $w_emailPub,
+                    'w_url'            => $w_url,
+                    'hq_acronym'       => $hq_acronym,
+                    'hq_url'           => $hq_url,
+                    'hq_email'         => $hq_email,
+                    'w_address'        => array(
+                        'accuracy'                => $w_accuracy,
+                        'text'                    => $w_text,
+                        'postalText'              => $w_postalText,
+                        'postalCode'              => $w_postalCode,
+                        'localityId'              => $w_localityId,
+                        'subAdministrativeAreaId' => $w_subAdministrativeAreaId,
+                        'administrativeAreaId'    => $w_administrativeAreaId,
+                        'countryId'               => $w_countryId,
+                        'latitude'                => $w_latitude,
+                        'longitude'               => $w_longitude,
+                        'pub'                     => $w_pub,
+                        'updateTime'              => $w_updateTime,
+                        'north'                   => $w_north,
+                        'south'                   => $w_south,
+                        'east'                    => $w_east,
+                        'west'                    => $w_west,
+                    ),
+                    'hq_address'       => array(
+                        'accuracy'                => $hq_accuracy,
+                        'text'                    => $hq_text,
+                        'postalText'              => $hq_postalText,
+                        'postalCode'              => $hq_postalCode,
+                        'localityId'              => $hq_localityId,
+                        'subAdministrativeAreaId' => $hq_subAdministrativeAreaId,
+                        'administrativeAreaId'    => $hq_administrativeAreaId,
+                        'countryId'               => $hq_countryId,
+                        'latitude'                => $hq_latitude,
+                        'longitude'               => $hq_longitude,
+                        'pub'                     => $hq_pub,
+                        'updateTime'              => $hq_updateTime,
+                        'north'                   => $hq_north,
+                        'south'                   => $hq_south,
+                        'east'                    => $hq_east,
+                        'west'                    => $hq_west,
+                    ),
+                );
             }
-            if ($i >= $jobNb) {
-                break;
+
+            $res = XDB::iterator("SELECT  link_id AS jobid, tel_type AS type, pub, display_tel AS tel, comment
+                                    FROM  profile_phones
+                                   WHERE  uid = {?} AND link_type = 'pro'
+                                ORDER BY  link_id",
+                                 S::i('uid'));
+            $i = 0;
+            $jobNb = count($this->values['jobs']);
+            while ($phone = $res->next()) {
+                $jobid = $phone['jobid'];
+                while ($i < $jobNb && $this->values['jobs'][$i]['id'] < $jobid) {
+                    $i++;
+                }
+                if ($i >= $jobNb) {
+                    break;
+                }
+                $job =& $this->values['jobs'][$i];
+                if (!isset($job['w_phone'])) {
+                    $job['w_phone'] = array();
+                }
+                if ($job['id'] == $jobid) {
+                    $job['w_phone'][] = $phone;
+                }
+            }
+            foreach ($this->values['jobs'] as $id => &$job) {
+                if (!isset($job['w_phone'])) {
+                    $job['w_phone'] = array(
+                        0 => array(
+                            'type'    => 'fixed',
+                            'tel'     => '',
+                            'pub'     => 'private',
+                            'comment' => '',
+                        )
+                    );
+                }
             }
-            $job =& $this->values['jobs'][$i];
-            if (!isset($job['w_phone'])) {
-                $job['w_phone'] = array();
+ 
+            $job['w_email_new'] = '';
+            if (!isset($job['hq_phone'])) {
+                $job['hq_phone'] = '';
             }
-            if ($job['id'] == $jobid) {
-                $job['w_phone'][] = $phone;
+            if (!isset($job['hq_fax'])) {
+                $job['hq_fax'] = '';
             }
-        }
-        foreach ($this->values['jobs'] as $id => &$job) {
-            if (!isset($job['w_phone'])) {
-                $job['w_phone'] = array();
+            if (!isset($job['w_email_pub'])) {
+                $job['w_email_pub'] = 'private';
             }
+            if (!$job['hq_address']['text']) {
+                $job['hq_address'] = array(
+                    'text'                    => '',
+                    'accuracy'                => '',
+                    'postalText'              => '',
+                    'postalCode'              => '',
+                    'administrativeAreaId'    => '',
+                    'subAdministrativeAreaId' => '',
+                    'localityId'              => '',
+                    'countryId'               => '',
+                    'latitude'                => '',
+                    'longitude'               => '',
+                    'north'                   => '',
+                    'south'                   => '',
+                    'east'                    => '',
+                    'west'                    => '',
+                    'cedex'                   => '',
+                    'updateTime'              => '',
+                    'changed'                 => '0',
+                    'removed'                 => '0',
+                );
+            }
+            $job['w_address']['cedex'] = '';
+            $job['w_address']['changed'] = '0';
+            $job['w_address']['removed'] = '0';
+        } else {
+            $this->values['jobs'][] = $this->settings['jobs']->emptyJob();
         }
     }
 

diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index b84355c..b754171 100644 (file)
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -271,7 +271,7 @@ abstract class ProfileGeocoding implements ProfileSetting
     {
         require_once 'geocoding.inc.php';
         $success = true;
-        if ($address['changed'] == 1) {
+        if (isset($address['changed']) && $address['changed'] == 1) {
             $gmapsGeocoder = new GMapsGeocoder();
             $address = $gmapsGeocoder->getGeocodedAddress($address);
             if (isset($address['geoloc'])) {

diff --git a/templates/profile/jobs.job.tpl b/templates/profile/jobs.job.tpl
index 7489ede..3cb051e 100644 (file)
--- a/templates/profile/jobs.job.tpl
+++ b/templates/profile/jobs.job.tpl
@@ -28,6 +28,8 @@
 <div id="{$jobid}">
   <input type="hidden" name="{$jobpref}[removed]" value="0" />
   <input type="hidden" name="{$jobpref}[new]" value="{if $new}1{else}0{/if}" />
+  <input type="hidden" name="{$jobpref}[id]" value="{$i}" />
+  <input type="hidden" name="{$jobpref}[jobid]" value="{$job.jobid}" />
   <table id="{$jobid}_grayed" class="bicol" style="display: none; margin-bottom: 1em">
     <tr>
       <th class="grayed">
@@ -38,6 +40,7 @@
       </th>
     </tr>
   </table>
+
   <table id="{$jobid}_cont" class="bicol" summary="Entreprise n°{$i+1}" style="margin-bottom: 1em">
     <tr>
       <th colspan="2" style="text-align: right">
@@ -54,7 +57,7 @@
         </a>
       </th>
     </tr>
-    {if !$job.tmp_name}
+    {if !$job.tmp_name && !$job.name}
     <tr class="{$entreprise}">
       <td class="center" colspan="2">
         <small>Si ton entreprise ne figure pas dans la liste,
@@ -124,7 +127,7 @@
       <td class="titre" rowspan="4">Secteur&nbsp;d'activité</td>
       <td>
         <select name="{$jobpref}[sector]" onchange="updateJobSector({$i}, '')">
-          <option value="">&nbsp;</option>
+          <option value="0">&nbsp;</option>
           {foreach from=$sectors item=item}
           <option value="{$item.id}" {if $item.id eq $job.sector}selected="selected"{/if}>
             {$item.label}
@@ -135,12 +138,12 @@
     </tr>
     <tr class="pair {$sector}" style="display: none">
       <td id="{$jobid}_subSector">
-        <input type="hidden" name="{$jobpref}[subSector]" value="{$job.subSector|default:'-1'}" />
+        <input type="hidden" name="{$jobpref}[subSector]" value="{$job.subSector|default:0}" />
       </td>
     </tr>
     <tr class="pair {$sector}" style="display: none">
       <td id="{$jobid}_subSubSector">
-        <input type="hidden" name="{$jobpref}[subSubSector]" value="{$job.subSubSector|default:'-1'}" />
+        <input type="hidden" name="{$jobpref}[subSubSector]" value="{$job.subSubSector|default:0}" />
       </td>
     </tr>
     <tr class="pair {$sector}" style="display: none">

diff --git a/templates/profile/jobs.sector.tpl b/templates/profile/jobs.sector.tpl
index 4dcf488..56154a8 100644 (file)
--- a/templates/profile/jobs.sector.tpl
+++ b/templates/profile/jobs.sector.tpl
@@ -22,7 +22,7 @@
 
 <?xml version="1.0" encoding="utf-8"?>
 <select name="jobs[{$id}][subSector]" {if ($change)}onchange="updateJobSubSector({$id}, '')"{/if}>
-  <option value=""></option>
+  <option value="0"></option>
   {iterate from=$subSectors item=subSector}
   {if $subSector.optgroup}
   {if $gp}

diff --git a/templates/profile/jobs.sub_sector.tpl b/templates/profile/jobs.sub_sector.tpl
index 2415b47..99fb20b 100644 (file)
--- a/templates/profile/jobs.sub_sector.tpl
+++ b/templates/profile/jobs.sub_sector.tpl
@@ -22,7 +22,7 @@
 
 <?xml version="1.0" encoding="utf-8"?>
 <select name="jobs[{$id}][subSubSector]" onchange="updateJobAlternates({$id})">
-  <option value=""></option>
+  <option value="0"></option>
   {iterate from=$subSubSectors item=subSubSector}
   <option value="{$subSubSector.id}" {if $subSubSector.id eq $sel}selected="selected"{/if}>{$subSubSector.name}</option>
   {/iterate}