X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fxnetgrp.php;h=2b5966de7669f061d5dc3884eb536d7017703f6f;hb=72aed335acfdcceeaf613fc313e7ad39c3866e4e;hp=4b5e9f6055c8413689a96237ddf9c288be8aca91;hpb=e50f74d50fb29c50325120aec408611c9407c6d9;p=platal.git diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 4b5e9f6..2b5966d 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -29,34 +29,34 @@ class XnetGrpModule extends PLModule '%grp/asso.php' => $this->make_hook('index', AUTH_PUBLIC), '%grp/logo' => $this->make_hook('logo', AUTH_PUBLIC), '%grp/site' => $this->make_hook('site', AUTH_PUBLIC), - '%grp/edit' => $this->make_hook('edit', AUTH_MDP, 'groupadmin'), - '%grp/mail' => $this->make_hook('mail', AUTH_MDP, 'groupadmin'), - '%grp/forum' => $this->make_hook('forum', AUTH_MDP, 'groupmember'), - '%grp/former_users' => $this->make_hook('former_users', AUTH_MDP, 'admin'), - '%grp/annuaire' => $this->make_hook('annuaire', AUTH_MDP, 'groupannu'), - '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_MDP, 'groupmember:groupannu'), - '%grp/annuaire/csv' => $this->make_hook('csv', AUTH_MDP, 'groupmember:groupannu'), - '%grp/directory/sync' => $this->make_hook('directory_sync', AUTH_MDP, 'groupadmin'), - '%grp/directory/unact' => $this->make_hook('non_active', AUTH_MDP, 'groupadmin'), - '%grp/trombi' => $this->make_hook('trombi', AUTH_MDP, 'groupannu'), - '%grp/geoloc' => $this->make_hook('geoloc', AUTH_MDP, 'groupannu'), - '%grp/subscribe' => $this->make_hook('subscribe', AUTH_MDP), - '%grp/subscribe/valid' => $this->make_hook('subscribe_valid', AUTH_MDP, 'groupadmin'), - '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_MDP, 'groupmember'), - - '%grp/change_rights' => $this->make_hook('change_rights', AUTH_MDP), - '%grp/admin/annuaire' => $this->make_hook('admin_annuaire', AUTH_MDP, 'groupadmin'), - '%grp/member' => $this->make_hook('admin_member', AUTH_MDP, 'groupadmin'), - '%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), - '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_MDP, 'groupadmin'), - '%grp/member/suggest' => $this->make_hook('admin_member_suggest', AUTH_MDP, 'groupadmin'), + '%grp/edit' => $this->make_hook('edit', AUTH_PASSWD, 'groupadmin'), + '%grp/mail' => $this->make_hook('mail', AUTH_PASSWD, 'groupadmin'), + '%grp/forum' => $this->make_hook('forum', AUTH_PASSWD, 'groupmember'), + '%grp/former_users' => $this->make_hook('former_users', AUTH_PASSWD, 'admin'), + '%grp/annuaire' => $this->make_hook('annuaire', AUTH_PASSWD, 'groupannu'), + '%grp/annuaire/vcard' => $this->make_hook('vcard', AUTH_PASSWD, 'groupmember:groupannu'), + '%grp/annuaire/csv' => $this->make_hook('csv', AUTH_PASSWD, 'groupmember:groupannu'), + '%grp/directory/sync' => $this->make_hook('directory_sync', AUTH_PASSWD, 'groupadmin'), + '%grp/directory/unact' => $this->make_hook('non_active', AUTH_PASSWD, 'groupadmin'), + '%grp/trombi' => $this->make_hook('trombi', AUTH_PASSWD, 'groupannu'), + '%grp/geoloc' => $this->make_hook('geoloc', AUTH_PASSWD, 'groupannu'), + '%grp/subscribe' => $this->make_hook('subscribe', AUTH_PASSWD, 'groups'), + '%grp/subscribe/valid' => $this->make_hook('subscribe_valid', AUTH_PASSWD, 'groupadmin'), + '%grp/unsubscribe' => $this->make_hook('unsubscribe', AUTH_PASSWD, 'groupmember'), + + '%grp/change_rights' => $this->make_hook('change_rights', AUTH_PASSWD, 'groups'), + '%grp/admin/annuaire' => $this->make_hook('admin_annuaire', AUTH_PASSWD, 'groupadmin'), + '%grp/member' => $this->make_hook('admin_member', AUTH_PASSWD, 'groupadmin'), + '%grp/member/new' => $this->make_hook('admin_member_new', AUTH_PASSWD, 'groupadmin'), + '%grp/member/new/ajax' => $this->make_hook('admin_member_new_ajax', AUTH_PASSWD, 'groups', NO_AUTH), + '%grp/member/del' => $this->make_hook('admin_member_del', AUTH_PASSWD, 'groupadmin'), + '%grp/member/suggest' => $this->make_hook('admin_member_suggest', AUTH_PASSWD, 'groupadmin'), '%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/new' => $this->make_hook('edit_announce', AUTH_PASSWD, 'groupadmin'), + '%grp/announce/edit' => $this->make_hook('edit_announce', AUTH_PASSWD, 'groupadmin'), '%grp/announce/photo' => $this->make_hook('photo_announce', AUTH_PUBLIC), - '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_MDP, 'groupadmin'), + '%grp/admin/announces' => $this->make_hook('admin_announce', AUTH_PASSWD, 'groupadmin'), ); } @@ -120,6 +120,12 @@ class XnetGrpModule extends PLModule WHERE asso_id = {?} AND expiration >= CURRENT_DATE() AND FIND_IN_SET('public', flags)", $globals->asso('id')); + $payments = XDB::fetchAllAssoc("SELECT id, text + FROM payments + WHERE asso_id = {?} AND NOT FIND_IN_SET('old', flags) AND FIND_IN_SET('public', flags) + ORDER BY id DESC", + $globals->asso('id')); + $page->assign('payments', $payments); } if (may_update()) { $subs_valid = XDB::query("SELECT uid @@ -162,6 +168,15 @@ class XnetGrpModule extends PLModule { global $globals; $page->changeTpl('xnetgrp/edit.tpl'); + $error = false; + + if (S::admin()) { + $domains = XDB::iterator('SELECT * + FROM group_dom + ORDER BY nom'); + $page->assign('domains', $domains); + $page->assign('super', true); + } if (Post::has('submit')) { S::assert_xsrf_token(); @@ -182,12 +197,38 @@ class XnetGrpModule extends PLModule if (Post::v('mail_domain') && (strstr(Post::v('mail_domain'), '.') === false)) { $page->trigError('Le domaine doit être un FQDN (aucune modification effectuée) !!!'); - return; + $error = true; } if (Post::t('nom') == '' || Post::t('diminutif') == '') { $page->trigError('Ni le nom ni le diminutif du groupe ne peuvent être vide.'); + $error = true; + } + if ($error) { + $page->assign('nom', Post::t('nom')); + $page->assign('diminutif', Post::t('diminutif')); + $page->assign('mail_domain', Post::t('mail_domain')); + $page->assign('cat', Post::v('cat')); + $page->assign('dom', Post::v('dom')); + $page->assign('ax', Post::v('ax')); + $page->assign('axDate', Post::t('axDate')); + $page->assign('site', $site); + $page->assign('resp', Post::t('resp')); + $page->assign('mail', Post::t('mail')); + $page->assign('phone', Post::t('phone')); + $page->assign('fax', Post::t('fax')); + $page->assign('address', Post::t('address')); + $page->assign('forum', Post::t('forum')); + $page->assign('inscriptible', Post::v('inscriptible')); + $page->assign('sub_url', Post::t('sub_url')); + $page->assign('unsub_url', Post::t('unsub_url')); + $page->assign('welcome_msg', Post::t('welcome_msg')); + $page->assign('pub', Post::v('pub')); + $page->assign('notif_unsub', Post::i('notif_unsub')); + $page->assign('descr', Post::t('descr')); + $page->assign('error', $error); return; } + $axDate = make_datetime(Post::v('axDate')); if (Post::t('axDate') != '') { $axDate = make_datetime(Post::v('axDate'))->format('Y-m-d'); @@ -261,14 +302,13 @@ class XnetGrpModule extends PLModule pl_redirect('../' . Post::v('diminutif', $globals->asso('diminutif')) . '/edit'); } - - if (S::admin()) { - $dom = XDB::iterator('SELECT * - FROM group_dom - ORDER BY nom'); - $page->assign('dom', $dom); - $page->assign('super', true); - } + $page->assign('error', $error); + $page->assign('cat', $globals->asso('cat')); + $page->assign('dom', $globals->asso('dom')); + $page->assign('ax', $globals->asso('ax')); + $page->assign('inscriptible', $globals->asso('inscriptible')); + $page->assign('pub', $globals->asso('pub')); + $page->assign('notif_unsub', $globals->asso('notif_unsub')); } function handler_mail($page) @@ -374,7 +414,7 @@ class XnetGrpModule extends PLModule if (is_null($filename)) { $filename = $globals->asso('diminutif') . '.csv'; } - $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers(); + $users = $globals->asso()->getMembersFilter(null, new UFO_Name())->getUsers(); pl_cached_content_headers('text/x-csv', 1); $page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN); $page->assign('users', $users); @@ -671,7 +711,7 @@ class XnetGrpModule extends PLModule $append = "\n" . "-- \n" . "Ce message a été envoyé suite à la demande d'inscription de\n" - . S::user()->fullName() . ' (X' . S::v('promo') . ")\n" + . S::user()->fullName(true) . "\n" . "Via le site www.polytechnique.net. Tu peux choisir de valider ou\n" . "de refuser sa demande d'inscription depuis la page :\n" . "http://www.polytechnique.net/" . $globals->asso("diminutif") . "/subscribe/" . S::user()->login() . "\n" @@ -970,10 +1010,10 @@ class XnetGrpModule extends PLModule list($lastname, $firstname) = str_replace(array('-', ' ', "'"), '%', array(Env::t('nom'), Env::t('prenom'))); $cond = new PFC_And(new PFC_Not(new UFC_Registered())); if (!empty($lastname)) { - $cond->addChild(new UFC_Name(Profile::LASTNAME, $lastname, UFC_Name::CONTAINS)); + $cond->addChild(new UFC_NameTokens($lastname, array(), false, false, Profile::LASTNAME)); } if (!empty($firstname)) { - $cond->addChild(new UFC_Name(Profile::FIRSTNAME, $firstname, UFC_Name::CONTAINS)); + $cond->addChild(new UFC_NameTokens($firstname, array(), false, false, Profile::FIRSTNAME)); } if (Env::t('promo')) { $cond->addChild(new UFC_Promo('=', UserFilter::DISPLAY, Env::t('promo'))); @@ -1278,30 +1318,24 @@ class XnetGrpModule extends PLModule } if ($globals->asso('has_nl')) { + $nl = NewsLetter::forGroup($globals->asso('shortname')); // Updates group's newsletter subscription. if (Post::i('newsletter') == 1) { - XDB::execute('INSERT IGNORE INTO newsletter_ins (uid, nlid) - SELECT {?}, id - FROM newsletters - WHERE group_id = {?}', - $user->id(), $globals->asso('id')); + $nl->subscribe($user); } else { - XDB::execute('DELETE ni - FROM newsletter_ins AS ni - INNER JOIN newsletters AS n ON (n.id = ni.nlid) - WHERE ni.uid = {?} AND n.group_id = {?}', - $user->id(), $globals->asso('id')); + $nl->unsubscribe(null, $user->id()); } } } $res = XDB::rawFetchAllAssoc('SHOW COLUMNS FROM group_members LIKE \'position\''); $positions = str_replace(array('enum(', ')', '\''), '', $res[0]['Type']); - $nl_registered = XDB::fetchOneCell('SELECT COUNT(ni.uid) - FROM newsletter_ins AS ni - INNER JOIN newsletters AS n ON (n.id = ni.nlid) - WHERE ni.uid = {?} AND n.group_id = {?}', - $user->id(), $globals->asso('id')); + if ($globals->asso('has_nl')) { + $nl = NewsLetter::forGroup($globals->asso('shortname')); + $nl_registered = $nl->subscriptionState($user); + } else { + $nl_registered = false; + } $page->assign('user', $user); $page->assign('suggest', $this->suggest($user));