From a5be2bda80d0a471cc9abf31a751c694e284b107 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Fri, 3 Dec 2004 16:43:30 +0000 Subject: [PATCH] misc bugfixes + attempt to really separate lists from the rest * Banana : - show formular even after entering the password. * Mail : - already add MailCOnfig because we really need to make @polytechnique.org disappear everywhere and make use of $globals->mail->domain instead. * NewsLetter : - use globals->mail->domain * Lists : - Make it a separate module : really ok for the php part. Needs work for the rpc, but I cannot test atm. git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-34 --- .../lists.foreach_template.py} | 0 ...onarc_by_month.pl => lists.mhonarc_by_month.pl} | 0 .../mhonarc_pipe.sh => lists.mhonarc_pipe.sh} | 0 bin/{mailman/mailman-rpc.py => lists.rpc.py} | 0 hooks/core/lists.inc.php | 37 +++++++++++++++++++ hooks/core/newsletter.inc.php | 3 +- htdocs/inscription/step4.php | 2 -- htdocs/listes/admin.php | 7 ++-- htdocs/listes/archives.php | 8 ++--- htdocs/listes/check.php | 4 +-- htdocs/listes/delete.php | 4 +-- htdocs/listes/index.php | 5 +-- htdocs/listes/members.php | 5 +-- htdocs/listes/moderate.php | 14 ++++---- htdocs/listes/options.php | 4 +-- htdocs/listes/soptions.php | 4 +-- htdocs/listes/trombi.php | 5 +-- htdocs/login.php | 1 - include/conf.d/lists.globals.inc.php | 2 +- include/conf.d/lists.menu.inc.php | 3 ++ include/conf.d/mail.globals.inc.php | 34 ++++++++++++++++++ include/conf.d/tmp.menu.inc.php | 1 - include/lists.inc.php | 42 ++++++++++++++++++++++ include/newsletter.inc.php | 7 ++-- include/user.func.inc.php | 27 +++----------- install.d/banana/README | 2 +- install.d/lists/README | 42 ++++++++++++++++++++++ install.d/lists/files | 12 ++++--- install.d/lists/platal.mrc | 3 -- install.d/platal-dev/files | 1 + templates/confbanana.tpl | 2 +- templates/newsletter/index.tpl | 4 --- upgrade/0.9.3/update.sh | 1 - 33 files changed, 211 insertions(+), 75 deletions(-) rename bin/{mailman/foreach_template.py => devel/lists.foreach_template.py} (100%) rename bin/{mailman/mhonarc_by_month.pl => lists.mhonarc_by_month.pl} (100%) rename bin/{mailman/mhonarc_pipe.sh => lists.mhonarc_pipe.sh} (100%) rename bin/{mailman/mailman-rpc.py => lists.rpc.py} (100%) create mode 100644 hooks/core/lists.inc.php create mode 100644 include/conf.d/lists.menu.inc.php create mode 100644 include/conf.d/mail.globals.inc.php create mode 100644 include/lists.inc.php create mode 100644 install.d/lists/README diff --git a/bin/mailman/foreach_template.py b/bin/devel/lists.foreach_template.py similarity index 100% rename from bin/mailman/foreach_template.py rename to bin/devel/lists.foreach_template.py diff --git a/bin/mailman/mhonarc_by_month.pl b/bin/lists.mhonarc_by_month.pl similarity index 100% rename from bin/mailman/mhonarc_by_month.pl rename to bin/lists.mhonarc_by_month.pl diff --git a/bin/mailman/mhonarc_pipe.sh b/bin/lists.mhonarc_pipe.sh similarity index 100% rename from bin/mailman/mhonarc_pipe.sh rename to bin/lists.mhonarc_pipe.sh diff --git a/bin/mailman/mailman-rpc.py b/bin/lists.rpc.py similarity index 100% rename from bin/mailman/mailman-rpc.py rename to bin/lists.rpc.py diff --git a/hooks/core/lists.inc.php b/hooks/core/lists.inc.php new file mode 100644 index 0000000..78efd66 --- /dev/null +++ b/hooks/core/lists.inc.php @@ -0,0 +1,37 @@ +subscribe("promo$promo"); +} + +// }}} + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +?> diff --git a/hooks/core/newsletter.inc.php b/hooks/core/newsletter.inc.php index 9e9676e..4557756 100644 --- a/hooks/core/newsletter.inc.php +++ b/hooks/core/newsletter.inc.php @@ -23,9 +23,8 @@ function &newsletter_subscribe($forlife, $uid, $promo, $password, &$result) { - global $globals; require_once('newsletter.inc.php'); - subscribe_nl(); + subscribe_nl(true,$uid); return ($result = true); } diff --git a/htdocs/inscription/step4.php b/htdocs/inscription/step4.php index 9d02792..fae9777 100644 --- a/htdocs/inscription/step4.php +++ b/htdocs/inscription/step4.php @@ -138,8 +138,6 @@ if (!empty($_REQUEST['ref'])) { $hook->subscribe($forlife, $uid, $promo, $password, true); start_connexion($uid,false); - /****************** inscription à la liste promo +nl ****************/ - $inspromo = inscription_listes_base($uid,$password,$promo); } else $page->assign('error',ERROR_REF); diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php index 811c94f..5328901 100644 --- a/htdocs/listes/admin.php +++ b/htdocs/listes/admin.php @@ -24,11 +24,10 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_skinned_page('listes/admin.tpl', AUTH_MDP); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') $err = Array(); - -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if(isset($_REQUEST['add_member'])) { $arr = $client->mass_subscribe($liste, Array($_REQUEST['add_member'])); @@ -55,7 +54,7 @@ if(isset($_REQUEST['del_owner'])) { if(list($det,$mem,$own) = $client->get_members($liste)) { $membres = Array(); foreach($mem as $member) { - if(preg_match('/^([^.]*\.([^.]*)\.\d\d\d\d)@polytechnique.org$/', $member[1], $matches)) { + if(preg_match('/^([^.]*\.([^.]*)\.\d\d\d\d)@'.$globals->mail->domain.'$/', $member[1], $matches)) { $key = strtoupper($matches[2]{0}); $membres[$key][$matches[2]] = Array('n' => $member[0], 'l' => $matches[1], 'a' => $member[1]); } else { diff --git a/htdocs/listes/archives.php b/htdocs/listes/archives.php index e8e08ee..bda91f8 100644 --- a/htdocs/listes/archives.php +++ b/htdocs/listes/archives.php @@ -24,9 +24,9 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_skinned_page('listes/archives.tpl', AUTH_COOKIE, 'listes/archives.head.tpl'); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if (list($det) = $client->get_members($liste)) { if ( substr($liste,0,5) != 'promo' && ( $det['ins'] || $det['priv'] ) && !$det['own'] && ($det['sub']<2) ) { @@ -37,11 +37,11 @@ if (list($det) = $client->get_members($liste)) { if(strstr('/', $file)!==false || !preg_match(',^\d+/\d+$,', $_GET['rep'])) { $page->assign('no_list',true); } else { - $page->assign('url', $globals->lists->spool."/polytechnique.org-$liste/$rep/$file"); + $page->assign('url', $globals->lists->spool."/{$globals->mail->domain}-$liste/$rep/$file"); } } else { $archs = Array(); - foreach (glob($globals->lists->spool."/polytechnique.org-$liste/*/*") as $rep) { + foreach (glob($globals->lists->spool."/{$globals->mail->domain}-$liste/*/*") as $rep) { if (preg_match(",/(\d*)/(\d*)$,", $rep, $matches)) { $archs[intval($matches[1])][intval($matches[2])] = true; } diff --git a/htdocs/listes/check.php b/htdocs/listes/check.php index 5a65909..ff60a97 100644 --- a/htdocs/listes/check.php +++ b/htdocs/listes/check.php @@ -24,9 +24,9 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_admin_page('listes/check.tpl'); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if(isset($_POST['correct'])) { $client->check_options($liste, true); } diff --git a/htdocs/listes/delete.php b/htdocs/listes/delete.php index d859f3d..08f7dde 100644 --- a/htdocs/listes/delete.php +++ b/htdocs/listes/delete.php @@ -24,9 +24,9 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_skinned_page('listes/delete.tpl', AUTH_MDP); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if ( isset($_POST['valid']) && ($_POST['valid'] == 'OUI') && $client->delete_list($liste,!empty($_POST['del_archive'])) ) { diff --git a/htdocs/listes/index.php b/htdocs/listes/index.php index cef94f6..3dc18e8 100644 --- a/htdocs/listes/index.php +++ b/htdocs/listes/index.php @@ -21,9 +21,10 @@ require_once("xorg.inc.php"); new_skinned_page('listes/index.tpl', AUTH_MDP); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') + +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); if(isset($_GET['del'])) { $client->unsubscribe($_GET['del']); header('Location: index.php'); diff --git a/htdocs/listes/members.php b/htdocs/listes/members.php index c2f8102..90bd568 100644 --- a/htdocs/listes/members.php +++ b/htdocs/listes/members.php @@ -24,9 +24,10 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_skinned_page('listes/members.tpl', AUTH_COOKIE); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') + +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); if(isset($_GET['del'])) { $client->unsubscribe($liste); header("Location: ?liste=$liste"); diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php index ba3ca55..7813266 100644 --- a/htdocs/listes/moderate.php +++ b/htdocs/listes/moderate.php @@ -22,15 +22,15 @@ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -if(preg_match('!(?:[a-z0-9]+\.)?polytechnique\.org-(.*)!', $liste,$matches)) { +if(preg_match("!(?:[a-z0-9]+\\.)?{$globals->mail->domain}-(.*)!", $liste,$matches)) { header('Location: ?liste='.$matches[1]); } require_once("xorg.inc.php"); new_skinned_page('listes/moderate.tpl', AUTH_MDP); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if(isset($_REQUEST['sadd'])) { $client->handle_request($liste,$_REQUEST['sadd'],4,''); @@ -47,9 +47,9 @@ if(isset($_REQUEST['mid'])) { $mid = $_REQUEST['mid']; require_once('diogenes.hernes.inc.php'); $mailer = new HermesMailer(); - $mailer->addTo("$liste-owner@polytechnique.org"); - $mailer->setFrom("$liste-bounces@polytechnique.org"); - $mailer->addHeader('Reply-To', "$liste-owner@polytechnique.org"); + $mailer->addTo("$liste-owner@{$globals->mail->domain}"); + $mailer->setFrom("$liste-bounces@{$globals->mail->domain}"); + $mailer->addHeader('Reply-To', "$liste-owner@{$globals->mail->domain}"); $mail = $client->get_pending_mail($liste, $mid); @@ -120,7 +120,7 @@ if(isset($_REQUEST['sid'])) { $h = fopen($fname,'r'); $msg = fread($h, filesize($fname)); fclose($h); - $msg = str_replace("%(adminaddr)s","$liste-owner@polytechnique.org", $msg); + $msg = str_replace("%(adminaddr)s","$liste-owner@{$globals->mail->domain}", $msg); $msg = str_replace("%(request)s","<< SUJET DU MAIL >>", $msg); $msg = str_replace("%(reason)s","<< TON EXPLICATION >>", $msg); $msg = str_replace("%(listname)s","$liste", $msg); diff --git a/htdocs/listes/options.php b/htdocs/listes/options.php index 4903ae0..78dd373 100644 --- a/htdocs/listes/options.php +++ b/htdocs/listes/options.php @@ -24,9 +24,9 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_skinned_page('listes/options.tpl', AUTH_MDP); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if(isset($_POST['submit'])) { $values =array_map('stripslashes',$_POST); diff --git a/htdocs/listes/soptions.php b/htdocs/listes/soptions.php index 8401937..a982825 100644 --- a/htdocs/listes/soptions.php +++ b/htdocs/listes/soptions.php @@ -24,9 +24,9 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_admin_page('listes/soptions.tpl'); -require_once('xml-rpc-client.inc.php'); +require_once('lists.inc.php') -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); if(isset($_POST['submit'])) { $values = array_map('stripslashes', $_POST); diff --git a/htdocs/listes/trombi.php b/htdocs/listes/trombi.php index a2ed9a2..94c708d 100644 --- a/htdocs/listes/trombi.php +++ b/htdocs/listes/trombi.php @@ -24,10 +24,11 @@ $liste = strtolower($_REQUEST['liste']); require_once("xorg.inc.php"); new_skinned_page('listes/trombi.tpl', AUTH_COOKIE); -require_once('xml-rpc-client.inc.php'); require_once("trombi.inc.php"); +require_once('lists.inc.php') + +$client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); -$client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); if(isset($_GET['del'])) { $client->unsubscribe($liste); header("Location: ?liste=$liste"); diff --git a/htdocs/login.php b/htdocs/login.php index 90b3efd..26852c2 100644 --- a/htdocs/login.php +++ b/htdocs/login.php @@ -65,7 +65,6 @@ if ($nbAlea > 0) { $publicite = array_chunk( $publicite , $pub_nbLig , true ) ; $page->assign_by_ref('publicite', $publicite); - // affichage des evenements // annonces promos triées par présence d'une limite sur les promos // puis par dates croissantes d'expiration diff --git a/include/conf.d/lists.globals.inc.php b/include/conf.d/lists.globals.inc.php index eda434a..36d1b80 100644 --- a/include/conf.d/lists.globals.inc.php +++ b/include/conf.d/lists.globals.inc.php @@ -24,7 +24,7 @@ class ListsConfig { var $rpchost = 'localhost'; - var $rpcport = 119; + var $rpcport = 4949; var $spool = '/var/spool/platal/archives/'; } diff --git a/include/conf.d/lists.menu.inc.php b/include/conf.d/lists.menu.inc.php new file mode 100644 index 0000000..7e35aef --- /dev/null +++ b/include/conf.d/lists.menu.inc.php @@ -0,0 +1,3 @@ +addPrivateEntry(XOM_SERVICES, 20, 'Listes de diffusion', 'listes/'); +?> diff --git a/include/conf.d/mail.globals.inc.php b/include/conf.d/mail.globals.inc.php new file mode 100644 index 0000000..673eda9 --- /dev/null +++ b/include/conf.d/mail.globals.inc.php @@ -0,0 +1,34 @@ +mail = new MailConfig; + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +?> diff --git a/include/conf.d/tmp.menu.inc.php b/include/conf.d/tmp.menu.inc.php index 9608eca..b486751 100644 --- a/include/conf.d/tmp.menu.inc.php +++ b/include/conf.d/tmp.menu.inc.php @@ -9,7 +9,6 @@ $this->addPrivateEntry(XOM_CUSTOM, 40, 'Mon mot de passe', 'motdepassemd5 $this->addPrivateEntry(XOM_CUSTOM, 50, 'Mes préférences', 'preferences.php'); $this->addPrivateEntry(XOM_SERVICES, 00, 'Envoyer un mail', 'sendmail.php'); -$this->addPrivateEntry(XOM_SERVICES, 20, 'Listes de diffusion', 'listes/'); $this->addPrivateEntry(XOM_SERVICES, 30, 'Envoyer un mail', 'sendmail.php'); $this->addPrivateEntry(XOM_SERVICES, 40, 'Patte cassée', 'pattecassee.php'); diff --git a/include/lists.inc.php b/include/lists.inc.php new file mode 100644 index 0000000..717c0ff --- /dev/null +++ b/include/lists.inc.php @@ -0,0 +1,42 @@ +mail->domain; + $url = "http://$uid:$pass/{$globals->lists->rpchost}:{$globals->lists->rpcport}/$dom"; + $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); + return $client; +} + +// }}} + +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker: +?> diff --git a/include/newsletter.inc.php b/include/newsletter.inc.php index afbdd6b..bb21ea0 100644 --- a/include/newsletter.inc.php +++ b/include/newsletter.inc.php @@ -323,7 +323,7 @@ EOF; $mailer = new HermesMailer(); $mailer->setFrom($globals->newsletter->from); $mailer->setSubject($this->title()); - $mailer->addTo("\"$prenom $nom\" <$login@polytechnique.org>"); + $mailer->addTo("\"$prenom $nom\" <$login@{$globals->mail->domain}>"); if (!empty($globals->newsletter->replyto)) { $mailer->addHeader('Reply-To',$globals->newsletter->replyto); } @@ -481,12 +481,13 @@ function unsubscribe_nl() $globals->db->query("DELETE FROM newsletter_ins WHERE user_id={$_SESSION['uid']}"); } -function subscribe_nl($html=true) +function subscribe_nl($html=true, $uid=-1) { global $globals; + $user = $uid == -1 ? $_SESSION['uid'] : $uid; $format = $html ? 'html' : 'text'; $globals->db->query("REPLACE INTO newsletter_ins (user_id,last,pref) - SELECT {$_SESSION['uid']}, MAX(id), '$format' + SELECT '$user', MAX(id), '$format' FROM newsletter WHERE bits!='new'"); } diff --git a/include/user.func.inc.php b/include/user.func.inc.php index df8905b..e0879fc 100644 --- a/include/user.func.inc.php +++ b/include/user.func.inc.php @@ -59,28 +59,11 @@ function user_clear_all_subs($user_id, $really_del=true) $globals->db->query("delete from user_changes where user_id=$uid"); $globals->db->query("delete from watch_sub where uid=$uid"); - require_once('xml-rpc-client.inc.php'); - $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); - $client->kill($alias, $really_del); -} - -// }}} -// {{{ function inscription_listes_base() - -/** inscrit l'uid donnée à la promo - * @param $uid UID - * @param $promo promo - * @return reponse MySQL - * @see admin/RegisterNewUser.php - * @see step4.php - */ -function inscription_listes_base($uid,$pass,$promo) -{ - require_once('xml-rpc-client.inc.php'); - global $globals; - // récupération de l'id de la liste promo - $client = new xmlrpc_client("http://$uid:$pass@localhost:4949/polytechnique.org"); - $client->subscribe("promo$promo"); + include_once('lists.inc.php'); + if (function_exists(lists_xmlrpc)) { + $client =& lists_xmlrpc($_SESSION['uid'], $_SESSION['password']); + $client->kill($alias, $really_del); + } } // }}} diff --git a/install.d/banana/README b/install.d/banana/README index ae47f89..5c2812c 100644 --- a/install.d/banana/README +++ b/install.d/banana/README @@ -1,5 +1,5 @@ - Notes for the skin module for plat/al + Notes for the banana module for plat/al STATUS diff --git a/install.d/lists/README b/install.d/lists/README new file mode 100644 index 0000000..4c19f67 --- /dev/null +++ b/install.d/lists/README @@ -0,0 +1,42 @@ + + Notes for the lists module for plat/al + + +CONFIG OPTIONS +-------------- + + All settings of the module are shown here with their default and meaning + + [lists] + + rpchost = "localhost" ; the host that runs the xml-rpc + rpcport = 4949 ; the port for the xml-rpc server + + spool = "/var/spool/platal/archives/" + ; the directory that holds mhonarc archives + +MAILMAN CONFIG +-------------- + +add in /etc/mailman/mm_cfg.py + + MYSQL_USER = + MYSQL_PASS = + ADMIN_ML_OWNER = + SENDER_HEADERS = ('X-Org-Mail', 'from', None, 'reply-to', 'sender') + + +BUGS +---- + + http://trackers.polytechnique.org/index.php?cat=15 + + +DEPENDS +------- + + platal, mail + + mailman + + python-mysql + + mhonarc + diff --git a/install.d/lists/files b/install.d/lists/files index 981f4f5..bd652c3 100644 --- a/install.d/lists/files +++ b/install.d/lists/files @@ -1,7 +1,7 @@ -bin/mailman/foreach_template.py -bin/mailman/mailman-rpc.py -bin/mailman/mhonarc_by_month.pl -bin/mailman/mhonarc_pipe.sh +bin/lists.mhonarc_by_month.pl +bin/lists.mhonarc_pipe.sh +bin/lists.rpc.py +hooks/core/lists.inc.php htdocs/admin/lists.php htdocs/images/lists_date.png htdocs/images/lists_firstia.png @@ -24,11 +24,15 @@ htdocs/listes/moderate.php htdocs/listes/options.php htdocs/listes/soptions.php htdocs/listes/trombi.php +include/conf.d/lists.globals.inc.php +include/conf.d/lists.menu.inc.php +include/lists.inc.php include/validations/listes.inc.php templates/admin/lists.tpl templates/include/form.valid.listes.tpl templates/include/form.valid.ml.tpl templates/listes/admin.tpl +templates/listes/archives.head.tpl templates/listes/archives.tpl templates/listes/check.tpl templates/listes/create.tpl diff --git a/install.d/lists/platal.mrc b/install.d/lists/platal.mrc index dfadc57..a887369 100644 --- a/install.d/lists/platal.mrc +++ b/install.d/lists/platal.mrc @@ -490,7 +490,4 @@ date - - - diff --git a/install.d/platal-dev/files b/install.d/platal-dev/files index 49e6db0..c25d87e 100644 --- a/install.d/platal-dev/files +++ b/install.d/platal-dev/files @@ -2,6 +2,7 @@ include/conf.d/README bin/devel/modules_status bin/devel/tplgettext.php +bin/devel/lists.foreach_template.py bin/xhtml/get_classes.pl bin/xhtml/validate.pl diff --git a/templates/confbanana.tpl b/templates/confbanana.tpl index e96ea3d..dbc17b4 100644 --- a/templates/confbanana.tpl +++ b/templates/confbanana.tpl @@ -23,7 +23,7 @@ {dynamic} -{if !$smarty.post} +{if !$smarty.post.action}

Tu peux régler quelques paramètres qui apparaîtront sur les messages lorsque diff --git a/templates/newsletter/index.tpl b/templates/newsletter/index.tpl index ec6c26f..3de8076 100644 --- a/templates/newsletter/index.tpl +++ b/templates/newsletter/index.tpl @@ -22,10 +22,6 @@

Lettre de Polytechnique.org

-

-Tu trouveras ici les archives de la lettre d'information de Polytechnique.org. Pour t'abonner à -cette lettre, il te suffit de te rendre sur la page des listes. -

Pour demander l'ajout d'une annonce dans la prochaine lettre mensuelle, diff --git a/upgrade/0.9.3/update.sh b/upgrade/0.9.3/update.sh index f43b581..bbc7dfc 100755 --- a/upgrade/0.9.3/update.sh +++ b/upgrade/0.9.3/update.sh @@ -20,7 +20,6 @@ done echo "BE CAREFUL : * scripts/ is now essentially in bin/ - (with for this release, the inner path unchanged) --> have to modify crons --> have to modify xml-rpc path in the daemontools -- 2.1.4