Commit 132c9287 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

More fixes.

parent ffe9510d
......@@ -16,10 +16,45 @@
[% IF subaction == 'vhosts' %]
<h2>[%|loc%]Virtual Robots[%END%]</h2> <br />
[% IF robots %]
[%|loc%]The following virtual robots are running on this server:[%END%]
<ul>
[% FOREACH vr = robots %]<li><a href="[% vr.value.wwsympa_url %]/serveradmin">[% vr.key %]</a> - <i>[%|loc%]Sympa URL:[%END%]</i> <b>[% vr.value.wwsympa_url %]</b> - <i>[%|loc%]Mail domain:[%END%]</i> <b>[% vr.key %]</b> - <i>[%|loc%]Listmaster(s):[%END%]</i> <b>[% FOREACH admin = vr.value.listmaster %][% admin %] [% END %]</b></li>[% END %]
</ul>
<p>
[%|loc%]The following virtual robots are running on this server:[%END%]
</p>
[% FOREACH vr = robots %]
<h4>
[% IF vr.value.wwsympa_url ~%]
<a href="[% vr.value.wwsympa_url %]/serveradmin">
[% vr.value.title || vr.key %]
</a>
[%~ ELSE ~%]
[% vr.value.title || vr.key %]
[%~ END %]
</h4>
<ul>
<li>
<i>[%|loc%]Mail domain:[%END%]</i>
<b>[% vr.key %]</b>
</li>
[% IF vr.value.wwsympa_url ~%]
<li>
<i>[%|loc%]Sympa URL:[%END%]</i>
<b>[% vr.value.wwsympa_url %]</b>
</li>
[%~ END %]
<li>
<i>[%|loc%]Listmaster(s):[%END%]</i>
[% FOREACH admin = vr.value.listmasters ~%]
[% UNLESS loop.first ~%]
[% UNLESS loop.last ~%]
[%|loc%], [%END%]
[%~ ELSE ~%]
[%|loc%], and [%END%]
[%~ END %]
[%~ END ~%]
<b>[% admin %]</b>
[%~ END %]
</li>
</ul>
[% END %]
[% ELSE %]
<p>[%|loc%]No Virtual Robot defined on this server[%END%]</p>
[% END %]
......
......@@ -16989,8 +16989,11 @@ sub get_server_details {
my $r = $_;
( $r => {
(host => $r), # Compat.<6.2.32
( listmasters =>
[Sympa::get_listmasters_email($r)]
),
map { ($_ => Conf::get_robot_conf($r, $_)) }
qw(listmaster wwsympa_url)
qw(listmaster title wwsympa_url)
}
)
} @robots
......
......@@ -1971,8 +1971,8 @@ sub _infer_robot_parameter_values {
if not defined $param->{'config_hash'}{'domain'}
and defined $param->{'config_hash'}{'host'};
$param->{'config_hash'}{'wwsympa_url'} ||= sprintf 'http://%s/sympa',
$param->{'config_hash'}{'domain'};
#XXX$param->{'config_hash'}{'wwsympa_url'} ||= sprintf 'http://%s/sympa',
#XXX $param->{'config_hash'}{'domain'};
$param->{'config_hash'}{'static_content_url'} ||=
$Conf{'static_content_url'};
......
......@@ -501,7 +501,7 @@ sub html_store {
$yyyy,
$mm,
Conf::get_robot_conf($list->{'domain'}, 'arc_path'),
Conf::get_robot_conf($list->{'domain'}, 'wwsympa_url'),
(Conf::get_robot_conf($list->{'domain'}, 'wwsympa_url') || ''),
$tag
),
'-umask' => $Conf::Conf{'umask'}
......@@ -669,7 +669,7 @@ sub html_rebuild {
$yyyy,
$mm,
Conf::get_robot_conf($robot_id, 'arc_path'),
Conf::get_robot_conf($robot_id, 'wwsympa_url'),
(Conf::get_robot_conf($robot_id, 'wwsympa_url') || ''),
$tag
),
'-umask' => $Conf::Conf{'umask'},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment