Merge remote branch 'origin/platal-1.0.0'
[platal.git] / modules / profile.php
index 077b3dc..61d1596 100644 (file)
@@ -51,6 +51,7 @@ class ProfileModule extends PLModule
 
             'referent'                   => $this->make_hook('referent',                   AUTH_COOKIE),
             'emploi'                     => $this->make_hook('ref_search',                 AUTH_COOKIE),
+            'jobs'                       => $this->make_hook('ref_search',                 AUTH_COOKIE),
             'referent/search'            => $this->make_hook('ref_search',                 AUTH_COOKIE),
             'referent/ssect'             => $this->make_hook('ref_sect',                   AUTH_COOKIE, 'user', NO_AUTH),
             'referent/country'           => $this->make_hook('ref_country',                AUTH_COOKIE, 'user', NO_AUTH),
@@ -75,7 +76,9 @@ class ProfileModule extends PLModule
         );
     }
 
-    /* XXX COMPAT */
+    /* Function needed for compatibility reasons.
+     * TODO: removes calls to fiche.php?user=blah.machin.2083 and then removes this.
+     */
     function handler_fiche(&$page)
     {
         return $this->handler_profile($page, Env::v('user'));
@@ -90,7 +93,7 @@ class ProfileModule extends PLModule
         // Retrieve the photo and its mime type.
         if ($req && S::logged()) {
             include 'validations.inc.php';
-            $myphoto = PhotoReq::get_request($profile->owner()->id());
+            $myphoto = PhotoReq::get_request($profile->id());
             $photo = PlImage::fromData($myphoto->data, $myphoto->mimetype);
         } else {
             $photo = $profile->getPhoto(true, true);
@@ -119,7 +122,7 @@ class ProfileModule extends PLModule
 
     function handler_name_info(&$page)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/name_info.tpl', SIMPLE);
         $res = XDB::iterator("SELECT  name, explanations,
                                       FIND_IN_SET('public', flags) AS public,
@@ -134,31 +137,59 @@ class ProfileModule extends PLModule
     {
         $res = XDB::query("SELECT  icon
                              FROM  profile_networking_enum
-                            WHERE  network_type = {?}",
+                            WHERE  nwid = {?}",
                           $mid);
         $img  = dirname(__FILE__) . '/../htdocs/images/networking/' . $res->fetchOneCell();
-        $type = mime_content_type($img);
-        header("Content-Type: $type");
+        pl_cached_content_headers(mime_content_type($img));
         echo file_get_contents($img);
         exit;
     }
 
-    function handler_photo_change(&$page)
+    /** Tries to return the correct user from given hrpid
+     * Will redirect to $returnurl$hrpid if $hrpid was empty
+     */
+    private function findProfile($returnurl, $hrpid = null)
+    {
+        if (is_null($hrpid)) {
+            $user = S::user();
+            if (!$user->hasProfile()) {
+                return PL_NOT_FOUND;
+            } else {
+                pl_redirect($returnurl . $user->profile()->hrid());
+            }
+        } else {
+            $profile = Profile::get($hrpid);
+            if (!$profile) {
+                return PL_NOT_FOUND;
+            } else if (!S::user()->canEdit($profile) && Platal::notAllowed()) {
+                return PL_FORBIDDEN;
+            }
+        }
+        return $profile;
+    }
+
+    function handler_photo_change(&$page, $hrpid = null)
     {
         global $globals;
+        $profile = $this->findProfile('photo/change/', $hrpid);
+        if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
+            return $profile;
+        }
+
         $page->changeTpl('profile/trombino.tpl');
+        $page->assign('hrpid', $profile->hrid());
 
         require_once('validations.inc.php');
 
-        $trombi_x = '/home/web/trombino/photos' . S::v('promo') . '/' . S::user()->login() . '.jpg';
+        $trombi_x = '/home/web/trombino/photos' . $profile->promo() . '/' . $profile->hrid() . '.jpg';
         if (Env::has('upload')) {
             S::assert_xsrf_token();
 
-            $upload = new PlUpload(S::user()->login(), 'photo');
+            $upload = new PlUpload($profile->hrid(), 'photo');
             if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) {
                 $page->trigError('Une erreur est survenue lors du téléchargement du fichier');
             } else {
-                $myphoto = new PhotoReq(S::user(), $upload);
+                $myphoto = new PhotoReq(S::user(), $profile, $upload);
                 if ($myphoto->isValid()) {
                     $myphoto->submit();
                 }
@@ -166,9 +197,9 @@ class ProfileModule extends PLModule
         } elseif (Env::has('trombi')) {
             S::assert_xsrf_token();
 
-            $upload = new PlUpload(S::user()->login(), 'photo');
+            $upload = new PlUpload($profile->hrid(), 'photo');
             if ($upload->copyFrom($trombi_x)) {
-                $myphoto = new PhotoReq(S::user(), $upload);
+                $myphoto = new PhotoReq(S::user(), $profile, $upload);
                 if ($myphoto->isValid()) {
                     $myphoto->commit();
                     $myphoto->clean();
@@ -179,25 +210,25 @@ class ProfileModule extends PLModule
 
             XDB::execute('DELETE FROM  profile_photos
                                 WHERE  pid = {?}',
-                         S::user()->profile()->id());
+                         $profile->id());
             XDB::execute("DELETE FROM  requests
-                                WHERE  uid = {?} AND type = 'photo'",
-                         S::v('uid'));
+                                WHERE  pid = {?} AND type = 'photo'",
+                         $profile->id());
             $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  uid = {?} AND type = 'photo'",
-                              S::v('uid'));
+                                     WHERE  pid = {?} AND type = 'photo'",
+                              $profile->id());
             $globals->updateNbValid();
         }
 
         $sql = XDB::query("SELECT  COUNT(*)
                              FROM  requests
-                            WHERE  uid = {?} AND type = 'photo'",
-                          S::v('uid'));
+                            WHERE  pid = {?} AND type = 'photo'",
+                          $profile->id());
         $page->assign('submited', $sql->fetchOneCell());
         $page->assign('has_trombi_x', file_exists($trombi_x));
     }
@@ -230,6 +261,11 @@ class ProfileModule extends PLModule
             $view = 'private';
         }
 
+        // Display pending picture
+        if (S::logged() && Env::v('modif') == 'new') {
+            $page->assign('with_pending_pic', true);
+        }
+
         // Fetches profile's and profile's owner information and redirects to
         // marketing if the owner has not subscribed and the requirer has logged in.
         $profile = Profile::get($pid, Profile::FETCH_ALL, $view);
@@ -247,7 +283,7 @@ class ProfileModule extends PLModule
         $page->setTitle($profile->fullName());
 
         // Determines and displays the virtual alias.
-        if (!is_null($owner)) {
+        if (!is_null($owner) && $profile->alias_pub == 'public') {
             $page->assign('virtualalias', $owner->emailAlias());
         }
 
@@ -272,24 +308,13 @@ class ProfileModule extends PLModule
         http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id);
     }
 
-    function handler_p_edit(&$page, $user = null, $opened_tab = null, $mode = null, $success = null)
+    function handler_p_edit(&$page, $hrpid = null, $opened_tab = null, $mode = null, $success = null)
     {
         global $globals;
 
-        if (is_null($user)) {
-            $user = S::user();
-            if (!$user->hasProfile()) {
-                return PL_NOT_FOUND;
-            } else {
-                pl_redirect('profile/edit/' . $user->profile()->hrid());
-            }
-        } else {
-            $user = Profile::get($user);
-            if (!$user) {
-                return PL_NOT_FOUND;
-            } else if (!S::user()->canEdit($user) && Platal::notAllowed()) {
-                return PL_FORBIDDEN;
-            }
+        $profile = $this->findProfile('profile/edit/', $hrpid);
+        if (! ($profile instanceof Profile) && ($profile == PL_NOT_FOUND || $profile == PL_FORBIDDEN)) {
+            return $profile;
         }
 
         // Build the page
@@ -299,8 +324,8 @@ class ProfileModule extends PLModule
         $page->addJsLink('profile.js');
         $page->addJsLink('jquery.autocomplete.js');
         $wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false);
-        $wiz->addUserData('profile', $user);
-        $wiz->addUserData('owner', $user->owner());
+        $wiz->addUserData('profile', $profile);
+        $wiz->addUserData('owner', $profile->owner());
         $this->load('page.inc.php');
         $wiz->addPage('ProfileSettingGeneral', 'Général', 'general');
         $wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses');
@@ -309,9 +334,9 @@ class ProfileModule extends PLModule
         $wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi');
         $wiz->addPage('ProfileSettingSkills', 'Compétences diverses', 'skill');
         $wiz->addPage('ProfileSettingMentor', 'Mentoring', 'mentor');
-        $wiz->apply($page, 'profile/edit/' . $user->hrid(), $opened_tab, $mode);
+        $wiz->apply($page, 'profile/edit/' . $profile->hrid(), $opened_tab, $mode);
 
-        if (!$user->birthdate) {
+        if (!$profile->birthdate) {
             $page->trigWarning("Ta date de naissance n'est pas renseignée, ce qui t'empêcheras de réaliser"
                       . " la procédure de récupération de mot de passe si un jour tu le perdais.");
         }
@@ -372,7 +397,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_edu(&$page, $eduid, $class)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/general.edu.tpl', NO_SKIN);
         $res = XDB::iterator("SELECT  id, field
                                 FROM  profile_education_field_enum
@@ -424,7 +449,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_sub_sector(&$page, $id, $ssect, $sssect = -1)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $res = XDB::iterator("SELECT  id, name
                                 FROM  profile_job_subsubsector_enum
                                WHERE  subsectorid = {?}", $ssect);
@@ -436,7 +461,7 @@ class ProfileModule extends PLModule
 
     function handler_ajax_alternates(&$page, $id, $sssect)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $res = XDB::iterator('SELECT  name
                                 FROM  profile_job_alternates
                                WHERE  subsubsectorid = {?}
@@ -474,21 +499,22 @@ class ProfileModule extends PLModule
         }
     }
 
-    function handler_ajax_searchname(&$page, $id)
+    function handler_ajax_searchname(&$page, $id, $isFemale)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/general.searchname.tpl', NO_SKIN);
         $res = XDB::query("SELECT  id, name, FIND_IN_SET('public', flags) AS pub
                              FROM  profile_name_enum
                             WHERE  NOT FIND_IN_SET('not_displayed', flags)
                                    AND NOT FIND_IN_SET('always_displayed', flags)");
         $page->assign('sn_type_list', $res->fetchAllAssoc());
+        $page->assign('isFemale', $isFemale);
         $page->assign('i', $id);
     }
 
     function handler_ajax_buildnames(&$page, $data, $isFemale)
     {
-        header('Content-Type: text/html; charset=utf-8');
+        pl_content_headers("text/html");
         $page->changeTpl('profile/general.buildnames.tpl', NO_SKIN);
         require_once 'name.func.inc.php';
         $page->assign('names', build_javascript_names($data, $isFemale));
@@ -538,11 +564,14 @@ class ProfileModule extends PLModule
         $wp = new PlWikiPage('Docs.Emploi');
         $wp->buildCache();
 
-        $page->setTitle('Conseil Pro');
+        $page->setTitle('Emploi et Carrières');
 
         // Retrieval of sector names
-        $sectors = DirEnum::getOptions(DirEnum::SECTORS);
-        $sectors[''] = '';
+        $sectors = XDB::fetchAllAssoc('id', 'SELECT  pjse.id, pjse.name
+                                               FROM  profile_job_sector_enum AS pjse
+                                         INNER JOIN  profile_mentor_sector AS pms ON (pms.sectorid = pjse.id)
+                                           GROUP BY  pjse.id
+                                           ORDER BY  pjse.name');
         $page->assign_by_ref('sectors', $sectors);
 
         // nb de mentors
@@ -573,9 +602,12 @@ class ProfileModule extends PLModule
         $page->assign('onchange', 'setSSectors()');
         $page->assign('id', 'ssect_field');
         $page->assign('name', 'subSector');
-        $it = XDB::iterator("SELECT  id, name AS field
-                               FROM  profile_job_subsector_enum
-                              WHERE  sectorid = {?}", $sect);
+        $it = XDB::iterator("SELECT  pjsse.id, pjsse.name AS field
+                               FROM  profile_job_subsector_enum AS pjsse
+                         INNER JOIN  profile_mentor_sector AS pms ON (pms.sectorid = pjsse.sectorid AND pms.subsectorid = pjsse.id)
+                              WHERE  pjsse.sectorid = {?}
+                           GROUP BY  pjsse.id
+                           ORDER BY  pjsse.name", $sect);
         $page->assign('list', $it);
     }
 
@@ -723,7 +755,7 @@ class ProfileModule extends PLModule
     function handler_admin_education_degree(&$page, $action = 'list', $id = null) {
         $page->setTitle('Administration - Niveau de formation');
         $page->assign('title', 'Gestion des niveau de formation');
-        $table_editor = new PLTableEditor('admin/education_degree', 'profile_education_degree_enum', 'id', true);
+        $table_editor = new PLTableEditor('admin/education_degree', 'profile_education_degree_enum', 'id');
         $table_editor->add_join_table('profile_education_degree', 'degreeid', true);
         $table_editor->add_join_table('profile_education', 'degreeid', true);
         $table_editor->describe('degree', 'niveau', true);
@@ -733,8 +765,16 @@ class ProfileModule extends PLModule
         $page->setTitle('Administration - Correspondances formations - niveau de formation');
         $page->assign('title', 'Gestion des correspondances formations - niveau de formation');
         $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true);
-        $table_editor->describe('eduid', 'formation', true);
-        $table_editor->describe('degreeid', 'niveau', true);
+        $table_editor->describe('eduid', 'id formation', true);
+        $table_editor->describe('degreeid', 'id niveau', true);
+
+        // Adds fields to show the names of education
+        $table_editor->add_option_table('profile_education_enum','profile_education_enum.id = eduid');
+        $table_editor->add_option_field('profile_education_enum.name', 'edu_name', 'formation', null, 'degreeid');
+        // Adds fields to show the names of degrees
+        $table_editor->add_option_table('profile_education_degree_enum','profile_education_degree_enum.id = t.degreeid');
+        $table_editor->add_option_field('profile_education_degree_enum.degree', 'degree_name', 'niveau');
+
         $table_editor->apply($page, $action, $id);
     }
     function handler_admin_sections(&$page, $action = 'list', $id = null) {
@@ -757,7 +797,7 @@ class ProfileModule extends PLModule
     function handler_admin_networking(&$page, $action = 'list', $id = null) {
         $page->assign('xorg_title', 'Polytechnique.org - Administration - Networking');
         $page->assign('title', 'Gestion des types de networking');
-        $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'network_type');
+        $table_editor = new PLTableEditor('admin/networking', 'profile_networking_enum', 'nwid');
         $table_editor->describe('name', 'intitulé', true);
         $table_editor->describe('icon', 'nom de l\'icône', false);
         $table_editor->describe('filter', 'filtre', true);