X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp.php;h=bd2fdf2400566d298d19269d590e9e8a3cec79f2;hb=a5878ac19cc6ea75a753470cf68b7d2180d6cd51;hp=c8754d1e8dcadee3436c654089c71f6360183c00;hpb=e2b0a45c4117c2524b0b44e4a04ac230f180fd03;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index c8754d1..bd2fdf2 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -1,6 +1,6 @@ fetchOneAssoc()); } - return $user; + return $user; } elseif ($dom == 'polytechnique.org' || $dom == 'm4x.org') { $res = XDB::query( "SELECT user_id AS uid, u.promo, @@ -54,12 +54,12 @@ function get_infos($email) u.prenom, b.alias, CONCAT(b.alias, '@m4x.org') AS email, CONCAT(b.alias, '@polytechnique.org') AS email2, - m.perms='admin' AS perms, m.origine, + m.perms = 'admin' AS perms, m.origine, FIND_IN_SET('femme', u.flags) AS sexe FROM auth_user_md5 AS u INNER JOIN aliases AS a ON ( u.user_id = a.id AND a.type != 'homonyme' ) INNER JOIN aliases AS b ON ( u.user_id = b.id AND b.type = 'a_vie' ) - INNER JOIN groupex.membres AS m ON ( m.uid = u.user_id AND asso_id={?}) + LEFT JOIN groupex.membres AS m ON ( m.uid = u.user_id AND asso_id={?}) WHERE a.alias = {?} AND u.user_id < 50000", $globals->asso('id'), $mbox); return $res->fetchOneAssoc(); } @@ -97,13 +97,14 @@ class XnetGrpModule extends PLModule '%grp/member/new' => $this->make_hook('admin_member_new', AUTH_MDP, 'groupadmin'), '%grp/member/new/ajax' - => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH), + => $this->make_hook('admin_member_new_ajax', AUTH_MDP, 'user', NO_AUTH), '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'), - '%grp/rss' => $this->make_hook('rss', AUTH_PUBLIC), + '%grp/rss' => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS), '%grp/announce/new' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_MDP, 'groupadmin'), + '%grp/announce/photo' => $this->make_hook('photo_announce', AUTH_PUBLIC), '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP, 'groupadmin'), ); } @@ -122,7 +123,7 @@ class XnetGrpModule extends PLModule XDB::query('DELETE r.* FROM groupex.announces_read AS r INNER JOIN groupex.announces AS a ON a.id = r.announce_id - WHERE peremption < CURRENT_DATE()'); + WHERE peremption < CURRENT_DATE()'); XDB::query('INSERT INTO groupex.announces_read VALUES ({?}, {?})', Env::i('read'), S::i('uid')); @@ -134,7 +135,8 @@ class XnetGrpModule extends PLModule Env::i('unread'), S::i('uid')); pl_redirect("#art" . Env::i('unread')); } - $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife + $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife, + FIND_IN_SET('photo', a.flags) AS photo FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) INNER JOIN aliases AS l ON (u.user_id = l.id AND l.type = 'a_vie') @@ -155,7 +157,7 @@ class XnetGrpModule extends PLModule S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo')); $page->assign('article_index', $index); } else { - $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo + $arts = XDB::iterator("SELECT a.*, u.nom, u.prenom, u.promo, FIND_IN_SET('photo', a.flags) AS photo FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) WHERE asso_id = {?} AND peremption >= CURRENT_DATE() @@ -165,16 +167,13 @@ class XnetGrpModule extends PLModule if (!S::has('core_rss_hash')) { $page->setRssLink("Polytechnique.net :: {$globals->asso("nom")} :: News publiques", - "rss/rss.xml"); + $platal->ns . "rss/rss.xml"); } else { $page->setRssLink("Polytechnique.net :: {$globals->asso("nom")} :: News", - 'rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); + $platal->ns . 'rss/'.S::v('forlife') .'/'.S::v('core_rss_hash').'/rss.xml'); } - - $page->register_modifier('wiki_to_html', array('MiniWiki','WikiToHTML')); - $page->assign('articles', $arts); - $page->assign('asso', $globals->asso()); + $page->assign('articles', $arts); } function handler_logo(&$page) @@ -210,7 +209,7 @@ class XnetGrpModule extends PLModule global $globals; $site = $globals->asso('site'); if (!$site) { - $page->trig('Le groupe n\'a pas de site web'); + $page->trig('Le groupe n\'a pas de site web.'); return $this->handler_index($page); } http_redirect($site); @@ -223,6 +222,8 @@ class XnetGrpModule extends PLModule $page->changeTpl('xnetgrp/edit.tpl'); if (Post::has('submit')) { + S::assert_xsrf_token(); + if (S::has_perms()) { if (Post::v('mail_domain') && (strstr(Post::v('mail_domain'), '.') === false)) { $page->trig("le domaine doit être un FQDN (aucune modif effectuée) !!!"); @@ -233,14 +234,15 @@ class XnetGrpModule extends PLModule SET nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, forum={?}, mail_domain={?}, ax={?}, pub={?}, - sub_url={?}, inscriptible={?}, unsub_url={?} + sub_url={?}, inscriptible={?}, unsub_url={?}, + flags='wiki_desc' WHERE id={?}", Post::v('nom'), Post::v('diminutif'), Post::v('cat'), Post::i('dom'), Post::v('descr'), Post::v('site'), Post::v('mail'), Post::v('resp'), Post::v('forum'), Post::v('mail_domain'), - Post::has('ax'), Post::has('pub')?'private':'public', + Post::has('ax'), Post::v('pub'), Post::v('sub_url'), Post::v('inscriptible'), Post::v('unsub_url'),$globals->asso('id')); if (Post::v('mail_domain')) { @@ -252,12 +254,12 @@ class XnetGrpModule extends PLModule "UPDATE groupex.asso SET descr={?}, site={?}, mail={?}, resp={?}, forum={?}, ax={?}, pub= {?}, sub_url={?}, - unsub_url={?} + unsub_url={?},flags='wiki_desc' WHERE id={?}", Post::v('descr'), Post::v('site'), Post::v('mail'), Post::v('resp'), Post::v('forum'), Post::has('ax'), - Post::has('pub')?'private':'public', + Post::v('pub'), Post::v('sub_url'), Post::v('unsub_url'), $globals->asso('id')); } @@ -266,9 +268,9 @@ class XnetGrpModule extends PLModule $logo = file_get_contents($_FILES['logo']['tmp_name']); $mime = $_FILES['logo']['type']; XDB::execute('UPDATE groupex.asso - SET logo={?}, logo_mime={?} - WHERE id={?}', $logo, $mime, - $globals->asso('id')); + SET logo={?}, logo_mime={?} + WHERE id={?}', $logo, $mime, + $globals->asso('id')); } pl_redirect('../'.Post::v('diminutif', $globals->asso('diminutif')).'/edit'); @@ -279,6 +281,11 @@ class XnetGrpModule extends PLModule $page->assign('dom', $dom); $page->assign('super', true); } + if (!$globals->asso('wiki_desc') && $globals->asso('descr')) { + $page->trig("Attention, le format de la description a changé et utilise désormais la syntaxe wiki " + . "intégrée au site. Il te faudra probablement adapter le formatage du texte actuel pour " + . "qu'il s'affiche correctement avec cette nouvelle syntaxe."); + } } function handler_mail(&$page) @@ -300,6 +307,7 @@ class XnetGrpModule extends PLModule $mbr = array_keys(Env::v('membres', array())); require_once dirname(__FILE__) . '/xnetgrp/mail.inc.php'; + set_time_limit(120); $tos = get_all_redirects($mbr, $mls, $mmlist); $upload = PlUpload::get($_FILES['uploaded'], S::v('forlife'), 'xnet.emails', true); send_xnet_mails($from, $sujet, $body, Env::v('wiki'), $tos, Post::v('replyto'), $upload, @$_FILES['uploaded']['name']); @@ -328,10 +336,13 @@ class XnetGrpModule extends PLModule { global $globals; - if ($action == 'geoloc' || $action == 'trombi') { + if ($action == 'search') { + http_redirect("https://www.polytechnique.org/search/adv?rechercher=Chercher&groupex={$globals->asso('id')}" + . "&cityid=" . Env::v('cityid') . "&mapid=" . Env::v('mapid')); + } else if ($action == 'geoloc' || $action == 'trombi') { $view = new UserSet(); $view->addMod('trombi', 'Trombinoscope'); - $view->addMod('geoloc', 'Planisphère'); + $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'annuaire/search')); $view->apply('annuaire', $page, $action, $subaction); if ($action == 'geoloc' && $subaction) { return; @@ -355,7 +366,7 @@ class XnetGrpModule extends PLModule 1, 1)) as letter, COUNT(*) FROM groupex.membres AS m LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid) - WHERE asso_id = {?} and (u.perms != \'pending\' OR u.perms IS NULL) + WHERE asso_id = {?} and (u.perms != \'pending\' OR m.email IS NOT NULL) GROUP BY letter ORDER BY letter', $globals->asso('id')); } else { @@ -423,14 +434,14 @@ class XnetGrpModule extends PLModule m.perms='admin' AS admin, m.origine='X' AS x, u.perms!='pending' AS inscrit, - m.uid, IF(e.email IS NULL,NULL,1) AS actif + m.uid, IF(e.email IS NULL AND FIND_IN_SET('googleapps', u.mail_storage) = 0, NULL, 1) AS actif FROM groupex.membres AS m LEFT JOIN auth_user_md5 AS u ON ( u.user_id = m.uid ) LEFT JOIN aliases AS a ON ( a.id = m.uid AND a.type='a_vie' ) LEFT JOIN emails AS e ON ( e.flags = 'active' AND e.uid = m.uid) WHERE m.asso_id = {?} $ini AND (m.origine != 'X' OR u.perms != 'pending' OR m.email IS NOT NULL) - GROUP BY m.uid + GROUP BY m.uid ORDER BY $tri LIMIT {?},{?}", $globals->asso('id'), $ofs*NB_PER_PAGE, NB_PER_PAGE); $page->assign('ann', $ann); @@ -446,7 +457,7 @@ class XnetGrpModule extends PLModule { pl_redirect('annuaire/geoloc'); } - + function handler_vcard(&$page, $photos = null) { global $globals; @@ -469,19 +480,17 @@ class XnetGrpModule extends PLModule if (!is_null($u) && may_update()) { $page->assign('u', $u); - $res = XDB::query("SELECT nom, prenom, promo, user_id - FROM auth_user_md5 AS u - INNER JOIN aliases AS al ON (al.id = u.user_id - AND al.type != 'liste') - WHERE al.alias = {?}", $u); + $res = XDB::query("SELECT u.nom, u.prenom, u.promo, u.user_id, FIND_IN_SET('femme', u.flags) + FROM auth_user_md5 AS u + INNER JOIN aliases AS al ON (al.id = u.user_id AND al.type != 'liste') + WHERE al.alias = {?}", $u); - if (list($nom, $prenom, $promo, $uid) = $res->fetchOneRow()) { + if (list($nom, $prenom, $promo, $uid, $sexe) = $res->fetchOneRow()) { $res = XDB::query("SELECT COUNT(*) - FROM groupex.membres AS m - INNER JOIN aliases AS a ON (m.uid = a.id - AND a.type != 'homonyme') - WHERE a.alias = {?} AND m.asso_id = {?}", - $u, $globals->asso('id')); + FROM groupex.membres AS m + INNER JOIN aliases AS a ON (m.uid = a.id AND a.type != 'homonyme') + WHERE a.alias = {?} AND m.asso_id = {?}", + $u, $globals->asso('id')); $n = $res->fetchOneCell(); if ($n) { $page->kill("$prenom $nom est déjà membre du groupe !"); @@ -489,24 +498,25 @@ class XnetGrpModule extends PLModule } elseif (Env::has('accept')) { - XDB::execute("INSERT INTO groupex.membres - VALUES ({?}, {?}, 'membre', 'X', NULL, NULL, NULL, NULL, NULL)", + XDB::execute("INSERT INTO groupex.membres (asso_id, uid) + VALUES ({?}, {?})", $globals->asso('id'), $uid); $mailer = new PlMailer(); $mailer->addTo("$u@polytechnique.org"); $mailer->setFrom('"'.S::v('prenom').' '.S::v('nom') .'" <'.S::v('forlife').'@polytechnique.org>'); $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription'); - $message = "Cher Camarade,\n" + $message = ($sexe ? 'Chère' : 'Cher') . " Camarade,\n" . "\n" . " Suite à ta demande d'adhésion à ".$globals->asso('nom').",\n" . "j'ai le plaisir de t'annoncer que ton inscription a été validée !\n" . "\n" . "Bien cordialement,\n" + . "-- \n" . "{$_SESSION["prenom"]} {$_SESSION["nom"]}."; $mailer->setTxtBody($message); $mailer->send(); - $page->kill("$prenom $nom a bien été inscrit"); + pl_redirect("member/$u"); } elseif (Env::has('refuse')) { @@ -517,7 +527,7 @@ class XnetGrpModule extends PLModule $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée'); $mailer->setTxtBody(Env::v('motif')); $mailer->send(); - $page->kill("la demande $prenom $nom a bien été refusée"); + $page->kill("La demande de $prenom $nom a bien été refusée."); } else { $page->assign('show_form', true); $page->assign('prenom', $prenom); @@ -531,7 +541,7 @@ class XnetGrpModule extends PLModule } if (is_member()) { - $page->kill("tu es déjà membre !"); + $page->kill("Tu es déjà membre !"); return; } @@ -582,7 +592,7 @@ class XnetGrpModule extends PLModule { if (Env::has('right') && (may_update() || S::has('suid'))) { switch (Env::v('right')) { - case 'admin': + case 'admin': XnetSession::killSuid(); break; case 'anim': @@ -591,7 +601,7 @@ class XnetGrpModule extends PLModule is_member(true); break; case 'member': - XnetSession::doSelfSuid(); + XnetSession::doSelfSuid(); may_update(false, true); is_member(true); break; @@ -602,7 +612,7 @@ class XnetGrpModule extends PLModule break; } } - pl_redirect(""); + http_redirect($_SERVER['HTTP_REFERER']); } function handler_admin_annuaire(&$page) @@ -681,7 +691,7 @@ class XnetGrpModule extends PLModule WHERE a.alias={?}', $globals->asso('id'), $forlife); pl_redirect("member/$forlife"); } else { - $page->trig($email." n'est pas un alias polytechnique.org valide"); + $page->trig($email." n'est pas un alias polytechnique.org valide."); } } else { require_once 'xorg.misc.inc.php'; @@ -698,7 +708,7 @@ class XnetGrpModule extends PLModule $market = new Marketing($uid, $email, 'group', $globals->asso('nom'), Env::v('market_from'), S::v('uid')); $market->add(); - } + } } XDB::execute('INSERT INTO groupex.membres (uid, asso_id, origine, email) VALUES ({?}, {?}, "X", {?})', @@ -715,7 +725,7 @@ class XnetGrpModule extends PLModule pl_redirect("member/$email"); } } else { - $page->trig("« $email » n'est pas une adresse mail valide"); + $page->trig("« $email » n'est pas une adresse mail valide."); } } } @@ -749,7 +759,7 @@ class XnetGrpModule extends PLModule FROM auth_user_md5 WHERE $where"); } - if ($res->total() < 30) { + if ($res && $res->total() < 30) { $page->assign("choix", $res); } } @@ -764,7 +774,7 @@ class XnetGrpModule extends PLModule $user_same_email = get_infos($user['email']); $domain = $globals->asso('mail_domain'); - if (!$domain || !empty($user_same_email)) { + if (!$domain || (!empty($user_same_email) && $user_same_email['uid'] != $user['uid'])) { return true; } @@ -811,7 +821,7 @@ class XnetGrpModule extends PLModule } if ($this->unsubscribe($user)) { - $page->trig('Vous avez été désinscrit du groupe avec succès'); + $page->trig('Vous avez été désinscrit du groupe avec succès.'); } else { $page->trig('Vous avez été désinscrit du groupe, mais des erreurs se sont produites lors des désinscriptions des alias et des mailing-lists.'); } @@ -838,6 +848,75 @@ class XnetGrpModule extends PLModule } } + private function changeLogin(PlatalPage &$page, array &$user, MMList &$mmlist, $login) + { + require_once 'user.func.inc.php'; + // Search the uid of the user... + $res = XDB::query("SELECT f.id, f.alias + FROM aliases AS a + INNER JOIN aliases AS f ON (f.id = a.id AND f.type = 'a_vie') + WHERE a.alias = {?}", + $login); + if ($res->numRows() == 0) { + $x = get_not_registered_user($login); + if (!$x) { + $page->trig("Le login $login ne correspond à aucun X."); + return false; + } else if (count($x) > 1) { + $page->trig("Le login $login correspond a plusieurs camarades."); + return false; + } + $uid = $x[0]['user_id']; + $sub = false; + } else { + list($uid, $login) = $res->fetchOneRow(); + $sub = true; + } + + // Check if the user is already in the group + global $globals; + $res = XDB::query("SELECT uid, email + FROM groupex.membres + WHERE uid = {?} AND asso_id = {?}", + $uid, $globals->asso('id')); + if ($res->numRows()) { + list($uid, $email) = $res->fetchOneRow(); + XDB::execute("DELETE FROM groupex.membres + WHERE uid = {?}", + $user['uid']); + } else { + $email = $user['email']; + XDB::execute("UPDATE groupex.membres + SET uid = {?}, origine = 'X' + WHERE uid = {?} AND asso_id = {?}", + $uid, $user['uid'], $globals->asso('id')); + } + if ($sub) { + $email = $login . '@' . $globals->mail->domain; + } + + // Update subscription to aliases + if ($email != $user['email']) { + XDB::execute("UPDATE IGNORE virtual_redirect AS vr + INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', -1) = {?}) + SET vr.redirect = {?} + WHERE vr.redirect = {?}", + $globals->asso('mail_domain'), $email, $user['email']); + XDB::execute("DELETE vr.* + FROM virtual_redirect AS vr + INNER JOIN virtual AS v ON(vr.vid = v.vid AND SUBSTRING_INDEX(alias, '@', -1) = {?}) + WHERE vr.redirect = {?}", + $globals->asso('mail_domain'), $user['email']); + foreach (Env::v('ml1', array()) as $ml => $state) { + $mmlist->replace_email($ml, $user['email'], $email); + } + } + if ($sub) { + return $login; + } + return $user['email']; + } + function handler_admin_member(&$page, $user) { global $globals; @@ -853,6 +932,15 @@ class XnetGrpModule extends PLModule $globals->asso('mail_domain')); if (Post::has('change')) { + // Convert user status to X + if ($user['origine'] == 'ext' && trim(Post::v('login_X'))) { + $forlife = $this->changeLogin($page, $user, $mmlist, trim(Post::v('login_X'))); + if ($forlife) { + pl_redirect('member/' . $forlife); + } + } + + // Update user info $email_changed = ($user['origine'] != 'X' && strtolower($user['email']) != strtolower(Post::v('email'))); $from_email = $user['email']; if ($user['origine'] != 'X') { @@ -877,15 +965,16 @@ class XnetGrpModule extends PLModule $perms ? 'admin' : 'membre', $user['uid'], $globals->asso('id')); $user['perms'] = $perms; - $page->trig('permissions modifiées'); + $page->trig('Permissions modifiées !'); } + // Update ML subscriptions foreach (Env::v('ml1', array()) as $ml => $state) { $ask = empty($_REQUEST['ml2'][$ml]) ? 0 : 2; if ($ask == $state) { if ($state && $email_changed) { $mmlist->replace_email($ml, $from_email, $user['email2']); - $page->trig("L'abonnement de {$user['prenom']} {$user['nom']} à $ml@ a été mis à jour"); + $page->trig("L'abonnement de {$user['prenom']} {$user['nom']} à $ml@ a été mis à jour."); } continue; } @@ -895,17 +984,18 @@ class XnetGrpModule extends PLModule ."cours sur $ml@ !!!"); } elseif ($ask) { $mmlist->mass_subscribe($ml, Array($user['email2'])); - $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml@"); + $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml@."); } else { if ($email_changed) { $mmlist->mass_unsubscribe($ml, Array($from_email)); } else { $mmlist->mass_unsubscribe($ml, Array($user['email2'])); } - $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml@"); + $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml@."); } } + // Change subscriptioin to aliases foreach (Env::v('ml3', array()) as $ml => $state) { $ask = !empty($_REQUEST['ml4'][$ml]); if($state == $ask) continue; @@ -913,28 +1003,29 @@ class XnetGrpModule extends PLModule XDB::query("INSERT INTO virtual_redirect (vid,redirect) SELECT vid,{?} FROM virtual WHERE alias={?}", $user['email'], $ml); - $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml"); + $page->trig("{$user['prenom']} {$user['nom']} a été abonné à $ml."); } else { XDB::query("DELETE FROM virtual_redirect USING virtual_redirect INNER JOIN virtual USING(vid) WHERE redirect={?} AND alias={?}", $user['email'], $ml); - $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml"); + $page->trig("{$user['prenom']} {$user['nom']} a été désabonné de $ml."); } } } $page->assign('user', $user); + echo $user['email2']; $listes = $mmlist->get_lists($user['email2']); $page->assign('listes', $listes); $res = XDB::query( 'SELECT alias, redirect IS NOT NULL as sub FROM virtual AS v - LEFT JOIN virtual_redirect AS vr ON(v.vid=vr.vid AND redirect={?}) + LEFT JOIN virtual_redirect AS vr ON(v.vid=vr.vid AND (redirect = {?} OR redirect = {?})) WHERE alias LIKE {?} AND type="user"', - $user['email'], '%@'.$globals->asso('mail_domain')); + $user['email'], $user['email2'], '%@'.$globals->asso('mail_domain')); $page->assign('alias', $res->fetchAllAssoc()); } @@ -943,11 +1034,11 @@ class XnetGrpModule extends PLModule global $globals; require_once('rss.inc.php'); $uid = init_rss('xnetgrp/announce-rss.tpl', $user, $hash, false); - $page->register_modifier('wiki_to_html', array('MiniWiki', 'WikiToHTML')); if ($uid) { $rss = XDB::iterator("SELECT a.id, a.titre, a.texte, a.contacts, a.create_date, - IF(u2.nom_usage != '', u2.nom_usage, u2.nom) AS nom, u2.prenom, u2.promo + IF(u2.nom_usage != '', u2.nom_usage, u2.nom) AS nom, u2.prenom, u2.promo, + FIND_IN_SET('photo', a.flags) AS photo FROM auth_user_md5 AS u INNER JOIN groupex.announces AS a ON ( (a.promo_min = 0 OR a.promo_min <= u.promo) AND (a.promo_max = 0 OR a.promo_max <= u.promo)) @@ -966,15 +1057,57 @@ class XnetGrpModule extends PLModule $page->assign('rss', $rss); } + private function upload_image(PlatalPage &$page, PlUpload &$upload) + { + if (@!$_FILES['image']['tmp_name'] && !Env::v('image_url')) { + return true; + } + if (!$upload->upload($_FILES['image']) && !$upload->download(Env::v('image_url'))) { + $page->trig('Impossible de télécharger l\'image'); + return false; + } elseif (!$upload->isType('image')) { + $page->trig('Le fichier n\'est pas une image valide au format JPEG, GIF ou PNG.'); + $upload->rm(); + return false; + } elseif (!$upload->resizeImage(200, 300, 100, 100, 32284)) { + $page->trig('Impossible de retraiter l\'image'); + return false; + } + return true; + } + + function handler_photo_announce(&$page, $eid = null) { + if ($eid) { + $res = XDB::query("SELECT * FROM groupex.announces_photo WHERE eid = {?}", $eid); + if ($res->numRows()) { + $photo = $res->fetchOneAssoc(); + header('Content-Type: image/' . $photo['attachmime']); + echo $photo['attach']; + exit; + } + } else { + $upload = new PlUpload(S::v('forlife'), 'xnetannounce'); + if ($upload->exists() && $upload->isType('image')) { + header('Content-Type: ' . $upload->contentType()); + echo $upload->getContents(); + exit; + } + } + global $globals; + header('Content-Type: image/png'); + echo file_get_contents($globals->spoolroot . '/htdocs/images/logo.png'); + exit; + } + function handler_edit_announce(&$page, $aid = null) { global $globals, $platal; $page->changeTpl('xnetgrp/announce-edit.tpl'); - $page->register_modifier('wiki_to_html', array('MiniWiki','WikiToHTML')); $page->assign('new', is_null($aid)); $art = array(); - if (Post::v('valid') == 'Visualiser' || Post::v('valid') == 'Enregistrer') { + if (Post::v('valid') == 'Visualiser' || Post::v('valid') == 'Enregistrer' + || Post::v('valid') == 'Supprimer l\'image' || Post::v('valid') == 'Pas d\'image') { if (!is_null($aid)) { $art['id'] = $aid; } @@ -992,6 +1125,8 @@ class XnetGrpModule extends PLModule $art['xorg'] = Post::has('xorg'); $art['nl'] = Post::has('nl'); $art['event'] = Post::v('event'); + $upload = new PlUpload(S::v('forlife'), 'xnetannounce'); + $this->upload_image($page, $upload); $art['contact_html'] = $art['contacts']; if ($art['event']) { @@ -1003,52 +1138,80 @@ class XnetGrpModule extends PLModule ($art['promo_min'] != 0 && ($art['promo_min'] <= 1900 || $art['promo_min'] >= 2020)) || ($art['promo_max'] != 0 && ($art['promo_max'] <= 1900 || $art['promo_max'] >= 2020)))) { - $page->trig("L'intervalle de promotions est invalide"); + $page->trig("L'intervalle de promotions est invalide."); Post::kill('valid'); } if (!trim($art['titre']) || !trim($art['texte'])) { - $page->trig("L'article doit avoir un titre et un contenu"); + $page->trig("L'article doit avoir un titre et un contenu."); Post::kill('valid'); } + + if (Post::v('valid') == 'Supprimer l\'image') { + $upload->rm(); + Post::kill('valid'); + } + $art['photo'] = $upload->exists() || Post::i('photo'); + if (Post::v('valid') == 'Pas d\'image' && !is_null($aid)) { + XDB::query("DELETE FROM groupex.announces_photo WHERE eid = {?}", $aid); + $upload->rm(); + Post::kill('valid'); + $art['photo'] = false; + } } if (Post::v('valid') == 'Enregistrer') { $promo_min = ($art['public'] ? 0 : $art['promo_min']); $promo_max = ($art['public'] ? 0 : $art['promo_max']); + $flags = array(); + if ($art['public']) { + $flags[] = 'public'; + } + if ($art['photo']) { + $flags[] = 'photo'; + } + $flags = implode(',', $flags); if (is_null($aid)) { - $fulltext = $art['texte']; - if (!empty($art['contact_html'])) { - $fulltext .= "\n\n'''Contacts :'''\\\\\n" . $art['contact_html']; + $fulltext = $art['texte']; + if (!empty($art['contact_html'])) { + $fulltext .= "\n\n'''Contacts :'''\\\\\n" . $art['contact_html']; } - $post = null; + $post = null;/* if ($globals->asso('forum')) { require_once 'banana/forum.inc.php'; $banana = new ForumsBanana(S::v('forlife')); $post = $banana->post($globals->asso('forum'), null, $art['titre'], MiniWiki::wikiToText($fulltext, false, 0, 80)); - } + }*/ XDB::query("INSERT INTO groupex.announces (user_id, asso_id, create_date, titre, texte, contacts, peremption, promo_min, promo_max, flags, post_id) VALUES ({?}, {?}, NOW(), {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})", S::i('uid'), $globals->asso('id'), $art['titre'], $art['texte'], $art['contact_html'], - $art['peremption'], $promo_min, $promo_max, $art['public'] ? 'public' : '', $post); + $art['peremption'], $promo_min, $promo_max, $flags, $post); $aid = XDB::insertId(); + if ($art['photo']) { + list($imgx, $imgy, $imgtype) = $upload->imageInfo(); + XDB::execute("INSERT INTO groupex.announces_photo + SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}", + $aid, $imgtype, $imgx, $imgy, $upload->getContents()); + } if ($art['xorg']) { require_once('validations.inc.php'); - $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], - MiniWiki::WikiToHTML($fulltext), - $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::v('uid')); + $article = new EvtReq("[{$globals->asso('nom')}] " . $art['titre'], $fulltext, + $art['promo_min'], $art['promo_max'], $art['peremption'], "", S::v('uid'), + $upload); $article->submit(); - $page->trig("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation"); + $page->trig("L'affichage sur la page d'accueil de Polytechnique.org est en attente de validation."); + } else if ($upload && $upload->exists()) { + $upload->rm(); } if ($art['nl']) { require_once('validations.inc.php'); $article = new NLReq(S::v('uid'), $globals->asso('nom') . " : " .$art['titre'], $art['texte'], $art['contact_html']); $article->submit(); - $page->trig("La parution dans la Lettre Mensuelle est en attente de validation"); + $page->trig("La parution dans la Lettre Mensuelle est en attente de validation."); } } else { XDB::query("UPDATE groupex.announces @@ -1056,17 +1219,25 @@ class XnetGrpModule extends PLModule promo_min={?}, promo_max={?}, flags={?} WHERE id={?} AND asso_id={?}", $art['titre'], $art['texte'], $art['contacts'], $art['peremption'], - $promo_min, $promo_max, $art['public'] ? 'public' : '', + $promo_min, $promo_max, $flags, $art['id'], $globals->asso('id')); + if ($art['photo'] && $upload->exists()) { + list($imgx, $imgy, $imgtype) = $upload->imageInfo(); + XDB::execute("REPLACE INTO groupex.announces_photo + SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}", + $aid, $imgtype, $imgx, $imgy, $upload->getContents()); + $upload->rm(); + } } } if (Post::v('valid') == 'Enregistrer' || Post::v('valid') == 'Annuler') { pl_redirect(""); - } + } if (empty($art) && !is_null($aid)) { $res = XDB::query("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife, - FIND_IN_SET('public', a.flags) AS public + FIND_IN_SET('public', a.flags) AS public, + FIND_IN_SET('photo', a.flags) AS photo FROM groupex.announces AS a INNER JOIN auth_user_md5 AS u USING(user_id) INNER JOIN aliases AS l ON (l.id = u.user_id AND l.type = 'a_vie') @@ -1076,7 +1247,7 @@ class XnetGrpModule extends PLModule $art = $res->fetchOneAssoc(); $art['contact_html'] = $art['contacts']; } else { - $page->kill("Aucun article correspond à l'identifiant indiqué"); + $page->kill("Aucun article correspond à l'identifiant indiqué."); } } @@ -1088,10 +1259,11 @@ class XnetGrpModule extends PLModule if ($events->total()) { $page->assign('events', $events); } - } + } $art['contact_html'] = @MiniWiki::WikiToHTML($art['contact_html']); $page->assign('art', $art); + $page->assign_by_ref('upload', $upload); } function handler_admin_announce(&$page)