Commit 2dddabf5 authored by david.verdin's avatar david.verdin
Browse files

[-bug] Retrieving bug fixes from 6.0 branch.


git-svn-id: https://subversion.renater.fr/sympa/trunk@6297 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent da5f5222
......@@ -411,7 +411,6 @@ AC_ARG_WITH(
)
AC_SUBST(VIRTUAL_ALIASES)
NEWALIASES=/usr/bin/newaliases
AC_ARG_WITH(
[newaliases],
AS_HELP_STRING(
......@@ -420,6 +419,26 @@ AC_ARG_WITH(
),
[NEWALIASES="$withval"]
)
if test -n "$NEWALIASES"; then
# user-supplied value
AC_MSG_CHECKING([user-supplied newaliases command])
if test -f "$NEWALIASES"; then
:
else
AC_MSG_RESULT([non-existing])
AC_MSG_ERROR([invalid value $NEWALIASES for newaliases command])
fi
if test -x "$NEWALIASES"; then
:
else
AC_MSG_RESULT([non-executable])
AC_MSG_ERROR([invalid value $NEWALIASES for newaliases command])
fi
AC_MSG_RESULT([$NEWALIASES])
else
# default value
NEWALIASES=/usr/bin/newaliases
fi
AC_SUBST(NEWALIASES)
NEWALIASES_ARG=
......@@ -433,7 +452,6 @@ AC_ARG_WITH(
)
AC_SUBST(NEWALIASES_ARG)
POSTMAP=/usr/sbin/postmap
AC_ARG_WITH(
[postmap],
AS_HELP_STRING(
......@@ -442,6 +460,26 @@ AC_ARG_WITH(
),
[POSTMAP="$withval"]
)
if test -n "$POSTMAP"; then
# user-supplied value
AC_MSG_CHECKING([user-supplied postmap command])
if test -f "$POSTMAP"; then
:
else
AC_MSG_RESULT([non-existing])
AC_MSG_ERROR([invalid value $POSTMAP for postmap command])
fi
if test -x "$POSTMAP"; then
:
else
AC_MSG_RESULT([non-executable])
AC_MSG_ERROR([invalid value $POSTMAP for postmap command])
fi
AC_MSG_RESULT([$POSTMAP])
else
# default value
POSTMAP=/usr/sbin/postmap
fi
AC_SUBST(POSTMAP)
POSTMAP_ARG=${VIRTUAL_ALIASES}
......
......@@ -67,9 +67,9 @@ pending subscription requests you should click on the following link:[%END%]
[% conf.wwsympa_url %]/ticket/[% one_time_ticket %]
[%|loc(replyto,keyauth,list.name,who,gecos)%]If prefered, you can accept this subscription request sending an email to %1 with the following subject:
AUTH %2 ADD %3 %4 %5
[%END%]
[%|loc(replyto)%]If prefered, you can accept this subscription request sending an email to %1 with the following subject:[%END%]
AUTH [%keyauth%] ADD [%list.name%] [%who%] [%gecos%]
[%|loc%]That can be done using this mailto link:[%END%][% FILTER escape_url %]mailto:[%replyto%]?subject=auth [%keyauth%] ADD [%list.name%] [%escaped_who%] [%escaped_gecos%][% END %]
......@@ -90,20 +90,20 @@ with you, you should click on the following link:[% END %]
[% FILTER escape_url %]mailto:[%sympa%]?subject=auth [%keyauth%] DEL [%list.name%] [%escaped_who%][% END %]
[%|loc(sympa,keyauth,list.name,who)-%]
[%|loc(sympa)-%]
or send an email to %1 with the following subject:
AUTH %2 DEL %3 %4
[%END%]
AUTH [%keyauth%] DEL [%list.name%] [%who%]
[% ELSIF type == 'bounce_rate' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]WARNING: bounce rate too high in list %1[%END%][%END%]
[%|loc(list.name,rate,conf.wwsympa_url,list.name)%]Bounce rate in list %1 is %2.
[%|loc(list.name,rate)%]Bounce rate in list %1 is %2.
You should delete bouncing subscribers:
%3/reviewbouncing/%4
[%END%]
[% conf.wwsympa_url %]/reviewbouncing/[% list.name %]
[% ELSIF type == 'notice' -%]
......
......@@ -15,9 +15,9 @@ Content-Disposition: inline
[% FILTER escape_url %]mailto:[%conf.sympa%]?subject=CONFIRM [%authkey%][% END %]
[%|loc(conf.sympa,authkey)%]Or send a message to %1 with the following subject:
CONFIRM %2
[%|loc(conf.sympa)%]Or send a message to %1 with the following subject:
[% END %]
CONFIRM [% authkey %]
[%- END -%]
--[% boundary %]
......
......@@ -25,7 +25,7 @@ use lib '--modulesdir--';
use wwslib;
use Conf;
use Language;
require "tt2.pl";
use tt2;
use Sympa::Constants;
$wwsympa_conf_file = Sympa::Constants::WWSCONFIG;
......
......@@ -33,4 +33,4 @@ Sympa/Constants.pm: Sympa/Constants.pm.in Makefile
-e 's|--staticdir--|$(staticdir)|' \
-e 's|--arcdir--|$(arcdir)|' \
-e 's|--bouncedir--|$(bouncedir)|' \
< $< > $@
< $(srcdir)/$@.in > $@
......@@ -60,7 +60,7 @@
<input type="hidden" name="list" value="[% list %]"/>
<input type="hidden" name="d_admin" value="create"/>
[% ELSIF shared == 'exist' %]
<input class="MainMenuLinks" type="submit" name="action_d_admin" value="[%|loc%]Delete Shared[%END%]" onClick="return request_confirm('[% FILTER escape_quote %][%|loc%]Are you sure you wish to delete the shared documents?[%END%][%END%]');"/> [%|loc%]Closes the shared document web space. It can be restored using "Restore shared" button.[%END%]</li>
<input class="MainMenuLinks" type="submit" name="action_d_admin" value="[%|loc%]Delete Shared[%END%]" onClick="return request_confirm('[% FILTER escape_quote %][%|loc(listname)%]Are you sure you wish to delete the shared documents for list %1?[%END%][%END%]');"/> [%|loc%]Closes the shared document web space. It can be restored using "Restore shared" button.[%END%]</li>
<input type="hidden" name="list" value="[% list %]"/>
<input type="hidden" name="d_admin" value="delete"/>
[% ELSIF shared == 'deleted' %]
......
......@@ -9,7 +9,7 @@
<li class="menuLinks"><span class="bg_color_error">[%|loc%]List not yet activated[%END%]</span></li>
[% END %]
<li class="menuLinks">[%|loc%]Subscribers:[%END%] [% total %]</li>
<li class="menuLinks">[% IF is_priv %]<span>([%|loc%]Error rate:&nbsp;[%END%][% bounce_rate %] %)</span>[% END %]</li>
<li class="menuLinks">[% IF is_priv %]<span>([%|loc%]Error rate:[%END%][% bounce_rate %]&nbsp;%)</span>[% END %]</li>
<li class="menuLinks">[%|loc%]Owners[%END%]</li>
[% FOREACH o = owner %]
[% IF o.value.visibility != 'conceal' %]
......
......@@ -10,15 +10,15 @@
</fieldset>
</form>
[%END%]
[% IF is_listmaster %][%|loc%][Listmaster][%END%]
[% ELSIF is_privileged_owner %][%|loc%][Privileged owner][%END%]
[% ELSIF is_owner %][%|loc%][Owner][%END%]
[% ELSIF is_editor %][%|loc%][Editor][%END%]
[% ELSIF is_subscriber %][%|loc%][Subscriber][%END%]
[% IF is_listmaster %][[%|loc%]Listmaster[%END%]]
[% ELSIF is_privileged_owner %][[%|loc%]Privileged owner[%END%]]
[% ELSIF is_owner %][[%|loc%]Owner[%END%]]
[% ELSIF is_editor %][[%|loc%]Editor[%END%]]
[% ELSIF is_subscriber %][[%|loc%]Subscriber[%END%]]
[% END %]
<br />
[% IF last_login_date %]
<span>[%|loc(last_login_host,last_login_date)%]last login from %1 &nbsp;&nbsp; (%2)</span>[%END%]
<span>[%|loc(last_login_host)%]last login from %1[%END%] &nbsp;&nbsp; ([% last_login_date %])</span>
[%END%]
</div>
......
......@@ -15,7 +15,7 @@
<input class="MainMenuLinks" type="submit" name="action_sso_login" value="[% server.value %]" />
[% END %]
[% ELSE %]
<label for="auth_service_name">[%|loc%]To login, select your organization authentication server below:&nbsp;&nbsp;&nbsp;&nbsp;[%END%]</label>
<label for="auth_service_name">[%|loc%]To login, select your organization authentication server below:[%END%]&nbsp;&nbsp;&nbsp;&nbsp;</label>
<select id="auth_service_name" name="auth_service_name" onchange="this.form.submit();">
[% FOREACH server = sso %]
<option value="[% server.key %]">[% server.value %]</option>
......
......@@ -38,10 +38,10 @@
[%|loc%]If you are not using css_path and css_url parameters, colors are defined in the robot.conf configuration file. Otherwise, colors are defined in the static CSS. Colors can be changed on your current session using the following color editor. When finished, you may copy the result a new CCS static file. The target is specified by css_path parameter.[%END%]
[% IF css_path %]([% css_path %])[% END %]
[%|loc%]
Be careful: the CSS file is overwritten using css.tt2 template, usually this file is comming from Sympa distribution so your CSS customization may be erased when doing this.
Be careful: the CSS file is overwritten using css.tt2 template, usually this file is comming from Sympa distribution so your CSS customization may be erased when doing this.[% END %]
</p>
<p>
Use the color editor in order to change defined colors. First select the color you want to change and pick a color,then apply it using the test button. The new color is not really installed but it is used only for your own session. When happy with the different colors you choosen, you may save them in a new static CSS.
[%|loc%]Use the color editor in order to change defined colors. First select the color you want to change and pick a color,then apply it using the test button. The new color is not really installed but it is used only for your own session. When happy with the different colors you choosen, you may save them in a new static CSS.
[%END%]
</p>
......@@ -73,7 +73,7 @@ Use the color editor in order to change defined colors. First select the color y
<h3>[%|loc%]Color chart[%END%]</h3>
<p>Please note that these indications don't cover the exact usage of each color parameter, as it would be far too long to describe. What lies in this table should however give you a correct snapshot of what the color parameters are used for. For more details on rendering, feel free to try changing the colors in your session to see how well all that works.</p>
<p>[%|loc%]Please note that these indications don't cover the exact usage of each color parameter, as it would be far too long to describe. What lies in this table should however give you a correct snapshot of what the color parameters are used for. For more details on rendering, feel free to try changing the colors in your session to see how well all that works.[%END%]</p>
<table summary="[%|loc%]This table display every colors used in Sympa, with their hexadecimal code [%END%]" id="color_table">
<tr id="color_table_title">
......@@ -134,7 +134,7 @@ Use the color editor in order to change defined colors. First select the color y
<td>color_8</td>
<td>[% color_8 %]</td>
<td style="background-color: [% color_8 %];cursor: pointer ;" onclick="chooseColorNumber('color_8')" align="center">&nbsp;</td>
<td>[%|loc%]font and border color of:[%END%]<UL><LI>[%|loc%]hovered hyperlinks;[%END%]</LI><LI>[%|loc%]navigation tabs;[%END%]</LI><LI>[%|loc%]buttons;[%END%]</LI></UL>[%|loc%]background color of hovered buttons.[%END%]</td>
<td>[%|loc%]font and border color of:[%END%]<UL><LI>[%|loc%]hovered links;[%END%]</LI><LI>[%|loc%]navigation tabs;[%END%]</LI><LI>[%|loc%]buttons;[%END%]</LI></UL>[%|loc%]background color of hovered buttons.[%END%]</td>
</tr>
<tr>
<td>color_9</td>
......
Supports Markdown
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