Commit 663af634 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

Merge tag '6.2.68' into issue-1186_rev

parents 74b429b0 f71f5ce9
......@@ -22,8 +22,14 @@ Actual behavior
---------------
<!--- Tell us what happens instead of the expected behavior -->
Steps to reproduce
------------------
<!-- Actual steps that can reproduce the actual behavior -->
<!-- "I opened URL 'aaa', clicked 'bbb' button, ..." and so on -->
Additional information
----------------------
<!--- You may also attach files using "selecting them" link below. -->
<!--- NOTE that you should not include sensitive information! -->
<!-- You may also attach configuration files and/or logs -->
<!-- "selecting or pasting them" link below may be used -->
<!-- NOTE that you should not include sensitive information! -->
on:
push:
branches:
- '*'
tags-ignore:
- '*'
pull_request:
branches:
- '*'
jobs:
make-check:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os:
#- 'macos-latest' # Crypt::OpenSSL::X509 doesn't support openssl@3
- 'ubuntu-latest'
perl:
- '5.34'
- '5.32'
- '5.30'
#- '5.28'
- '5.26'
- '5.24'
#- '5.22'
#- '5.20' # Fails with ubuntu: See below.
#- '5.18'
- '5.16'
name: Perl ${{ matrix.perl }} on ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- name: Install dependencies for Linux
if: runner.os == 'Linux'
run: |
sudo apt update -y
sudo apt install -y gettext
- name: Install dependencies for macOS
if: runner.os == 'macOS'
run: |
brew install automake
#XXX This doesn't work, though I don't know why.
#- name: Workaround for rt.perl.org#116989
# if: runner.os == 'Linux' && matrix.perl == '5.20'
# # For Crypt::OpenSSL::X509
# run: >
# echo PERL_CPANM_OPT=--configure-args="CCFLAGS='-Wno-error=unused-function'"
# >> $GITHUB_ENV
- name: Workaround for macOS
if: runner.os == 'macOS'
# For Crypt::SMIME
run: >
echo "PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig"
>> $GITHUB_ENV
- name: Set up Perl
uses: shogo82148/actions-setup-perl@v1
with:
perl-version: ${{ matrix.perl }}
install-modules-with: cpanm
install-modules-args: >
--verbose --no-interactive
--with-develop
--with-feature=Data::Password --with-feature=ldap
--with-feature=safe-unicode --with-feature=smime
--with-feature=soap --with-feature=sqlite
- name: Run tests
run: |
if [ "$(uname -s)" = "Linux" ]; then
# Workaround to avoid reference to older libcrypto by perl binary
export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
fi
autoreconf -i
./configure --with-defaultdir=`pwd`/default
cd src; make; cd ..
make check-local TEST_FILES='xt/perltidy.t' || true
make check-local
shell: bash
......@@ -36,6 +36,7 @@ Makefile
/src/cgi/*.fcgi
/src/libexec/*.pl
/src/sbin/*.pl
/src/sbin/sympa
/default/list_aliases.tt2
/po/sympa/remove-potcdate.sed
/po/sympa/stamp-po
......@@ -43,6 +44,7 @@ Makefile
/po/web_help/stamp-po
/src/etc/script/sympa
/src/lib/stamp-man3
/src/lib/stamp-man1
/src/lib/Sympa/Constants.pm
/src/lib/Sympa/Internals.pod
/src/libexec/bouncequeue
......
......@@ -36,6 +36,7 @@ check_SCRIPTS = \
t/Message_smime.t \
t/Message_urlize.t \
t/Regexps.t \
t/Request_Handler_add+del.t \
t/Scenario.t \
t/Tools_Data.t \
t/Tools_File.t \
......@@ -111,13 +112,13 @@ MSGFMT=@MSGFMT@
check-local: $(check_DATA)
if test -d t; then \
[ -z "$(TEST_FILES)" ] && TEST_FILES="$(check_SCRIPTS)"; \
PERL5LIB=src/lib; export PERL5LIB; \
PERL5LIB=src/lib:$(PERL5LIB); export PERL5LIB; \
$(PERL) -MTest::Harness -e 'runtests @ARGV' $$TEST_FILES; \
fi
authorcheck:
[ -z "$(TEST_FILES)" ] && TEST_FILES="$(noinst_SCRIPTS)"; \
PERL5LIB=src/lib; export PERL5LIB; \
PERL5LIB=src/lib:$(PERL5LIB); export PERL5LIB; \
$(PERL) -MTest::Harness -e 'runtests @ARGV' $$TEST_FILES
install-data-hook: installdir installconfig nextstep
......@@ -212,7 +213,7 @@ nextstep:
@echo "#"
@echo "# UPGRADING"
@echo "# * Run this script to upgrade your data structures:"
@echo "# $(sbindir)/sympa.pl --upgrade"
@echo "# $(sbindir)/sympa upgrade"
@echo "#######################################################"
uninstall-hook:
......@@ -232,12 +233,16 @@ distcheck-hook:
-sha256sum $(DIST_ARCHIVES) > $(DIST_ARCHIVES).sha256
-openssl sha512 $(DIST_ARCHIVES) > $(DIST_ARCHIVES).sha512
# tidyall --conf-file doc/dot.tidyallrc --root-dir . --recursive src t xt
tidyall:
tidyall --conf-file doc/dot.tidyallrc --root-dir . -r src t xt
@ ( echo 'exit 1 if grep { $$_->error }'; \
echo 'Code::TidyAll->new_from_conf_file('; \
echo ' "doc/dot.tidyallrc", root_dir => ".", recursive => 1'; \
echo ')->process_paths(qw(src xt t))' \
) | $(PERL) -MCode::TidyAll
all-local: sympa.conf-dist
sympa.conf-dist:
@PERL5LIB=$(srcdir)/src/lib; export PERL5LIB; \
$(PERL) mk-sympa-dist.pl
# Change Log
## [6.2.68](https://github.com/sympa-community/sympa/tree/6.2.68) (2022-01-25)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.67b.3...6.2.68)
**Incompatible changes** (from 6.2.66) **:**
- sympa.pl: `--import` option was deprecated. Use `--add` option instead [\#1251](https://github.com/sympa-community/sympa/pull/1251).
**Implemented enhancements:**
- Show list names when purging closed lists [\#1311](Show list names when purging closed lists).
**Fixed bugs:**
- Database: Nested transaction crashes [\#1330](https://github.com/sympa-community/sympa/issues/1330).
- Test: `add` request omits `quiet` option [\#1326](https://github.com/sympa-community/sympa/issues/1326).
- Upgrade: some parameters in list config files may be removed during upgrade from 6.1.x to 6.2.x [\#1321](https://github.com/sympa-community/sympa/issues/1321).
- Improve xgettext.pl [\#1320](https://github.com/sympa-community/sympa/pull/1320).
- WWSympa: Predefined fonts are hard to read comfortably [\#1305](https://github.com/sympa-community/sympa/issues/1305).
- SpamAssassin rejects anonymized messages originally posted by Mozilla [\#1306](https://github.com/sympa-community/sympa/issues/1306).
**Merged pull requests:**
- Migration to the new domain (1) [\#1337](https://github.com/sympa-community/sympa/pull/1337).
- More fixes for \#1286 [\#1319](https://github.com/sympa-community/sympa/pull/1319).
- Update .gitignore [\#1316](https://github.com/sympa-community/sympa/pull/1316).
- Suppress non-fatal warnings in the tests [\#1309](https://github.com/sympa-community/sympa/pull/1309).
## [6.2.67b.3](https://github.com/sympa-community/sympa/tree/6.2.67b.3) (2021-12-20)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.67b.2...6.2.67b.3)
**Incompatible changes:**
- sympa.pl: `--import` option was deprecated. Use `--add` option instead [\#1251](https://github.com/sympa-community/sympa/pull/1251).
**Implemented enhancements:**
- sympa.pl: Now `sympa.pl` has the new name `sympa` and the new command line format [\#1286](https://github.com/sympa-community/sympa/pull/1286). For backward compatibility, The older name and form will also be supported.
- sympa.pl: Adding a new option --add, and expand --add and --del options [\#1251](https://github.com/sympa-community/sympa/pull/1251) [\#1282](https://github.com/sympa-community/sympa/pull/1282) [\#1285](https://github.com/sympa-community/sympa/pull/1285)
**Fixed bugs:**
- Cosmetic problems in Listmaster Admin menu [\#1294](https://github.com/sympa-community/sympa/issues/1294)
- Listmaster Admin's menu entry "Edit Robot Config" missing when in "Skins, CSS and colors" [\#1291](https://github.com/sympa-community/sympa/issues/1291)
- Create a list as copy does not copy all configuration \(template files\) [\#1290](https://github.com/sympa-community/sympa/issues/1290)
- make check: PERL5LIB environment variable was overwritten [\#1299](https://github.com/sympa-community/sympa/pull/1299)
- macOS: t/Tools\_File.t fails. [\#1288](https://github.com/sympa-community/sympa/pull/1288)
**Merged pull requests:**
- Adding the workflow for automated testing [\#1287](https://github.com/sympa-community/sympa/pull/1287) [\#1301](https://github.com/sympa-community/sympa/pull/1301)
## [6.2.67b.2](https://github.com/sympa-community/sympa/tree/6.2.67b.2) (2021-11-26)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.67b.1...6.2.67b.2)
**Implemented enhancements:**
- Build process: Use configured Perl on "make tidyall" [\#1269](https://github.com/sympa-community/sympa/pull/1269)
**Fixed bugs:**
- Config: The warning that `password_hash` parameter should not be changed is obsoleted (see also [\#1277](https://github.com/sympa-community/sympa/issues/1277))
- Included owners won't be removed even if they have been removed from the data source [\#1272](https://github.com/sympa-community/sympa/issues/1272)
- WWSympa: Misleading line folding in the tooltip [\#1262](https://github.com/sympa-community/sympa/issues/1262)
- `footer_type` no longer omits `text/html` parts [\#1271](https://github.com/sympa-community/sympa/pull/1271)
- Fix outdated "intranet" sample in `create_list` schema description. [\#1267](https://github.com/sympa-community/sympa/pull/1267)
- WWSympa: CAS negotiation can be messed via query parameter [\#1255](https://github.com/sympa-community/sympa/pull/1255) [\#1261](https://github.com/sympa-community/sympa/pull/1261)
**Merged pull requests:**
- Cleanup: Avoid using bareword filehandles. And some cleanups [\#1226](https://github.com/sympa-community/sympa/pull/1226)
## [6.2.67b.1](https://github.com/sympa-community/sympa/tree/6.2.67b.1) (2021-10-24)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.66...6.2.67b.1)
**Implemented enhancements:**
- S/MIME: Simplify the method to get email addresses in X.509 certificates [\#1239](https://github.com/sympa-community/sympa/issues/1239)
- Refactoring: Cleanup reporting on web UI [\#1247](https://github.com/sympa-community/sympa/pull/1247)
- sympa.pl: Add del command to remove emails from list [\#911](https://github.com/sympa-community/sympa/pull/911)
**Fixed bugs:**
- MySQL: probe_db() cannot update int fields with MySQL 8.0.17 or later [\#1252](https://github.com/sympa-community/sympa/issues/1252)
- WWSympa: Invalid POST data breaks `sso_login` form for all users [\#1245](https://github.com/sympa-community/sympa/issues/1245)
- Unuseful emails to listmaster. [\#1244](https://github.com/sympa-community/sympa/issues/1244)
- Memory consumption while archive download [\#1235](https://github.com/sympa-community/sympa/issues/1235)
## [6.2.66](https://github.com/sympa-community/sympa/tree/6.2.66) (2021-09-29)
No changes.
## [6.2.65b.2](https://github.com/sympa-community/sympa/tree/6.2.65b.2) (2021-08-30)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.65b.1...6.2.65b.2)
**Implemented enhancements:**
- Add summary of outstanding moderation requests in "My lists" page [\#1194](https://github.com/sympa-community/sympa/issues/1194).
- `edit_list.conf` should not be loaded multiple times to waste memory [\#1172](https://github.com/sympa-community/sympa/pull/1172).
**Fixed bugs:**
- Robot listmasters could edit site templates [\#1224](https://github.com/sympa-community/sympa/issues/1224).
- Make the characters used for e-mail addresses conform to RFC 5322 [\#1217](https://github.com/sympa-community/sympa/issues/1217).
**Merged pull requests:**
- Update cpanfile [\#1231](https://github.com/sympa-community/sympa/pull/1231).
## [6.2.65b.1](https://github.com/sympa-community/sympa/tree/6.2.65b.1) (2021-07-30)
[Full Changelog](https://github.com/sympa-community/sympa/compare/6.2.64...6.2.65b.1)
......
[![Build status](https://travis-ci.org/sympa-community/sympa.svg?branch=sympa-6.2)](https://travis-ci.org/sympa-community/sympa)
[![Build status](https://github.com/sympa-community/sympa/actions/workflows/make-check.yml/badge.svg)](https://github.com/sympa-community/sympa/actions/workflows/make-check.yml)
[![License](https://img.shields.io/github/license/sympa-community/sympa.svg)](COPYING)
[![Latest release](https://img.shields.io/github/release/sympa-community/sympa.svg)](https://github.com/sympa-community/sympa/releases/latest)
[![Latest tag](https://img.shields.io/github/tag/sympa-community/sympa.svg)](https://github.com/sympa-community/sympa/releases)
......
markdown: kramdown
remote_theme: sympa-community/sympa-pages-theme
exclude:
- default/
- doc/
- po/
- src/
- support/
- t/
- www/
- xt/
- "*.in"
- configure.ac
- cpanfile
- etc_README
- Makefile.am
include:
- CONTRIBUTING.md
plugins:
- jekyll-readme-index
......@@ -25,7 +25,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.60)
AC_INIT(sympa, 6.2.65b.1, sympa-developpers@listes.renater.fr)
AC_INIT(sympa, 6.2.68, sympa-developpers@listes.renater.fr)
AM_INIT_AUTOMAKE([foreign -Wall -Werror 1.9 tar-pax])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_PO_SUBDIRS
......
......@@ -5,8 +5,12 @@
# Notation suggested on https://metacpan.org/pod/Carton#PERL-VERSIONS
requires 'perl', '5.16.0';
# This module provides zip/unzip for archive and shared document download/upload
requires 'Archive::Zip', '>= 1.05';
# Used to zip/unzip for archive and shared document download/upload.
# Note: Some environments not providing 'Archive::Zip::Simple*' modules may
# use a memory-consuming module 'Archive::Zip' for the alternative.
requires 'Archive::Zip::SimpleUnzip', '>= 0.024';
requires 'Archive::Zip::SimpleZip', '>= 0.021';
#requires 'Archive::Zip', '>= 1.05';
# Required to run Sympa web interface
requires 'CGI', '>= 3.51';
......@@ -57,6 +61,9 @@ requires 'File::NFSLock';
# Used to create or remove paths
requires 'File::Path', '>= 2.08';
# Used to parse arguments of command line tools
requires 'Getopt::Long', '>= 2.24';
# Note: 'HTML::Entities' >=3.59 is included in HTML-Parser which
# 'HTML::StripScripts::Parser' depends on.
......@@ -204,15 +211,16 @@ feature 'Crypt::Eksblowfish', 'Used to encrypt passwords with the Bcrypt hash al
};
feature 'x509-auth', 'Required to extract user certificates for SSL clients and S/MIME messages.' => sub {
requires 'Crypt::OpenSSL::X509', '>= 1.800.1';
# Note: email() for certificate on versions < 1.909 was broken.
requires 'Crypt::OpenSSL::X509', '>= 1.909';
};
feature 'smime', 'Required to sign, verify, encrypt and decrypt S/MIME messages.' => sub {
requires 'Convert::ASN1';
requires 'Crypt::SMIME', '>= 0.15';
# Required to extract user certificates for SSL clients and S/MIME messages.
# Note: On versions < 1.808, the value() method for extension was broken.
requires 'Crypt::OpenSSL::X509', '>= 1.808';
# Note: value() for extension on versions < 1.808 was broken.
# Note: email() for certificate on versions < 1.909 was broken.
requires 'Crypt::OpenSSL::X509', '>= 1.909';
};
feature 'csv', 'CSV database driver, required if you include list members, owners or moderators from CSV file.' => sub {
......
......@@ -158,6 +158,9 @@ message_hook privileged_owner read
personalization owner,privileged_owner read
default_owner_options owner read
default_editor_options owner read
default privileged_owner write
default owner write
default editor read
......
......@@ -58,4 +58,4 @@ Subject: [%"User guide"|loc|qencode%]
[%|loc%]MODINDEX <list> * Moderation: to view the list of messages to moderate[%END%]
[%END#wrap%][% END %]
[%|loc(conf.version)%]Powered by Sympa %1[%END%][%|loc%]:[%END%] http://www.sympa.org
[%|loc(conf.version)%]Powered by Sympa %1[%END%][%|loc%]:[%END%] https://sympa-community.github.io/
......@@ -368,10 +368,8 @@ Subject: [%"Listmaster: internal server error"|loc(list.name)|qencode%]
[%|loc(who)%] User %1 has encountered an internal server error[%END%]
([%|loc%]Web interface[%END%] - ACTION[%|loc%]:[%END%] [%action%][% IF list.name %] - LIST[%|loc%]:[%END%] [%list.name%]@[%domain%][%END%])[%|loc%]:[%END%]
[%IF error == 'chdir_error' %][%|loc%]Unable to change directory.[%END%]
[%ELSIF error == 'no_authentication_service_name' %][%|loc%]The authentication server name is not defined.[%END%]
[%IF error == 'no_authentication_service_name' %][%|loc%]The authentication server name is not defined.[%END%]
[%ELSIF error == 'auth_conf_no_identified_user' %][%|loc%]auth.conf error: either email_http_header or host/get_email_by_uid_filter entries should be defined.[%END%]
[%ELSIF error == 'unknown_authentication_service' %][%|loc(name)%]Unknown authentication service %1.[%END%]
[%ELSIF error == 'add_user_db_failed' %][%|loc(user)%]Add user '%1' in DB failed.[%END%]
[%ELSIF error == 'update_user_db_failed' %][%|loc(user)%]Update user '%1' in DB failed[%END%][% IF old_email %][%|loc(old_email)%] (old email: %1)[%END%][%END%]
[%ELSIF error == 'add_subscriber_db_failed' %][%|loc(sub)%]Add subscriber '%1' in DB failed.[%END%]
......@@ -395,8 +393,6 @@ Subject: [%"Listmaster: internal server error"|loc(list.name)|qencode%]
[%ELSIF error == 'month_not_found' %][%|loc(month,list.name)%]Unable to find month '%1' for list '%2'[%END%][%IF dir%][%|loc(dir)%]: unable to read '%1'.[%END%][%END%]
[%ELSIF error == 'arc_not_found' %][%|loc(arc_file,list.name,path)%]Unable to find archive '%1' for list '%2'[%END%][%IF path%][%|loc(path)%]: unable to read '%1'.[%END%][%END%]
[%ELSIF error == 'inaccessible_archive' %][%|loc(list.name)%]Unable to find archive for list '%1'[%END%][%IF path%][%|loc(path)%]: unable to read '%1'.[%END%][%END%]
[%ELSIF error == 'may_not_send_me'%][%|loc()%]Unable to send archive: no message id found.[%END%]
[%ELSIF error == 'archive_not_found'%][%|loc(msgid)%]No message found in archives matching Message-ID '%1'.[%END%]
[%ELSIF error == 'cannot_save_config'%][%|loc(list.name)%]Cannot save config file for list '%1'.[%END%]
[%ELSIF error == 'failed_to_install_aliases'%][%|loc%]Failed to install aliases.[%END%]
[%ELSIF error == 'failed_to_remove_aliases'%][%|loc%]Failed to remove aliases.[%END%]
......@@ -416,7 +412,6 @@ Subject: [%"Listmaster: internal server error"|loc(list.name)|qencode%]
[%ELSIF error == 'delete_shared'%][%|loc(list.name)%]Cannot delete shared for list '%1'.[%END%]
[%ELSIF error == 'browse_shared'%][%|loc%]Impossible to browse shared documents for list '%1'.[%END%]
[%ELSIF error == 'cannot_upload'%][%|loc(path)%]Cannot upload file '%1'.[%END%]
[%ELSIF error == 'cannot_unzip' %][%|loc(name)%]Cannot unzip file '%1'.[%END%]
[%ELSIF error == 'error_during_unzip' %][%|loc(name)%]Errors while unzipping file '%1'.[%END%]
[%ELSIF error == 'cannot_send_remind' %][%|loc(from,list.name)%]Unable to send command REMIND from '%1' to list '%2'.[%END%]
[%ELSIF error == 'cannot_send_mail' %][%|loc(from,list.name)%]Unable to send mail from '%1' to list '%2'.[%END%]
......@@ -424,7 +419,6 @@ Subject: [%"Listmaster: internal server error"|loc(list.name)|qencode%]
[%ELSIF error == 'del_sub_request' %][%|loc(sub)%]Unable to delete subscription request for user '%1'.[%END%]
[%ELSIF error == 'add_file_zip' %][%|loc(file)%]Unable to add file '%1' to archives.[%END%]
[%ELSIF error == 'write_file_zip' %][%|loc(zipfile)%]Unable to write zip file '%1'.[%END%]
[%ELSIF error == 'err_404' %][%|loc(zipfile)%]File not found.[%END%]
[%ELSIF error == 'new_document_failed' %][%|loc(path,list.name)%]Unable to create a Shared Document with path '%1' for list '%2'.[%END%]
[%ELSIF error == 'cookie_error' %][%|loc%]Parameter cookie undefined, authentication failure.[%END%]
[%ELSIF error == 'cookie_error_env' %][%|loc(env)%]Cookie error: '%1' undefined, authentication failure.[%END%]
......
......@@ -206,6 +206,9 @@
[%~ ELSIF report_entry == 'action_privileged_owner' ~%]
[%|loc%]This action is restricted to privileged list owners.[%END%]
[%~ ELSIF report_entry == 'action_super_listmaster' ~%]
[%|loc%]This action is restricted to super-listmasters.[%END%]
[%~ ELSIF report_entry == 'edit_right' ~%]
[%|loc(role,right)%]Rights to this action are '%2' for a '%1'.[%END%]
......@@ -233,9 +236,6 @@
[% IF report_entry == '' ~%]
[%~ ELSIF report_entry == 'month_not_found' ~%]
[%|loc(report_param.month)%]Unable to find month '%1'[%END%]
[%~ ELSIF report_entry == 'inaccessible_archive' ~%]
[%|loc(report_param.year_month)%]Archives from %1 are not accessible[%END%]
......@@ -269,9 +269,6 @@
[%~ ELSIF report_entry == 'no_identified_user' ~%]
[%|loc%]Failed to get your email address from the authentication service.[%END%]
[%~ ELSIF report_entry == 'err_404' ~%]
[%|loc(report_param.key)%]File not found.[%END%]
[%~ ELSIF report_entry == 'db_error' ~%]
[%|loc%]Database error.[%END%]
......@@ -287,6 +284,12 @@
[%~ ELSIF report_entry == 'unable_to_rename_list' ~%]
[%|loc(report_param.listname,report_param.new_listname)%]Unable to rename list '%1' to '%2'.[%END%]
[%~ ELSIF report_entry == 'unable_to_add_to_database' ~%]
[%|loc(report_param.email)%]Attempts to add some users in database failed.[%END%]
[%~ ELSIF report_entry == 'unable_to_delete_from_database' ~%]
[%|loc(report_param.email)%]Attempts to delete some users in database failed.[%END%]
[%~ END ~%]
[%############################~%]
......@@ -896,6 +899,30 @@ Warning: this message may already have been sent by one of the list's moderators
[%~ ELSIF report_entry == 'no_classic_session' ~%]
[%|loc()%]You are not authorized to delete your account if you are not using the built-in authentication (i.e. you are using a LDAP authentication, a SSO system, etc.).[%END%]
[%~ ELSIF report_entry == 'unknown_authentication_service' ~%]
[%|loc(report_param.name)%]Unknown authentication service %1.[%END%]
[%~ ELSIF report_entry == 'no_message_id_to_send' ~%]
[%|loc()%]Unable to send archive: no message id found.[%END%]
[%~ ELSIF report_entry == 'no_message_id_to_view' ~%]
[%|loc()%]Unable to view archived message: no message id found.[%END%]
[%~ ELSIF report_entry == 'list_not_configured_for_tracking' ~%]
[%|loc()%]This list is not configured for tracking.[%END%]
[%~ ELSIF report_entry == 'no_message_id_in_archive' ~%]
[%|loc(report_param.msgid)%]No message found in archives matching Message-ID '%1'.[%END%]
[%~ ELSIF report_entry == 'unknown_scenario' ~%]
[%|loc(report_param.msgid)%]Unknown scenario '%1'.[%END%]
[%~ ELSIF report_entry == 'month_not_found' ~%]
[%|loc(report_param.month)%]Unable to find month '%1'[%END%]
[%~ ELSIF report_entry == 'cannot_get_privilege' ~%]
[%|loc()%]You are not allowed to get the privilege of this user.[%END%]
[%~ END ~%]
[%~ END ~%]
......@@ -503,6 +503,11 @@
[% FOREACH l = selected_lists ~%]
<input type="hidden" name="selected_lists" value="[% l %]" />
[%~ END %]
<ul class="styled-list">
[% FOREACH l = selected_lists ~%]
<li>[% l %]</li>
[%~ END %]
</ul>
[%~ ELSIF confirm_action == 'remove_arc' ~%]
<input type="hidden" name="yyyy" value="[% yyyy %]" />
<input type="hidden" name="month" value="[% month %]" />
......
......@@ -49,10 +49,21 @@
<br />
<label for="scope_out">[%|loc%]Scope: [%END%] </label>
<select id="scope_out" name="scope_out">
<option value="site" [% IF scope == 'site' %]selected[% END %]>[%|loc%]site[%END%]</option>
[% UNLESS default_robot %]
<option value="robot" [% IF scope == 'robot' %]selected[% END %]>[%|loc%]robot[%END%]</option>
[%END%]
[% IF is_super_listmaster ~%]
<option value="site"
[%~ IF scope == 'site' %] selected[% END %]>
[%|loc%]site[%END%]
</option>
<option value="robot"
[%~ IF scope == 'robot' %] selected[% END %]>
[%|loc%]robot[%END%]
</option>
[%~ ELSE ~%]
<option value="robot"
[%~ IF scope == 'robot' || scope == 'site' %] selected[% END %]>
[%|loc%]robot[%END%]
</option>
[%~ END %]
<option value="list" [% IF scope == 'list' %]selected[% END %]>[%|loc%]list[%END%]</option>
</select>
<br />
......
This diff is collapsed.
......@@ -17,15 +17,6 @@
</br>
[% END %]
[%###################-%]
[%#### SYSTEM ERROR -%]
[%###################-%]
[% FOREACH s_err = system_errors %]
[%|loc(s_err.action)%]SYSTEM ERROR (%1)[%END-%]
[% IF s_err.msg == 'a' %][% END %]
<br />
[% END %]
[%###################-%]
[%#### USER ERROR -%]
[%###################-%]
......
<!-- footer.tt2 -->
<footer role="contentinfo">
<img src="[% icons_url %]/favicon_sympa.png" alt="[%|loc%]SYMPA logo[%END%]" width="20" height="20"/>
<a href="https://www.sympa.org">[%|loc(version)%]Powered by Sympa %1[%END%]</a>
<a href="https://sympa-community.github.io/">[%|loc(version)%]Powered by Sympa %1[%END%]</a>
</footer>
<!-- end footer.tt2 -->
......@@ -47,7 +47,7 @@
[% PROCESS 'user_menu.tt2' %]
</ul>
</li>
[%~ ELSIF use_passwd || use_sso || authentication_info_url ~%]
[%~ ELSIF use_passwd || sso.size || authentication_info_url ~%]
[% PROCESS 'login_menu.tt2' %]
[%~ END %]
</ul>
......
......@@ -6,7 +6,7 @@
[% ELSE ~%]
<h2>
<i class="fa fa-user"></i>
[% IF use_sso && use_passwd && only_passwd ~%]
[% IF sso.size && use_passwd && only_passwd ~%]
[%|loc%]Login locally[%END%]
[%~ ELSE ~%]
[%|loc%]Login[%END%]
......@@ -17,7 +17,7 @@
[%|loc%]In order to perform a privileged operation (one that requires your email address), you need to login.[%END%]
</p>
[% IF use_sso && !only_passwd ~%]
[% IF sso.size && !only_passwd ~%]
<div class="row">
<div class="columns">
<form id="use-sso" action="[% path_cgi %]" method="post">
......@@ -27,7 +27,7 @@
<input type="hidden" name="list" value="[% list %]" />
<input type="hidden" name="action" value="sso_login" />
<input type="hidden" name="nomenu" value="[% nomenu %]" />
[% IF sso_number == 1 ~%]
[% IF sso.size == 1 ~%]
[% FOREACH server = sso ~%]
<input type="hidden" name="auth_service_name" value="[% server.key %]" />
<button type="submit" name="action_sso_login" value="[% server.value %]">
......@@ -53,9 +53,9 @@
</form>
</div>
</div>
[% END # IF use_sso && !only_passwd ~%]
[% END # IF sso.size && !only_passwd ~%]
[% IF use_passwd && use_sso && !only_passwd ~%]
[% IF use_passwd && sso.size && !only_passwd ~%]
<hr />
<h3>
<i class="fa fa-user"></i> [%|loc%]Login locally[%END%]
......
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