| [vhffs-dev] [1879] backported commits 1714, 1715, 1874, 1875, 1876, 1877 to 4.3 branch |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1879
Author: gradator
Date: 2011-07-23 00:35:04 +0200 (Sat, 23 Jul 2011)
Log Message:
-----------
backported commits 1714, 1715, 1874, 1875, 1876, 1877 to 4.3 branch
Modified Paths:
--------------
branches/vhffs-4.3/vhffs-api/src/Vhffs/Conf.pm
branches/vhffs-4.3/vhffs-api/src/Vhffs/Panel/MailingList.pm
branches/vhffs-4.3/vhffs-api/src/Vhffs/Robots/Git.pm
branches/vhffs-4.3/vhffs-contrib/autoreply/patch
branches/vhffs-4.3/vhffs-irc/modobot.pl
branches/vhffs-4.3/vhffs-public/templates/content/group-details.tt
Modified: branches/vhffs-4.3/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- branches/vhffs-4.3/vhffs-api/src/Vhffs/Conf.pm 2011-07-22 22:23:16 UTC (rev 1878)
+++ branches/vhffs-4.3/vhffs-api/src/Vhffs/Conf.pm 2011-07-22 22:35:04 UTC (rev 1879)
@@ -68,6 +68,7 @@
$conf = new Config::General(
-ConfigFile => $filename ,
+ -UTF8 => 1
);
%Config = $conf->getall();
Modified: branches/vhffs-4.3/vhffs-api/src/Vhffs/Panel/MailingList.pm
===================================================================
--- branches/vhffs-4.3/vhffs-api/src/Vhffs/Panel/MailingList.pm 2011-07-22 22:23:16 UTC (rev 1878)
+++ branches/vhffs-4.3/vhffs-api/src/Vhffs/Panel/MailingList.pm 2011-07-22 22:35:04 UTC (rev 1879)
@@ -105,7 +105,7 @@
my ($main, $gid) = @_;
my $dbh = $main->get_db_object;
- my $sql = 'SELECT l.local_part || \'@\' || l.domain AS listname, l.local_part, l.domain, o.description FROM vhffs_ml l INNER JOIN vhffs_object o ON l.object_id = o.object_id WHERE o.owner_gid = ? AND o.state = ?';
+ my $sql = 'SELECT l.local_part || \'@\' || l.domain AS listname, l.local_part, l.domain, l.open_archive, o.description FROM vhffs_ml l INNER JOIN vhffs_object o ON l.object_id = o.object_id WHERE o.owner_gid = ? AND o.state = ?';
return $dbh->selectall_arrayref($sql, { Slice => {} }, $gid, Vhffs::Constants::ACTIVATED);
}
Modified: branches/vhffs-4.3/vhffs-api/src/Vhffs/Robots/Git.pm
===================================================================
--- branches/vhffs-4.3/vhffs-api/src/Vhffs/Robots/Git.pm 2011-07-22 22:23:16 UTC (rev 1878)
+++ branches/vhffs-4.3/vhffs-api/src/Vhffs/Robots/Git.pm 2011-07-22 22:35:04 UTC (rev 1879)
@@ -99,8 +99,8 @@
if( $git->get_ml_name !~ /^\s*$/ ) {
system('cp %VHFFS_BOTS_DIR%/misc/git_post-receive '.$dir.'/hooks/post-receive' );
- system('git-config -f '.$dir.'/config hooks.mailinglist '.$git->{ml_name} );
- system('git-config -f '.$dir.'/config hooks.envelopesender '.$mail_from );
+ system('git config -f '.$dir.'/config hooks.mailinglist '.$git->{ml_name} );
+ system('git config -f '.$dir.'/config hooks.envelopesender '.$mail_from );
}
return 0;
Modified: branches/vhffs-4.3/vhffs-contrib/autoreply/patch
===================================================================
--- branches/vhffs-4.3/vhffs-contrib/autoreply/patch 2011-07-22 22:23:16 UTC (rev 1878)
+++ branches/vhffs-4.3/vhffs-contrib/autoreply/patch 2011-07-22 22:35:04 UTC (rev 1879)
@@ -4,21 +4,21 @@
+++ vhffs-doc/config/exim4-mx1/00_vhffs-main (copie de travail)
@@ -33,5 +33,16 @@
VHFFS_LISTENGINE_UID=www-data
- VHFFS_LISTENGINE_GID=www-data
+ VHFFS_LISTENGINE_GID=www-data
- +# auto reply stuff
- +VHFFS_AUTOREPLY_DOMAINS = ${lookup pgsql{select domain from vhffs_autoreply where local_part = '${quote_pgsql:$local_part}' and domain = '${quote_pgsql:$domain}' and current_date between start and "end"}}
- +VHFFS_AUTOREPLY_TEXT = ${lookup pgsql{select message from vhffs_autoreply where local_part = '${quote_pgsql:$local_part}' and domain = '${quote_pgsql:$domain}'}}
- +VHFFS_AUTOREPLY_SUBJECT = ${lookup pgsql{select subject from vhffs_autoreply where local_part = '${quote_pgsql:$local_part}' and domain = '${quote_pgsql:$domain}'}}
- +
- +# Basedir to store "once" file for autoreply
- +# once files holds addresses for which an autoreply has already been sent
- +# to avoid duplicate.
- +VHFFS_AUTOREPLY_ONCE_HOME = /data/mail/onces
- +VHFFS_AUTOREPLY_ONCE_DIR = VHFFS_AUTOREPLY_ONCE_HOME/${lookup pgsql{SELECT boxes_path FROM vhffs_mxdomain WHERE domain = '${quote_pgsql:$domain}'}}
- +
- # Predefines Macro
- MAIN_LOCAL_DOMAINS=VHFFS_LOCAL_DOMAINS:DEBCONFlocal_domainsDEBCONF
++# auto reply stuff
++VHFFS_AUTOREPLY_DOMAINS = ${lookup pgsql{select domain from vhffs_autoreply where local_part = '${quote_pgsql:$local_part}' and domain = '${quote_pgsql:$domain}' and current_date between start and "end"}}
++VHFFS_AUTOREPLY_TEXT = ${lookup pgsql{select message from vhffs_autoreply where local_part = '${quote_pgsql:$local_part}' and domain = '${quote_pgsql:$domain}'}}
++VHFFS_AUTOREPLY_SUBJECT = ${lookup pgsql{select subject from vhffs_autoreply where local_part = '${quote_pgsql:$local_part}' and domain = '${quote_pgsql:$domain}'}}
++
++# Basedir to store "once" file for autoreply
++# once files holds addresses for which an autoreply has already been sent
++# to avoid duplicate.
++VHFFS_AUTOREPLY_ONCE_HOME = /data/mail/onces
++VHFFS_AUTOREPLY_ONCE_DIR = VHFFS_AUTOREPLY_ONCE_HOME/${lookup pgsql{SELECT boxes_path FROM vhffs_mxdomain WHERE domain = '${quote_pgsql:$domain}'}}
++
+ # Predefines Macro
+ MAIN_LOCAL_DOMAINS=VHFFS_LOCAL_DOMAINS:DEBCONFlocal_domainsDEBCONF
Index: vhffs-backend/src/pgsql/initdb.sql.in
===================================================================
--- vhffs-backend/src/pgsql/initdb.sql.in (révision 1225)
Modified: branches/vhffs-4.3/vhffs-irc/modobot.pl
===================================================================
--- branches/vhffs-4.3/vhffs-irc/modobot.pl 2011-07-22 22:23:16 UTC (rev 1878)
+++ branches/vhffs-4.3/vhffs-irc/modobot.pl 2011-07-22 22:35:04 UTC (rev 1879)
@@ -44,6 +44,7 @@
my $configirc = $vhffs->get_config->get_irc;
my $chan = $configirc->{modobot_channel};
+$chan =~ s/^\\#/#/;
my $conn=$irc->newconn(Nick => $configirc->{modobot_name},
Server => $configirc->{modobot_server},
Modified: branches/vhffs-4.3/vhffs-public/templates/content/group-details.tt
===================================================================
--- branches/vhffs-4.3/vhffs-public/templates/content/group-details.tt 2011-07-22 22:23:16 UTC (rev 1878)
+++ branches/vhffs-4.3/vhffs-public/templates/content/group-details.tt 2011-07-22 22:35:04 UTC (rev 1879)
@@ -99,8 +99,12 @@
<ul class="ml-info">
[% FOREACH list = ml.lists %]
<li>
+[% IF list.open_archive %]
<p><a class="list-archives-link" href="[% ml.archives_url %]/[% list.domain %]/[% list.local_part %]">
[% list.listname | mail %]</a></p>
+[% ELSE %]
+<p>[% list.listname | mail %]</p>
+[% END %]
<p>[% list.description %]</p>
</li>
[% END %]