Fixes ProfileAddresses

[platal.git] / modules / profile.php

diff --git a/modules/profile.php b/modules/profile.php
index 69dc2bf..eed29c2 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -84,17 +84,17 @@ class ProfileModule extends PLModule
 
     function handler_photo(&$page, $x = null, $req = null)
     {
-        if (!$x || !($user = User::getSilent($x))) {
+        if (!$x || !($profile = Profile::get($x))) {
             return PL_NOT_FOUND;
         }
 
         // Retrieve the photo and its mime type.
         if ($req && S::logged()) {
             include 'validations.inc.php';
-            $myphoto = PhotoReq::get_request($user->id());
+            $myphoto = PhotoReq::get_request($profile->owner()->id());
             $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype);
         } else {
-            $photo = $user->profile()->getPhoto(true);
+            $photo = $profile->getPhoto(true);
         }
 
         // Display the photo, or a default one when not available.
@@ -181,23 +181,23 @@ class ProfileModule extends PLModule
             XDB::execute('DELETE FROM  profile_photos
                                 WHERE  pid = {?}',
                          S::user()->profile()->id());
-            XDB::execute('DELETE FROM  requests
-                                WHERE  user_id = {?} AND type="photo"',
+            XDB::execute("DELETE FROM  requests
+                                WHERE  uid = {?} AND type = 'photo'",
                          S::v('uid'));
             $globals->updateNbValid();
             $page->trigSuccess("Ta photo a bien été supprimée. Elle ne sera plus visible sur le site dans au plus une heure.");
         } elseif (Env::v('cancel')) {
             S::assert_xsrf_token();
 
-            $sql = XDB::query('DELETE FROM  requests
-                                     WHERE  user_id={?} AND type="photo"',
+            $sql = XDB::query("DELETE FROM  requests
+                                     WHERE  uid = {?} AND type = 'photo'",
                               S::v('uid'));
             $globals->updateNbValid();
         }
 
-        $sql = XDB::query('SELECT  COUNT(*)
+        $sql = XDB::query("SELECT  COUNT(*)
                              FROM  requests
-                            WHERE  user_id={?} AND type="photo"',
+                            WHERE  uid = {?} AND type = 'photo'",
                           S::v('uid'));
         $page->assign('submited', $sql->fetchOneCell());
         $page->assign('has_trombi_x', file_exists($trombi_x));
@@ -568,7 +568,7 @@ class ProfileModule extends PLModule
         } elseif ($promo_sortie == $promo + 3) {
             XDB::execute('UPDATE  profile_education
                              SET  grad_year = {?}
-                           WHERE  uid = {?} AND FIND_IN_SET(\'primary\', flags)',
+                           WHERE  pid = {?} AND FIND_IN_SET(\'primary\', flags)',
                          $promo_sortie, $profile->id());
             $page->trigSuccess('Ton statut "orange" a été supprimé.');
             $page->assign('promo_sortie_old', $promo_sortie);
@@ -602,7 +602,7 @@ class ProfileModule extends PLModule
         //expertise
         $res = XDB::query('SELECT  expertise
                              FROM  profile_mentor
-                            WHERE  uid = {?}', $user->id());
+                            WHERE  pid = {?}', $user->id());
         $page->assign('expertise', $res->fetchOneCell());
 
         // Sectors
@@ -612,7 +612,7 @@ class ProfileModule extends PLModule
                    FROM  profile_mentor_sector      AS m
               LEFT JOIN  profile_job_sector_enum    AS s  ON(m.sectorid = s.id)
               LEFT JOIN  profile_job_subsector_enum AS ss ON(m.sectorid = ss.sectorid AND m.subsectorid = ss.id)
-                  WHERE  uid = {?}", $user->id());
+                  WHERE  pid = {?}", $user->id());
         while (list($sector, $subSector) = $res->next()) {
             $sectors[]    = $sector;
             $subSectors[] = $subSector;
@@ -625,7 +625,7 @@ class ProfileModule extends PLModule
                 "SELECT  gc.countryFR
                    FROM  profile_mentor_country AS m
               LEFT JOIN  geoloc_countries       AS gc ON (m.country = gc.iso_3166_1_a2)
-                  WHERE  uid = {?}", $user->id());
+                  WHERE  pid = {?}", $user->id());
         $page->assign('pays', $res->fetchColumn());
 
         $page->addJsLink('close_on_esc.js');
@@ -638,8 +638,6 @@ class ProfileModule extends PLModule
 
         $page->setTitle('Conseil Pro');
 
-        require_once "directory.enums.inc.php";
-
         // Retrieval of sector names
         $sectors = DirEnum::getOptions(DirEnum::SECTORS);
         $sectors[''] = '';
@@ -688,7 +686,7 @@ class ProfileModule extends PLModule
         $it = XDB::iterator("SELECT  gc.iso_3166_1_a2 AS id, gc.countryFR AS field
                                FROM  geoloc_countries       AS gc
                          INNER JOIN  profile_mentor_country AS mp ON (mp.country = gc.iso_3166_1_a2)
-                         INNER JOIN  profile_mentor_sector  AS ms ON (ms.uid = mp.uid)
+                         INNER JOIN  profile_mentor_sector  AS ms ON (ms.pid = mp.pid)
                               WHERE  ms.sectorid = {?} " . $where . "
                            GROUP BY  iso_3166_1_a2
                            ORDER BY  countryFR", $sect, $ssect);