X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprofile.php;h=22513ecfe499d299976cb572d663e9a0e5cf4ccb;hb=10c0ebff150acd256f9e72e58ab8d56bb07e0a7d;hp=b86cbdcbd456db7789f8de0b6632806b021c4a52;hpb=2f678da163eb9d8720145557a569aba7364f05c4;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index b86cbdc..22513ec 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -45,24 +45,22 @@ class ProfileModule extends PLModule /* XXX COMPAT */ function handler_fiche(&$page) { - return $this->handler_profile($page, Env::get('user')); + return $this->handler_profile($page, Env::v('user')); } function _trombi_getlist($offset, $limit) { - global $globals; - $where = ( $this->promo > 0 ? "WHERE promo='{$this->promo}'" : "" ); - $res = $globals->xdb->query( + $res = XDB::query( "SELECT COUNT(*) FROM auth_user_md5 AS u RIGHT JOIN photo AS p ON u.user_id=p.uid $where"); $pnb = $res->fetchOneCell(); - $res = $globals->xdb->query( + $res = XDB::query( "SELECT promo, user_id, a.alias AS forlife, IF (nom_usage='', nom, nom_usage) AS nom, prenom FROM photo AS p @@ -80,26 +78,24 @@ class ProfileModule extends PLModule return PL_NOT_FOUND; } - global $globals; - - $res = $globals->xdb->query("SELECT id, pub FROM aliases + $res = XDB::query("SELECT id, pub FROM aliases LEFT JOIN photo ON(id = uid) WHERE alias = {?}", $x); list($uid, $photo_pub) = $res->fetchOneRow(); - if ($req && logged()) { + if ($req && S::logged()) { include 'validations.inc.php'; $myphoto = PhotoReq::get_request($uid); Header('Content-type: image/'.$myphoto->mimetype); echo $myphoto->data; } else { - $res = $globals->xdb->query( + $res = XDB::query( "SELECT attachmime, attach FROM photo WHERE uid={?}", $uid); if ((list($type, $data) = $res->fetchOneRow()) - && ($photo_pub == 'public' || logged())) { + && ($photo_pub == 'public' || S::logged())) { Header("Content-type: image/$type"); echo $data; } else { @@ -112,52 +108,48 @@ class ProfileModule extends PLModule function handler_photo_change(&$page) { - global $globals; - $page->changeTpl('trombino.tpl'); require_once('validations.inc.php'); - $trombi_x = '/home/web/trombino/photos'.Session::get('promo') - .'/'.Session::get('forlife').'.jpg'; + $trombi_x = '/home/web/trombino/photos'.S::v('promo') + .'/'.S::v('forlife').'.jpg'; if (Env::has('upload')) { $file = isset($_FILES['userfile']['tmp_name']) ? $_FILES['userfile']['tmp_name'] - : Env::get('photo'); + : Env::v('photo'); if ($data = file_get_contents($file)) { - if ($myphoto = new PhotoReq(Session::getInt('uid'), $data)) { + if ($myphoto = new PhotoReq(S::v('uid'), $data)) { $myphoto->submit(); } } else { $page->trig('Fichier inexistant ou vide'); } } elseif (Env::has('trombi')) { - $myphoto = new PhotoReq(Session::getInt('uid'), + $myphoto = new PhotoReq(S::v('uid'), file_get_contents($trombi_x)); if ($myphoto) { $myphoto->commit(); $myphoto->clean(); } - } elseif (Env::get('suppr')) { - $globals->xdb->execute('DELETE FROM photo WHERE uid = {?}', - Session::getInt('uid')); - $globals->xdb->execute('DELETE FROM requests + } elseif (Env::v('suppr')) { + XDB::execute('DELETE FROM photo WHERE uid = {?}', + S::v('uid')); + XDB::execute('DELETE FROM requests WHERE user_id = {?} AND type="photo"', - Session::getInt('uid')); - } elseif (Env::get('cancel')) { - $sql = $globals->xdb->query('DELETE FROM requests + S::v('uid')); + } elseif (Env::v('cancel')) { + $sql = XDB::query('DELETE FROM requests WHERE user_id={?} AND type="photo"', - Session::getInt('uid')); + S::v('uid')); } - $sql = $globals->xdb->query('SELECT COUNT(*) FROM requests + $sql = XDB::query('SELECT COUNT(*) FROM requests WHERE user_id={?} AND type="photo"', - Session::getInt('uid')); + S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); - - return PL_OK; } function handler_profile(&$page, $x = null) @@ -169,15 +161,14 @@ class ProfileModule extends PLModule global $globals; require_once 'user.func.inc.php'; - $page->changeTpl('fiche.tpl'); - $page->assign('simple', true); + $page->changeTpl('fiche.tpl', SIMPLE); $view = 'private'; - if (!logged() || Env::get('view') == 'public') $view = 'public'; - if (logged() && Env::get('view') == 'ax') $view = 'ax'; + if (!S::logged() || Env::v('view') == 'public') $view = 'public'; + if (S::logged() && Env::v('view') == 'ax') $view = 'ax'; if (is_numeric($x)) { - $res = $globals->xdb->query( + $res = XDB::query( "SELECT alias FROM aliases AS a INNER JOIN auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie') @@ -191,14 +182,14 @@ class ProfileModule extends PLModule return PL_NOT_FOUND; } - $new = Env::get('modif') == 'new'; - $user = get_user_details($login, Session::getInt('uid'), $view); + $new = Env::v('modif') == 'new'; + $user = get_user_details($login, S::v('uid'), $view); $title = $user['prenom'] . ' ' . empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage']; $page->assign('xorg_title', $title); // photo - $photo = $globals->baseurl.'/photo/'.$user['forlife'].($new ? '/req' : ''); + $photo = 'photo/'.$user['forlife'].($new ? '/req' : ''); if (!isset($user['y']) and !isset($user['x'])) { list($user['x'], $user['y']) = getimagesize("images/none.png"); @@ -226,21 +217,19 @@ class ProfileModule extends PLModule $page->assign_by_ref('x', $user); $page->assign('photo_url', $photo); // alias virtual - $res = $globals->xdb->query( + $res = XDB::query( "SELECT alias FROM virtual INNER JOIN virtual_redirect USING(vid) INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) WHERE ( redirect={?} OR redirect={?} ) AND alias LIKE '%@{$globals->mail->alias_dom}'", - Session::getInt('uid'), + S::v('uid'), $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); $page->addJsLink('javascript/close_on_esc.js'); - - return PL_OK; } function handler_p_edit(&$page, $opened_tab = 'general') @@ -257,27 +246,27 @@ class ProfileModule extends PLModule require_once 'synchro_ax.inc.php'; if (Post::has('register_from_ax_question')) { - $globals->xdb->query('UPDATE auth_user_quick + XDB::query('UPDATE auth_user_quick SET profile_from_ax = 1 WHERE user_id = {?}', - Session::getInt('uid')); + S::v('uid')); } if (is_ax_key_missing()) { $page->assign('no_private_key', true); } - if (Env::get('synchro_ax') == 'confirm' && !is_ax_key_missing()) { - ax_synchronize(Session::get('bestalias'), Session::getInt('uid')); + if (Env::v('synchro_ax') == 'confirm' && !is_ax_key_missing()) { + ax_synchronize(S::v('bestalias'), S::v('uid')); $page->trig('Ton profil a été synchronisé avec celui du site polytechniciens.com'); } // pour tous les tabs, la date de naissance pour verifier // quelle est bien rentree et la date. - $res = $globals->xdb->query( + $res = XDB::query( "SELECT naissance, DATE_FORMAT(date, '%d.%m.%Y') FROM auth_user_md5 - WHERE user_id={?}", Session::getInt('uid')); + WHERE user_id={?}", S::v('uid')); list($naissance, $date_modif_profil) = $res->fetchOneRow(); // lorsqu'on n'a pas la date de naissance en base de données @@ -285,26 +274,26 @@ class ProfileModule extends PLModule // la date de naissance n'existait pas et vient d'être soumise dans la variable if (Env::has('birth')) { //en cas d'erreur : - if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) { + if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::v('birth'))) { $page->assign('etat_naissance', 'query'); $page->trig('Date de naissance incorrecte ou incohérente.'); - return PL_OK; + return; } //sinon - $birth = sprintf("%s-%s-%s", substr(Env::get('birth'), 4, 4), - substr(Env::get('birth'), 2, 2), - substr(Env::get('birth'), 0, 2)); - $globals->xdb->execute("UPDATE auth_user_md5 + $birth = sprintf("%s-%s-%s", substr(Env::v('birth'), 4, 4), + substr(Env::v('birth'), 2, 2), + substr(Env::v('birth'), 0, 2)); + XDB::execute("UPDATE auth_user_md5 SET naissance={?} WHERE user_id={?}", $birth, - Session::getInt('uid')); + S::v('uid')); $page->assign('etat_naissance', 'ok'); - return PL_OK; + return; } $page->assign('etat_naissance', 'query'); - return PL_OK; // on affiche le formulaire pour naissance + return; // on affiche le formulaire pour naissance } //doit-on faire un update ? @@ -316,7 +305,7 @@ class ProfileModule extends PLModule require_once "profil/assign_{$opened_tab}.inc.php"; $page->assign('onglet', $opened_tab); $page->assign('onglet_tpl', "profil/$opened_tab.tpl"); - return PL_OK; + return; } $date=date("Y-m-j");//nouvelle date de mise a jour @@ -325,25 +314,24 @@ class ProfileModule extends PLModule /* on sauvegarde les changements dans user_changes : * on a juste besoin d'insérer le user_id de la personne dans la table */ - $globals->xdb->execute('REPLACE INTO user_changes SET user_id={?}', - Session::getInt('uid')); + XDB::execute('REPLACE INTO user_changes SET user_id={?}', + S::v('uid')); - if (!Session::has('suid')) { + if (!S::has('suid')) { require_once 'notifs.inc.php'; - register_watch_op(Session::getInt('uid'), WATCH_FICHE); + register_watch_op(S::v('uid'), WATCH_FICHE); } // mise a jour des champs relatifs au tab ouvert require_once "profil/update_{$opened_tab}.inc.php"; - $log =& Session::getMixed('log'); + $log =& S::v('log'); $log->log('profil', $opened_tab); $page->assign('etat_update', 'ok'); } if (Env::has('suivant')) { - redirect($globals->baseurl . '/profile/edit/' . - get_next_tab($opened_tab)); + pl_redirect('profile/edit/' . get_next_tab($opened_tab)); } require_once "profil/get_{$opened_tab}.inc.php"; @@ -353,32 +341,30 @@ class ProfileModule extends PLModule $page->assign('onglet', $opened_tab); $page->assign('onglet_tpl', "profil/$opened_tab.tpl"); - return PL_OK; + return; } function handler_p_orange(&$page) { - global $globals; - $page->changeTpl('orange.tpl'); require_once 'validations.inc.php'; require_once 'xorg.misc.inc.php'; - $res = $globals->xdb->query( + $res = XDB::query( "SELECT u.promo, u.promo_sortie FROM auth_user_md5 AS u - WHERE user_id={?}", Session::getInt('uid')); + WHERE user_id={?}", S::v('uid')); list($promo, $promo_sortie_old) = $res->fetchOneRow(); $page->assign('promo_sortie_old', $promo_sortie_old); $page->assign('promo', $promo); if (!Env::has('promo_sortie')) { - return PL_OK; + return; } - $promo_sortie = Env::getInt('promo_sortie'); + $promo_sortie = Env::i('promo_sortie'); if ($promo_sortie < 1000 || $promo_sortie > 9999) { $page->trig('L\'année de sortie doit être un nombre de quatre chiffres'); @@ -390,9 +376,9 @@ class ProfileModule extends PLModule $page->trig('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); } elseif ($promo_sortie == $promo + 3) { - $globals->xdb->execute( + XDB::execute( "UPDATE auth_user_md5 set promo_sortie={?} - WHERE user_id={?}", $promo_sortie, Session::getInt('uid')); + WHERE user_id={?}", $promo_sortie, S::v('uid')); $page->trig('Ton statut "orange" a été supprimé.'); $page->assign('promo_sortie_old', $promo_sortie); } @@ -400,30 +386,25 @@ class ProfileModule extends PLModule $page->assign('promo_sortie', $promo_sortie); if (Env::has('submit')) { - $myorange = new OrangeReq(Session::getInt('uid'), + $myorange = new OrangeReq(S::v('uid'), $promo_sortie); $myorange->submit(); $page->assign('myorange', $myorange); } } - - return PL_OK; } function handler_referent(&$page, $x = null) { - global $globals; - require_once 'user.func.inc.php'; if (is_null($x)) { return PL_NOT_FOUND; } - $page->changeTpl('fiche_referent.tpl'); - $page->assign('simple', true); + $page->changeTpl('fiche_referent.tpl', SIMPLE); - $res = $globals->xdb->query( + $res = XDB::query( "SELECT prenom, nom, user_id, promo, cv, a.alias AS bestalias FROM auth_user_md5 AS u INNER JOIN aliases AS a ON (u.user_id=a.id @@ -448,12 +429,12 @@ class ProfileModule extends PLModule ///// recuperations infos referent //expertise - $res = $globals->xdb->query("SELECT expertise FROM mentor WHERE uid = {?}", $user_id); + $res = XDB::query("SELECT expertise FROM mentor WHERE uid = {?}", $user_id); $page->assign('expertise', $res->fetchOneCell()); //secteurs $secteurs = $ss_secteurs = Array(); - $res = $globals->xdb->iterRow( + $res = XDB::iterRow( "SELECT s.label, ss.label FROM mentor_secteurs AS m LEFT JOIN emploi_secteur AS s ON(m.secteur = s.id) @@ -467,7 +448,7 @@ class ProfileModule extends PLModule $page->assign_by_ref('ss_secteurs', $ss_secteurs); //pays - $res = $globals->xdb->query( + $res = XDB::query( "SELECT gp.pays FROM mentor_pays AS m LEFT JOIN geoloc_pays AS gp ON(m.pid = gp.a2) @@ -475,21 +456,18 @@ class ProfileModule extends PLModule $page->assign('pays', $res->fetchColumn()); $page->addJsLink('javascript/close_on_esc.js'); - return PL_OK; } function handler_ref_search(&$page) { - global $globals; - $page->changeTpl('referent.tpl'); $page->assign('xorg_title', 'Polytechnique.org - Conseil Pro'); - $secteur_sel = Post::get('secteur'); - $ss_secteur_sel = Post::get('ss_secteur'); - $pays_sel = Post::get('pays', '00'); - $expertise_champ = Post::get('expertise'); + $secteur_sel = Post::v('secteur'); + $ss_secteur_sel = Post::v('ss_secteur'); + $pays_sel = Post::v('pays', '00'); + $expertise_champ = Post::v('expertise'); $page->assign('pays_sel', $pays_sel); $page->assign('expertise_champ', $expertise_champ); @@ -497,7 +475,7 @@ class ProfileModule extends PLModule $page->assign('ss_secteur_sel', $ss_secteur_sel); //recuperation des noms de secteurs - $res = $globals->xdb->iterRow("SELECT id, label FROM emploi_secteur"); + $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); $secteurs[''] = ''; while (list($tmp_id, $tmp_label) = $res->next()) { $secteurs[$tmp_id] = $tmp_label; @@ -507,7 +485,7 @@ class ProfileModule extends PLModule //on recupere les sous-secteurs si necessaire $ss_secteurs[''] = ''; if (!empty($secteur_sel)) { - $res = $globals->xdb->iterRow("SELECT id, label FROM emploi_ss_secteur + $res = XDB::iterRow("SELECT id, label FROM emploi_ss_secteur WHERE secteur = {?}", $secteur_sel); while (list($tmp_id, $tmp_label) = $res->next()) { $ss_secteurs[$tmp_id] = $tmp_label; @@ -516,7 +494,7 @@ class ProfileModule extends PLModule $page->assign_by_ref('ss_secteurs', $ss_secteurs); //recuperation des noms de pays - $res = $globals->xdb->iterRow("SELECT a2, pays FROM geoloc_pays + $res = XDB::iterRow("SELECT a2, pays FROM geoloc_pays WHERE pays <> '' ORDER BY pays"); $pays['00'] = ''; while (list($tmp_id, $tmp_label) = $res->next()) { @@ -525,11 +503,11 @@ class ProfileModule extends PLModule $page->assign_by_ref('pays', $pays); // nb de mentors - $res = $globals->xdb->query("SELECT count(*) FROM mentor"); + $res = XDB::query("SELECT count(*) FROM mentor"); $page->assign('mentors_number', $res->fetchOneCell()); if (!Env::has('Chercher')) { - return PL_OK; + return; } // On vient d'un formulaire @@ -563,17 +541,17 @@ class ProfileModule extends PLModule WHERE $where GROUP BY uid ORDER BY RAND({?})"; - $res = $globals->xdb->iterator($sql, Session::getInt('uid')); + $res = XDB::iterator($sql, S::v('uid')); if ($res->total() == 0) { $page->assign('recherche_trop_large', true); - return PL_OK; + return; } $nb_max_res_total = 100; $nb_max_res_ppage = 10; - $curpage = Env::getInt('curpage', 1); + $curpage = Env::i('curpage', 1); $personnes = array(); $i = 0; @@ -590,32 +568,29 @@ class ProfileModule extends PLModule $page->assign('nb_pages_total', intval($res->total() / $nb_max_res_ppage) + 1); } - - return PL_OK; } function handler_p_usage(&$page) { - global $globals; - $page->changeTpl('nomusage.tpl'); require_once 'validations.inc.php'; require_once 'xorg.misc.inc.php'; + require_once 'diogenes/diogenes.flagset.inc.php'; - $res = $globals->xdb->query( + $res = XDB::query( "SELECT u.nom, u.nom_usage, u.flags, e.alias FROM auth_user_md5 AS u LEFT JOIN aliases AS e ON(u.user_id = e.id AND FIND_IN_SET('usage', e.flags)) - WHERE user_id={?}", Session::getInt('uid')); + WHERE user_id={?}", S::v('uid')); list($nom, $usage_old, $flags, $alias_old) = $res->fetchOneRow(); $flags = new flagset($flags); $page->assign('usage_old', $usage_old); $page->assign('alias_old', $alias_old); - $nom_usage = replace_accent(trim(Env::get('nom_usage'))); + $nom_usage = replace_accent(trim(Env::v('nom_usage'))); $nom_usage = strtoupper($nom_usage); $page->assign('usage_req', $nom_usage); @@ -625,17 +600,15 @@ class ProfileModule extends PLModule $page->assign('same', true); } else { // le nom de mariage est distinct du nom à l'X // on calcule l'alias pour l'afficher - $reason = Env::get('reason'); + $reason = Env::v('reason'); if ($reason == 'other') { - $reason = Env::get('other_reason'); + $reason = Env::v('other_reason'); } - $myusage = new UsageReq(Session::getInt('uid'), $nom_usage, $reason); + $myusage = new UsageReq(S::v('uid'), $nom_usage, $reason); $myusage->submit(); $page->assign('myusage', $myusage); } } - - return PL_OK; } function handler_trombi(&$page, $promo = null) @@ -646,13 +619,13 @@ class ProfileModule extends PLModule $page->assign('xorg_title', 'Polytechnique.org - Trombi Promo'); if (is_null($promo)) { - return PL_OK; + return; } $this->promo = $promo = intval($promo); if ($promo >= 1900 && $promo < intval(date('Y')) - || ($promo == -1 && has_perms())) + || ($promo == -1 && S::has_perms())) { $trombi = new Trombi(array($this, '_trombi_getlist')); $trombi->hidePromo(); @@ -661,8 +634,6 @@ class ProfileModule extends PLModule } else { $page->trig('Promotion incorrecte (saisir au format YYYY). Recommence.'); } - - return PL_OK; } function format_adr($params, &$smarty) @@ -687,7 +658,7 @@ class ProfileModule extends PLModule $x = substr($x, 0, strlen($x) - 4); } - new_nonhtml_page('vcard.tpl', AUTH_COOKIE); + $page->changeTpl('vcard.tpl', NO_SKIN); require_once 'xorg.misc.inc.php'; require_once 'user.func.inc.php'; @@ -698,14 +669,14 @@ class ProfileModule extends PLModule $user = get_user_details($login); // alias virtual - $res = $globals->xdb->query( + $res = XDB::query( "SELECT alias FROM virtual INNER JOIN virtual_redirect USING(vid) INNER JOIN auth_user_quick ON ( user_id = {?} AND emails_alias_pub = 'public' ) WHERE ( redirect={?} OR redirect={?} ) AND alias LIKE '%@{$globals->mail->alias_dom}'", - Session::getInt('uid'), + S::v('uid'), $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); @@ -717,8 +688,6 @@ class ProfileModule extends PLModule header("Cache-Control: "); header("Content-type: text/x-vcard\n"); header("Content-Transfer-Encoding: Quoted-Printable\n"); - - return PL_OK; } }