X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fxnetgrp.php;h=05319f00a1a0c3ee000b7827babff3b30e4dca9e;hb=801adeec34eada13769fd991c99026c824bbdef3;hp=711ece02caea77497db3a0bb39495dab2496f9fb;hpb=26ba053e75092d038f571b77eaf3005509da0648;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 711ece0..05319f0 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -48,7 +48,7 @@ class XnetGrpModule extends PLModule '%grp/member/new/ajax' => $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, 'user', NO_HTTPS), + '%grp/rss' => $this->make_token_hook('rss', AUTH_PUBLIC), '%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), @@ -184,40 +184,63 @@ class XnetGrpModule extends PLModule $page->trigError('Ni le nom ni le diminutif du groupe ne peuvent être vide.'); return; } + $axDate = make_datetime(Post::v('axDate')); + if (Post::t('axDate') != '') { + $axDate = make_datetime(Post::v('axDate'))->format('Y-m-d'); + } else { + $axDate = null; + } XDB::execute( "UPDATE groups SET nom={?}, diminutif={?}, cat={?}, dom={?}, descr={?}, site={?}, mail={?}, resp={?}, - forum={?}, mail_domain={?}, ax={?}, pub={?}, + forum={?}, mail_domain={?}, ax={?}, axDate = {?}, pub={?}, sub_url={?}, inscriptible={?}, unsub_url={?}, - flags={?} + flags = {?}, welcome_msg = {?} WHERE id={?}", Post::v('nom'), Post::v('diminutif'), Post::v('cat'), (Post::i('dom') == 0) ? null : Post::i('dom'), Post::v('descr'), $site, Post::v('mail'), Post::v('resp'), Post::v('forum'), Post::v('mail_domain'), - Post::has('ax'), Post::v('pub'), + Post::has('ax'), $axDate, Post::v('pub'), Post::v('sub_url'), Post::v('inscriptible'), - Post::v('unsub_url'), $flags, $globals->asso('id')); + Post::v('unsub_url'), $flags, Post::t('welcome_msg'), + $globals->asso('id')); if (Post::v('mail_domain')) { - XDB::execute('INSERT IGNORE INTO virtual_domains (domain) VALUES({?})', - Post::v('mail_domain')); + XDB::execute('INSERT IGNORE INTO email_virtual_domains (name) + VALUES ({?})', + Post::t('mail_domain')); + XDB::execute('UPDATE email_virtual_domains + SET aliasing = id + WHERE name = {?}', + Post::t('mail_domain')); } } else { XDB::execute( "UPDATE groups SET descr={?}, site={?}, mail={?}, resp={?}, forum={?}, pub= {?}, sub_url={?}, - unsub_url={?},flags={?} + unsub_url = {?}, flags = {?}, welcome_msg = {?} WHERE id={?}", Post::v('descr'), $site, Post::v('mail'), Post::v('resp'), Post::v('forum'), Post::v('pub'), Post::v('sub_url'), Post::v('unsub_url'), - $flags, $globals->asso('id')); + $flags, Post::t('welcome_msg'), + $globals->asso('id')); } + Phone::deletePhones(0, Phone::LINK_GROUP, $globals->asso('id')); + $phone = new Phone(array('link_type' => 'group', 'link_id' => $globals->asso('id'), 'id' => 0, + 'type' => 'fixed', 'display' => Post::v('phone'), 'pub' => 'public')); + $fax = new Phone(array('link_type' => 'group', 'link_id' => $globals->asso('id'), 'id' => 1, + 'type' => 'fax', 'display' => Post::v('fax'), 'pub' => 'public')); + $phone->save(); + $fax->save(); + Address::deleteAddresses(null, Address::LINK_GROUP, null, $globals->asso('id')); + $address = new Address(array('groupid' => $globals->asso('id'), 'type' => Address::LINK_GROUP, 'text' => Post::v('address'))); + $address->save(); if ($_FILES['logo']['name']) { $upload = PlUpload::get($_FILES['logo'], $globals->asso('id'), 'asso.logo', true); @@ -361,7 +384,7 @@ class XnetGrpModule extends PLModule { global $globals; $vcard = new VCard($photos == 'photos', 'Membre du groupe ' . $globals->asso('nom')); - $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles()); + $vcard->addProfiles($globals->asso()->getMembersFilter()->getProfiles(null, Profile::FETCH_ALL)); $vcard->show(); } @@ -401,6 +424,7 @@ class XnetGrpModule extends PLModule . "\n" . " Suite à ta demande d'adhésion à " . $globals->asso('nom') . ", j'ai le plaisir de t'annoncer que ton inscription a été validée !\n" + . (is_null($globals->asso('welcome_msg')) ? '' : "\n" . $globals->asso('welcome_msg') . "\n") . "\n" . "Bien cordialement,\n" . "-- \n" @@ -491,9 +515,9 @@ class XnetGrpModule extends PLModule $uf = New UserFilter(New UFC_Group($globals->asso('id'), true)); $admins = $uf->iterUsers(); $admin = $admins->next(); - $to = $admin->bestalias; + $to = $admin->bestEmail(); while ($admin = $admins->next()) { - $to .= ', ' . $admin->bestalias; + $to .= ', ' . $admin->bestEmail(); } $append = "\n" @@ -784,11 +808,11 @@ class XnetGrpModule extends PLModule } } - XDB::execute("DELETE FROM virtual_redirect - USING virtual_redirect - INNER JOIN virtual USING(vid) - WHERE redirect={?} AND alias LIKE {?}", - $user->forlifeEmail(), '%@'.$domain); + XDB::execute('DELETE v + FROM email_virtual AS v + INNER JOIN email_virtual_domains AS d ON (v.domain = d.id) + WHERE v.redirect = {?} AND d.name = {?}', + $user->forlifeEmail(), $domain); return !$warning; } @@ -913,11 +937,12 @@ class XnetGrpModule extends PLModule // Update group params for user $perms = Post::v('group_perms'); $comm = Post::t('comm'); - if ($user->group_perms != $perms || $user->group_comm != $comm) { + $position = (Post::t('group_position') == '') ? null : Post::v('group_position'); + if ($user->group_perms != $perms || $user->group_comm != $comm || $user->group_position != $position) { XDB::query('UPDATE group_members - SET perms = {?}, comm = {?} + SET perms = {?}, comm = {?}, position = {?} WHERE uid = {?} AND asso_id = {?}', - ($perms == 'admin') ? 'admin' : 'membre', $comm, + ($perms == 'admin') ? 'admin' : 'membre', $comm, $position, $user->id(), $globals->asso('id')); if (XDB::affectedRows()) { if ($perms != $user->group_perms) { @@ -926,6 +951,9 @@ class XnetGrpModule extends PLModule if ($comm != $user->group_comm) { $page->trigSuccess('Commentaire mis à jour.'); } + if ($position != $user->group_position) { + $page->trigSuccess('Poste mis à jour.'); + } } } @@ -961,44 +989,40 @@ class XnetGrpModule extends PLModule // Change subscriptioin to aliases foreach (Env::v('ml3', array()) as $ml => $state) { + require_once 'emails.inc.php'; $ask = !empty($_REQUEST['ml4'][$ml]); if($state == $ask) { if ($state && $email_changed) { - XDB::query("UPDATE virtual_redirect AS vr, virtual AS v - SET vr.redirect = {?} - WHERE vr.vid = v.vid AND v.alias = {?} AND vr.redirect = {?}", - $user->forlifeEmail(), $ml, $from_email); + update_list_alias($user, $from_email, $ml, $globals->asso('mail_domain')); $page->trigSuccess("L'abonnement de {$user->fullName()} à $ml a été mis à jour."); } } else if($ask) { - XDB::query("INSERT INTO virtual_redirect (vid,redirect) - SELECT vid,{?} FROM virtual WHERE alias={?}", - $user->forlifeEmail(), $ml); + add_to_list_alias($user, $ml, $globals->asso('mail_domain')); $page->trigSuccess("{$user->fullName()} a été abonné à $ml."); } else { - XDB::query("DELETE FROM virtual_redirect - USING virtual_redirect - INNER JOIN virtual USING(vid) - WHERE redirect={?} AND alias={?}", - $from_email, $ml); + delete_from_list_alias($user, $ml, $globals->asso('mail_domain')); $page->trigSuccess("{$user->fullName()} a été désabonné de $ml."); } } } + $res = XDB::rawFetchAllAssoc('SHOW COLUMNS FROM group_members LIKE \'position\''); + $positions = str_replace(array('enum(', ')', '\''), '', $res[0]['Type']); + $page->assign('user', $user); $page->assign('listes', $mmlist->get_lists($user->forlifeEmail())); - $page->assign('alias', $user->emailAliases($globals->asso('mail_domain'), 'user', true)); + $page->assign('alias', $user->emailGroupAliases($globals->asso('mail_domain'))); + $page->assign('positions', explode(',', $positions)); } - function handler_rss($page, $user = null, $hash = null) + function handler_rss(PlPage $page, PlUser $user) { global $globals; $page->assign('asso', $globals->asso()); $this->load('feed.inc.php'); $feed = new XnetGrpEventFeed(); - return $feed->run($page, $user, $hash, false); + return $feed->run($page, $user, false); } private function upload_image(PlPage $page, PlUpload $upload)