Commit feed270a authored by IKEDA Soji's avatar IKEDA Soji
Browse files

Issue #263: Error message is missing one parameter

parent 3786e3f1
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2017 The Sympa Community. See the AUTHORS.md file at the top-level # Copyright 2017, 2018 The Sympa Community. See the AUTHORS.md file at the
# directory of this distribution and at # top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>. # <https://github.com/sympa-community/sympa.git>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
...@@ -72,7 +72,7 @@ sub _twist { ...@@ -72,7 +72,7 @@ sub _twist {
if ($list->is_list_member($email)) { if ($list->is_list_member($email)) {
$self->add_stash($request, 'user', 'already_subscriber', $self->add_stash($request, 'user', 'already_subscriber',
{'email' => $email}); {'email' => $email, 'listname' => $list->{'name'}});
$log->syslog('err', $log->syslog('err',
'ADD command rejected; user "%s" already member of list "%s"', 'ADD command rejected; user "%s" already member of list "%s"',
$email, $which); $email, $which);
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2018 The Sympa Community. See the AUTHORS.md file at the
# top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -60,7 +63,7 @@ sub _twist { ...@@ -60,7 +63,7 @@ sub _twist {
if ($list->is_list_member($email)) { if ($list->is_list_member($email)) {
$self->add_stash($request, 'user', 'already_subscriber', $self->add_stash($request, 'user', 'already_subscriber',
{'email' => $email}); {'email' => $email, 'listname' => $list->{'name'}});
$log->syslog( $log->syslog(
'err', 'err',
'INVITE command rejected; user "%s" already member of list "%s"', 'INVITE command rejected; user "%s" already member of list "%s"',
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
# Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
# 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites # 2006, 2007, 2008, 2009, 2010, 2011 Comite Reseau des Universites
# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER # Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017 GIP RENATER
# Copyright 2018 The Sympa Community. See the AUTHORS.md file at the
# top-level directory of this distribution and at
# <https://github.com/sympa-community/sympa.git>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -74,7 +77,7 @@ sub _twist { ...@@ -74,7 +77,7 @@ sub _twist {
my $user_entry = $list->get_list_member($email); my $user_entry = $list->get_list_member($email);
if (defined $user_entry) { if (defined $user_entry) {
$self->add_stash($request, 'user', 'already_subscriber', $self->add_stash($request, 'user', 'already_subscriber',
{'email' => $email}); {'email' => $email, 'listname' => $list->{'name'}});
$log->syslog( $log->syslog(
'err', 'err',
'User %s is subscribed to %s already. Ignoring subscription request', 'User %s is subscribed to %s already. Ignoring subscription request',
......
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