From: Nicolas Iooss Date: Wed, 5 Mar 2014 19:23:23 +0000 (+0100) Subject: Merge branch 'xorg/maint' X-Git-Tag: xorg/1.1.12~17 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5f317a8d97f36d3a201149039b6996586b57826d;hp=7951d5b0c1bc1e69b7790403309061df2d4d8cc4;p=platal.git Merge branch 'xorg/maint' Conflicts: include/newsletter.inc.php --- diff --git a/ChangeLog b/ChangeLog index 842641b..bfcc099 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ ================================================================================ +VERSION 1.1.12 XX XX XXXX + + * Usability: + - Make /emails page clearer -IOS + +================================================================================ VERSION 1.1.11 31 12 2013 * Letters: diff --git a/banana b/banana index 9a99d31..a90b6fc 160000 --- a/banana +++ b/banana @@ -1 +1 @@ -Subproject commit 9a99d3160d51c7c9bbf0fb5bc1ad76546e86d39c +Subproject commit a90b6fc9a76f346c4f8232c9358f3c1b48b26f32 diff --git a/bin/banana.feedgen.php b/bin/banana.feedgen.php index 390403a..5afe646 100755 --- a/bin/banana.feedgen.php +++ b/bin/banana.feedgen.php @@ -17,5 +17,5 @@ Banana::$spool_root = $globals->spoolroot . '/spool/banana/'; Banana::$nntp_host = ForumsBanana::buildURL(); Banana::refreshAllFeeds(array('NNTP', 'MLArchive')); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/banana.spoolgen.php b/bin/banana.spoolgen.php index e1bc4c9..17f7f6e 100755 --- a/bin/banana.spoolgen.php +++ b/bin/banana.spoolgen.php @@ -17,5 +17,5 @@ Banana::$spool_root = $globals->spoolroot . '/spool/banana/'; Banana::$nntp_host = ForumsBanana::buildURL(); Banana::createAllSpool(array('NNTP', 'MLArchive')); system("chown -R www-data:www-data " . Banana::$spool_root); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/check_security_fixes.py b/bin/check_security_fixes.py index f14dcfc..019e9fa 100755 --- a/bin/check_security_fixes.py +++ b/bin/check_security_fixes.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * @@ -174,4 +174,4 @@ def main(): if __name__ == '__main__': main() -# vim:set et sw=2 sts=2 sws=2 enc=utf-8: +# vim:set et sw=2 sts=2 sws=2 fenc=utf-8: diff --git a/bin/connect.db.inc.php b/bin/connect.db.inc.php index 6c1ed2b..2f267f5 100644 --- a/bin/connect.db.inc.php +++ b/bin/connect.db.inc.php @@ -1,6 +1,6 @@ debug = 0; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/banana.feedgen.php b/bin/cron/banana.feedgen.php index 09d169d..1ff5147 100755 --- a/bin/cron/banana.feedgen.php +++ b/bin/cron/banana.feedgen.php @@ -17,5 +17,5 @@ Banana::$spool_root = $globals->spoolroot . '/spool/banana/'; Banana::$nntp_host = ForumsBanana::buildURL(); Banana::refreshAllFeeds(array('NNTP')); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/bestmail.check.php b/bin/cron/bestmail.check.php new file mode 100755 index 0000000..6074e73 --- /dev/null +++ b/bin/cron/bestmail.check.php @@ -0,0 +1,89 @@ +#!/usr/bin/php5 -q +next()) { + $pid = $row[0]; + + // Find the address which would be selected as "AX mail" + // But don't update anything + $best_mail = Address::updateBestMail($pid, true); + if (is_null($best_mail)) { + continue; + } + + // Just continue if the returned address is already selected + $flags = new PlFlagSet($best_mail['flags']); + if ($flags->hasFlag('dn_best_mail')) { + continue; + } + + // The current profile is buggy. + // Let's fetch more data to print detailed information + $profile = Profile::get($pid); + $addresses = ProfileField::getForPID('ProfileAddresses', array($pid), $admin_visibility); + $addresses = $addresses->get(Profile::ADDRESS_POSTAL); + + $old_mail = null; + $new_mail = null; + foreach ($addresses as $addr) { + if ($addr->flags->hasFlag('dn_best_mail')) { + $old_mail = $addr; + } else if ($addr->id == $best_mail['id']) { + $new_mail = $addr; + } + } + + echo "Profile " . $profile->hrid() . " ($pid) has a wrongly selected best mail.\n"; + if (is_null($old_mail)) { + echo "... no currently selected best mail\n"; + } else { + echo "... currently selected best mail: " . $old_mail->formatted_address . + " (flags: " . $old_mail->flags->flags() . ", pub: " . $old_mail->pub . ")\n"; + } + if (is_null($new_mail)) { + echo "... unable to find newly selected best mail (BUG!)\n"; + } else { + echo "... best mail that would be selected: " . $new_mail->formatted_address . + " (flags: " . $new_mail->flags->flags() . ", pub: " . $new_mail->pub . ")\n"; + } + echo "\n"; +} + +print "Done.\n"; + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: +?> diff --git a/bin/cron/checkdb.php b/bin/cron/checkdb.php index cbd7350..a2dd732 100755 --- a/bin/cron/checkdb.php +++ b/bin/cron/checkdb.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/clean.php b/bin/cron/clean.php index 78f33ac..76af55d 100755 --- a/bin/cron/clean.php +++ b/bin/cron/clean.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/compliance.php b/bin/cron/compliance.php index 16f29fe..fef9273 100755 --- a/bin/cron/compliance.php +++ b/bin/cron/compliance.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/cron_ml_moderate.php b/bin/cron/cron_ml_moderate.php index a779564..52864d5 100755 --- a/bin/cron/cron_ml_moderate.php +++ b/bin/cron/cron_ml_moderate.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q lists->max_mail_per_min sleep(60 * $count / $globals->lists->max_mail_per_min); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/cron_validations.php b/bin/cron/cron_validations.php index b83efe7..bbaf000 100755 --- a/bin/cron/cron_validations.php +++ b/bin/cron/cron_validations.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q setTxtBody($message); $mymail->send(); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/cron_xnet_accounts.php b/bin/cron/cron_xnet_accounts.php index f26ef2c..0a51745 100755 --- a/bin/cron/cron_xnet_accounts.php +++ b/bin/cron/cron_xnet_accounts.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php index 1cab2d0..426a2d6 100755 --- a/bin/cron/emails.check.php +++ b/bin/cron/emails.check.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/google_apps.php b/bin/cron/google_apps.php index 69c1be5..ee4a180 100755 --- a/bin/cron/google_apps.php +++ b/bin/cron/google_apps.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/homonyms.php b/bin/cron/homonyms.php index 3d27903..e4e9db0 100755 --- a/bin/cron/homonyms.php +++ b/bin/cron/homonyms.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q next()) { $req->submit(); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/newsletters.send.php b/bin/cron/newsletters.send.php index 06874d8..296fb8d 100755 --- a/bin/cron/newsletters.send.php +++ b/bin/cron/newsletters.send.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/notifs.birthday.php b/bin/cron/notifs.birthday.php index d86245e..8f7c2c7 100755 --- a/bin/cron/notifs.birthday.php +++ b/bin/cron/notifs.birthday.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q $affected changes\n"; } while ($affected > 0); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/notifs.send.php b/bin/cron/notifs.send.php index e2433ff..8a873aa 100755 --- a/bin/cron/notifs.send.php +++ b/bin/cron/notifs.send.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/cron/phones.check.php b/bin/cron/phones.check.php index 92707ee..497662e 100755 --- a/bin/cron/phones.check.php +++ b/bin/cron/phones.check.php @@ -99,5 +99,5 @@ foreach ($prefixes as $i => $prefix) { } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/profile_modification.php b/bin/cron/profile_modification.php index 580d3ba..d08a03f 100755 --- a/bin/cron/profile_modification.php +++ b/bin/cron/profile_modification.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q total() > 0) { WHERE type = \'third_party\''); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/cron/registrations.php b/bin/cron/registrations.php index 1866b89..825ed62 100755 --- a/bin/cron/registrations.php +++ b/bin/cron/registrations.php @@ -52,5 +52,5 @@ $mailer->addTo($globals->register->notif); $mailer->setTxtBody($message); $mailer->send(); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/csv2sql.php b/bin/csv2sql.php index b78e9f9..34a62b5 100755 --- a/bin/csv2sql.php +++ b/bin/csv2sql.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 setCSV($source); $translater->run($action, $insert_relation, $update_relation); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/devel/lists.foreach_template.py b/bin/devel/lists.foreach_template.py index 7fc0d74..788e060 100755 --- a/bin/devel/lists.foreach_template.py +++ b/bin/devel/lists.foreach_template.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * diff --git a/bin/devel/xhtml.classes.pl b/bin/devel/xhtml.classes.pl index e693a17..4d48a1b 100755 --- a/bin/devel/xhtml.classes.pl +++ b/bin/devel/xhtml.classes.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * diff --git a/bin/devel/xhtml.validate.pl b/bin/devel/xhtml.validate.pl index 8aff7a7..684424b 100755 --- a/bin/devel/xhtml.validate.pl +++ b/bin/devel/xhtml.validate.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * diff --git a/bin/formatAddresses.php b/bin/formatAddresses.php index 257a785..52636ef 100755 --- a/bin/formatAddresses.php +++ b/bin/formatAddresses.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/lists.create_promo.php b/bin/lists.create_promo.php index 07e7ca6..3222a42 100755 --- a/bin/lists.create_promo.php +++ b/bin/lists.create_promo.php @@ -31,5 +31,5 @@ $req = new ListeReq($owner_user, false, "promo", $promo . '.' . $globals->mail-> 1 /*private*/, 2 /*moderate*/, 0 /*free subscription*/, array($owner), array()); $req->submit(); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py index cff5ca0..cda3511 100755 --- a/bin/lists.rpc.py +++ b/bin/lists.rpc.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * diff --git a/bin/marketPromo.php b/bin/marketPromo.php index 66f758d..076e019 100755 --- a/bin/marketPromo.php +++ b/bin/marketPromo.php @@ -46,6 +46,6 @@ while ($data = fgetcsv($handle)) { $market->send(); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/newsletter.bounces.processor.py b/bin/newsletter.bounces.processor.py index cc6d278..f315b84 100755 --- a/bin/newsletter.bounces.processor.py +++ b/bin/newsletter.bounces.processor.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * @@ -165,16 +165,24 @@ def findAddressInBounce(bounce): print('! Not a valid bounce (expected text/plain, found %s).' % content.get_content_type()) return None # Extract the faulty email address - recipient_match = _recipient_re.search(content['Final-Recipient']) + # Some MTA don't set Final-Recipient but use Remote-Recipient instead + if 'Final-Recipient' in content: + final_recipient = content['Final-Recipient'] + elif 'Remote-Recipient' in content: + final_recipient = content['Remote-Recipient'] + else: + print('! Not a valid bounce (no Final-Recipient).') + return None + recipient_match = _recipient_re.search(final_recipient) if recipient_match is None: # Be nice, test another regexp - recipient_match = _recipient_re2.search(content['Final-Recipient']) + recipient_match = _recipient_re2.search(final_recipient) if recipient_match is None: print('! Missing final recipient.') return None email = recipient_match.group(1) # Check the action field - if content['Action'].lower() != 'failed': + if content['Action'].lower().strip() != 'failed': print('! Not a failed action (%s).' % content['Action']) return None @@ -407,7 +415,7 @@ class DirectBouncesFilter(MboxFilter): # Additionnal checks, just to be sure elif message['From'] != 'MAILER-DAEMON@polytechnique.org (Mail Delivery System)' \ or message['Subject'] != 'Undelivered Mail Returned to Sender': - print('! Not an usual direct bounce (From="%s", Subject="%s").' % (message['From'], message['Subject'])) + print('! Not an usual direct bounce (From=%r, Subject=%r).' % (message['From'], message['Subject'])) else: email = findAddressInBounce(message) if email is not None: @@ -601,8 +609,8 @@ class DeliveryStatusNotificationFilter(MboxFilter): # Detect ill-formatted reports, sent as plain text email if report_message.get_content_type() == 'text/plain' and ( - 'MAILER-DAEMON@' in message['From'].upper() or - 'mail delivery failure' == message['Subject'].lower() + 'MAILER-DAEMON@' in message.get('From', '').upper() or + 'mail delivery failure' == message.get('Subject', '').lower() ): email = findAddressInPlainBounce(report_message) if email is not None: diff --git a/bin/newsletter.send.php b/bin/newsletter.send.php index 84f93c4..1d56351 100755 --- a/bin/newsletter.send.php +++ b/bin/newsletter.send.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q getIssue($id); $issue->sendToAll(); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/bin/poisonous_email_generator.py b/bin/poisonous_email_generator.py index 178da9b..a34aaaa 100755 --- a/bin/poisonous_email_generator.py +++ b/bin/poisonous_email_generator.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #*************************************************************************** -#* Copyright (C) 2003-2013 Polytechnique.org * +#* Copyright (C) 2003-2014 Polytechnique.org * #* http://opensource.polytechnique.org/ * #* * #* This program is free software; you can redistribute it and/or modify * diff --git a/bin/promo_update_help.php b/bin/promo_update_help.php index 65bbebc..69abe82 100755 --- a/bin/promo_update_help.php +++ b/bin/promo_update_help.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q diff --git a/bin/search.rebuild_db.php b/bin/search.rebuild_db.php index 2f63158..be34531 100755 --- a/bin/search.rebuild_db.php +++ b/bin/search.rebuild_db.php @@ -1,7 +1,7 @@ #!/usr/bin/php5 -q 0) { print "done\n"; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/classes/address.php b/classes/address.php index 8a2c44f..2ebe8b5 100644 --- a/classes/address.php +++ b/classes/address.php @@ -1,6 +1,6 @@ pid != 0) { - $this->updateAxMail(); + self::updateBestMail($this->pid); } } } - private function updateAxMail() + /** + * Upate the denormalized flag which is used to mark the best mail to use + * when sending postal mail + * + * Call with $fake to true to only get which address would be selected, + * without updating anything in the database. + * Returns an array describing the selected profile address + */ + static public function updateBestMail($pid, $fake=false) { - XDB::execute("UPDATE profile_addresses - SET flags = REPLACE(flags, 'ax_mail', '') - WHERE pid = {?}", - $this->pid); + if (!$fake) { + XDB::execute("UPDATE profile_addresses + SET flags = REPLACE(flags, 'dn_best_mail', '') + WHERE pid = {?}", + $pid); + } - $ax_mail = XDB::fetchOneAssoc("SELECT pid, jobid, groupid, type, id + /* Following order is selected to find the best mail: + * * Use addresses without the deliveryIssue flag if possible. + * * Among these, use addresses flagged as "current". + * * If there is no such addresses or several ones, prefer those + * without "secondary" flag. + * * If there are still several addresses in the selection, try not + * to select the ones with "job" type. + */ + $best_mail = XDB::fetchOneAssoc("SELECT pid, jobid, groupid, type, id, flags FROM profile_addresses - WHERE pub IN ('public', 'ax') AND FIND_IN_SET('mail', flags) AND pid = {?} - ORDER BY NOT FIND_IN_SET('current', flags), - FIND_IN_SET('secondary', flags), type = 'job'", - $this->pid); - - if ($ax_mail) { + WHERE FIND_IN_SET('mail', flags) AND pid = {?} + ORDER BY FIND_IN_SET('deliveryIssue', flags), + NOT FIND_IN_SET('current', flags), + FIND_IN_SET('secondary', flags), type = 'job' + LIMIT 1", + $pid); + + if (!$fake && $best_mail) { XDB::execute("UPDATE profile_addresses - SET flags = CONCAT(flags, ',ax_mail') + SET flags = CONCAT(flags, ',dn_best_mail') WHERE pid = {?} AND jobid = {?} AND groupid = {?} AND type = {?} AND id = {?}", - $ax_mail['pid'], $ax_mail['jobid'], $ax_mail['groupid'], $ax_mail['type'], $ax_mail['id']); + $best_mail['pid'], $best_mail['jobid'], $best_mail['groupid'], $best_mail['type'], $best_mail['id']); } + return $best_mail; } public function updateGeocoding($text) @@ -916,12 +937,12 @@ class Address } } -/** Iterator over a set of Phones +/** Iterator over a set of Addresses * * @param $pid, $type, $jobid, $pub * - * The iterator contains the phones that correspond to the value stored in the - * parameters' arrays. + * The iterator contains the addresses that correspond to the value stored in + * the parameters' arrays. */ class AddressIterator implements PlIterator { @@ -1008,5 +1029,5 @@ class AddressIterator implements PlIterator } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/classes/direnum.php b/classes/direnum.php index 6153c68..777653b 100644 --- a/classes/direnum.php +++ b/classes/direnum.php @@ -1,6 +1,6 @@ diff --git a/classes/geocoder.php b/classes/geocoder.php index 4b478d8..30d6fbd 100644 --- a/classes/geocoder.php +++ b/classes/geocoder.php @@ -1,6 +1,6 @@ diff --git a/classes/gmapsgeocoder.php b/classes/gmapsgeocoder.php index bea3a52..c16ebba 100644 --- a/classes/gmapsgeocoder.php +++ b/classes/gmapsgeocoder.php @@ -1,6 +1,6 @@ diff --git a/classes/group.php b/classes/group.php index 99a6a87..9fe100b 100644 --- a/classes/group.php +++ b/classes/group.php @@ -1,6 +1,6 @@ diff --git a/classes/jobterms.php b/classes/jobterms.php index d166f8f..b17033c 100644 --- a/classes/jobterms.php +++ b/classes/jobterms.php @@ -1,6 +1,6 @@ diff --git a/classes/phone.php b/classes/phone.php index 21be6a6..da9de1d 100644 --- a/classes/phone.php +++ b/classes/phone.php @@ -1,6 +1,6 @@ diff --git a/classes/platalglobals.php.in b/classes/platalglobals.php.in index 5f0ce5a..6bd1518 100644 --- a/classes/platalglobals.php.in +++ b/classes/platalglobals.php.in @@ -1,6 +1,6 @@ diff --git a/classes/platallogger.php b/classes/platallogger.php index 83cf1a6..b76daf4 100644 --- a/classes/platallogger.php +++ b/classes/platallogger.php @@ -1,6 +1,6 @@ diff --git a/classes/profile.php b/classes/profile.php index 0f5eb73..7065598 100644 --- a/classes/profile.php +++ b/classes/profile.php @@ -1,6 +1,6 @@ 'Nom affiché', 'freetext' => 'Commentaire', 'freetext_pub' => 'Affichage du commentaire', + 'axfreetext' => 'Commentaire AX', 'photo' => 'Photographie', 'photo_pub' => 'Affichage de la photographie', 'addresses' => 'Adresses', @@ -499,7 +500,7 @@ class Profile implements PlExportable } XDB::execute("UPDATE profiles - SET cv = NULL, freetext = NULL, freetext_pub = 'private', + SET cv = NULL, freetext = NULL, freetext_pub = 'private', axfreetext = NULL, medals_pub = 'private', alias_pub = 'hidden', email_directory = NULL WHERE pid = {?}", @@ -1012,6 +1013,22 @@ class Profile implements PlExportable } } + /* Hobbies + */ + public function getHobbies() { + if ($this->visibility->isVisible(Visibility::EXPORT_PRIVATE)) { + return XDB::fetchAllAssoc('type', 'SELECT type, GROUP_CONCAT(text) + FROM profile_hobby + WHERE pid = {?} + GROUP BY type', $this->id()); + } else { + return XDB::fetchAllAssoc('type', 'SELECT type, GROUP_CONCAT(text) + FROM profile_hobby + WHERE pub = \'public\' AND pid = {?} + GROUP BY type', $this->id()); + } + } + /* Medals */ private $medals = null; @@ -1504,5 +1521,5 @@ class ProfileIterator implements PlIterator } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/classes/user.php b/classes/user.php index d7c2b99..10e131c 100644 --- a/classes/user.php +++ b/classes/user.php @@ -1,6 +1,6 @@ diff --git a/classes/userfilter.php b/classes/userfilter.php index f07e2a8..dffa8a7 100644 --- a/classes/userfilter.php +++ b/classes/userfilter.php @@ -1,6 +1,6 @@ diff --git a/classes/userfilter/conditions.inc.php b/classes/userfilter/conditions.inc.php index 7ea27f4..150e97e 100644 --- a/classes/userfilter/conditions.inc.php +++ b/classes/userfilter/conditions.inc.php @@ -1,6 +1,6 @@ 'current', - self::FLAG_TEMP => 'temporary', - self::FLAG_SECOND => 'secondary', - self::FLAG_MAIL => 'mail', - self::FLAG_CEDEX => 'cedex', - self::FLAG_AX_MAIL => 'ax_mail', + self::FLAG_CURRENT => 'current', + self::FLAG_TEMP => 'temporary', + self::FLAG_SECOND => 'secondary', + self::FLAG_MAIL => 'mail', + self::FLAG_CEDEX => 'cedex', + self::FLAG_BEST_MAIL => 'dn_best_mail', ); protected $flags; @@ -1721,5 +1722,5 @@ class UFC_PartnerSharingID extends UserFilterCondition } // }}} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/classes/userfilter/orders.inc.php b/classes/userfilter/orders.inc.php index 5c25686..f0eefc5 100644 --- a/classes/userfilter/orders.inc.php +++ b/classes/userfilter/orders.inc.php @@ -1,6 +1,6 @@ diff --git a/classes/visibility.php b/classes/visibility.php index 2abf8f6..ffd12e0 100644 --- a/classes/visibility.php +++ b/classes/visibility.php @@ -1,6 +1,6 @@ diff --git a/classes/xnet.php b/classes/xnet.php index 471576d..1251ba6 100644 --- a/classes/xnet.php +++ b/classes/xnet.php @@ -1,6 +1,6 @@ diff --git a/classes/xnetpage.php b/classes/xnetpage.php index 1ef1ecd..280585f 100644 --- a/classes/xnetpage.php +++ b/classes/xnetpage.php @@ -1,6 +1,6 @@ diff --git a/classes/xnetsession.php b/classes/xnetsession.php index dd1e3ea..f03a838 100644 --- a/classes/xnetsession.php +++ b/classes/xnetsession.php @@ -1,6 +1,6 @@ diff --git a/classes/xorg.php b/classes/xorg.php index a7858db..362bf78 100644 --- a/classes/xorg.php +++ b/classes/xorg.php @@ -1,6 +1,6 @@ diff --git a/classes/xorgpage.php b/classes/xorgpage.php index 2ffcf4e..b132fe8 100644 --- a/classes/xorgpage.php +++ b/classes/xorgpage.php @@ -1,6 +1,6 @@ diff --git a/classes/xorgsession.php b/classes/xorgsession.php index 0563d92..2a9e73d 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -1,6 +1,6 @@ diff --git a/configs/mails.conf b/configs/mails.conf index 0fdad28..a5dd398 100644 --- a/configs/mails.conf +++ b/configs/mails.conf @@ -41,8 +41,8 @@ from=webmaster@polytechnique.org to=non-geoloc@staff.polytechnique.org [mails_comletter] -from="Lettre de la communauté" -replyto=debat@polytechnique.org +from="Lettre de la communauté" +replyto=animateurs@debats.polytechnique.org [mails_ax] from="AX" diff --git a/configs/platal.cron.in b/configs/platal.cron.in index c1e5606..82a09d2 100644 --- a/configs/platal.cron.in +++ b/configs/platal.cron.in @@ -9,6 +9,7 @@ WD=/home/web/prod/platal/bin/cron 0 20 2-31 * * web cd $WD; ./emails.check.php | mail -e -s "Qualite de l'annuaire" hotliners@staff.m4x.org 0 20 1 * * web cd $WD; ./emails.check.php -v | mail -e -s "Qualite de l'annuaire : verbeux" hotliners@staff.m4x.org 0 22 * * * web cd $WD; ./phones.check.php > /dev/null +0 30 * * 1 web cd $WD; ./bestmail.check.php # inscription report 0 6 * * 1 web cd $WD; ./registrations.php @@ -44,4 +45,4 @@ WD=/home/web/prod/platal/bin/cron # xnet accounts creation 0 * * * * web cd $WD; ./cron_xnet_accounts.php -# vim:set noet syntax=crontab ts=8 sw=8 sts=8 enc=utf-8: +# vim:set noet syntax=crontab ts=8 sw=8 sts=8 fenc=utf-8: diff --git a/configs/platal.ini b/configs/platal.ini index 532f221..4f94bea 100644 --- a/configs/platal.ini +++ b/configs/platal.ini @@ -1,5 +1,5 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Copyright (C) 2003-2013 Polytechnique.org ; +; Copyright (C) 2003-2014 Polytechnique.org ; ; http://opensource.polytechnique.org/ ; ; ; ; This program is free software; you can redistribute it and/or modify ; @@ -436,7 +436,7 @@ pass_ax = "" ; $globals->webservice->hsot_ax ; Host of the webservice of the AX -host_ax = "https://www.polytechniciens.com/" +host_ax = "http://www.ax.polytechnique.edu/" ; $globals->webservice->private_key_ax ; Path to the private key used for authentication with the webservice of the AX diff --git a/core b/core index d38ecb1..fa7ffd6 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit d38ecb11de0d913af7533b957778feea865d0ef4 +Subproject commit fa7ffd661d77b24cdb385aca7bdb04c938214061 diff --git a/htdocs/css/bandeau.css b/htdocs/css/bandeau.css index 4dc166e..99b6cac 100644 --- a/htdocs/css/bandeau.css +++ b/htdocs/css/bandeau.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/base.css b/htdocs/css/base.css index 2777afa..227c411 100644 --- a/htdocs/css/base.css +++ b/htdocs/css/base.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/default.css b/htdocs/css/default.css index 9e84d14..ab31152 100644 --- a/htdocs/css/default.css +++ b/htdocs/css/default.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/espace.css b/htdocs/css/espace.css index 8f8d242..98c8cf1 100644 --- a/htdocs/css/espace.css +++ b/htdocs/css/espace.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/humlinux.css b/htdocs/css/humlinux.css index d17d7b8..1c8110b 100644 --- a/htdocs/css/humlinux.css +++ b/htdocs/css/humlinux.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/igoogle.css b/htdocs/css/igoogle.css index 4555f5c..8cbeece 100644 --- a/htdocs/css/igoogle.css +++ b/htdocs/css/igoogle.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css index 4e8763e..f6f66d1 100644 --- a/htdocs/css/keynote.css +++ b/htdocs/css/keynote.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/linux.css b/htdocs/css/linux.css index 3931fab..a18fd22 100644 --- a/htdocs/css/linux.css +++ b/htdocs/css/linux.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/liteskin.css b/htdocs/css/liteskin.css index c2e2e9c..4b61d64 100644 --- a/htdocs/css/liteskin.css +++ b/htdocs/css/liteskin.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/nbviolet.css b/htdocs/css/nbviolet.css index 0bf115e..563a4e2 100644 --- a/htdocs/css/nbviolet.css +++ b/htdocs/css/nbviolet.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/newxorg.css b/htdocs/css/newxorg.css index 5bf9914..50f8891 100644 --- a/htdocs/css/newxorg.css +++ b/htdocs/css/newxorg.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/nl.AX.css b/htdocs/css/nl.AX.css index b7891ab..fe27266 100644 --- a/htdocs/css/nl.AX.css +++ b/htdocs/css/nl.AX.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/nl.Ecole.css b/htdocs/css/nl.Ecole.css index d33de6c..3fd730b 100644 --- a/htdocs/css/nl.Ecole.css +++ b/htdocs/css/nl.Ecole.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/nl.FX.css b/htdocs/css/nl.FX.css index 609dfcf..12ca0ed 100644 --- a/htdocs/css/nl.FX.css +++ b/htdocs/css/nl.FX.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/nl.Polytechnique.org.css b/htdocs/css/nl.Polytechnique.org.css index c252102..8658a52 100644 --- a/htdocs/css/nl.Polytechnique.org.css +++ b/htdocs/css/nl.Polytechnique.org.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/nl.default.css b/htdocs/css/nl.default.css index 930e867..5126409 100644 --- a/htdocs/css/nl.default.css +++ b/htdocs/css/nl.default.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/oldtimes.css b/htdocs/css/oldtimes.css index d3351ab..5c972dc 100644 --- a/htdocs/css/oldtimes.css +++ b/htdocs/css/oldtimes.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/openweb.css b/htdocs/css/openweb.css index 4725f69..69af38e 100644 --- a/htdocs/css/openweb.css +++ b/htdocs/css/openweb.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/sharky.css b/htdocs/css/sharky.css index d201ead..1ca11f6 100644 --- a/htdocs/css/sharky.css +++ b/htdocs/css/sharky.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/spectral.css b/htdocs/css/spectral.css index feb03b2..0bde032 100644 --- a/htdocs/css/spectral.css +++ b/htdocs/css/spectral.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/trapped.css b/htdocs/css/trapped.css index fdd3622..e182d3a 100644 --- a/htdocs/css/trapped.css +++ b/htdocs/css/trapped.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/css/xnet.css b/htdocs/css/xnet.css index 417a1c7..f64f597 100644 --- a/htdocs/css/xnet.css +++ b/htdocs/css/xnet.css @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * diff --git a/htdocs/images/ax_mail_header_normal.jpg b/htdocs/images/ax_mail_header_normal.jpg deleted file mode 100644 index ab98f38..0000000 Binary files a/htdocs/images/ax_mail_header_normal.jpg and /dev/null differ diff --git a/htdocs/images/icons/flag_black.gif b/htdocs/images/icons/flag_black.gif new file mode 100644 index 0000000..eb7494c Binary files /dev/null and b/htdocs/images/icons/flag_black.gif differ diff --git a/htdocs/javascript/igoogle.js b/htdocs/javascript/igoogle.js index 11e81a5..ec1795f 100644 --- a/htdocs/javascript/igoogle.js +++ b/htdocs/javascript/igoogle.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -34,4 +34,4 @@ function markEventAsRead(event_id) return false; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/javascript/jobtermstree.js b/htdocs/javascript/jobtermstree.js index 865af4c..644978b 100644 --- a/htdocs/javascript/jobtermstree.js +++ b/htdocs/javascript/jobtermstree.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -50,5 +50,5 @@ function createJobTermsTree(domElement, platalpage, treeid, clickFunc, text_filt }} }); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/javascript/maps.js b/htdocs/javascript/maps.js index edfd2e9..f0a7d3f 100644 --- a/htdocs/javascript/maps.js +++ b/htdocs/javascript/maps.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -172,4 +172,4 @@ function color_average(color_array) return color_code; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/javascript/profile.js b/htdocs/javascript/profile.js index 7ab5e91..e6fea88 100644 --- a/htdocs/javascript/profile.js +++ b/htdocs/javascript/profile.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -58,11 +58,12 @@ var subgrades; var names; var multiples; -// Publicity follows the following ordering: private < ax < public. +// Publicity follows the following ordering: hidden < private < ax < public. var publicity = []; -publicity['private'] = 0; -publicity['ax'] = 1; -publicity['public'] = 2; +publicity['hidden'] = 0; +publicity['private'] = 1; +publicity['ax'] = 2; +publicity['public'] = 3; // Names {{{1 @@ -823,4 +824,4 @@ function updatePublicity(mainField, mainId, subField, subId) } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/javascript/search.js b/htdocs/javascript/search.js index cbd70ab..94dc9ab 100644 --- a/htdocs/javascript/search.js +++ b/htdocs/javascript/search.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -334,4 +334,4 @@ function addressesDump() } // }}} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/javascript/xnet_members.js b/htdocs/javascript/xnet_members.js index cabb8f3..92c7b83 100644 --- a/htdocs/javascript/xnet_members.js +++ b/htdocs/javascript/xnet_members.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -58,4 +58,4 @@ function updateSuggestions(baseurl, uid) } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js index fc979d4..2ce2212 100644 --- a/htdocs/javascript/xorg.js +++ b/htdocs/javascript/xorg.js @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2003-2013 Polytechnique.org * + * Copyright (C) 2003-2014 Polytechnique.org * * http://opensource.polytechnique.org/ * * * * This program is free software; you can redistribute it and/or modify * @@ -1255,4 +1255,4 @@ $(function() { }); }); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: diff --git a/htdocs/listes_redirect.php b/htdocs/listes_redirect.php index 5345972..13cb213 100644 --- a/htdocs/listes_redirect.php +++ b/htdocs/listes_redirect.php @@ -1,6 +1,6 @@ diff --git a/htdocs/url_redirect.php b/htdocs/url_redirect.php index 2fdef84..2120fc4 100644 --- a/htdocs/url_redirect.php +++ b/htdocs/url_redirect.php @@ -1,6 +1,6 @@ diff --git a/htdocs/webredirect.php b/htdocs/webredirect.php index 1e84b07..8ba42f9 100644 --- a/htdocs/webredirect.php +++ b/htdocs/webredirect.php @@ -1,6 +1,6 @@ diff --git a/htdocs/xnet.php b/htdocs/xnet.php index c3f1f58..c442a48 100644 --- a/htdocs/xnet.php +++ b/htdocs/xnet.php @@ -1,6 +1,6 @@ diff --git a/htdocs/xorg.php b/htdocs/xorg.php index feab20e..fc3acd5 100644 --- a/htdocs/xorg.php +++ b/htdocs/xorg.php @@ -1,6 +1,6 @@ diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php index 9187764..9057502 100644 --- a/include/banana/forum.inc.php +++ b/include/banana/forum.inc.php @@ -1,6 +1,6 @@ diff --git a/include/banana/hooks.inc.php b/include/banana/hooks.inc.php index f881814..af146f5 100644 --- a/include/banana/hooks.inc.php +++ b/include/banana/hooks.inc.php @@ -1,6 +1,6 @@ diff --git a/include/banana/ml.inc.php b/include/banana/ml.inc.php index 83959ff..5d185a0 100644 --- a/include/banana/ml.inc.php +++ b/include/banana/ml.inc.php @@ -1,6 +1,6 @@ diff --git a/include/banana/moderate.inc.php b/include/banana/moderate.inc.php index 2afb571..b30e8ac 100644 --- a/include/banana/moderate.inc.php +++ b/include/banana/moderate.inc.php @@ -1,6 +1,6 @@ diff --git a/include/comletter.inc.php b/include/comletter.inc.php index 9e228b0..4419d61 100644 --- a/include/comletter.inc.php +++ b/include/comletter.inc.php @@ -1,6 +1,6 @@ diff --git a/include/common.inc.php b/include/common.inc.php index 9beca6f..b0f5b8a 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -1,6 +1,6 @@ diff --git a/include/education.func.inc.php b/include/education.func.inc.php index fce66c3..8ff9a5f 100644 --- a/include/education.func.inc.php +++ b/include/education.func.inc.php @@ -1,6 +1,6 @@ register_function('education_degree_name', 'education_degree_name'); -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/emails.combobox.inc.php b/include/emails.combobox.inc.php index e47ffb9..05525c5 100644 --- a/include/emails.combobox.inc.php +++ b/include/emails.combobox.inc.php @@ -1,6 +1,6 @@ assign('email_lists', $emails); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/emails.inc.php b/include/emails.inc.php index 61e0edf..f2f12e0 100644 --- a/include/emails.inc.php +++ b/include/emails.inc.php @@ -1,6 +1,6 @@ diff --git a/include/googleapps.inc.php b/include/googleapps.inc.php index f7ab2bf..a62f636 100644 --- a/include/googleapps.inc.php +++ b/include/googleapps.inc.php @@ -1,6 +1,6 @@ diff --git a/include/ical.inc.php b/include/ical.inc.php index 12adbf6..6c4eea3 100644 --- a/include/ical.inc.php +++ b/include/ical.inc.php @@ -1,6 +1,6 @@ diff --git a/include/mailinglist.inc.php b/include/mailinglist.inc.php index 155275d..292266b 100644 --- a/include/mailinglist.inc.php +++ b/include/mailinglist.inc.php @@ -1,6 +1,6 @@ diff --git a/include/marketing.inc.php b/include/marketing.inc.php index 18e1e30..d314831 100644 --- a/include/marketing.inc.php +++ b/include/marketing.inc.php @@ -1,6 +1,6 @@ $user->isFemale(), 'mail' => $email, 'to' => '"' . $user->fullName() . '" <' . $email . '>', - 'forlife_email' => $user->forlifeEmail(), - 'forlife_email2' => $user->forlifeEmailAlternate() + 'forlife_email' => $user->hruid . "@" . $user->mainEmailDomain(), + 'forlife_email2' => $user->hruid . "@" . $user->alternateEmailDomain() ); } @@ -370,5 +370,5 @@ class DefaultMarketing extends AnnuaireMarketing { } -// vim:set et sw=4 sts=4 sws=4 enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 fenc=utf-8: ?> diff --git a/include/name.func.inc.php b/include/name.func.inc.php index c23ffac..176870a 100644 --- a/include/name.func.inc.php +++ b/include/name.func.inc.php @@ -1,6 +1,6 @@ diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index 5ceabc0..313d98d 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -1,6 +1,6 @@ group_id = $data['group_id']; $this->group = $data['group_name']; $this->name = $data['nl_name']; - $this->custom_css = $data['custom_css']; $this->criteria = new PlFlagSet($data['criteria']); // Load the categories @@ -109,7 +106,7 @@ class NewsLetter */ public static function getAll($sort = 'id', $order = 'ASC') { - $res = XDB::fetchAllAssoc('SELECT n.id, g.nom AS group_name, n.name, n.custom_css, n.criteria, g.diminutif AS group_link + $res = XDB::fetchAllAssoc('SELECT n.id, g.nom AS group_name, n.name, n.criteria, g.diminutif AS group_link FROM newsletters AS n INNER JOIN groups AS g ON (n.group_id = g.id) ORDER BY ' . $sort . ' ' . $order); @@ -517,7 +514,7 @@ class NewsLetter */ public function cssFile() { - if ($this->custom_css) { + if ($this->hasCustomCss()) { $base = $this->group; } else { $base = self::FORMAT_DEFAULT_GROUP; @@ -529,7 +526,7 @@ class NewsLetter */ public function tplFile() { - if ($this->custom_css) { + if ($this->hasCustomCss()) { $base = $this->group; } else { $base = self::FORMAT_DEFAULT_GROUP; @@ -670,7 +667,16 @@ class NewsLetter public function hasCustomCss() { - return $this->custom_css; + switch ($this->group) { + case self::GROUP_XORG: + case self::GROUP_COMMUNITY: + case self::GROUP_AX: + case self::GROUP_EP: + case self::GROUP_FX: + return true; + default: + return false; + } } public function canSyncWithGroup() @@ -1246,6 +1252,13 @@ class NLIssue public function sendTo($user, $hash = null) { global $globals; + + // Don't send email to users without an address + // Note: this would never happen when using sendToAll + if (!$user->bestEmail()) { + return; + } + $this->fetchArticles(); if (is_null($hash)) { @@ -1548,5 +1561,5 @@ function format_text($input, $format, $indent = 0, $width = 68) // }}} -// vim:set et sw=4 sts=4 sws=4 enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 fenc=utf-8: ?> diff --git a/include/notifs.inc.php b/include/notifs.inc.php index 3899308..19a6480 100644 --- a/include/notifs.inc.php +++ b/include/notifs.inc.php @@ -1,6 +1,6 @@ diff --git a/include/partnersharing.inc.php b/include/partnersharing.inc.php index 5583dab..31ed652 100644 --- a/include/partnersharing.inc.php +++ b/include/partnersharing.inc.php @@ -1,6 +1,6 @@ diff --git a/include/profilefields.inc.php b/include/profilefields.inc.php index 6c64ce9..8a3ace0 100644 --- a/include/profilefields.inc.php +++ b/include/profilefields.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder.inc.php b/include/reminder.inc.php index 93d58e1..aabd989 100644 --- a/include/reminder.inc.php +++ b/include/reminder.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/ax_letter.inc.php b/include/reminder/ax_letter.inc.php index 12289ca..01f4c02 100644 --- a/include/reminder/ax_letter.inc.php +++ b/include/reminder/ax_letter.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/email_backup.inc.php b/include/reminder/email_backup.inc.php index 0cd3bb8..fc1b021 100644 --- a/include/reminder/email_backup.inc.php +++ b/include/reminder/email_backup.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/email_warning.inc.php b/include/reminder/email_warning.inc.php index 392331e..2542ccf 100644 --- a/include/reminder/email_warning.inc.php +++ b/include/reminder/email_warning.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/gapps.inc.php b/include/reminder/gapps.inc.php index 0cfd521..7b373e9 100644 --- a/include/reminder/gapps.inc.php +++ b/include/reminder/gapps.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/ml.inc.php b/include/reminder/ml.inc.php index 0cee77f..25b0609 100644 --- a/include/reminder/ml.inc.php +++ b/include/reminder/ml.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/nl.inc.php b/include/reminder/nl.inc.php index 626af00..b37d7d3 100644 --- a/include/reminder/nl.inc.php +++ b/include/reminder/nl.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/no_redirection.inc.php b/include/reminder/no_redirection.inc.php index 950de03..49db3c7 100644 --- a/include/reminder/no_redirection.inc.php +++ b/include/reminder/no_redirection.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/profile_update.inc.php b/include/reminder/profile_update.inc.php index a24bd7c..5ecba92 100644 --- a/include/reminder/profile_update.inc.php +++ b/include/reminder/profile_update.inc.php @@ -1,6 +1,6 @@ diff --git a/include/reminder/promotion_ml.inc.php b/include/reminder/promotion_ml.inc.php index d32eafb..72bea9d 100644 --- a/include/reminder/promotion_ml.inc.php +++ b/include/reminder/promotion_ml.inc.php @@ -1,6 +1,6 @@ diff --git a/include/security.inc.php b/include/security.inc.php index 832432f..827e39d 100644 --- a/include/security.inc.php +++ b/include/security.inc.php @@ -1,6 +1,6 @@ diff --git a/include/test.inc.php b/include/test.inc.php index 6781c40..9da4d56 100644 --- a/include/test.inc.php +++ b/include/test.inc.php @@ -1,6 +1,6 @@ diff --git a/include/ufbuilder.inc.php b/include/ufbuilder.inc.php index b106cb7..9cb95cf 100644 --- a/include/ufbuilder.inc.php +++ b/include/ufbuilder.inc.php @@ -1,6 +1,6 @@ onlycurrentfield = $onlycurrentfield; - $this->onlyaxmailfield = $onlyaxmailfield; + $this->onlybestmailfield = $onlybestmailfield; $this->direnum = constant('DirEnum::' . $addressfield); } @@ -1087,8 +1087,8 @@ class UFBF_AddressMixed extends UFBF_Mixed if ($ufb->isOn($this->onlycurrentfield)) { $flags |= UFC_Address::FLAG_CURRENT; } - if ($ufb->isOn($this->onlyaxmailfield)) { - $flags |= UFC_Address::FLAG_AX_MAIL; + if ($ufb->isOn($this->onlybestmailfield)) { + $flags |= UFC_Address::FLAG_BEST_MAIL; } if ($flags == UFC_Address::FLAG_NONE) { $flags = UFC_Address::FLAG_ANY; @@ -1099,7 +1099,7 @@ class UFBF_AddressMixed extends UFBF_Mixed public function getEnvFieldNames() { - return array($this->envfield, $this->envfieldindex, $this->onlycurrentfield, $this->onlyaxmailfield); + return array($this->envfield, $this->envfieldindex, $this->onlycurrentfield, $this->onlybestmailfield); } } // }}} @@ -1109,13 +1109,13 @@ class UFBF_AddressIndex extends UFBF_Index { protected $direnum; protected $onlycurrentfield; - protected $onlyaxmailfield; + protected $onlybestmailfield; - public function __construct($envfield, $formtext = '', $addressfield, $onlycurrentfield = 'only_current', $onlyaxmailfield = 'only_ax_mail') + public function __construct($envfield, $formtext = '', $addressfield, $onlycurrentfield = 'only_current', $onlybestmailfield = 'only_best_mail') { parent::__construct($envfield, $formtext); $this->onlycurrentfield = $onlycurrentfield; - $this->onlyaxmailfield = $onlyaxmailfield; + $this->onlybestmailfield = $onlybestmailfield; $this->direnum = constant('DirEnum::' . $addressfield); } @@ -1126,8 +1126,8 @@ class UFBF_AddressIndex extends UFBF_Index if ($ufb->isOn($this->onlycurrentfield)) { $flags |= UFC_Address::FLAG_CURRENT; } - if ($ufb->isOn($this->onlyaxmailfield)) { - $flags |= UFC_Address::FLAG_AX_MAIL; + if ($ufb->isOn($this->onlybestmailfield)) { + $flags |= UFC_Address::FLAG_BEST_MAIL; } if ($flags == UFC_Address::FLAG_NONE) { $flags = UFC_Address::FLAG_ANY; @@ -1138,7 +1138,7 @@ class UFBF_AddressIndex extends UFBF_Index public function getEnvFieldNames() { - return array($this->envfield, $this->onlycurrentfield, $this->onlyaxmailfield); + return array($this->envfield, $this->onlycurrentfield, $this->onlybestmailfield); } } // }}} @@ -1454,5 +1454,5 @@ class UFBF_DeltaTenMessage extends UFBF_Text } // }}} -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/userset.inc.php b/include/userset.inc.php index c3ff5ac..67d8aab 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -1,6 +1,6 @@ fetchAllRow() as $item) { - list($promo, $title, $lastname, $firstname, $company, $full_address, $zipcode, $email) = array_map('utf8_decode', $item); + list($axid, $promo, $title, $lastname, $firstname, $company, $full_address, $zipcode, $email, $delivery_issue) = array_map('utf8_decode', $item); $lines = self::split_address($full_address); - fputcsv($csv, - array($promo, $title, $lastname, $firstname, $company, $full_address, $lines[0], $lines[1], $lines[2], $zipcode, $email), - ';'); + fputcsv($csv, array( + $axid, $promo, $title, $lastname, $firstname, $company, + $full_address, $lines[0], $lines[1], $lines[2], $zipcode, + $email, $delivery_issue), ';'); } } fclose($csv); @@ -534,5 +536,5 @@ class JSonView implements PlView } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/validations.inc.php b/include/validations.inc.php index 2840965..9bcde80 100644 --- a/include/validations.inc.php +++ b/include/validations.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/account.inc.php b/include/validations/account.inc.php index 815ea7a..bf39cb6 100644 --- a/include/validations/account.inc.php +++ b/include/validations/account.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/address.inc.php b/include/validations/address.inc.php index 3d8a6e0..0e1c0b7 100644 --- a/include/validations/address.inc.php +++ b/include/validations/address.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/aliases.inc.php b/include/validations/aliases.inc.php index 16c6c92..2dbcbb5 100644 --- a/include/validations/aliases.inc.php +++ b/include/validations/aliases.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/broken.inc.php b/include/validations/broken.inc.php index 7f1912f..1841da2 100644 --- a/include/validations/broken.inc.php +++ b/include/validations/broken.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/bulkaccounts.inc.php b/include/validations/bulkaccounts.inc.php index d8f0c70..96bfe5a 100644 --- a/include/validations/bulkaccounts.inc.php +++ b/include/validations/bulkaccounts.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/comletter.inc.php b/include/validations/comletter.inc.php index 530d7bc..8d6be05 100644 --- a/include/validations/comletter.inc.php +++ b/include/validations/comletter.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/entreprises.inc.php b/include/validations/entreprises.inc.php index b516e6f..06af35b 100644 --- a/include/validations/entreprises.inc.php +++ b/include/validations/entreprises.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/evts.inc.php b/include/validations/evts.inc.php index 70a33c8..d20326b 100644 --- a/include/validations/evts.inc.php +++ b/include/validations/evts.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/googleapps.inc.php b/include/validations/googleapps.inc.php index 36f9007..efa44ec 100644 --- a/include/validations/googleapps.inc.php +++ b/include/validations/googleapps.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/homonymes.inc.php b/include/validations/homonymes.inc.php index 5778bc2..caf2de3 100644 --- a/include/validations/homonymes.inc.php +++ b/include/validations/homonymes.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/listes.inc.php b/include/validations/listes.inc.php index 599921d..5e61ea1 100644 --- a/include/validations/listes.inc.php +++ b/include/validations/listes.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/marketing.inc.php b/include/validations/marketing.inc.php index 36d34f6..4510ab3 100644 --- a/include/validations/marketing.inc.php +++ b/include/validations/marketing.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/medals.inc.php b/include/validations/medals.inc.php index f133345..fa3c1f2 100644 --- a/include/validations/medals.inc.php +++ b/include/validations/medals.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/names.inc.php b/include/validations/names.inc.php index 34e0567..81533ec 100644 --- a/include/validations/names.inc.php +++ b/include/validations/names.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/nl.inc.php b/include/validations/nl.inc.php index 2fc3678..4cdc35a 100644 --- a/include/validations/nl.inc.php +++ b/include/validations/nl.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/orange.inc.php b/include/validations/orange.inc.php index e6c5314..2999cd4 100644 --- a/include/validations/orange.inc.php +++ b/include/validations/orange.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/paiements.inc.php b/include/validations/paiements.inc.php index 6580f96..05b2e31 100644 --- a/include/validations/paiements.inc.php +++ b/include/validations/paiements.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/photos.inc.php b/include/validations/photos.inc.php index 87d6c86..5a9cd40 100644 --- a/include/validations/photos.inc.php +++ b/include/validations/photos.inc.php @@ -1,6 +1,6 @@ diff --git a/include/validations/surveys.inc.php b/include/validations/surveys.inc.php index eb54c4f..28bbbe1 100644 --- a/include/validations/surveys.inc.php +++ b/include/validations/surveys.inc.php @@ -1,6 +1,6 @@ diff --git a/include/vcard.inc.php b/include/vcard.inc.php index c824777..2fb2e58 100644 --- a/include/vcard.inc.php +++ b/include/vcard.inc.php @@ -1,6 +1,6 @@ diff --git a/include/webservices/ax/client.inc b/include/webservices/ax/client.inc index a662552..2a2571a 100755 --- a/include/webservices/ax/client.inc +++ b/include/webservices/ax/client.inc @@ -429,5 +429,5 @@ function recupere_infos_ancien($AX_MATRICULE) return $Ancien_renvoye; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/webservices/manageurs.client.inc.php b/include/webservices/manageurs.client.inc.php index 91ece55..05644b9 100644 --- a/include/webservices/manageurs.client.inc.php +++ b/include/webservices/manageurs.client.inc.php @@ -29,5 +29,5 @@ function get_annuaire_infos($amicale, $id_assoce, $adresse){ else return false; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/webservices/manageurs.inc.php b/include/webservices/manageurs.inc.php index 761196e..54b140c 100644 --- a/include/webservices/manageurs.inc.php +++ b/include/webservices/manageurs.inc.php @@ -1,6 +1,6 @@ diff --git a/include/webservices/manageurs.server.inc.php b/include/webservices/manageurs.server.inc.php index 8eb6d9b..304c5a6 100644 --- a/include/webservices/manageurs.server.inc.php +++ b/include/webservices/manageurs.server.inc.php @@ -209,5 +209,5 @@ function get_nouveau_infos($method, $params) { return $reply; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/wiki/e-protect.php b/include/wiki/e-protect.php index fa01e9b..aa4132b 100644 --- a/include/wiki/e-protect.php +++ b/include/wiki/e-protect.php @@ -130,5 +130,5 @@ function eProtectEncode ($pagename,$page,&$new) { $text = preg_replace("/$KeepToken(\\d+)$KeepToken/e",'$KPV[$1]',$text); // put the [= .. =] back in to the text $new['text'] = $text; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/wiki/farmconfig.php b/include/wiki/farmconfig.php index 2faf4f9..0b8c44c 100644 --- a/include/wiki/farmconfig.php +++ b/include/wiki/farmconfig.php @@ -113,5 +113,5 @@ $AuthFunction = 'ReadPage'; $HandleAuth['diff'] = 'edit'; $HandleAuth['source'] = 'edit'; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/include/xnet.inc.php b/include/xnet.inc.php index b34e5c3..ef8e987 100644 --- a/include/xnet.inc.php +++ b/include/xnet.inc.php @@ -1,6 +1,6 @@ diff --git a/include/xorg.inc.php b/include/xorg.inc.php index 8cbc042..164293e 100644 --- a/include/xorg.inc.php +++ b/include/xorg.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/admin.php b/modules/admin.php index 59b0bee..347e66e 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -1,6 +1,6 @@ next()) && $a['Field'] != 'category'); - $page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1)))); + $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1))); + sort($categories); + $page->assign('categories', $categories); $hidden = array(); $res = XDB::query('SELECT hidden_requests @@ -2146,5 +2148,5 @@ class AdminModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/admin/homonyms.inc.php b/modules/admin/homonyms.inc.php index 91933c0..db2180f 100644 --- a/modules/admin/homonyms.inc.php +++ b/modules/admin/homonyms.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/api.php b/modules/api.php index 3457d3c..bb832f4 100644 --- a/modules/api.php +++ b/modules/api.php @@ -1,6 +1,6 @@ diff --git a/modules/auth.php b/modules/auth.php index e497ff1..0d09dce 100644 --- a/modules/auth.php +++ b/modules/auth.php @@ -1,6 +1,6 @@ diff --git a/modules/auth/auth.inc.php b/modules/auth/auth.inc.php index 2a6b33b..bc4289f 100644 --- a/modules/auth/auth.inc.php +++ b/modules/auth/auth.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/axletter.php b/modules/axletter.php index 17ced30..081f487 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -1,6 +1,6 @@ diff --git a/modules/bandeau.php b/modules/bandeau.php index 4f2682d..5e96942 100644 --- a/modules/bandeau.php +++ b/modules/bandeau.php @@ -1,6 +1,6 @@ diff --git a/modules/carnet.php b/modules/carnet.php index 862acd3..588be5d 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -1,6 +1,6 @@ diff --git a/modules/carnet/contacts.pdf.inc.php b/modules/carnet/contacts.pdf.inc.php index 97ea5a8..1585312 100644 --- a/modules/carnet/contacts.pdf.inc.php +++ b/modules/carnet/contacts.pdf.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/carnet/feed.inc.php b/modules/carnet/feed.inc.php index 9472250..a69e65b 100644 --- a/modules/carnet/feed.inc.php +++ b/modules/carnet/feed.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/carnet/fonts/Vera.php b/modules/carnet/fonts/Vera.php index 6471fd5..f2f679f 100644 --- a/modules/carnet/fonts/Vera.php +++ b/modules/carnet/fonts/Vera.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='Vera.z'; $originalsize=65932; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraBI.php b/modules/carnet/fonts/VeraBI.php index 7915611..6e40297 100644 --- a/modules/carnet/fonts/VeraBI.php +++ b/modules/carnet/fonts/VeraBI.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraBI.z'; $originalsize=63208; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraBd.php b/modules/carnet/fonts/VeraBd.php index e12a384..406e3ef 100644 --- a/modules/carnet/fonts/VeraBd.php +++ b/modules/carnet/fonts/VeraBd.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraBd.z'; $originalsize=58716; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraIt.php b/modules/carnet/fonts/VeraIt.php index 879e8bb..fe217b6 100644 --- a/modules/carnet/fonts/VeraIt.php +++ b/modules/carnet/fonts/VeraIt.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraIt.z'; $originalsize=63684; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraMoBI.php b/modules/carnet/fonts/VeraMoBI.php index f7694fb..5ba5f58 100644 --- a/modules/carnet/fonts/VeraMoBI.php +++ b/modules/carnet/fonts/VeraMoBI.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraMoBI.z'; $originalsize=55032; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraMoBd.php b/modules/carnet/fonts/VeraMoBd.php index 20a6c37..5f65b04 100644 --- a/modules/carnet/fonts/VeraMoBd.php +++ b/modules/carnet/fonts/VeraMoBd.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraMoBd.z'; $originalsize=49052; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraMoIt.php b/modules/carnet/fonts/VeraMoIt.php index eca7446..a09a0e1 100644 --- a/modules/carnet/fonts/VeraMoIt.php +++ b/modules/carnet/fonts/VeraMoIt.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraMoIt.z'; $originalsize=54508; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraMono.php b/modules/carnet/fonts/VeraMono.php index 9806559..312d662 100644 --- a/modules/carnet/fonts/VeraMono.php +++ b/modules/carnet/fonts/VeraMono.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraMono.z'; $originalsize=49224; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraSe.php b/modules/carnet/fonts/VeraSe.php index ba30529..f964ed8 100644 --- a/modules/carnet/fonts/VeraSe.php +++ b/modules/carnet/fonts/VeraSe.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraSe.z'; $originalsize=60280; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/fonts/VeraSeBd.php b/modules/carnet/fonts/VeraSeBd.php index a2b4b8d..4bb8b03 100644 --- a/modules/carnet/fonts/VeraSeBd.php +++ b/modules/carnet/fonts/VeraSeBd.php @@ -21,5 +21,5 @@ $enc='ISO-8859-15'; $diff='128 /.notdef 130 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 142 /.notdef 145 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef 158 /.notdef /.notdef 164 /Euro 166 /Scaron 168 /scaron 180 /Zcaron 184 /zcaron 188 /OE /oe /Ydieresis'; $file='VeraSeBd.z'; $originalsize=58736; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/carnet/outlook.inc.php b/modules/carnet/outlook.inc.php index 00de2e4..8c652e3 100644 --- a/modules/carnet/outlook.inc.php +++ b/modules/carnet/outlook.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/comletter.php b/modules/comletter.php index b6e7194..9c759c5 100644 --- a/modules/comletter.php +++ b/modules/comletter.php @@ -1,6 +1,6 @@ diff --git a/modules/deltaten.php b/modules/deltaten.php index 3929075..050f12f 100644 --- a/modules/deltaten.php +++ b/modules/deltaten.php @@ -1,6 +1,6 @@ diff --git a/modules/email.php b/modules/email.php index 772c121..360c462 100644 --- a/modules/email.php +++ b/modules/email.php @@ -1,6 +1,6 @@ $this->make_hook('duplicated', AUTH_PASSWD, 'admin'), 'admin/emails/watch' => $this->make_hook('duplicated', AUTH_PASSWD, 'admin'), 'admin/emails/lost' => $this->make_hook('lost', AUTH_PASSWD, 'admin'), - 'admin/emails/broken' => $this->make_hook('broken_addr', AUTH_PASSWD, 'admin'), + 'admin/emails/broken' => $this->make_hook('broken_addr', AUTH_PASSWD, 'admin,edit_directory'), ); } @@ -98,9 +98,23 @@ class EmailModule extends PLModule INNER JOIN email_virtual_domains AS m ON (s.domain = m.id) INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id) WHERE s.uid = {?} - ORDER BY !alias, s.email", + ORDER BY !alias, s.email, d.name", $user->id()); - $page->assign('aliases', $aliases); + $aliases_forlife = array(); + $aliases_hundred = array(); + $aliases_other = array(); + while ($a = $aliases->next()) { + if ($a['forlife']) { + $aliases_forlife[] = $a; + } elseif ($a['hundred_year']) { + $aliases_hundred[] = $a; + } else { + $aliases_other[] = $a; + } + } + $page->assign('aliases_forlife', $aliases_forlife); + $page->assign('aliases_hundred', $aliases_hundred); + $page->assign('aliases_other', $aliases_other); $alias = XDB::fetchOneCell('SELECT COUNT(email) FROM email_source_account @@ -925,5 +939,5 @@ class EmailModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/epletter.php b/modules/epletter.php index 8e7fe2b..88f4103 100644 --- a/modules/epletter.php +++ b/modules/epletter.php @@ -1,6 +1,6 @@ diff --git a/modules/events.php b/modules/events.php index d225ad7..6aeea80 100644 --- a/modules/events.php +++ b/modules/events.php @@ -1,6 +1,6 @@ diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php index 683a63f..e7ed989 100644 --- a/modules/events/feed.inc.php +++ b/modules/events/feed.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/forums.php b/modules/forums.php index 1f22b38..914fafc 100644 --- a/modules/forums.php +++ b/modules/forums.php @@ -1,6 +1,6 @@ diff --git a/modules/fusionax.php b/modules/fusionax.php index 4415691..892b393 100644 --- a/modules/fusionax.php +++ b/modules/fusionax.php @@ -1,6 +1,6 @@ diff --git a/modules/fxletter.php b/modules/fxletter.php index c1141d4..b47a5ad 100644 --- a/modules/fxletter.php +++ b/modules/fxletter.php @@ -1,6 +1,6 @@ diff --git a/modules/gadgets.php b/modules/gadgets.php index e542105..a274478 100644 --- a/modules/gadgets.php +++ b/modules/gadgets.php @@ -1,6 +1,6 @@ diff --git a/modules/gadgets/gadgets.inc.php b/modules/gadgets/gadgets.inc.php index a5766b9..b58e06f 100644 --- a/modules/gadgets/gadgets.inc.php +++ b/modules/gadgets/gadgets.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/geoloc.php b/modules/geoloc.php index 21c7044..d731e6a 100644 --- a/modules/geoloc.php +++ b/modules/geoloc.php @@ -1,6 +1,6 @@ diff --git a/modules/googleapps.php b/modules/googleapps.php index 36015ed..c898819 100644 --- a/modules/googleapps.php +++ b/modules/googleapps.php @@ -1,6 +1,6 @@ diff --git a/modules/lists.php b/modules/lists.php index e1315e0..4e15843 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -1,6 +1,6 @@ unsubscribeBulk(array($del_member->forlifeEmail())); - } - } else { - $mlist->unsubscribeBulk(array(Env::v('del_member'))); + if ($del_member = User::getSilent(Env::t('del_member'))) { + $mlist->unsubscribeBulk(array($del_member->forlifeEmail())); } pl_redirect('lists/admin/'.$liste); } @@ -797,12 +793,8 @@ class ListsModule extends PLModule if (Env::has('del_owner')) { S::assert_xsrf_token(); - if (strpos(Env::v('del_owner'), '@') === false) { - if ($del_owner = User::getSilent(Env::t('del_owner'))) { - $mlist->unsubscribeBulk(array($del_owner->forlifeEmail())); - } - } else { - $mlist->removeOwner(Env::v('del_owner')); + if ($del_owner = User::getSilent(Env::t('del_owner'))) { + $mlist->unsubscribeBulk(array($del_owner->forlifeEmail())); } pl_redirect('lists/admin/'.$liste); } @@ -1060,5 +1052,5 @@ class ListsModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/lists/lists.inc.php b/modules/lists/lists.inc.php index fb88cd8..4e90b4c 100644 --- a/modules/lists/lists.inc.php +++ b/modules/lists/lists.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/marketing.php b/modules/marketing.php index a043020..a939a6a 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -1,6 +1,6 @@ getText(array( 'sexe' => $user->isFemale(), - 'forlife_email' => $user->forlifeEmail(), - 'forlife_email2' => $user->forlifeEmailAlternate() + 'forlife_email' => $user->hruid . "@" . $user->mainEmailDomain(), + 'forlife_email2' => $user->hruid . "@" . $user->alternateEmailDomain() )); $text = str_replace('%%hash%%', '', $text); $text = str_replace('%%personal_notes%%', '', $text); @@ -401,5 +401,5 @@ class MarketingModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/newsletter.php b/modules/newsletter.php index acb6127..230265e 100644 --- a/modules/newsletter.php +++ b/modules/newsletter.php @@ -1,6 +1,6 @@ 'Id', 'group_name' => 'Groupe', 'name' => 'Titre', - 'custom_css' => 'CSS spécifique', 'criteria' => 'Critères actifs' ); static $next_orders = array( @@ -545,5 +544,5 @@ class NewsletterModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/openid.php b/modules/openid.php index b956906..6c2f1d4 100644 --- a/modules/openid.php +++ b/modules/openid.php @@ -1,6 +1,6 @@ diff --git a/modules/openid/openid.inc.php b/modules/openid/openid.inc.php index c9e39de..1bf2337 100644 --- a/modules/openid/openid.inc.php +++ b/modules/openid/openid.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/payment.php b/modules/payment.php index eb2a941..1776cc4 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -1,6 +1,6 @@ diff --git a/modules/payment/money.inc.php b/modules/payment/money.inc.php index ae03a69..4fedaa3 100644 --- a/modules/payment/money.inc.php +++ b/modules/payment/money.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/payment/money/bplccyberplus.inc.php b/modules/payment/money/bplccyberplus.inc.php index 23665ab..0b273a5 100644 --- a/modules/payment/money/bplccyberplus.inc.php +++ b/modules/payment/money/bplccyberplus.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/payment/money/paypal.inc.php b/modules/payment/money/paypal.inc.php index f1bb052..e026991 100644 --- a/modules/payment/money/paypal.inc.php +++ b/modules/payment/money/paypal.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/platal.php b/modules/platal.php index f4b0443..1772921 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -1,6 +1,6 @@ diff --git a/modules/platal/review.inc.php b/modules/platal/review.inc.php index 0dea755..1f05231 100644 --- a/modules/platal/review.inc.php +++ b/modules/platal/review.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/poison.php b/modules/poison.php index 1161f34..a9d2263 100644 --- a/modules/poison.php +++ b/modules/poison.php @@ -1,6 +1,6 @@ diff --git a/modules/poison/poison.inc.php b/modules/poison/poison.inc.php index 6575a98..f0ea842 100644 --- a/modules/poison/poison.inc.php +++ b/modules/poison/poison.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/profile.php b/modules/profile.php index 4396249..42c93ed 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -1,6 +1,6 @@ hasProfile()) { return PL_NOT_FOUND; } else { - $profile = $user->profile(); + $profile = $user->profile(false,0,Visibility::get(Visibility::VIEW_ADMIN)); } } else { - $profile = Profile::get($hrpid); + $profile = Profile::get($hrpid,0,Visibility::get(Visibility::VIEW_ADMIN)); } if (!$profile) { @@ -294,7 +294,7 @@ class ProfileModule extends PLModule if (!$user->ax_id) { $page->kill("Le matricule AX de {$user->hrid()} est inconnu"); } - http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id); + http_redirect("http://kx.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=" . $user->ax_id); } function handler_p_edit($page, $hrpid = null, $opened_tab = null, $mode = null, $success = null) @@ -869,5 +869,5 @@ class ProfileModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php index a37a7d4..24bc995 100644 --- a/modules/profile/addresses.inc.php +++ b/modules/profile/addresses.inc.php @@ -1,6 +1,6 @@ pid()), array(Address::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_PRIVATE)); + $it = Address::iterate(array($page->pid()), array(Address::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_ADMIN)); while ($address = $it->next()) { $addresses[] = $address->toFormArray(); } @@ -73,5 +73,5 @@ class ProfilePageAddresses extends ProfilePage } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/profile/decos.inc.php b/modules/profile/decos.inc.php index 26a856c..2fab0f9 100644 --- a/modules/profile/decos.inc.php +++ b/modules/profile/decos.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/profile/deltaten.inc.php b/modules/profile/deltaten.inc.php index 921428c..8a3d577 100644 --- a/modules/profile/deltaten.inc.php +++ b/modules/profile/deltaten.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index 265be33..c11abf4 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -1,6 +1,6 @@ settings['deathdate'] = new ProfileSettingDate(true); $this->settings['birthdate'] = new ProfileSettingDate(true); $this->settings['birthdate_ref'] = new ProfileSettingDate(true); + $this->settings['axfreetext'] = null; } else { $this->settings['yourself'] = null; $this->settings['birthdate'] = new ProfileSettingDate(); @@ -665,7 +666,7 @@ class ProfilePageGeneral extends ProfilePage // Checkout all data... $res = XDB::query("SELECT p.nationality1, p.nationality2, p.nationality3, IF(p.birthdate = 0, '', p.birthdate) AS birthdate, p.email_directory as email_directory, pd.promo AS promo_display, - p.freetext, p.freetext_pub, p.ax_id AS matricule_ax, pd.yourself, + p.freetext, p.freetext_pub, p.axfreetext, p.ax_id AS matricule_ax, pd.yourself, p.deathdate, IF(p.birthdate_ref = 0, '', p.birthdate_ref) AS birthdate_ref, p.title AS profile_title FROM profiles AS p @@ -698,7 +699,7 @@ class ProfilePageGeneral extends ProfilePage { if ($this->changed['nationality1'] || $this->changed['nationality2'] || $this->changed['nationality3'] || $this->changed['birthdate'] || $this->changed['freetext'] || $this->changed['freetext_pub'] - || $this->changed['email_directory'] || $this->changed['profile_title']) { + || $this->changed['axfreetext'] || $this->changed['email_directory'] || $this->changed['profile_title']) { if ($this->values['nationality3'] == "") { $this->values['nationality3'] = NULL; } @@ -731,11 +732,11 @@ class ProfilePageGeneral extends ProfilePage XDB::execute("UPDATE profiles SET nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?}, - freetext = {?}, freetext_pub = {?}, email_directory = {?}, title = {?} + freetext = {?}, freetext_pub = {?}, axfreetext = {?}, email_directory = {?}, title = {?} WHERE pid = {?}", $this->values['nationality1'], $this->values['nationality2'], $this->values['nationality3'], ProfileSettingDate::toSQLDate($this->values['birthdate']), - $this->values['freetext'], $this->values['freetext_pub'], $new_email, + $this->values['freetext'], $this->values['freetext_pub'], $this->values['axfreetext'], $new_email, $this->values['profile_title'], $this->pid()); } if ($this->changed['photo_pub']) { @@ -824,5 +825,5 @@ class ProfilePageGeneral extends ProfilePage } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/profile/groups.inc.php b/modules/profile/groups.inc.php index 9202481..7ddde90 100644 --- a/modules/profile/groups.inc.php +++ b/modules/profile/groups.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php index 937cba7..4786339 100644 --- a/modules/profile/jobs.inc.php +++ b/modules/profile/jobs.inc.php @@ -1,6 +1,6 @@ pid()), array(Address::LINK_JOB), array(), Visibility::get(Visibility::VIEW_PRIVATE)); + $it = Address::iterate(array($page->pid()), array(Address::LINK_JOB), array(), Visibility::get(Visibility::VIEW_ADMIN)); while ($address = $it->next()) { $jobs[$address->id]['w_address'] = $address->toFormArray(); } - $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB), array(), Visibility::get(Visibility::VIEW_PRIVATE)); + $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB), array(), Visibility::get(Visibility::VIEW_ADMIN)); while ($phone = $it->next()) { $jobs[$phone->link_id]['w_phone'][$phone->id] = $phone->toFormArray(); } @@ -464,5 +464,5 @@ class ProfilePageJobs extends ProfilePage } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/profile/mentor.inc.php b/modules/profile/mentor.inc.php index 36fc072..a2e1b06 100644 --- a/modules/profile/mentor.inc.php +++ b/modules/profile/mentor.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php index d6c2225..fd13c93 100644 --- a/modules/profile/page.inc.php +++ b/modules/profile/page.inc.php @@ -1,6 +1,6 @@ pid()), array(Phone::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_PRIVATE)); + $it = Phone::iterate(array($page->pid()), array(Phone::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_ADMIN)); while ($phone = $it->next()) { $success = ($phone->format() && $success); $phones[] = $phone->toFormArray(); @@ -438,5 +438,5 @@ require_once dirname(__FILE__) . '/jobs.inc.php'; require_once dirname(__FILE__) . '/mentor.inc.php'; require_once dirname(__FILE__) . '/deltaten.inc.php'; -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/register.php b/modules/register.php index 4fd6188..82ada2c 100644 --- a/modules/register.php +++ b/modules/register.php @@ -1,6 +1,6 @@ diff --git a/modules/register/register.inc.php b/modules/register/register.inc.php index daacf51..993ead3 100644 --- a/modules/register/register.inc.php +++ b/modules/register/register.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/reminder.php b/modules/reminder.php index dc11be8..68f4869 100644 --- a/modules/reminder.php +++ b/modules/reminder.php @@ -1,6 +1,6 @@ diff --git a/modules/search.php b/modules/search.php index 8716d4a..e3bfee7 100644 --- a/modules/search.php +++ b/modules/search.php @@ -1,6 +1,6 @@ diff --git a/modules/sharingapi.php b/modules/sharingapi.php index 08502a4..a892504 100644 --- a/modules/sharingapi.php +++ b/modules/sharingapi.php @@ -1,6 +1,6 @@ diff --git a/modules/sharingapi/request.inc.php b/modules/sharingapi/request.inc.php index 1902ae6..a33989b 100644 --- a/modules/sharingapi/request.inc.php +++ b/modules/sharingapi/request.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/stats.php b/modules/stats.php index 366915e..45c220d 100644 --- a/modules/stats.php +++ b/modules/stats.php @@ -1,6 +1,6 @@ diff --git a/modules/survey.php b/modules/survey.php index 5b684f1..22e6566 100644 --- a/modules/survey.php +++ b/modules/survey.php @@ -1,6 +1,6 @@ diff --git a/modules/survey/question.inc.php b/modules/survey/question.inc.php index 4aeeeb1..4a6cdc7 100644 --- a/modules/survey/question.inc.php +++ b/modules/survey/question.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php index 6f8ad08..296f03b 100644 --- a/modules/survey/survey.inc.php +++ b/modules/survey/survey.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/urlshortener.php b/modules/urlshortener.php index 7a3404f..c6cf94f 100644 --- a/modules/urlshortener.php +++ b/modules/urlshortener.php @@ -1,6 +1,6 @@ diff --git a/modules/xnet.php b/modules/xnet.php index ac0d1d8..d7726b3 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -1,6 +1,6 @@ diff --git a/modules/xnetevents.php b/modules/xnetevents.php index fd64cf1..a9d4d1c 100644 --- a/modules/xnetevents.php +++ b/modules/xnetevents.php @@ -1,6 +1,6 @@ diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 4e70c06..594f0aa 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 872a180..cc39f46 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -1,6 +1,6 @@ asso('id'), $users); $new_users = array_diff($users, $former_users); foreach ($former_users as $uid) { @@ -514,10 +514,8 @@ class XnetGrpModule extends PLModule $data = array(); foreach ($new_users as $uid) { - $data[] = XDB::format('({?}, {?})', $globals->asso('id'), $uid); + Group::subscribe($globals->asso('id'), $uid); } - XDB::rawExecute('INSERT INTO group_members (asso_id, uid) - VALUES ' . implode(',', $data)); } if (Env::has('add_nonusers')) { @@ -552,9 +550,7 @@ class XnetGrpModule extends PLModule VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, \'xnet\', \'disabled\')', $hruid, $display_name, $full_name, $directory_name, $sort_name, $firstname, $lastname, $email); $uid = XDB::insertId(); - XDB::execute('INSERT INTO group_members (asso_id, uid) - VALUES ({?}, {?})', - $globals->asso('id'), $uid); + Group::subscribe($globals->asso('id'), $uid); } } @@ -729,7 +725,7 @@ class XnetGrpModule extends PLModule $this->removeSubscriptionRequest($user->id()); Group::subscribe($globals->asso('id'), $user->id()); - if (XDB::affectedRows() == 1) { + if (XDB::affectedRows() == 1 && $user->forlifeEmail()) { $mailer = new PlMailer(); $mailer->addTo($user->forlifeEmail()); $mailer->setFrom('"' . S::user()->fullName() . '" <' . S::user()->forlifeEmail() . '>'); @@ -792,12 +788,14 @@ class XnetGrpModule extends PLModule S::assert_xsrf_token(); $this->removeSubscriptionRequest($user->id()); - $mailer = new PlMailer(); - $mailer->addTo($user->forlifeEmail()); - $mailer->setFrom('"' . S::user()->fullName() . '" <' . S::user()->forlifeEmail() . '>'); - $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée'); - $mailer->setTxtBody(Env::v('motif')); - $mailer->send(); + if ($user->forlifeEmail()) { + $mailer = new PlMailer(); + $mailer->addTo($user->forlifeEmail()); + $mailer->setFrom('"' . S::user()->fullName() . '" <' . S::user()->forlifeEmail() . '>'); + $mailer->setSubject('['.$globals->asso('nom').'] Demande d\'inscription annulée'); + $mailer->setTxtBody(Env::v('motif')); + $mailer->send(); + } $page->killSuccess("La demande de {$user->fullName()} a bien été refusée."); } else { $page->assign('show_form', true); @@ -1083,7 +1081,7 @@ class XnetGrpModule extends PLModule Group::subscribe($globals->asso('id'), $user->id()); $this->removeSubscriptionRequest($user->id()); - if ($user->isActive()) { + if ($user->isActive() && $user->bestEmail()) { $mailer = new PlMailer('xnetgrp/forced-subscription.mail.tpl'); $mailer->addTo($user->bestEmail()); $mailer->assign('group', $globals->asso('nom')); @@ -1781,5 +1779,5 @@ class XnetGrpModule extends PLModule } } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php index 3921f84..137cf76 100644 --- a/modules/xnetgrp/feed.inc.php +++ b/modules/xnetgrp/feed.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/xnetgrp/mail.inc.php b/modules/xnetgrp/mail.inc.php index 2565718..473a931 100644 --- a/modules/xnetgrp/mail.inc.php +++ b/modules/xnetgrp/mail.inc.php @@ -1,6 +1,6 @@ diff --git a/modules/xnetlists.php b/modules/xnetlists.php index bd4f200..bc1bcbb 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -1,6 +1,6 @@ diff --git a/modules/xnetnl.php b/modules/xnetnl.php index ca764b1..61764e0 100644 --- a/modules/xnetnl.php +++ b/modules/xnetnl.php @@ -1,6 +1,6 @@ diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php index 4a12514..74483c3 100644 --- a/plugins/function.display_address.php +++ b/plugins/function.display_address.php @@ -1,6 +1,6 @@ diff --git a/plugins/function.display_education.php b/plugins/function.display_education.php index 143c474..752c5e7 100644 --- a/plugins/function.display_education.php +++ b/plugins/function.display_education.php @@ -1,6 +1,6 @@ field, $edu->program, $params->b('full')); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/plugins/function.display_phones.php b/plugins/function.display_phones.php index 8e67c03..c5a918f 100644 --- a/plugins/function.display_phones.php +++ b/plugins/function.display_phones.php @@ -1,6 +1,6 @@ diff --git a/plugins/function.poison.php b/plugins/function.poison.php index e7baf47..20c2435 100644 --- a/plugins/function.poison.php +++ b/plugins/function.poison.php @@ -1,6 +1,6 @@ '; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/plugins/function.profile.php b/plugins/function.profile.php index d3a93d2..fc7087f 100644 --- a/plugins/function.profile.php +++ b/plugins/function.profile.php @@ -1,6 +1,6 @@ diff --git a/plugins/function.select_nat.php b/plugins/function.select_nat.php index 38bdb2e..dd4f512 100644 --- a/plugins/function.select_nat.php +++ b/plugins/function.select_nat.php @@ -1,6 +1,6 @@ diff --git a/plugins/function.test_email.php b/plugins/function.test_email.php index 16689f6..e21fc2b 100644 --- a/plugins/function.test_email.php +++ b/plugins/function.test_email.php @@ -1,6 +1,6 @@ '; } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/plugins/insert.getStaticMapURL.php b/plugins/insert.getStaticMapURL.php index 0302f50..945b590 100644 --- a/plugins/insert.getStaticMapURL.php +++ b/plugins/insert.getStaticMapURL.php @@ -1,6 +1,6 @@ diff --git a/plugins/insert.getUserName.php b/plugins/insert.getUserName.php index 0fd9e83..8e81c7e 100644 --- a/plugins/insert.getUserName.php +++ b/plugins/insert.getUserName.php @@ -1,6 +1,6 @@ bestEmail(); } -// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8: ?> diff --git a/plugins/modifier.get_profile.php b/plugins/modifier.get_profile.php index d71e425..251fa8b 100644 --- a/plugins/modifier.get_profile.php +++ b/plugins/modifier.get_profile.php @@ -1,6 +1,6 @@ diff --git a/plugins/modifier.get_user.php b/plugins/modifier.get_user.php index 1e646ac..abf7474 100644 --- a/plugins/modifier.get_user.php +++ b/plugins/modifier.get_user.php @@ -1,6 +1,6 @@ diff --git a/templates/admin/account_watch.tpl b/templates/admin/account_watch.tpl index 71b07d4..003c29c 100644 --- a/templates/admin/account_watch.tpl +++ b/templates/admin/account_watch.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -55,4 +55,4 @@ {/iterate} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/accounts.tpl b/templates/admin/accounts.tpl index d2f1413..a4a91b9 100644 --- a/templates/admin/accounts.tpl +++ b/templates/admin/accounts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -125,4 +125,4 @@ function add_user_to_url(f) { -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/add_accounts.tpl b/templates/admin/add_accounts.tpl index 12749a0..ef20ea6 100644 --- a/templates/admin/add_accounts.tpl +++ b/templates/admin/add_accounts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -137,4 +137,4 @@ {/if} -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} +{* vim:set et sws=2 sts=2 sw=2 fenc=utf-8: *} diff --git a/templates/admin/add_secondary_edu.tpl b/templates/admin/add_secondary_edu.tpl index ed792ab..7aaaf63 100644 --- a/templates/admin/add_secondary_edu.tpl +++ b/templates/admin/add_secondary_edu.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -69,4 +69,4 @@

-{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} +{* vim:set et sws=2 sts=2 sw=2 fenc=utf-8: *} diff --git a/templates/admin/admin_name.tpl b/templates/admin/admin_name.tpl index c2b2af0..37e963e 100644 --- a/templates/admin/admin_name.tpl +++ b/templates/admin/admin_name.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -55,4 +55,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/dead_but_active.tpl b/templates/admin/dead_but_active.tpl index 2bc2aaa..da722a3 100644 --- a/templates/admin/dead_but_active.tpl +++ b/templates/admin/dead_but_active.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -51,4 +51,4 @@ {/iterate} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/deces_promo.tpl b/templates/admin/deces_promo.tpl index d92af09..e1e0bd4 100644 --- a/templates/admin/deces_promo.tpl +++ b/templates/admin/deces_promo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -57,4 +57,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/forums-promo.mail.tpl b/templates/admin/forums-promo.mail.tpl index e7b6b2e..71ad1c8 100644 --- a/templates/admin/forums-promo.mail.tpl +++ b/templates/admin/forums-promo.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ Création du forum promo {$promo} à faire ! (+ de 20% d'inscrits) {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/geocoding.tpl b/templates/admin/geocoding.tpl index d64be6c..96bcf9a 100644 --- a/templates/admin/geocoding.tpl +++ b/templates/admin/geocoding.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -72,4 +72,4 @@

-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/geocoding_edit.tpl b/templates/admin/geocoding_edit.tpl index e5e3db6..b8c5197 100644 --- a/templates/admin/geocoding_edit.tpl +++ b/templates/admin/geocoding_edit.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -52,4 +52,4 @@

-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/homonymes.tpl b/templates/admin/homonymes.tpl index 4dcd184..d62abc0 100644 --- a/templates/admin/homonymes.tpl +++ b/templates/admin/homonymes.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -140,4 +140,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/icons.tpl b/templates/admin/icons.tpl index 63b5e89..ceee7d2 100644 --- a/templates/admin/icons.tpl +++ b/templates/admin/icons.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/admin/index.tpl b/templates/admin/index.tpl index 6fb9bf6..71f5418 100644 --- a/templates/admin/index.tpl +++ b/templates/admin/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -229,4 +229,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/ipwatcher.tpl b/templates/admin/ipwatcher.tpl index 1dfa945..9e27b24 100644 --- a/templates/admin/ipwatcher.tpl +++ b/templates/admin/ipwatcher.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -138,4 +138,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/jobs.tpl b/templates/admin/jobs.tpl index 9a2128d..4e9ddb3 100644 --- a/templates/admin/jobs.tpl +++ b/templates/admin/jobs.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -109,4 +109,4 @@

-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/logger-view.tpl b/templates/admin/logger-view.tpl index d5b65f4..2b214d3 100644 --- a/templates/admin/logger-view.tpl +++ b/templates/admin/logger-view.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -144,4 +144,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/phd.tpl b/templates/admin/phd.tpl index d988863..b30eaa3 100644 --- a/templates/admin/phd.tpl +++ b/templates/admin/phd.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -77,4 +77,4 @@ function toggleAll() {

{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/postfix_delayed.tpl b/templates/admin/postfix_delayed.tpl index ff45f02..3a60ad7 100644 --- a/templates/admin/postfix_delayed.tpl +++ b/templates/admin/postfix_delayed.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -51,4 +51,4 @@ {/iterate} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/profile.tpl b/templates/admin/profile.tpl index 776f582..8137e38 100644 --- a/templates/admin/profile.tpl +++ b/templates/admin/profile.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -62,4 +62,4 @@

Il n'y a rien à vérifier.

{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl index d9685ed..61696d0 100644 --- a/templates/admin/user.tpl +++ b/templates/admin/user.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -587,4 +587,4 @@ $(function() { {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/useredit.mail.tpl b/templates/admin/useredit.mail.tpl index 61026be..bc0721c 100644 --- a/templates/admin/useredit.mail.tpl +++ b/templates/admin/useredit.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/admin/validation.tpl b/templates/admin/validation.tpl index 8117ee8..9ca178c 100644 --- a/templates/admin/validation.tpl +++ b/templates/admin/validation.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -189,7 +189,7 @@ function toggleField(name, id, obj) { {/if}

- Afficher seulement les validation suivantes : + Afficher seulement les validations suivantes :

@@ -200,4 +200,4 @@ function toggleField(name, id, obj) {
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/wiki.tpl b/templates/admin/wiki.tpl index 6065705..1fd369b 100644 --- a/templates/admin/wiki.tpl +++ b/templates/admin/wiki.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -148,4 +148,4 @@

* : les pages marquées d'une astérisque sont actuellement disponibles en cache (accès plus rapide).

-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/admin/xnet_without_group.tpl b/templates/admin/xnet_without_group.tpl index 2859d31..f098176 100644 --- a/templates/admin/xnet_without_group.tpl +++ b/templates/admin/xnet_without_group.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -44,4 +44,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/banana/index.tpl b/templates/banana/index.tpl index a5b9b2c..eea8a5f 100644 --- a/templates/banana/index.tpl +++ b/templates/banana/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -103,4 +103,4 @@

{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/batch.tpl b/templates/carnet/batch.tpl index 2b2b971..641ef29 100644 --- a/templates/carnet/batch.tpl +++ b/templates/carnet/batch.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -45,4 +45,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/calendar.outlook.tpl b/templates/carnet/calendar.outlook.tpl index 746f29f..87918c6 100644 --- a/templates/carnet/calendar.outlook.tpl +++ b/templates/carnet/calendar.outlook.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/carnet/calendar.tpl b/templates/carnet/calendar.tpl index c5f20dc..b963f0d 100644 --- a/templates/carnet/calendar.tpl +++ b/templates/carnet/calendar.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@ CLASS:PUBLIC {display_ical name="summary" value=$e.summary} END:VEVENT {/iterate} -END:VCALENDAR{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +END:VCALENDAR{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/index.tpl b/templates/carnet/index.tpl index 3773715..3b9ff3d 100644 --- a/templates/carnet/index.tpl +++ b/templates/carnet/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -94,4 +94,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/mescontacts.tpl b/templates/carnet/mescontacts.tpl index fae14ce..072ee30 100644 --- a/templates/carnet/mescontacts.tpl +++ b/templates/carnet/mescontacts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -98,4 +98,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/notif.mail.tpl b/templates/carnet/notif.mail.tpl index 23a5554..af78a03 100644 --- a/templates/carnet/notif.mail.tpl +++ b/templates/carnet/notif.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -50,4 +50,4 @@ Tu peux changer cette option sur la [[https://www.polytechnique.org/carnet/notif {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/notifs.tpl b/templates/carnet/notifs.tpl index 848336e..14eac76 100644 --- a/templates/carnet/notifs.tpl +++ b/templates/carnet/notifs.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -174,4 +174,4 @@ et cliquer sur les icones {icon name=add} pour les ajouter à cette liste. {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/panel.tpl b/templates/carnet/panel.tpl index 00329ec..135657d 100644 --- a/templates/carnet/panel.tpl +++ b/templates/carnet/panel.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -80,4 +80,4 @@ Il faut pour cela se rendre sur la page de configuration {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/rss.tpl b/templates/carnet/rss.tpl index 8fc612a..19c5b74 100644 --- a/templates/carnet/rss.tpl +++ b/templates/carnet/rss.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -38,4 +38,4 @@ {icon name=vcard title="Carte de visite" full=true} Télécharger la carte de visite électronique {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/carnet/tricontacts.tpl b/templates/carnet/tricontacts.tpl index 67613ee..ce4d1a4 100644 --- a/templates/carnet/tricontacts.tpl +++ b/templates/carnet/tricontacts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -40,4 +40,4 @@ Trier par : {/if}

-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/comletter/submit.tpl b/templates/comletter/submit.tpl index 35af36b..f17d37c 100644 --- a/templates/comletter/submit.tpl +++ b/templates/comletter/submit.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -138,4 +138,4 @@ Tu peux lire les conseils de rédaction {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/core/password_prompt.tpl b/templates/core/password_prompt.tpl index f080332..8ea84de 100644 --- a/templates/core/password_prompt.tpl +++ b/templates/core/password_prompt.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -172,4 +172,4 @@ {/literal} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/core/password_prompt_logged.tpl b/templates/core/password_prompt_logged.tpl index 200cab4..a4dcfbf 100644 --- a/templates/core/password_prompt_logged.tpl +++ b/templates/core/password_prompt_logged.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -79,4 +79,4 @@ {/literal} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/deltaten/index.tpl b/templates/deltaten/index.tpl index 069d9a3..fb93358 100644 --- a/templates/deltaten/index.tpl +++ b/templates/deltaten/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -187,4 +187,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/alias.tpl b/templates/emails/alias.tpl index 20bb0be..7492964 100644 --- a/templates/emails/alias.tpl +++ b/templates/emails/alias.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -137,4 +137,4 @@ {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/antispam.tpl b/templates/emails/antispam.tpl index 9bd6884..794e8ba 100644 --- a/templates/emails/antispam.tpl +++ b/templates/emails/antispam.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -142,4 +142,4 @@ {include wiki=Xorg.Antispam part=2} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/broken-web.mail.tpl b/templates/emails/broken-web.mail.tpl index 176d8f3..3e51268 100644 --- a/templates/emails/broken-web.mail.tpl +++ b/templates/emails/broken-web.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -41,4 +41,4 @@ consulter [[{$globals->baseurl}/emails/broken|la documentation sur le site]]. {include file="include/signature.mail.tpl"} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/broken.mail.tpl b/templates/emails/broken.mail.tpl index 64863f8..a8ed70f 100644 --- a/templates/emails/broken.mail.tpl +++ b/templates/emails/broken.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -54,4 +54,4 @@ elle te permettra de créer un nouveau mot de passe après avoir rentré ton login ({$user.alias}) et ta date de naissance !"; {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/broken.tpl b/templates/emails/broken.tpl index b150482..db852af 100644 --- a/templates/emails/broken.tpl +++ b/templates/emails/broken.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -110,4 +110,4 @@ correspondant si tu veux que nous puissions te répondre. {include wiki=Xorg.PatteCassee} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/broken_addr.tpl b/templates/emails/broken_addr.tpl index 1e5d14f..18e1e88 100644 --- a/templates/emails/broken_addr.tpl +++ b/templates/emails/broken_addr.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -42,4 +42,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/duplicated.tpl b/templates/emails/duplicated.tpl index 144b93d..d696e25 100644 --- a/templates/emails/duplicated.tpl +++ b/templates/emails/duplicated.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -132,4 +132,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/imap_register.tpl b/templates/emails/imap_register.tpl index b5115ab..12e2719 100644 --- a/templates/emails/imap_register.tpl +++ b/templates/emails/imap_register.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -41,4 +41,4 @@ problème en écrivant à support@pol

{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/index.tpl b/templates/emails/index.tpl index e036918..bb1e84e 100644 --- a/templates/emails/index.tpl +++ b/templates/emails/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -38,21 +38,54 @@ {/literal}
- {icon name="email"} Mes adresses polytechniciennes à vie + {icon name="email"} Mes adresses polytechniciennes
- Tes adresses polytechniciennes sont :
- + Tes adresses polytechniciennes sont : +
+ {if $aliases_forlife|@count} +
Adresses garanties à vie
+
+ {foreach from=$aliases_forlife item=a} + + {if $a.expire}(expire le {$a.expire|date_format}){/if} +
+ {/foreach} +
+ {/if} +
+ {if $aliases_hundred|@count} +
Adresses garanties 100 ans (*)
+
+ {foreach from=$aliases_hundred item=a} + + {if $a.expire}(expire le {$a.expire|date_format}){/if} +
+ {/foreach} +
+ {/if} +
+ {if $aliases_other|@count} +
Autres adresses (**)
+
+ {foreach from=$aliases_other item=a} + + {if $a.expire}(expire le {$a.expire|date_format}){/if} + {if $a.alias}(changer ou supprimer mon alias melix){/if} +
+ {/foreach} +
+ {/if} +

L'adresse cochée est celle que tu utilises le plus (et qui sera donc affichée sur ta carte de visite, ta fiche…).
Coche une autre case pour en changer ! @@ -74,12 +107,10 @@

{assign var="profile" value=$smarty.session.user->profile()} -(*) ces adresses email te sont réservées pour une période 100 ans après ton entrée à l'X (dans ton cas, jusqu'en {$profile->yearpromo()+100}). -

-

-(**) ces adresses email te sont réservées à vie. +(*) Ces adresses email te sont réservées pour une période de 100 ans après ton entrée à l'X (dans ton cas, jusqu'en {$profile->yearpromo()+100}).

+{if $aliases_other|@count}(**) {/if} {if $homonyme} Tu as un homonyme donc tu ne peux pas profiter de l'alias {$homonyme}@{$main_email_domain}. Si quelqu'un essaie d'envoyer un email à cette adresse par mégarde il recevra une réponse d'un robot lui expliquant l'ambiguité et lui @@ -133,4 +164,4 @@ ton homonyme et toi-même ne disposeraient plus que des adresses de la forme «p

-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/lost.tpl b/templates/emails/lost.tpl index 84bb362..a0ccd44 100644 --- a/templates/emails/lost.tpl +++ b/templates/emails/lost.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl index edcbd68..65634cf 100644 --- a/templates/emails/redirect.tpl +++ b/templates/emails/redirect.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -319,4 +319,4 @@

{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/rewrite-in.mail.tpl b/templates/emails/rewrite-in.mail.tpl index 9c2b4e5..628216a 100644 --- a/templates/emails/rewrite-in.mail.tpl +++ b/templates/emails/rewrite-in.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/emails/rewrite.tpl b/templates/emails/rewrite.tpl index 9d0a8c3..f6e2994 100644 --- a/templates/emails/rewrite.tpl +++ b/templates/emails/rewrite.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -24,4 +24,4 @@ {else} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl index ab40ffd..5129ca0 100644 --- a/templates/emails/send.tpl +++ b/templates/emails/send.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -364,4 +364,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/submit_spam.tpl b/templates/emails/submit_spam.tpl index c6982a6..83a0b0d 100644 --- a/templates/emails/submit_spam.tpl +++ b/templates/emails/submit_spam.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -59,4 +59,4 @@ {include wiki=Xorg.Mails part=clients} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/emails/test.mail.tpl b/templates/emails/test.mail.tpl index a8e65d5..297c30e 100644 --- a/templates/emails/test.mail.tpl +++ b/templates/emails/test.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/events/admin.tpl b/templates/events/admin.tpl index c77b821..1252197 100644 --- a/templates/events/admin.tpl +++ b/templates/events/admin.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -92,4 +92,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/events/admin_tips.tpl b/templates/events/admin_tips.tpl index a520c3b..78e33f9 100644 --- a/templates/events/admin_tips.tpl +++ b/templates/events/admin_tips.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -24,4 +24,4 @@ {include file="include/tips.tpl" full=true tips=$entry nochange=true} {include core=table-editor.tpl} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/events/form.tpl b/templates/events/form.tpl index 49463bf..52b5499 100644 --- a/templates/events/form.tpl +++ b/templates/events/form.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -188,4 +188,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/events/index.tpl b/templates/events/index.tpl index f458a17..56f678b 100644 --- a/templates/events/index.tpl +++ b/templates/events/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -214,4 +214,4 @@ Bienvenue {$smarty.session.user->displayName()}{if t($birthday)}

{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/events/preview.tpl b/templates/events/preview.tpl index d27dbc2..c862b7d 100644 --- a/templates/events/preview.tpl +++ b/templates/events/preview.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -27,4 +27,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/events/rss.tpl b/templates/events/rss.tpl index cdb425e..b4f05c7 100644 --- a/templates/events/rss.tpl +++ b/templates/events/rss.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -33,4 +33,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/events/submit.tpl b/templates/events/submit.tpl index 3bef8b8..7220c8e 100644 --- a/templates/events/submit.tpl +++ b/templates/events/submit.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -40,4 +40,4 @@ Merci pour ta contribution à la vie du site! {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/forums/admin.tpl b/templates/forums/admin.tpl index c996f55..c2b105f 100644 --- a/templates/forums/admin.tpl +++ b/templates/forums/admin.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -53,5 +53,5 @@ Les différentes règles sont appliquées par ordre de priorité décroissante. {/literal} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/corps.tpl b/templates/fusionax/corps.tpl index 95d1bd4..dbab9ae 100644 --- a/templates/fusionax/corps.tpl +++ b/templates/fusionax/corps.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@ {iterate from=$missingGrade item=grade}
  • {$grade.name}
    • {/iterate} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/deathdate_issues.tpl b/templates/fusionax/deathdate_issues.tpl index bdce96e..71a4d29 100644 --- a/templates/fusionax/deathdate_issues.tpl +++ b/templates/fusionax/deathdate_issues.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -56,4 +56,4 @@

    Il ne reste plus d'erreur liée à la fusion des annuaires concernant les dates de décès !

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/deceased.tpl b/templates/fusionax/deceased.tpl index 3e07684..78b9c27 100644 --- a/templates/fusionax/deceased.tpl +++ b/templates/fusionax/deceased.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -58,4 +58,4 @@ décès.

    Aucune différence pour les renseignements de décès entre les deux annuaires.

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/education.tpl b/templates/fusionax/education.tpl index fd931d2..89f2756 100644 --- a/templates/fusionax/education.tpl +++ b/templates/fusionax/education.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -46,4 +46,4 @@ {iterate from=$missingCouple item=couple}
  • {$couple.edu}, {$couple.degree} ({$couple.eduid}, {$couple.degreeid})
    • {/iterate} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/ids.tpl b/templates/fusionax/ids.tpl index 9453249..34c97ce 100644 --- a/templates/fusionax/ids.tpl +++ b/templates/fusionax/ids.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/fusionax/idsMissingInAx.tpl b/templates/fusionax/idsMissingInAx.tpl index fb98a22..a2a9a64 100644 --- a/templates/fusionax/idsMissingInAx.tpl +++ b/templates/fusionax/idsMissingInAx.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/fusionax/idsMissingInXorg.tpl b/templates/fusionax/idsMissingInXorg.tpl index dfd252b..822a813 100644 --- a/templates/fusionax/idsMissingInXorg.tpl +++ b/templates/fusionax/idsMissingInXorg.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/fusionax/idswrongInXorg.tpl b/templates/fusionax/idswrongInXorg.tpl index d4750c3..cb63988 100644 --- a/templates/fusionax/idswrongInXorg.tpl +++ b/templates/fusionax/idswrongInXorg.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/fusionax/import.tpl b/templates/fusionax/import.tpl index b43b828..f01348c 100644 --- a/templates/fusionax/import.tpl +++ b/templates/fusionax/import.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -53,4 +53,4 @@

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/index.tpl b/templates/fusionax/index.tpl index 5bff144..b9da97f 100644 --- a/templates/fusionax/index.tpl +++ b/templates/fusionax/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -43,4 +43,4 @@ Une fois ces vérifications faites, un root peut lancer le script merge.php dans le répertoire upgrade/1.0.1/

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/issues.tpl b/templates/fusionax/issues.tpl index 7ec8bd3..14059e2 100644 --- a/templates/fusionax/issues.tpl +++ b/templates/fusionax/issues.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -36,4 +36,4 @@

    Il ne reste plus d'erreur liée à la fusion des annuaires !

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/listFusion.tpl b/templates/fusionax/listFusion.tpl index 183a985..1b61c9e 100644 --- a/templates/fusionax/listFusion.tpl +++ b/templates/fusionax/listFusion.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -46,7 +46,7 @@ {$c.private_name} ({$c.promo}) {if t($c.pid)}{icon name="user_suit" title="Administrer utilisateur"}{/if} - {if t($c.ax_id)}{icon name="user_gray" title="fiche AX"}{/if} + {if t($c.ax_id)}{icon name="user_gray" title="fiche AX"}{/if} {if t($field1)} {$c.$field1} diff --git a/templates/fusionax/names.tpl b/templates/fusionax/names.tpl index 7166f1b..2321aab 100644 --- a/templates/fusionax/names.tpl +++ b/templates/fusionax/names.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -116,4 +116,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/other_issues.tpl b/templates/fusionax/other_issues.tpl index 7077b7b..2eb518a 100644 --- a/templates/fusionax/other_issues.tpl +++ b/templates/fusionax/other_issues.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -36,4 +36,4 @@

    Il ne reste plus d'erreur liée à la fusion des annuaires concernant les {$issue} !

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/promo.tpl b/templates/fusionax/promo.tpl index d241c22..b8c1843 100644 --- a/templates/fusionax/promo.tpl +++ b/templates/fusionax/promo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/fusionax/promo_issues.tpl b/templates/fusionax/promo_issues.tpl index 789357e..94ef7e0 100644 --- a/templates/fusionax/promo_issues.tpl +++ b/templates/fusionax/promo_issues.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -61,4 +61,4 @@

    Il ne reste plus d'erreur liée à la fusion des annuaires concernant les promotions !

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/fusionax/view.tpl b/templates/fusionax/view.tpl index acd96e6..e6c384d 100644 --- a/templates/fusionax/view.tpl +++ b/templates/fusionax/view.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/gadgets/ig-events.tpl b/templates/gadgets/ig-events.tpl index 2136f79..ebb9fa7 100644 --- a/templates/gadgets/ig-events.tpl +++ b/templates/gadgets/ig-events.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -48,4 +48,4 @@ {$event_count} événements au total >>> -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/gadgets/ig-events.xml.tpl b/templates/gadgets/ig-events.xml.tpl index d509bd3..bf62058 100644 --- a/templates/gadgets/ig-events.xml.tpl +++ b/templates/gadgets/ig-events.xml.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -32,4 +32,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/gadgets/ig-login.tpl b/templates/gadgets/ig-login.tpl index d0b54e2..5f634d9 100644 --- a/templates/gadgets/ig-login.tpl +++ b/templates/gadgets/ig-login.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/gadgets/ig-minifiche.tpl b/templates/gadgets/ig-minifiche.tpl index bcbb3c4..3e76f56 100644 --- a/templates/gadgets/ig-minifiche.tpl +++ b/templates/gadgets/ig-minifiche.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -105,4 +105,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/gadgets/ig-search.tpl b/templates/gadgets/ig-search.tpl index 5483e9e..5a0cfe6 100644 --- a/templates/gadgets/ig-search.tpl +++ b/templates/gadgets/ig-search.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -49,4 +49,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/gadgets/ig-search.xml.tpl b/templates/gadgets/ig-search.xml.tpl index 492391c..c3459dc 100644 --- a/templates/gadgets/ig-search.xml.tpl +++ b/templates/gadgets/ig-search.xml.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -32,4 +32,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/gadgets/ig-skin.tpl b/templates/gadgets/ig-skin.tpl index fe9d707..4958a51 100644 --- a/templates/gadgets/ig-skin.tpl +++ b/templates/gadgets/ig-skin.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -34,4 +34,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/geoloc/address.tpl b/templates/geoloc/address.tpl index a5e22e9..d622472 100644 --- a/templates/geoloc/address.tpl +++ b/templates/geoloc/address.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -22,4 +22,4 @@ {display_address adr=$address titre=$titre titre_div=$titre_div no_div=$no_div for=$for pos=$pos phones=$phones} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl index be32beb..3c24053 100644 --- a/templates/geoloc/form.address.tpl +++ b/templates/geoloc/form.address.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -80,4 +80,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/geoloc/index.tpl b/templates/geoloc/index.tpl index 6594019..76d480a 100644 --- a/templates/geoloc/index.tpl +++ b/templates/geoloc/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -26,4 +26,4 @@ map_initialize(); -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/googleapps/admin.job.tpl b/templates/googleapps/admin.job.tpl index 83a1e92..635b402 100644 --- a/templates/googleapps/admin.job.tpl +++ b/templates/googleapps/admin.job.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -83,4 +83,4 @@

    Retourner à la page d'administration de Google Apps.

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/googleapps/admin.tpl b/templates/googleapps/admin.tpl index 70904ce..a36d6c6 100644 --- a/templates/googleapps/admin.tpl +++ b/templates/googleapps/admin.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -107,4 +107,4 @@
    Utilisation disque des comptes sur les 12 derniers mois. -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/googleapps/admin.user.tpl b/templates/googleapps/admin.user.tpl index 2a10031..d4158d9 100644 --- a/templates/googleapps/admin.user.tpl +++ b/templates/googleapps/admin.user.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -149,4 +149,4 @@

    Retourner à la page d'administration de Google Apps.

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/googleapps/create.mail.tpl b/templates/googleapps/create.mail.tpl index 681bb5c..fd51acb 100644 --- a/templates/googleapps/create.mail.tpl +++ b/templates/googleapps/create.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/googleapps/index.tpl b/templates/googleapps/index.tpl index 639978e..5cb48c0 100644 --- a/templates/googleapps/index.tpl +++ b/templates/googleapps/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -413,4 +413,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/googleapps/unsuspend.mail.tpl b/templates/googleapps/unsuspend.mail.tpl index 8c66d2d..e69a3a1 100644 --- a/templates/googleapps/unsuspend.mail.tpl +++ b/templates/googleapps/unsuspend.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/include/csv.tpl b/templates/include/csv.tpl index 39bbc8f..777c182 100644 --- a/templates/include/csv.tpl +++ b/templates/include/csv.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -26,4 +26,4 @@ (encodage : iso-8859-1, séparateur : point-virgule) -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl index e974f25..163b26b 100644 --- a/templates/include/emails.combobox.tpl +++ b/templates/include/emails.combobox.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -109,4 +109,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/emploi.tpl b/templates/include/emploi.tpl index d6e0e7a..b35eee4 100644 --- a/templates/include/emploi.tpl +++ b/templates/include/emploi.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -57,4 +57,4 @@ {/if} -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} +{* vim:set et sws=2 sts=2 sw=2 fenc=utf-8: *} diff --git a/templates/include/field.promo.tpl b/templates/include/field.promo.tpl index e707225..b52f766 100644 --- a/templates/include/field.promo.tpl +++ b/templates/include/field.promo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -84,4 +84,4 @@ {/if} -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} +{* vim:set et sws=2 sts=2 sw=2 fenc=utf-8: *} diff --git a/templates/include/field.select.tpl b/templates/include/field.select.tpl index 56357ca..e7c4fe5 100644 --- a/templates/include/field.select.tpl +++ b/templates/include/field.select.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -29,4 +29,4 @@ {/if} -{* vim:set et sws=2 sts=2 sw=2 enc=utf-8: *} +{* vim:set et sws=2 sts=2 sw=2 fenc=utf-8: *} diff --git a/templates/include/flags.radio.tpl b/templates/include/flags.radio.tpl index 4da1c5d..da09b9e 100644 --- a/templates/include/flags.radio.tpl +++ b/templates/include/flags.radio.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -20,7 +20,7 @@ {* *} {**************************************************************************} {if t($withtext)} -Quelle couleur ? +Quelle couleur ?
    {/if} {if !t($val)}{assign var=val value='ax'}{/if} {if t($disabled)}{/if} @@ -30,10 +30,14 @@ {if t($withtext)}site public{/if} +{icon name="flag_orange" title="visible dans l'annuaire papier"} +{if t($withtext)}visible dans l'annuaire papier{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{icon name="flag_red" title="authentifié"} +{if t($withtext)}diplômés de l'X{/if} + +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.account.tpl b/templates/include/form.valid.account.tpl index 67b31a5..ea42168 100644 --- a/templates/include/form.valid.account.tpl +++ b/templates/include/form.valid.account.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@ {$valid->email} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.address.tpl b/templates/include/form.valid.address.tpl index c7b0af7..4086ff9 100644 --- a/templates/include/form.valid.address.tpl +++ b/templates/include/form.valid.address.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -25,4 +25,4 @@ {$valid->given_text} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.aliases.tpl b/templates/include/form.valid.aliases.tpl index c399d00..454ab98 100644 --- a/templates/include/form.valid.aliases.tpl +++ b/templates/include/form.valid.aliases.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -38,4 +38,4 @@ {$valid->reason|nl2br} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.broken.tpl b/templates/include/form.valid.broken.tpl index 9c805b3..391945d 100644 --- a/templates/include/form.valid.broken.tpl +++ b/templates/include/form.valid.broken.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -35,4 +35,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.bulk_accounts.tpl b/templates/include/form.valid.bulk_accounts.tpl index 865b3d3..762d6b5 100644 --- a/templates/include/form.valid.bulk_accounts.tpl +++ b/templates/include/form.valid.bulk_accounts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -34,4 +34,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-address.tpl b/templates/include/form.valid.edit-address.tpl index 041dcaf..b8b581d 100644 --- a/templates/include/form.valid.edit-address.tpl +++ b/templates/include/form.valid.edit-address.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -27,4 +27,4 @@ utiliser le bouton Éditer pour visualiser sur la carte la nouvelle pos {include file="geoloc/form.address.tpl" prefname="valid" prefid=0 address=$valid->address validation=1} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-entreprises.tpl b/templates/include/form.valid.edit-entreprises.tpl index cbcaa00..af700b7 100644 --- a/templates/include/form.valid.edit-entreprises.tpl +++ b/templates/include/form.valid.edit-entreprises.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -41,4 +41,4 @@ Fax :
    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-evts.tpl b/templates/include/form.valid.edit-evts.tpl index cca2546..12cc629 100644 --- a/templates/include/form.valid.edit-evts.tpl +++ b/templates/include/form.valid.edit-evts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -30,4 +30,4 @@ min
    Illustration : -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-listes.tpl b/templates/include/form.valid.edit-listes.tpl index 9c5cd45..7b99eb8 100644 --- a/templates/include/form.valid.edit-listes.tpl +++ b/templates/include/form.valid.edit-listes.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@
    {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-nl.tpl b/templates/include/form.valid.edit-nl.tpl index bc8d4ab..2a5da48 100644 --- a/templates/include/form.valid.edit-nl.tpl +++ b/templates/include/form.valid.edit-nl.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -27,4 +27,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-paiements.tpl b/templates/include/form.valid.edit-paiements.tpl index cdb94c5..bc61816 100644 --- a/templates/include/form.valid.edit-paiements.tpl +++ b/templates/include/form.valid.edit-paiements.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@  - 
    Rib_id :
    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.edit-photo.tpl b/templates/include/form.valid.edit-photo.tpl index 984669d..8f84d66 100644 --- a/templates/include/form.valid.edit-photo.tpl +++ b/templates/include/form.valid.edit-photo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -22,4 +22,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.entreprises.tpl b/templates/include/form.valid.entreprises.tpl index c62e821..31dfa94 100644 --- a/templates/include/form.valid.entreprises.tpl +++ b/templates/include/form.valid.entreprises.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -88,4 +88,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.evts.tpl b/templates/include/form.valid.evts.tpl index 882b69a..581d092 100644 --- a/templates/include/form.valid.evts.tpl +++ b/templates/include/form.valid.evts.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -48,4 +48,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.gapps-unsuspend.tpl b/templates/include/form.valid.gapps-unsuspend.tpl index 7485dfb..d9709fe 100644 --- a/templates/include/form.valid.gapps-unsuspend.tpl +++ b/templates/include/form.valid.gapps-unsuspend.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -26,4 +26,4 @@ {$valid->suspension_reason()|default:"-none-"|nl2br} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.homonymes.tpl b/templates/include/form.valid.homonymes.tpl index 0bc8318..168f7dc 100644 --- a/templates/include/form.valid.homonymes.tpl +++ b/templates/include/form.valid.homonymes.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -35,4 +35,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.listes.tpl b/templates/include/form.valid.listes.tpl index 4c9d247..4311e3d 100644 --- a/templates/include/form.valid.listes.tpl +++ b/templates/include/form.valid.listes.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -73,4 +73,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.mark.tpl b/templates/include/form.valid.mark.tpl index dfb44f0..48c5440 100644 --- a/templates/include/form.valid.mark.tpl +++ b/templates/include/form.valid.mark.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -45,4 +45,4 @@ {if $valid->perso}perso{else}par poly.org{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.medals.tpl b/templates/include/form.valid.medals.tpl index 2044da9..4bb84b8 100644 --- a/templates/include/form.valid.medals.tpl +++ b/templates/include/form.valid.medals.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -26,4 +26,4 @@ {$valid->medal_name()} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.names.tpl b/templates/include/form.valid.names.tpl index c5d43e1..8f4d498 100644 --- a/templates/include/form.valid.names.tpl +++ b/templates/include/form.valid.names.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -47,4 +47,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.nl.tpl b/templates/include/form.valid.nl.tpl index ac4d94b..684b7d1 100644 --- a/templates/include/form.valid.nl.tpl +++ b/templates/include/form.valid.nl.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -33,4 +33,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.orange.tpl b/templates/include/form.valid.orange.tpl index 15c7993..24732f1 100644 --- a/templates/include/form.valid.orange.tpl +++ b/templates/include/form.valid.orange.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -30,4 +30,4 @@ {$valid->newGradYear} au lieu de {$valid->oldGradYear} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.paiements.tpl b/templates/include/form.valid.paiements.tpl index 10de1d5..696c9d2 100644 --- a/templates/include/form.valid.paiements.tpl +++ b/templates/include/form.valid.paiements.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -68,4 +68,4 @@ {if $valid->rib_id}{$valid->rib_nom}{else}NULL{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.photos.tpl b/templates/include/form.valid.photos.tpl index 833133c..2a461b4 100644 --- a/templates/include/form.valid.photos.tpl +++ b/templates/include/form.valid.photos.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -29,4 +29,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/form.valid.surveys.tpl b/templates/include/form.valid.surveys.tpl index b22db6d..cb28e63 100644 --- a/templates/include/form.valid.surveys.tpl +++ b/templates/include/form.valid.surveys.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -34,4 +34,4 @@ Voir/Éditer le sondage complet -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/jobterms.branch.tpl b/templates/include/jobterms.branch.tpl index 6bcd8b5..c3fbdf6 100644 --- a/templates/include/jobterms.branch.tpl +++ b/templates/include/jobterms.branch.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -42,4 +42,4 @@ {/iterate} ] -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/massmailer-nav.tpl b/templates/include/massmailer-nav.tpl index 118c666..09a4c1c 100644 --- a/templates/include/massmailer-nav.tpl +++ b/templates/include/massmailer-nav.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -52,4 +52,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl index 606251b..3008886 100644 --- a/templates/include/minifiche.tpl +++ b/templates/include/minifiche.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -194,4 +194,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/plview.groupmember.entry.tpl b/templates/include/plview.groupmember.entry.tpl index ce90a39..2b893ba 100644 --- a/templates/include/plview.groupmember.entry.tpl +++ b/templates/include/plview.groupmember.entry.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/include/plview.groupmember.tpl b/templates/include/plview.groupmember.tpl index cc086df..d59a865 100644 --- a/templates/include/plview.groupmember.tpl +++ b/templates/include/plview.groupmember.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/plview.listmember.tpl b/templates/include/plview.listmember.tpl index 5f1ba79..4687185 100644 --- a/templates/include/plview.listmember.tpl +++ b/templates/include/plview.listmember.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -67,4 +67,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/plview.minifiche.tpl b/templates/include/plview.minifiche.tpl index b4dcb37..380903d 100644 --- a/templates/include/plview.minifiche.tpl +++ b/templates/include/plview.minifiche.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -26,4 +26,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/plview.referent.tpl b/templates/include/plview.referent.tpl index d4303c8..2362383 100644 --- a/templates/include/plview.referent.tpl +++ b/templates/include/plview.referent.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -53,4 +53,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/plview.trombi.entry.tpl b/templates/include/plview.trombi.entry.tpl index a014650..1172ffd 100644 --- a/templates/include/plview.trombi.entry.tpl +++ b/templates/include/plview.trombi.entry.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/include/plview.trombi.tpl b/templates/include/plview.trombi.tpl index 2534212..ee6df0b 100644 --- a/templates/include/plview.trombi.tpl +++ b/templates/include/plview.trombi.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -61,4 +61,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/select_promo.tpl b/templates/include/select_promo.tpl index bb34e86..823d55c 100644 --- a/templates/include/select_promo.tpl +++ b/templates/include/select_promo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -35,4 +35,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/signature.mail.tpl b/templates/include/signature.mail.tpl index 6d79616..d41d78e 100644 --- a/templates/include/signature.mail.tpl +++ b/templates/include/signature.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@ l'équipe de Polytechnique.org
    Le portail des élèves & anciens élèves de l'École polytechnique {elseif $mail_part eq "escaped_html"}Cordialement,
    --
    l'équipe de Polytechnique.org
    Le portail des élèves & anciens élèves de l'École polytechnique{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/tips.tpl b/templates/include/tips.tpl index 265fd2d..77f0a3f 100644 --- a/templates/include/tips.tpl +++ b/templates/include/tips.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -50,4 +50,4 @@ {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/include/trombi.tpl b/templates/include/trombi.tpl index 33cea77..ae37010 100644 --- a/templates/include/trombi.tpl +++ b/templates/include/trombi.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -63,4 +63,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/admin.tpl b/templates/lists/admin.tpl index 63d68a4..4879a3e 100644 --- a/templates/lists/admin.tpl +++ b/templates/lists/admin.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -157,4 +157,4 @@ emails de marketing. Une fois inscrits à Polytechnique.org, l'inscription à la -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/admin_aliases.tpl b/templates/lists/admin_aliases.tpl index 509f4e6..885e3e1 100644 --- a/templates/lists/admin_aliases.tpl +++ b/templates/lists/admin_aliases.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -47,4 +47,4 @@

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/admin_all.tpl b/templates/lists/admin_all.tpl index 8b2b907..00e895f 100644 --- a/templates/lists/admin_all.tpl +++ b/templates/lists/admin_all.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -36,4 +36,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/admin_edit_alias.tpl b/templates/lists/admin_edit_alias.tpl index 231bb2e..4cc144a 100644 --- a/templates/lists/admin_edit_alias.tpl +++ b/templates/lists/admin_edit_alias.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -89,4 +89,4 @@

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/annu.tpl b/templates/lists/annu.tpl index c156705..e10e5ce 100644 --- a/templates/lists/annu.tpl +++ b/templates/lists/annu.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -73,4 +73,4 @@ {include core=plset.tpl} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/archives.tpl b/templates/lists/archives.tpl index 7dd727a..1949137 100644 --- a/templates/lists/archives.tpl +++ b/templates/lists/archives.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -26,4 +26,4 @@ {$banana|smarty:nodefaults} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/check.tpl b/templates/lists/check.tpl index 795d95c..06a5e9f 100644 --- a/templates/lists/check.tpl +++ b/templates/lists/check.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -47,4 +47,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/create.tpl b/templates/lists/create.tpl index 3efe2b0..22d46f0 100644 --- a/templates/lists/create.tpl +++ b/templates/lists/create.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -205,4 +205,4 @@ liste : {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/delete.tpl b/templates/lists/delete.tpl index 8c4c5e1..cdf25e7 100644 --- a/templates/lists/delete.tpl +++ b/templates/lists/delete.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -60,4 +60,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/display_list.tpl b/templates/lists/display_list.tpl index e594d86..82c050a 100644 --- a/templates/lists/display_list.tpl +++ b/templates/lists/display_list.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -57,4 +57,4 @@ {/foreach} {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/header_listes.tpl b/templates/lists/header_listes.tpl index b01b991..8da8111 100644 --- a/templates/lists/header_listes.tpl +++ b/templates/lists/header_listes.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -103,4 +103,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/index.tpl b/templates/lists/index.tpl index d7fd160..293e2e3 100644 --- a/templates/lists/index.tpl +++ b/templates/lists/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -139,4 +139,4 @@ Les listes de diffusion publiques sont visibles par tous les X inscrits à Polyt {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/liste.inc.tpl b/templates/lists/liste.inc.tpl index 3e8397c..60b08cc 100644 --- a/templates/lists/liste.inc.tpl +++ b/templates/lists/liste.inc.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -95,4 +95,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/listes.inc.tpl b/templates/lists/listes.inc.tpl index fd88793..6872794 100644 --- a/templates/lists/listes.inc.tpl +++ b/templates/lists/listes.inc.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -37,4 +37,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/members.tpl b/templates/lists/members.tpl index 136c8d2..3583496 100644 --- a/templates/lists/members.tpl +++ b/templates/lists/members.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -120,4 +120,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/moderate.tpl b/templates/lists/moderate.tpl index 6c3f320..2c98f54 100644 --- a/templates/lists/moderate.tpl +++ b/templates/lists/moderate.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -210,4 +210,4 @@ $('.checkboxToggle').click(function (event) {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/moderate_mail.tpl b/templates/lists/moderate_mail.tpl index 8451b51..8204532 100644 --- a/templates/lists/moderate_mail.tpl +++ b/templates/lists/moderate_mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -65,4 +65,4 @@ En cas de refus, l'email envoyé à l'auteur de l'email que tu modères actuelle 
    {$msg|smarty:nodefaults|utf8_encode}
    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/moderate_sub.tpl b/templates/lists/moderate_sub.tpl index 5944ebf..d46be1d 100644 --- a/templates/lists/moderate_sub.tpl +++ b/templates/lists/moderate_sub.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -46,4 +46,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/options.tpl b/templates/lists/options.tpl index de5e52c..76476af 100644 --- a/templates/lists/options.tpl +++ b/templates/lists/options.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -227,4 +227,4 @@ redirection en mode 'inactif'. le logiciel de gestion des listes de diffusion sa {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/lists/soptions.tpl b/templates/lists/soptions.tpl index 4181c46..b365720 100644 --- a/templates/lists/soptions.tpl +++ b/templates/lists/soptions.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -89,4 +89,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/broken.tpl b/templates/marketing/broken.tpl index d66bd63..8754c01 100644 --- a/templates/marketing/broken.tpl +++ b/templates/marketing/broken.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -91,4 +91,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/index.tpl b/templates/marketing/index.tpl index 5b91cd9..b989d17 100644 --- a/templates/marketing/index.tpl +++ b/templates/marketing/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -102,5 +102,5 @@ nombre d'inscriptions en cours (2ème phase non -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/marketing.mail.tpl b/templates/marketing/marketing.mail.tpl index f5c23d7..eebc2b4 100644 --- a/templates/marketing/marketing.mail.tpl +++ b/templates/marketing/marketing.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -39,4 +39,4 @@ N'hésite pas à parler de Polytechnique.org à nos camarades pas encore inscrit {$sign} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/private.tpl b/templates/marketing/private.tpl index 0cd678d..c6990f2 100644 --- a/templates/marketing/private.tpl +++ b/templates/marketing/private.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -143,4 +143,4 @@ Sa dernière relance date du {$relance|date_format}. {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/promo.tpl b/templates/marketing/promo.tpl index 4f4379f..bccc380 100644 --- a/templates/marketing/promo.tpl +++ b/templates/marketing/promo.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -71,4 +71,4 @@

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/public.tpl b/templates/marketing/public.tpl index 9154ce0..a04e341 100644 --- a/templates/marketing/public.tpl +++ b/templates/marketing/public.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -130,4 +130,4 @@ peut sans aucun doute l'aider à se décider ! {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/relance.mail.tpl b/templates/marketing/relance.mail.tpl index 9cb9c9a..77fa719 100644 --- a/templates/marketing/relance.mail.tpl +++ b/templates/marketing/relance.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -48,4 +48,4 @@ Si le lien ci-dessus ne fonctionne pas en cliquant dessus, copie le intégraleme En cas de difficulté, nous sommes bien entendu à ton entière disposition ! {include file="include/signature.mail.tpl"} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/relance.tpl b/templates/marketing/relance.tpl index 6c20f63..7ecacc5 100644 --- a/templates/marketing/relance.tpl +++ b/templates/marketing/relance.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -58,4 +58,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/this_week.tpl b/templates/marketing/this_week.tpl index 6a1060f..da03dfc 100644 --- a/templates/marketing/this_week.tpl +++ b/templates/marketing/this_week.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -57,4 +57,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/marketing/volontaire.tpl b/templates/marketing/volontaire.tpl index 786489b..e25842a 100644 --- a/templates/marketing/volontaire.tpl +++ b/templates/marketing/volontaire.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -59,4 +59,4 @@ pas d'informations pour les gens de cette promo {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/admin.tpl b/templates/newsletter/admin.tpl index 83cffec..bb18e68 100644 --- a/templates/newsletter/admin.tpl +++ b/templates/newsletter/admin.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -53,4 +53,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/admin_all.tpl b/templates/newsletter/admin_all.tpl index b5978f5..d073798 100644 --- a/templates/newsletter/admin_all.tpl +++ b/templates/newsletter/admin_all.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -44,7 +44,6 @@ {$nl.id} {$nl.group_name} {$nl.name} - {if $nl.custom_css}Oui{else}Non{/if} {$nl.criteria} {/foreach} diff --git a/templates/newsletter/edit.tpl b/templates/newsletter/edit.tpl index a7ede1f..7a6dfc4 100644 --- a/templates/newsletter/edit.tpl +++ b/templates/newsletter/edit.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -360,4 +360,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/enable.mail.tpl b/templates/newsletter/enable.mail.tpl index 7294f08..a20a6cf 100644 --- a/templates/newsletter/enable.mail.tpl +++ b/templates/newsletter/enable.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -30,5 +30,5 @@ La newsletter du groupe $group a été activée par {$user->fullName()}. {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/enable.tpl b/templates/newsletter/enable.tpl index 4e231f6..6d18d2f 100644 --- a/templates/newsletter/enable.tpl +++ b/templates/newsletter/enable.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/newsletter/header.tpl b/templates/newsletter/header.tpl index 32992b2..0e8576e 100644 --- a/templates/newsletter/header.tpl +++ b/templates/newsletter/header.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/index.tpl b/templates/newsletter/index.tpl index e211fd1..c0e2183 100644 --- a/templates/newsletter/index.tpl +++ b/templates/newsletter/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -67,4 +67,4 @@ Tu n'es actuellement pas inscrit à la {$nl->name}. {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/nl.AX.mail.tpl b/templates/newsletter/nl.AX.mail.tpl index fd9f795..10a6044 100644 --- a/templates/newsletter/nl.AX.mail.tpl +++ b/templates/newsletter/nl.AX.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -90,4 +90,4 @@ ne plus recevoir : <https://www.polytechnique.org/ax/out/{if $hash}{$hash}{el {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/nl.Annonces.mail.tpl b/templates/newsletter/nl.Annonces.mail.tpl index 75be50a..96ee0aa 100644 --- a/templates/newsletter/nl.Annonces.mail.tpl +++ b/templates/newsletter/nl.Annonces.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -59,8 +59,8 @@ {$issue->signature('text')} -------------------------------------------------------------------- -Cette lettre est envoyée à tous les Polytechniciens sur Internet par -l'intermédiaire de Polytechnique.org. +Cette lettre est envoyée par le groupe Annonces et Débats grâce aux +outils de Polytechnique.org. {if $is_mail} archives : @@ -117,7 +117,7 @@ ne plus recevoir : <https://www.polytechnique.org/comletter/out/{if $hash}{$h {/foreach}
    {$issue->signature('html')|smarty:nodefaults}
    - Cette lettre est envoyée à tous les Polytechniciens sur Internet par l'intermédiaire de Polytechnique.org. + Cette lettre est envoyée par le groupe Annonces et Débats grâce aux outils de Polytechnique.org.
    [archives | @@ -132,4 +132,4 @@ ne plus recevoir : <https://www.polytechnique.org/comletter/out/{if $hash}{$h {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/nl.Ecole.mail.tpl b/templates/newsletter/nl.Ecole.mail.tpl index 0c22ab4..a997e5c 100644 --- a/templates/newsletter/nl.Ecole.mail.tpl +++ b/templates/newsletter/nl.Ecole.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -90,4 +90,4 @@ ne plus recevoir : <https://www.polytechnique.org/epletter/out/{if $hash}{$ha {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/nl.FX.mail.tpl b/templates/newsletter/nl.FX.mail.tpl index d532d8f..2ee7a56 100644 --- a/templates/newsletter/nl.FX.mail.tpl +++ b/templates/newsletter/nl.FX.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -109,4 +109,4 @@ ne plus recevoir : <https://www.polytechnique.org/fxletter/out/{if $hash}{$ha {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/nl.Polytechnique.org.mail.tpl b/templates/newsletter/nl.Polytechnique.org.mail.tpl index 486143c..e1c653d 100644 --- a/templates/newsletter/nl.Polytechnique.org.mail.tpl +++ b/templates/newsletter/nl.Polytechnique.org.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -129,4 +129,4 @@ ne plus recevoir : <https://www.polytechnique.org/nl/out/nohash/{$issue->id}& {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/nl.default.mail.tpl b/templates/newsletter/nl.default.mail.tpl index 3363e60..f4fbc80 100644 --- a/templates/newsletter/nl.default.mail.tpl +++ b/templates/newsletter/nl.default.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -130,5 +130,5 @@ ne plus recevoir : <http://www.polytechnique.org/{$nl->prefix()}/out/nohash/{ {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/notify_scheduled.mail.tpl b/templates/newsletter/notify_scheduled.mail.tpl index 2c13aff..d40be31 100644 --- a/templates/newsletter/notify_scheduled.mail.tpl +++ b/templates/newsletter/notify_scheduled.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -34,4 +34,4 @@ Aperçu / édition : {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/remaining.tpl b/templates/newsletter/remaining.tpl index 113c32e..7510282 100644 --- a/templates/newsletter/remaining.tpl +++ b/templates/newsletter/remaining.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -28,4 +28,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/search.tpl b/templates/newsletter/search.tpl index 9ceb568..bcbd271 100644 --- a/templates/newsletter/search.tpl +++ b/templates/newsletter/search.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -76,4 +76,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl index b8900fa..e2a363f 100644 --- a/templates/newsletter/show.tpl +++ b/templates/newsletter/show.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -52,4 +52,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/statistics.tpl b/templates/newsletter/statistics.tpl index c8654ed..62fa40c 100644 --- a/templates/newsletter/statistics.tpl +++ b/templates/newsletter/statistics.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -47,4 +47,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/submit.tpl b/templates/newsletter/submit.tpl index 23cf729..53f00bd 100644 --- a/templates/newsletter/submit.tpl +++ b/templates/newsletter/submit.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -139,4 +139,4 @@ Tu peux lire les conseils de rédaction avant d {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/newsletter/sync.tpl b/templates/newsletter/sync.tpl index e1332a8..b8bfca5 100644 --- a/templates/newsletter/sync.tpl +++ b/templates/newsletter/sync.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -74,4 +74,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/openid/idp_xrds.tpl b/templates/openid/idp_xrds.tpl index 7e84f1e..275917e 100644 --- a/templates/openid/idp_xrds.tpl +++ b/templates/openid/idp_xrds.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -34,4 +34,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/openid/openid.tpl b/templates/openid/openid.tpl index 16c6d70..4817bec 100644 --- a/templates/openid/openid.tpl +++ b/templates/openid/openid.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -28,4 +28,4 @@ Polytechnique.org.

    En savoir plus sur OpenId

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/openid/trust.tpl b/templates/openid/trust.tpl index 50a05cf..5a2737d 100644 --- a/templates/openid/trust.tpl +++ b/templates/openid/trust.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -68,4 +68,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/openid/user_xrds.tpl b/templates/openid/user_xrds.tpl index 85be07d..a458d45 100644 --- a/templates/openid/user_xrds.tpl +++ b/templates/openid/user_xrds.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -41,4 +41,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/payment/payment.tpl b/templates/payment/payment.tpl index bd09116..2d3888e 100644 --- a/templates/payment/payment.tpl +++ b/templates/payment/payment.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -208,4 +208,4 @@ Si tu n'es pas encore inscrit à cet événement, n'oublie pas d'aller t'

    {$texte|nl2br}

    {/if}

    [retour aux Télépaiements]

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/payment/xnet.tpl b/templates/payment/xnet.tpl index 2b51550..4c6e429 100644 --- a/templates/payment/xnet.tpl +++ b/templates/payment/xnet.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -164,4 +164,4 @@ il suffit de cliquer sur le titre de la colonne concernée. {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/acces_smtp.tpl b/templates/platal/acces_smtp.tpl index ff3b0b7..6b668f4 100644 --- a/templates/platal/acces_smtp.tpl +++ b/templates/platal/acces_smtp.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -123,4 +123,4 @@

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/changeLog.tpl b/templates/platal/changeLog.tpl index b84c56d..5d26120 100644 --- a/templates/platal/changeLog.tpl +++ b/templates/platal/changeLog.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -29,4 +29,4 @@ {/if} {$ChangeLog|smarty:nodefaults} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/email_preferences.tpl b/templates/platal/email_preferences.tpl index 2a574c2..ac69e36 100644 --- a/templates/platal/email_preferences.tpl +++ b/templates/platal/email_preferences.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -46,4 +46,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/error.tpl b/templates/platal/error.tpl index 3dcceff..585f190 100644 --- a/templates/platal/error.tpl +++ b/templates/platal/error.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/platal/exit.tpl b/templates/platal/exit.tpl index e0d422c..f0ea403 100644 --- a/templates/platal/exit.tpl +++ b/templates/platal/exit.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -52,4 +52,4 @@ connexion. Si tu utilises un ordinateur public ou que tu désires l'effacer, tu

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/filrss.tpl b/templates/platal/filrss.tpl index b50fae9..9668a15 100644 --- a/templates/platal/filrss.tpl +++ b/templates/platal/filrss.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -67,4 +67,4 @@ Attention : désactiver, puis réactiver le fil RSS en change l'adresse.

    [retour à la page dont tu venais]

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/index.tpl b/templates/platal/index.tpl index fc1b23f..1aa5cee 100644 --- a/templates/platal/index.tpl +++ b/templates/platal/index.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -80,7 +80,7 @@ polytechnique.edu, le portail des X sur le web est polytechnique.org, et le site de l'amicale des Anciens Eleves (AX) est - polytechniciens.com. + ax.polytechnique.edu.

    @@ -88,4 +88,4 @@
    L'équipe {#globals.core.sitename#}

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/password.success.tpl b/templates/platal/password.success.tpl index b7ab9e6..c9521a7 100644 --- a/templates/platal/password.success.tpl +++ b/templates/platal/password.success.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -36,4 +36,4 @@

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/password.tpl b/templates/platal/password.tpl index baa565f..d17dd30 100644 --- a/templates/platal/password.tpl +++ b/templates/platal/password.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -111,4 +111,4 @@

    {/if}{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/password_recovery_xnet.mail.tpl b/templates/platal/password_recovery_xnet.mail.tpl index b1dc4e1..530e3ed 100644 --- a/templates/platal/password_recovery_xnet.mail.tpl +++ b/templates/platal/password_recovery_xnet.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/platal/preferences.tpl b/templates/platal/preferences.tpl index 90a928d..ca11bf2 100644 --- a/templates/platal/preferences.tpl +++ b/templates/platal/preferences.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -109,4 +109,4 @@ $(function() { {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/raven.tpl b/templates/platal/raven.tpl index 6c164e3..b495de9 100644 --- a/templates/platal/raven.tpl +++ b/templates/platal/raven.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/platal/recovery.tpl b/templates/platal/recovery.tpl index 36b0103..c03421b 100644 --- a/templates/platal/recovery.tpl +++ b/templates/platal/recovery.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -107,4 +107,4 @@ Si tu n'accèdes pas à cet email dans les 6 heures, sollicite un nouveau certif {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/review.tpl b/templates/platal/review.tpl index 1d48ac8..a627067 100644 --- a/templates/platal/review.tpl +++ b/templates/platal/review.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -34,4 +34,4 @@ La page wiki associée n'existe pas. La page n'existe pas

    {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/skins.tpl b/templates/platal/skins.tpl index a59ead9..9e810aa 100644 --- a/templates/platal/skins.tpl +++ b/templates/platal/skins.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -55,4 +55,4 @@ Pour toute information complémentaire, n'hésite pas à écrire à {/iterate} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/tmpPWD.success.tpl b/templates/platal/tmpPWD.success.tpl index 4afdbc7..f2fa5ba 100644 --- a/templates/platal/tmpPWD.success.tpl +++ b/templates/platal/tmpPWD.success.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ pas crypté), de changer ton mot de passe. C'est pourquoi, dans ton intérêt, il est préférable que tu ne perdes pas ton mot de passe !!!

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/platal/webredirect.tpl b/templates/platal/webredirect.tpl index 059b88c..a233a27 100644 --- a/templates/platal/webredirect.tpl +++ b/templates/platal/webredirect.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -88,4 +88,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/admin_decos.tpl b/templates/profile/admin_decos.tpl index 3b4cf03..2c7affa 100644 --- a/templates/profile/admin_decos.tpl +++ b/templates/profile/admin_decos.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -85,4 +85,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/admin_trombino.tpl b/templates/profile/admin_trombino.tpl index e7c4099..762038d 100644 --- a/templates/profile/admin_trombino.tpl +++ b/templates/profile/admin_trombino.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -49,4 +49,4 @@ Photo actuelle de {$user->login()} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl index 62946cc..69dd6d0 100644 --- a/templates/profile/adresses.address.tpl +++ b/templates/profile/adresses.address.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -145,4 +145,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/adresses.tpl b/templates/profile/adresses.tpl index 31fdc59..3050dc0 100644 --- a/templates/profile/adresses.tpl +++ b/templates/profile/adresses.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -39,4 +39,4 @@
    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/base.tpl b/templates/profile/base.tpl index 86ba230..3926498 100644 --- a/templates/profile/base.tpl +++ b/templates/profile/base.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -24,10 +24,10 @@ {xsrf_token_field}
    {icon name=information title="Voir ma fiche"} Tu peux consulter - {if $isMe}ta{else}cette{/if} fiche telle que la - voient n'importe quel internaute, - l'AX{if $viewPrivate}ou - les X{/if}. + {if $isMe}ta{else}cette{/if} fiche telle qu'elle apparaît + pour n'importe quel internaute, + dans l'annuaire papier{if $viewPrivate} ou + pour les X{/if}.
    {include file="include/flags.radio.tpl" disabled=true withtext=true val="novalue" name="profile_ex_pub"} @@ -44,4 +44,4 @@
    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/deco.medal.tpl b/templates/profile/deco.medal.tpl index 25cf545..8bf4394 100644 --- a/templates/profile/deco.medal.tpl +++ b/templates/profile/deco.medal.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -53,4 +53,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/deco.tpl b/templates/profile/deco.tpl index ab5886d..234ba70 100644 --- a/templates/profile/deco.tpl +++ b/templates/profile/deco.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -68,4 +68,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/deltaten.tpl b/templates/profile/deltaten.tpl index 8cbf4a3..ee85a43 100644 --- a/templates/profile/deltaten.tpl +++ b/templates/profile/deltaten.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -55,5 +55,5 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/education.js.tpl b/templates/profile/education.js.tpl index 3347d8c..3be5d00 100644 --- a/templates/profile/education.js.tpl +++ b/templates/profile/education.js.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -24,4 +24,4 @@ educationDegree = new Array({education_degree}); educationDegreeAll = new Array({education_degree_all}); educationDegreeName = new Array({education_degree_name}); -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/fiche_referent.tpl b/templates/profile/fiche_referent.tpl index c350760..de620ff 100644 --- a/templates/profile/fiche_referent.tpl +++ b/templates/profile/fiche_referent.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -123,4 +123,4 @@
    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.buildnames.tpl b/templates/profile/general.buildnames.tpl index d639262..9c32707 100644 --- a/templates/profile/general.buildnames.tpl +++ b/templates/profile/general.buildnames.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -22,4 +22,4 @@ {$names} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.edu.tpl b/templates/profile/general.edu.tpl index 75381f3..dfb3a2c 100644 --- a/templates/profile/general.edu.tpl +++ b/templates/profile/general.edu.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -74,4 +74,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.hobby.tpl b/templates/profile/general.hobby.tpl index efa893a..e573404 100644 --- a/templates/profile/general.hobby.tpl +++ b/templates/profile/general.hobby.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -53,4 +53,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.networking.tpl b/templates/profile/general.networking.tpl index 8a6a4ac..aa3cd40 100644 --- a/templates/profile/general.networking.tpl +++ b/templates/profile/general.networking.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -57,4 +57,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.private_name.tpl b/templates/profile/general.private_name.tpl index 5dc610b..390e366 100644 --- a/templates/profile/general.private_name.tpl +++ b/templates/profile/general.private_name.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -41,4 +41,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.public_names.tpl b/templates/profile/general.public_names.tpl index 299da76..e451de1 100644 --- a/templates/profile/general.public_names.tpl +++ b/templates/profile/general.public_names.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -50,4 +50,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl index 03b1d92..5266aba 100644 --- a/templates/profile/general.tpl +++ b/templates/profile/general.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -423,6 +423,20 @@ {/if} + {if !t($isMe)} + + +
    + Commentaire AX +
    + + + + + + + {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/geocoding.mail.tpl b/templates/profile/geocoding.mail.tpl index 27f8545..f5c33dd 100644 --- a/templates/profile/geocoding.mail.tpl +++ b/templates/profile/geocoding.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/profile/grades.js.tpl b/templates/profile/grades.js.tpl index 6ebf448..3ab9388 100644 --- a/templates/profile/grades.js.tpl +++ b/templates/profile/grades.js.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -38,4 +38,4 @@ multiple = new Array(); {/foreach} {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/groupesx.tpl b/templates/profile/groupesx.tpl index 4b95277..329a6bf 100644 --- a/templates/profile/groupesx.tpl +++ b/templates/profile/groupesx.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -55,4 +55,4 @@ {/foreach} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/groups.tpl b/templates/profile/groups.tpl index d1f7ba7..237de46 100644 --- a/templates/profile/groups.tpl +++ b/templates/profile/groups.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -156,4 +156,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/jobs.job.tpl b/templates/profile/jobs.job.tpl index 214b233..e83ecf5 100644 --- a/templates/profile/jobs.job.tpl +++ b/templates/profile/jobs.job.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -244,4 +244,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/jobs.tpl b/templates/profile/jobs.tpl index 98127e2..1f2d1a1 100644 --- a/templates/profile/jobs.tpl +++ b/templates/profile/jobs.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -120,4 +120,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/mentor.tpl b/templates/profile/mentor.tpl index 45b8539..ed1b5b2 100644 --- a/templates/profile/mentor.tpl +++ b/templates/profile/mentor.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -234,4 +234,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/name_info.tpl b/templates/profile/name_info.tpl index e38c87d..f00b9d5 100644 --- a/templates/profile/name_info.tpl +++ b/templates/profile/name_info.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -54,4 +54,4 @@ par une particule, comme cela tu seras correctement classé dans l'ordre alphabétique. -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/no_geocoding.mail.tpl b/templates/profile/no_geocoding.mail.tpl index b30656b..963d8f6 100644 --- a/templates/profile/no_geocoding.mail.tpl +++ b/templates/profile/no_geocoding.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} diff --git a/templates/profile/notification.mail.tpl b/templates/profile/notification.mail.tpl index 69ed04b..a26a0e2 100644 --- a/templates/profile/notification.mail.tpl +++ b/templates/profile/notification.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -42,4 +42,4 @@ Tu peux aussi l'éditer toi-même là : {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/phone.tpl b/templates/profile/phone.tpl index 7976a22..4d9adb6 100644 --- a/templates/profile/phone.tpl +++ b/templates/profile/phone.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -63,4 +63,4 @@ {icon name=cross title="Supprimer le commentaire"} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl index 44b4925..2fee8b6 100644 --- a/templates/profile/profile.tpl +++ b/templates/profile/profile.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -86,6 +86,14 @@ $($.closeOnEsc); {/foreach} {/if} + {assign var=hobbies value=$profile->getHobbies()} + {if count($hobbies) > 0} +

    Hobbies...

    + {foreach from=$hobbies key=type item=text} +
    {$type} : {$text}
    + {/foreach} + {/if} + {if $profile->freetext}

    Commentaires :

    {$profile->freetext|miniwiki|smarty:nodefaults} @@ -96,7 +104,8 @@ $($.closeOnEsc); -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/profile/trombino.tpl b/templates/profile/trombino.tpl index e19a15c..6da5a54 100644 --- a/templates/profile/trombino.tpl +++ b/templates/profile/trombino.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -131,4 +131,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/breadcrumb.tpl b/templates/register/breadcrumb.tpl index 0d34bc5..9d1a306 100644 --- a/templates/register/breadcrumb.tpl +++ b/templates/register/breadcrumb.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -29,4 +29,4 @@ {if $step eq 5}{/if}Validation{if $step eq 5}{/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/end.mail.tpl b/templates/register/end.mail.tpl index d6eb514..940f37b 100644 --- a/templates/register/end.mail.tpl +++ b/templates/register/end.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -44,4 +44,4 @@ Si en cliquant dessus tu n'y arrives pas, copie intégralement ce lien dans la b Nous espérons que tu profiteras pleinement des services en ligne de Polytechnique.org ; s'ils te convainquent, n'oublie pas d'en parler aux camarades autour de toi ! {include file="include/signature.mail.tpl"} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/end.tpl b/templates/register/end.tpl index 5100336..74eebbc 100644 --- a/templates/register/end.tpl +++ b/templates/register/end.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -62,4 +62,4 @@ accéder au site, et à notre annuaire en ligne !

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/lostalias.mail.tpl b/templates/register/lostalias.mail.tpl index 62d7576..437f473 100644 --- a/templates/register/lostalias.mail.tpl +++ b/templates/register/lostalias.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -40,4 +40,4 @@ Commence dès aujourd'hui à communiquer à tes correspondants la nouvelle adres En nous excusant pour le désagrément occasionné, {include file="include/signature.mail.tpl"} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/marketer.mail.tpl b/templates/register/marketer.mail.tpl index 6b58377..e58254c 100644 --- a/templates/register/marketer.mail.tpl +++ b/templates/register/marketer.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ Nous t'écrivons pour t'informer que {$firstname} {$lastname} ({$promo}), que tu Merci de ta participation active à la reconnaissance de ce site !!! {include file="include/signature.mail.tpl"} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/registration.mail.tpl b/templates/register/registration.mail.tpl index 32bbc63..66d4a5e 100644 --- a/templates/register/registration.mail.tpl +++ b/templates/register/registration.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -43,4 +43,4 @@ {else}{$firstname} {$lastname} n'a jamais reçu d'email de marketing. {/if} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/step0.tpl b/templates/register/step0.tpl index a8da081..99b100c 100644 --- a/templates/register/step0.tpl +++ b/templates/register/step0.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -46,4 +46,4 @@ L'enregistrement se déroule en deux étapes : -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/step1.tpl b/templates/register/step1.tpl index 5265340..cd52fa8 100644 --- a/templates/register/step1.tpl +++ b/templates/register/step1.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -62,4 +62,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/step2.tpl b/templates/register/step2.tpl index 97430be..1789557 100644 --- a/templates/register/step2.tpl +++ b/templates/register/step2.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -89,4 +89,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/step3.tpl b/templates/register/step3.tpl index b2a8639..b4ea847 100644 --- a/templates/register/step3.tpl +++ b/templates/register/step3.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -148,4 +148,4 @@ {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/step4.tpl b/templates/register/step4.tpl index cfc1749..cc870a0 100644 --- a/templates/register/step4.tpl +++ b/templates/register/step4.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -41,4 +41,4 @@ En particulier, vérifie si l'email n'a pas été rejeté par ton filtre anti-sp d'expéditeur est register@polytechnique.org.

    -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/register/success.mail.tpl b/templates/register/success.mail.tpl index e57c0e6..4a6b111 100644 --- a/templates/register/success.mail.tpl +++ b/templates/register/success.mail.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -32,4 +32,4 @@ diffusion, aux infos promo, etc. N'oublie pas de mettre ta fiche-annuaire à jour. {include file="include/signature.mail.tpl"} {/if} -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/base.tpl b/templates/reminder/base.tpl index 347e00b..1fe0740 100644 --- a/templates/reminder/base.tpl +++ b/templates/reminder/base.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -55,4 +55,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/email_warning.tpl b/templates/reminder/email_warning.tpl index 1ebd018..955a47f 100644 --- a/templates/reminder/email_warning.tpl +++ b/templates/reminder/email_warning.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ Des problèmes sont actuellement recontrés sur tes redirections suivantes  -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/gapps.tpl b/templates/reminder/gapps.tpl index 7434aa1..a6d67cc 100644 --- a/templates/reminder/gapps.tpl +++ b/templates/reminder/gapps.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -39,4 +39,4 @@ {icon name=information} En savoir plus -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/ml.tpl b/templates/reminder/ml.tpl index 08374e3..1e3ec6a 100644 --- a/templates/reminder/ml.tpl +++ b/templates/reminder/ml.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -50,4 +50,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/no_redirection.tpl b/templates/reminder/no_redirection.tpl index c7a9931..b6b15ed 100644 --- a/templates/reminder/no_redirection.tpl +++ b/templates/reminder/no_redirection.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -24,4 +24,4 @@ Tu n'as plus de redirection valide ce qui rend ton adresse Polytechnique.org inutilisable. Rends-toi au plus vite sur la page de gestion des emails pour corriger ce problème. -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/notification.tpl b/templates/reminder/notification.tpl index 13095fd..87e247b 100644 --- a/templates/reminder/notification.tpl +++ b/templates/reminder/notification.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -29,4 +29,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/reminder/profile_update.tpl b/templates/reminder/profile_update.tpl index a185333..ad80b1c 100644 --- a/templates/reminder/profile_update.tpl +++ b/templates/reminder/profile_update.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -56,4 +56,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/search/adv.form.address_component.tpl b/templates/search/adv.form.address_component.tpl index 8c0108d..fb465b4 100644 --- a/templates/search/adv.form.address_component.tpl +++ b/templates/search/adv.form.address_component.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -31,4 +31,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/search/adv.form.autocomplete_select.tpl b/templates/search/adv.form.autocomplete_select.tpl index 492b835..0bc8de2 100644 --- a/templates/search/adv.form.autocomplete_select.tpl +++ b/templates/search/adv.form.autocomplete_select.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -32,4 +32,4 @@ -{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *} +{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *} diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl index d507579..f12a6e3 100644 --- a/templates/search/adv.form.tpl +++ b/templates/search/adv.form.tpl @@ -1,6 +1,6 @@ {**************************************************************************} {* *} -{* Copyright (C) 2003-2013 Polytechnique.org *} +{* Copyright (C) 2003-2014 Polytechnique.org *} {* http://opensource.polytechnique.org/ *} {* *} {* This program is free software; you can redistribute it and/or modify *} @@ -168,9 +168,9 @@ {if hasPerm('admin,edit_directory')} -