summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b63b592)
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
// Retrieve the photo and its mime type.
if ($req && S::logged()) {
include 'validations.inc.php';
// 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);
$photo = PlImage::fromData($myphoto->data, $myphoto->mimetype);
} else {
$photo = $profile->getPhoto(true, true);
- 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)
+ $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->changeTpl('profile/trombino.tpl');
+ $page->assign('hrpid', $profile->hrid());
require_once('validations.inc.php');
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();
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 {
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();
}
if ($myphoto->isValid()) {
$myphoto->submit();
}
} elseif (Env::has('trombi')) {
S::assert_xsrf_token();
} 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)) {
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();
if ($myphoto->isValid()) {
$myphoto->commit();
$myphoto->clean();
XDB::execute('DELETE FROM profile_photos
WHERE pid = {?}',
XDB::execute('DELETE FROM profile_photos
WHERE pid = {?}',
- S::user()->profile()->id());
XDB::execute("DELETE FROM requests
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
$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
$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));
}
$page->assign('submited', $sql->fetchOneCell());
$page->assign('has_trombi_x', file_exists($trombi_x));
}
http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id);
}
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)
- 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;
$page->addJsLink('profile.js');
$page->addJsLink('jquery.autocomplete.js');
$wiz = new PlWizard('Profil', PlPage::getCoreTpl('plwizard.tpl'), true, true, false);
$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');
$this->load('page.inc.php');
$wiz->addPage('ProfileSettingGeneral', 'Général', 'general');
$wiz->addPage('ProfileSettingAddresses', 'Adresses personnelles', 'adresses');
$wiz->addPage('ProfileSettingJobs', 'Informations professionnelles', 'emploi');
$wiz->addPage('ProfileSettingSkills', 'Compétences diverses', 'skill');
$wiz->addPage('ProfileSettingMentor', 'Mentoring', 'mentor');
$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.");
}
$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.");
}
if ($this->owner) {
$res = XDB::query("SELECT COUNT(*)
FROM requests
if ($this->owner) {
$res = XDB::query("SELECT COUNT(*)
FROM requests
- WHERE type = 'photo' AND uid = {?}",
+ WHERE type = 'photo' AND pid = {?}",
$this->owner->id());
$this->values['nouvellephoto'] = $res->fetchOneCell();
} else {
$this->owner->id());
$this->values['nouvellephoto'] = $res->fetchOneCell();
} else {
<tr class="pair">
<td class="titre">Photos</td>
<td>
<tr class="pair">
<td class="titre">Photos</td>
<td>
- <img src="photo/{$valid->user->login()}" style="width:110px;" alt=" [ PHOTO ] " />
+ <img src="photo/{$valid->profile->hrid()}" style="width:110px;" alt=" [ PHOTO ] " />
- <img src="photo/{$valid->user->login()}/req" style="width:110px;" alt=" [ PHOTO ] " />
+ <img src="photo/{$valid->profile->hrid()}/req" style="width:110px;" alt=" [ PHOTO ] " />
quelque part (sur ton ordinateur ou sur Internet) d'une photo
d'identité (dans un fichier au format JPEG, PNG ou GIF).<br />
<div class="center">
quelque part (sur ton ordinateur ou sur Internet) d'une photo
d'identité (dans un fichier au format JPEG, PNG ou GIF).<br />
<div class="center">
- <a href="photo/change">Éditer ta photo</a>
+ <a href="photo/change/{$profile->hrid()}">Éditer ta photo</a>
-<form enctype="multipart/form-data" action="photo/change" method="post">
+<form enctype="multipart/form-data" action="photo/change/{$hrpid}" method="post">
{xsrf_token_field}
{assign var="profile" value=$smarty.session.user->profile()}
{if $profile && (($profile->yearpromo() ge 1995) || ($profile->yearpromo() le 2002))}
{xsrf_token_field}
{assign var="profile" value=$smarty.session.user->profile()}
{if $profile && (($profile->yearpromo() ge 1995) || ($profile->yearpromo() le 2002))}
</tr>
<tr>
<td class="center">
</tr>
<tr>
<td class="center">
- <img src="photo/{$smarty.session.hruid}" width="200" alt=" [ PHOTO ] " />
+ <img src="photo/{$hrpid}" width="200" alt=" [ PHOTO ] " />
</td>
<td class="center half">
{if $submited}
</td>
<td class="center half">
{if $submited}
- <img src="photo/{$smarty.session.hruid}/req" width="200" alt=" [ PHOTO ] " />
+ <img src="photo/{$hrpid}/req" width="200" alt=" [ PHOTO ] " />
{else}
Pas d'image soumise
{/if}
{else}
Pas d'image soumise
{/if}