X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile.php;h=ba1a4f2644e43b076a267ac4285620a0f165d31a;hb=dc6378df04a613f3a65ae5e501b65de64a672b9a;hp=99695e02629e56baf7d929a194851d56da628a4e;hpb=b04882ff74e603c71accad830b26cd1c658305ea;p=platal.git diff --git a/modules/profile.php b/modules/profile.php index 99695e0..ba1a4f2 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ $this->make_hook('ajax_address', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/tel' => $this->make_hook('ajax_tel', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/medal' => $this->make_hook('ajax_medal', AUTH_COOKIE, 'user', NO_AUTH), + 'profile/networking' => $this->make_hook('networking', AUTH_PUBLIC), 'profile/ajax/job' => $this->make_hook('ajax_job', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/secteur' => $this->make_hook('ajax_secteur', AUTH_COOKIE, 'user', NO_AUTH), 'profile/ajax/skill' => $this->make_hook('ajax_skill', AUTH_COOKIE, 'user', NO_AUTH), @@ -59,7 +60,11 @@ class ProfileModule extends PLModule 'admin/formations' => $this->make_hook('admin_formations', AUTH_MDP, 'admin'), 'admin/sections' => $this->make_hook('admin_sections', AUTH_MDP, 'admin'), 'admin/secteurs' => $this->make_hook('admin_secteurs', AUTH_MDP, 'admin'), + 'admin/networking' => $this->make_hook('admin_networking', AUTH_MDP, 'admin'), 'admin/trombino' => $this->make_hook('admin_trombino', AUTH_MDP, 'admin'), + 'admin/ss_secteurs' => $this->make_hook('admin_ss_secteurs', AUTH_MDP, 'admin'), + 'admin/fonctions' => $this->make_hook('admin_fonctions', AUTH_MDP, 'admin'), + 'admin/phones_format_display' => $this->make_hook('admin_phones_format_display', AUTH_MDP, 'admin'), ); } @@ -106,11 +111,29 @@ class ProfileModule extends PLModule function handler_medal(&$page, $mid) { + $thumb = ($mid == 'thumb'); + $mid = $thumb ? @func_get_arg(2) : $mid; + $res = XDB::query("SELECT img FROM profile_medals WHERE id = {?}", $mid); - $img = dirname(__FILE__).'/../htdocs/images/medals/' . $res->fetchOneCell(); + $img = $thumb ? + dirname(__FILE__).'/../htdocs/images/medals/thumb/' . $res->fetchOneCell() : + dirname(__FILE__).'/../htdocs/images/medals/' . $res->fetchOneCell(); + $type = mime_content_type($img); + header("Content-Type: $type"); + echo file_get_contents($img); + exit; + } + + function handler_networking(&$page, $mid) + { + $res = XDB::query("SELECT icon + FROM profile_networking_enum + WHERE network_type = {?}", + $mid); + $img = dirname(__FILE__) . '/../htdocs/images/networking/' . $res->fetchOneCell(); $type = mime_content_type($img); header("Content-Type: $type"); echo file_get_contents($img); @@ -129,7 +152,7 @@ class ProfileModule extends PLModule if (Env::has('upload')) { $upload = new PlUpload(S::v('forlife'), 'photo'); if (!$upload->upload($_FILES['userfile']) && !$upload->download(Env::v('photo'))) { - $page->trig('Une erreur est survenue lors du téléchargement du fichier'); + $page->trigError('Une erreur est survenue lors du téléchargement du fichier'); } else { $myphoto = new PhotoReq(S::v('uid'), $upload); if ($myphoto->isValid()) { @@ -146,19 +169,23 @@ class ProfileModule extends PLModule } } } 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"', - S::v('uid')); + XDB::execute('DELETE FROM photo + WHERE uid = {?}', + S::v('uid')); + XDB::execute('DELETE FROM requests + WHERE user_id = {?} AND type="photo"', + S::v('uid')); + update_NbValid(); } elseif (Env::v('cancel')) { - $sql = XDB::query('DELETE FROM requests - WHERE user_id={?} AND type="photo"', - S::v('uid')); + $sql = XDB::query('DELETE FROM requests + WHERE user_id={?} AND type="photo"', + S::v('uid')); + update_NbValid(); } - $sql = XDB::query('SELECT COUNT(*) FROM requests - WHERE user_id={?} AND type="photo"', + $sql = XDB::query('SELECT COUNT(*) + FROM requests + WHERE user_id={?} AND type="photo"', S::v('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); @@ -187,27 +214,29 @@ class ProfileModule extends PLModule WHERE matricule={?}", $x); $login = $res->fetchOneCell(); } else { - $login = get_user_forlife($x); + $login = get_user_forlife($x, S::logged() ? '_default_user_callback' + : '_silent_user_callback'); } if (empty($login)) { - if (preg_match('/([-a-z]+)\.([-a-z]+)\.([0-9]{4})/i', $x, $matches)) { - $matches = str_replace('-', '_', $matches); - $res = XDB::query("SELECT user_id - FROM auth_user_md5 - WHERE prenom LIKE {?} AND nom LIKE {?} AND promo = {?} - AND perms = 'pending'", - $matches[1], $matches[2], $matches[3]); - if ($res->numRows() == 1) { - $uid = $res->fetchOneCell(); - pl_redirect('marketing/public/' . $uid); - } + $user = get_not_registered_user($x, true); + if ($user->total() != 1) { + return PL_NOT_FOUND; } - return PL_NOT_FOUND; + $user = $user->next(); + if (S::logged()) { + pl_redirect('marketing/public/' . $user['user_id']); + } + $user['forlife'] = $x; + } else { + $new = Env::v('modif') == 'new'; + $user = get_user_details($login, S::v('uid'), $view); + } + + if (S::logged()) { + $_SESSION['log']->log('view_profile', $login); } - $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); @@ -252,6 +281,7 @@ class ProfileModule extends PLModule $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2); $page->assign('virtualalias', $res->fetchOneCell()); + $page->assign('view', $view); $page->addJsLink('close_on_esc.js'); header('Last-Modified: ' . date('r', strtotime($user['date']))); @@ -286,14 +316,15 @@ class ProfileModule extends PLModule } 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'); + $page->trigSuccess('Ton profil a été synchronisé avec celui du site polytechniciens.com'); } // Build the page $page->addJsLink('ajax.js'); - $page->addJsLink('profile.js'); $page->addJsLink('applis.js'); $page->addJsLink('grades.js'); + $page->addJsLink('profile.js'); + $page->addJsLink('jquery.autocomplete.js'); $wiz = new PlWizard('Profil', 'core/plwizard.tpl', true, true); require_once dirname(__FILE__) . '/profile/page.inc.php'; $wiz->addPage('ProfileGeneral', 'Général', 'general'); @@ -310,7 +341,7 @@ class ProfileModule extends PLModule FROM auth_user_md5 WHERE user_id = {?} AND naissance = '0000-00-00'", S::i('uid')); if ($res->numRows()) { - $page->trig("Ta date de naissance n'est pas renseignée, ce qui t'empêcheras de réaliser" + $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"); } @@ -460,19 +491,19 @@ class ProfileModule extends PLModule $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'); + $page->trigError('L\'année de sortie doit être un nombre de quatre chiffres'); } elseif ($promo_sortie < $promo + 3) { - $page->trig('Trop tôt'); + $page->trigError('Trop tôt'); } elseif ($promo_sortie == $promo_sortie_old) { - $page->trig('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); + $page->trigWarning('Tu appartiens déjà à la promotion correspondante à cette année de sortie.'); } elseif ($promo_sortie == $promo + 3) { XDB::execute( "UPDATE auth_user_md5 set promo_sortie={?} WHERE user_id={?}", $promo_sortie, S::v('uid')); - $page->trig('Ton statut "orange" a été supprimé.'); + $page->trigSuccess('Ton statut "orange" a été supprimé.'); $page->assign('promo_sortie_old', $promo_sortie); } else { @@ -761,16 +792,105 @@ class ProfileModule extends PLModule } function handler_admin_sections(&$page, $action = 'list', $id = null) { $page->assign('xorg_title','Polytechnique.org - Administration - Sections'); - $page->assign('title', 'Gestion des Sections'); + $page->assign('title', 'Gestion des sections'); $table_editor = new PLTableEditor('admin/sections','sections','id'); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } + function handler_admin_ss_secteurs(&$page, $action = 'list', $id = null) { + $page->assign('xorg_title', 'Polytechnique.org - Administration - Sous-secteurs'); + $page->assign('title', 'Gestion des sous-secteurs'); + $table_editor = new PLTableEditor('admin/ss_secteurs', 'emploi_ss_secteur', 'id', true); + $table_editor->describe('label', 'intitulé', true); + $table_editor->apply($page, $action, $id); + } + function handler_admin_fonctions(&$page, $action = 'list', $id = null) { + $page->assign('xorg_title', 'Polytechnique.org - Administration - Fonctions'); + $page->assign('title', 'Gestion des fonctions'); + $table_editor = new PLTableEditor('admin/fonctions', 'fonctions_def', 'id', true); + $table_editor->describe('fonction_fr', 'intitulé', true); + $table_editor->describe('fonction_en', 'intitulé (ang)', true); + $table_editor->describe('flags', 'titre', true); + $table_editor->apply($page, $action, $id); + } function handler_admin_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Secteurs'); - $page->assign('title', 'Gestion des Secteurs'); - $table_editor = new PLTableEditor('admin/secteurs','emploi_secteur','id'); - $table_editor->describe('label','intitulé',true); + $page->assign('xorg_title', 'Polytechnique.org - Administration - Secteurs'); + $page->assign('title', 'Gestion des secteurs'); + $table_editor = new PLTableEditor('admin/secteurs', 'emploi_secteur', 'id', true); + $table_editor->describe('label', 'intitulé', true); + $table_editor->apply($page, $action, $id); + } + 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->describe('name', 'intitulé', true); + $table_editor->describe('icon', 'nom de l\'icône', false); + $table_editor->describe('filter', 'filtre', true); + $table_editor->describe('link', 'lien web', true); + $table_editor->apply($page, $action, $id); + } + function handler_admin_phones_format_display(&$page, $action = 'list', $id = null) { + $page->assign('xorg_title', 'Polytechnique.org - Administration - Format d\'affichage des numéros de téléphone '); + $page->assign('title', 'Gestion des formats d\'affichage des numéros de téléphone'); + $table_editor = new PLTableEditor('admin/phones_format_display', 'phone_formats', 'phoneprf',true); + $table_editor->describe('phoneprf', 'Préfixe International', true); + $table_editor->describe('format', 'format d\'Affichage (ex: (+p) ### ## ## ##)', true); + if ($action == 'update') { + if ((Post::has('phoneprf')) && (Post::v('phoneprf') == $id)) { + $res = XDB::query("SELECT format + FROM phone_formats + WHERE phoneprf = {?}", + $id); + $old_val = $res->fetchOneCell(); + if (Post::has('format')) { + $new_val = Post::v('format'); + } else { + $new_val = ''; + } + if ($new_val != $old_val){ + require_once("profil.func.inc.php"); + XDB::execute("UPDATE phone_formats + SET format = {?} + WHERE phoneprf = {?}", + $new_val, $id); + $prefixe = $id . '%'; + $res = XDB::iterator("SELECT uid, link_type, link_id, tel_id, tel_type, search_tel, pub + FROM telephone + WHERE search_tel LIKE {?}", + $prefixe); + $req = ''; + $i = 0; + while($phonenumber = $res->next()) { + if ($req != '') { + $req .= ",\n"; + } + $req .= "('" . addslashes($phonenumber['uid']) . "', '" . addslashes($phonenumber['link_type']) . "', '" . addslashes($phonenumber['link_id']) + . "', '" . addslashes($phonenumber['tel_id']) . "', '" . addslashes($phonenumber['tel_type']) + . "', '" . addslashes($phonenumber['search_tel']) . "', '" + . addslashes(format_display_number($phonenumber['search_tel'], &$erreur, array('format' => $new_val, 'phoneprf' => $id))) + . "', '" . addslashes($phonenumber['pub']) . "')"; + $i++; + if( $i == 1000) { + XDB::execute("INSERT INTO telephone(uid, link_type, link_id, tel_id ,tel_type, + search_tel, display_tel, pub) + VALUES " . $req . " + ON DUPLICATE KEY UPDATE display_tel = VALUES(display_tel)"); + $req = ''; + $i = 0; + } + } + if ($req != '') { + XDB::execute("INSERT INTO telephone(uid, link_type, link_id, tel_id ,tel_type, + search_tel, display_tel, pub) + VALUES " . $req . " + ON DUPLICATE KEY UPDATE display_tel = VALUES(display_tel)"); + } + } + } + $action = 'list'; + $id = null; + } $table_editor->apply($page, $action, $id); } function handler_admin_medals(&$page, $action = 'list', $id = null) { @@ -789,15 +909,24 @@ class ProfileModule extends PLModule if (Post::v('act') == 'del') { XDB::execute('DELETE FROM profile_medals_grades WHERE mid={?} AND gid={?}', $mid, Post::i('gid')); - } elseif (Post::v('act') == 'new') { - XDB::execute('INSERT INTO profile_medals_grades (mid,gid) - VALUES ({?},{?})', - $mid, max(array_keys(Post::v('grades', array(0))))+1); } else { foreach (Post::v('grades', array()) as $gid=>$text) { - XDB::execute('UPDATE profile_medals_grades - SET pos={?}, text={?} - WHERE gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid); + if ($gid === 0) { + if (!empty($text)) { + $res = XDB::query('SELECT MAX(gid) + FROM profile_medals_grades + WHERE mid = {?}', $mid); + $gid = $res->fetchOneCell() + 1; + + XDB::execute('INSERT INTO profile_medals_grades (mid, gid, text, pos) + VALUES ({?}, {?}, {?}, {?})', + $mid, $gid, $text, $_POST['pos']['0']); + } + } else { + XDB::execute('UPDATE profile_medals_grades + SET pos={?}, text={?} + WHERE gid={?} AND mid={?}', $_POST['pos'][$gid], $text, $gid, $mid); + } } } $res = XDB::iterator('SELECT gid, text, pos FROM profile_medals_grades WHERE mid={?} ORDER BY pos', $mid);