Backport 1766 -> 1768

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1771 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/bin/banana.feedgen.php b/bin/banana.feedgen.php
index b573adf..ddd9c05 100755 (executable)
--- a/bin/banana.feedgen.php
+++ b/bin/banana.feedgen.php
@@ -14,7 +14,7 @@ require_once dirname(__FILE__).'/../include/banana/ml.inc.php';
 Banana::$mbox_helper = $globals->banana->mbox_helper;
 Banana::$spool_root = $globals->banana->spool_root;
 Banana::$nntp_host = "news://{$globals->banana->web_user}:{$globals->banana->web_pass}@{$globals->banana->server}:{$globals->banana->port}/";
-Banana::refreshAllFeeds(array('NNTP', 'MLArchive'));
+Banana::refreshAllFeeds(array('MLArchive'));
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>

diff --git a/configs/platal.cron.in b/configs/platal.cron.in
index 82c815c..ba914ed 100644 (file)
--- a/configs/platal.cron.in
+++ b/configs/platal.cron.in
@@ -19,7 +19,7 @@ WD=/home/web/prod/platal/bin/cron
 0 */3 * * *    web     cd $WD; ./cron_validations.php
 
 # flux rss de banana
-*/5 * * * *     web     cd $WD; ./banana.feedgen.php > /dev/null
+*/5 * * * *     www-data     cd $WD; ./banana.feedgen.php > /dev/null
 
 # AX spammer
 15 * * * *      web     cd $WD; ./axletter.send.php | mail -e -s "envoi d'un mail de l'AX" br@staff.m4x.org

diff --git a/modules/xnetlists.php b/modules/xnetlists.php
index db9710b..8501046 100644 (file)
--- a/modules/xnetlists.php
+++ b/modules/xnetlists.php
@@ -34,6 +34,7 @@ class XnetListsModule extends ListsModule
             '%grp/lists/members'   => $this->make_hook('members',   AUTH_COOKIE),
             '%grp/lists/annu'      => $this->make_hook('annu',      AUTH_COOKIE),
             '%grp/lists/archives'  => $this->make_hook('archives',  AUTH_COOKIE),
+            '%grp/lists/archives/rss' => $this->make_hook('rss',    AUTH_PUBLIC),
 
             '%grp/lists/moderate'  => $this->make_hook('moderate',  AUTH_MDP),
             '%grp/lists/admin'     => $this->make_hook('admin',     AUTH_MDP),

diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 3668108..0a80db0 100644 (file)
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -25,7 +25,7 @@
 {javascript name="jquery"}
 {javascript name="jquery.autocomplete"}
 <script type="text/javascript">// <!-- 
-        var baseurl = "{#globals.baseurl#}/search/";
+        var baseurl = platal_baseurl + "search/";
         {literal}
         // display an autocomplete row : blabla (nb of found matches)
         function make_format_autocomplete(block) {

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 5bd2db1..49c3230 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -41,7 +41,7 @@
     <link rel="stylesheet" type="text/css" href="css/{$css}" />
     {/foreach}
     <script type="text/javascript">
-    var platal_baseurl = "{#globals.baseurl#}/"
+    var platal_baseurl = "{$globals->baseurl}/"
     if (window.top != window)
       document.write('<link rel="stylesheet" type="text/css" href="css/onlycontent.css" media="all"/>');
     </script>