Commit a25c7d56 authored by david.verdin's avatar david.verdin
Browse files

[-feature] Retrieving latest modifications from branch 6.1.


git-svn-id: https://subversion.renater.fr/sympa/trunk@6994 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 0de01f66
No preview for this file type
......@@ -287,6 +287,13 @@ Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server erro
[%|loc%]See logs for more details.[%END%]
[% ELSIF type == 'bounce_intern_error' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server error [%END%][%END%]
[%|loc(error)%]The following error occurred whila managing bounces: %&[%END%]
[%|loc%]See logs for more details.[%END%]
[%# INTERNAL SERVER ERROR : WEB -%]
[% ELSIF type == 'web_intern_error' -%]
Subject: [% FILTER qencode %][%|loc(list.name)%]Listmaster: internal server error [%END%][%END%]
......
......@@ -48,8 +48,9 @@ Thank you for your attention.
[%END%]
[% ELSIF entry == 'message_too_large' -%]
[%|loc(list.name)%]Your message could not be sent because its size
was over the maximum size allowed on this list.[%END%]
[%|loc(msg_size,max_size)%]Your message could not be sent because its size (%1 kB) was over the maximum size (%2 kB) allowed on this list.
Note: Because binary files have to be encoded in less-efficient ASCII format before being sent over email, the final size of an attachment is often significantly larger that the original file.[%END%]
[% ELSIF entry == 'list_unknown' -%]
[%|loc(listname)%]List '%1' does not exist.[%END%]
......
......@@ -22,14 +22,15 @@ msgid ""
msgstr ""
"Project-Id-Version: et\n"
"POT-Creation-Date: 2007-11-13 14:50+0200\n"
"PO-Revision-Date: 2010-10-11 13:45+0200\n"
"Last-Translator: Urmas Buhvestov <urmas@tamme.tartu.ee>\n"
"PO-Revision-Date: 2011-01-21 00:09+0200\n"
"Last-Translator: Urmas <urmas@tamme.tartu.ee>\n"
"Language-Team: Estonian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 1.0.2\n"
"X-Generator: Pootle 2.1.2\n"
#: ../web_tt2/help.tt2:11
msgid "Subscriber, moderator and owner documentation"
......@@ -37,24 +38,24 @@ msgstr "Tellija, moderaatori ja omaniku dokumentatsioon"
#: ../web_tt2/help.tt2:13
msgid "In this documentation, you will find:"
msgstr "Selles dokumendis Te leiate:"
msgstr "Selles dokumendis leiate:"
#. (path_cgi)
#: ../web_tt2/help.tt2:15
msgid ""
"a <a href=\"%1/help/introduction\">general introduction</a> to mailing lists;"
msgstr ""
msgstr " <a href=\"%1/help/introduction\">üldjuhend</a> listidest;"
#. (path_cgi)
#: ../web_tt2/help.tt2:16
msgid "a <a href=\"%1/help/user\">user guide</a> about the use of Sympa;"
msgstr ""
msgstr "Sympa <a href=\"%1/help/user\">kasutajajuhend</a>;"
#. (path_cgi)
#: ../web_tt2/help.tt2:17
msgid ""
"an <a href=\"%1/help/admin\">administrator guide</a> about the use of Sympa."
msgstr ""
msgstr "<a href=\"%1/help/admin\">juhend administraatorile</a>."
#. (path_cgi)
#: ../web_tt2/help.tt2:20
......@@ -63,6 +64,9 @@ msgid ""
"href=\"%1/help/introduction#features\">available features</a> in the mailing "
"list management software Sympa."
msgstr ""
"Kui soovite sooritada mingit kindlat tegevust, siis vaadake kõiki <a href=\"%"
"1/help/introduction#features\">olemasolevaid funktsioone</a> listide "
"haldustarkvaras Sympa."
#. (path_cgi)
#: ../web_tt2/help.tt2:21
......@@ -72,14 +76,18 @@ msgid ""
"to the <a href=\"%1/help/faqadmin\">administrators <acronym title="
"\"Frequently asked questions\">FAQ</acronym></a>."
msgstr ""
"Kui teil tekkib probleeme, siis palun vaadake<a href=\"%1/help/faquser"
"\">kasutajate <acronym title=\"Frequently asked questions\">KKK</acronym></"
"a> või <a href=\"%1/help/faqadmin\">administraatorite <acronym title="
"\"Frequently asked questions\">KKK</acronym></a>."
#: ../web_tt2/help_introduction.tt2:3
msgid "Mailing lists - General introduction"
msgstr ""
msgstr "Listid - Sissejuhatus"
#: ../web_tt2/help_introduction.tt2:5
msgid "What is a mailing list?"
msgstr ""
msgstr "Mis on list?"
#: ../web_tt2/help_introduction.tt2:6
msgid ""
......@@ -90,10 +98,14 @@ msgid ""
"send messages, to reply to them or to read them without contributing (i.e. "
"to \"lurk\")."
msgstr ""
"List on <strong>aadresside loetelu, mis võimaldab grupil tellijatel saada "
"listi saadetud kirju</strong>: iga kiri, mis listi saadetakse läheb kõigile "
"tellijatele. Kui olla listi tellija on võimalik saata kirju, vastata neile, "
"lugeda neid ilma lisavaevata."
#: ../web_tt2/help_introduction.tt2:7
msgid "Special cases:</strong>"
msgstr ""
msgstr "Erijuhud:</strong>"
#: ../web_tt2/help_introduction.tt2:9
msgid ""
......@@ -101,6 +113,8 @@ msgid ""
"subscribed to it. However, you need to be subscribed to a list to receive "
"its messages."
msgstr ""
"Mõnikord on võimalik listi saata kirju ka ilma tellijaks olemata. Aga listi "
"kirjade saamiseks peab olema listi tellija."
#: ../web_tt2/help_introduction.tt2:10
msgid ""
......@@ -109,10 +123,14 @@ msgid ""
"used to transmit information from a unique sender to a large number of "
"recipients."
msgstr ""
"Mõnikord on võimatu saata kirju listi isegi kui olete tellija: see on "
"teadete list, mida kasutatakse info jagamiseks ühelt kindlalt saatjalt "
"paljudele aadressidele."
#: ../web_tt2/help_introduction.tt2:13
#, fuzzy
msgid "Interest of mailing lists"
msgstr ""
msgstr "Listide huvi"
#: ../web_tt2/help_introduction.tt2:14
msgid ""
......@@ -2827,12 +2845,8 @@ msgstr ""
# #-#-#-#-# tmp_web_help_et.po (et) #-#-#-#-#
# nlsref 16,73
#: ../web_tt2/help_editlist.tt2:9
#, fuzzy
msgid "Privilege for adding (ADD command) a subscriber to the list"
msgstr ""
"#-#-#-#-# blank_web_help_et.po (sympa) #-#-#-#-#\n"
"#-#-#-#-# tmp_web_help_et.po (et) #-#-#-#-#\n"
"Kes võib listiga liituda"
msgstr "Õigus tellijate lisamiseks (käsk ADD) listi"
#: ../web_tt2/help_editlist.tt2:11
msgid ""
......
......@@ -5,6 +5,20 @@
-- Table structure for table `conf_table`
--
CREATE TABLE user_table (
email_user text NOT NULL,
gecos_user text,
password_user text,
last_login_date_user integer,
last_login_host_user text,
wrong_login_count_user integer,
cookie_delay_user integer,
lang_user text,
attributes_user text,
data_user text,
PRIMARY KEY (email_user)
);
CREATE TABLE conf_table (
robot_conf text,
label_conf text,
......@@ -62,6 +76,20 @@ CREATE TABLE logs_table (
-- Table structure for table `user_table`
--
CREATE TABLE bulkspool_table (
messagekey_bulkspool varchar(33) NOT NULL,
messageid_bulkspool varchar(100),
message_bulkspool text,
lock_bulkspool integer,
dkim_privatekey_bulkspool varchar(100),
dkim_selector_bulkspool varchar(50),
dkim_d_bulkspool varchar(50),
dkim_i_bulkspool varchar(50),
dkim_header_list_bulkspool varchar(500),
PRIMARY KEY (messagekey_bulkspool)
);
CREATE INDEX bulkspool_idx ON bulkspool_table(messagekey_bulkspool);
CREATE TABLE user_table (
email_user text NOT NULL,
last_login_date_user integer,
......
......@@ -1754,6 +1754,28 @@ sub increment_msg_count {
return 1;
}
# Returns the number of messages sent to the list
sub get_msg_count {
my $self = shift;
do_log('debug3', "Getting the number of messages for list %s",$self->{'name'});
## Be sure the list has been loaded.
my $name = $self->{'name'};
my $file = "$self->{'dir'}/stats";
my $count = 0 ;
if (open(MSG_COUNT, $file)) {
while (<MSG_COUNT>){
if ($_ =~ /^(\d+)\s+(.*)$/) {
$count=$1;
}
}
close MSG_COUNT ;
}
return $count;
}
## last date of distribution message .
sub get_latest_distribution_date {
my $self = shift;
......@@ -3103,7 +3125,7 @@ sub send_file {
return undef;
}
$data->{'sender'} = $who;
$data->{'sender'} ||= $who;
$data->{'list'}{'lang'} = $self->{'admin'}{'lang'};
$data->{'list'}{'name'} = $name;
$data->{'list'}{'domain'} = $data->{'robot_domain'} = $robot;
......@@ -4543,9 +4565,9 @@ sub add_parts {
}
}else {
if ($content_type =~ /^multipart\/alternative/i) {
if ($content_type =~ /^multipart\/alternative/i || $content_type =~ /^multipart\/related/i) {
&do_log('notice', 'Making multipart/alternative into multipart/mixed');
&do_log('notice', 'Making $1 into multipart/mixed');
$msg->make_multipart("mixed",Force=>1);
}
......@@ -5571,7 +5593,7 @@ sub get_first_list_member {
## SORT BY
if ($sortby eq 'domain') {
$statement = sprintf "SELECT user_subscriber \"email\", comment_subscriber \"gecos\", reception_subscriber \"reception\", topics_subscriber \"topics\", visibility_subscriber \"visibility\", bounce_subscriber \"bounce\", bounce_score_subscriber \"bounce_score\",bounce_address_subscriber \"bounce_address\", %s \"date\", %s \"update_date\", subscribed_subscriber \"subscribed\", included_subscriber \"included\", include_sources_subscriber \"id\", custom_attribute_subscriber \"custom_attribute\", substr(user_subscriber,instr(user_subscriber,'\@')+1) \"dom\",suspend_subscriber \"suspend\", suspend_start_date_subscriber \"startdate\", suspend_end_date_subscriber \"enddate\" %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY dom",
$statement = sprintf "SELECT user_subscriber \"email\", comment_subscriber \"gecos\", reception_subscriber \"reception\", topics_subscriber \"topics\", visibility_subscriber \"visibility\", bounce_subscriber \"bounce\", bounce_score_subscriber \"bounce_score\",bounce_address_subscriber \"bounce_address\", %s \"date\", %s \"update_date\", subscribed_subscriber \"subscribed\", included_subscriber \"included\", include_sources_subscriber \"id\", custom_attribute_subscriber \"custom_attribute\", substr(user_subscriber,instr(user_subscriber,'\@')+1) \"dom\",suspend_subscriber \"suspend\", suspend_start_date_subscriber \"startdate\", suspend_end_date_subscriber \"enddate\" %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY \"dom\"",
$date_field,
$update_field,
$additional,
......@@ -5604,7 +5626,7 @@ sub get_first_list_member {
## SORT BY
if ($sortby eq 'domain') {
$statement = sprintf "SELECT user_subscriber \"email\", comment_subscriber \"gecos\", reception_subscriber \"reception\", topics_subscriber \"topics\", visibility_subscriber \"visibility\", bounce_subscriber \"bounce\", bounce_score_subscriber \"bounce_score\", bounce_address_subscriber \"bounce_address\",%s \"date\", %s \"update_date\", subscribed_subscriber \"subscribed\", included_subscriber \"included\", include_sources_subscriber \"id\", custom_attribute_subscriber \"custom_attribute\", substring(user_subscriber,charindex('\@',user_subscriber)+1,100) \"dom\",suspend_subscriber \"suspend\", suspend_start_date_subscriber \"startdate\", suspend_end_date_subscriber \"enddate\" %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY dom",
$statement = sprintf "SELECT user_subscriber \"email\", comment_subscriber \"gecos\", reception_subscriber \"reception\", topics_subscriber \"topics\", visibility_subscriber \"visibility\", bounce_subscriber \"bounce\", bounce_score_subscriber \"bounce_score\", bounce_address_subscriber \"bounce_address\",%s \"date\", %s \"update_date\", subscribed_subscriber \"subscribed\", included_subscriber \"included\", include_sources_subscriber \"id\", custom_attribute_subscriber \"custom_attribute\", substring(user_subscriber,charindex('\@',user_subscriber)+1,100) \"dom\",suspend_subscriber \"suspend\", suspend_start_date_subscriber \"startdate\", suspend_end_date_subscriber \"enddate\" %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY \"dom\"",
$date_field,
$update_field,
$additional,
......@@ -5640,7 +5662,7 @@ sub get_first_list_member {
if ($sortby eq 'domain') {
## Redefine query to set "dom"
$statement = sprintf "SELECT user_subscriber AS email, comment_subscriber AS gecos, reception_subscriber AS reception, topics_subscriber AS topics, visibility_subscriber AS visibility, bounce_subscriber AS bounce, bounce_score_subscriber AS bounce_score, bounce_address_subscriber AS bounce_address, %s AS \"date\", %s AS update_date, subscribed_subscriber AS subscribed, included_subscriber AS included, include_sources_subscriber AS id, custom_attribute_subscriber AS custom_attribute, REVERSE(SUBSTRING(user_subscriber FROM position('\@' IN user_subscriber) FOR 50)) AS dom, suspend_subscriber AS suspend, suspend_start_date_subscriber AS startdate, suspend_end_date_subscriber AS enddate %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s ) ORDER BY dom",
$statement = sprintf "SELECT user_subscriber AS email, comment_subscriber AS gecos, reception_subscriber AS reception, topics_subscriber AS topics, visibility_subscriber AS visibility, bounce_subscriber AS bounce, bounce_score_subscriber AS bounce_score, bounce_address_subscriber AS bounce_address, %s AS \"date\", %s AS update_date, subscribed_subscriber AS subscribed, included_subscriber AS included, include_sources_subscriber AS id, custom_attribute_subscriber AS custom_attribute, REVERSE(SUBSTRING(user_subscriber FROM position('\@' IN user_subscriber) FOR 50)) AS \"dom\", suspend_subscriber AS suspend, suspend_start_date_subscriber AS startdate, suspend_end_date_subscriber AS enddate %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s ) ORDER BY \"dom\"",
$date_field,
$update_field,
$additional,
......@@ -5681,7 +5703,7 @@ sub get_first_list_member {
if ($sortby eq 'domain') {
## Redefine query to set "dom"
$statement = sprintf "SELECT user_subscriber AS email, comment_subscriber AS gecos, reception_subscriber AS reception, visibility_subscriber AS visibility, bounce_subscriber AS bounce, bounce_score_subscriber AS bounce_score, bounce_address_subscriber AS bounce_address, %s AS \"date\", %s AS update_date, subscribed_subscriber AS subscribed, included_subscriber AS included, include_sources_subscriber AS id, custom_attribute_subscriber AS custom_attribute, substr(user_subscriber,0,func_index(user_subscriber,'\@')+1) AS dom, suspend_subscriber AS suspend, suspend_start_date_subscriber AS startdate, suspend_end_date_subscriber AS enddate %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY dom",
$statement = sprintf "SELECT user_subscriber AS email, comment_subscriber AS gecos, reception_subscriber AS reception, visibility_subscriber AS visibility, bounce_subscriber AS bounce, bounce_score_subscriber AS bounce_score, bounce_address_subscriber AS bounce_address, %s AS \"date\", %s AS update_date, subscribed_subscriber AS subscribed, included_subscriber AS included, include_sources_subscriber AS id, custom_attribute_subscriber AS custom_attribute, substr(user_subscriber,0,func_index(user_subscriber,'\@')+1) AS \"dom\", suspend_subscriber AS suspend, suspend_start_date_subscriber AS startdate, suspend_end_date_subscriber AS enddate %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY \"dom\"",
$date_field,
$update_field,
$additional,
......@@ -5722,7 +5744,7 @@ sub get_first_list_member {
if ($sortby eq 'domain') {
## Redefine query to set "dom"
$statement = sprintf "SELECT user_subscriber AS email, comment_subscriber AS gecos, reception_subscriber AS reception, topics_subscriber AS topics, visibility_subscriber AS visibility, bounce_subscriber AS bounce, bounce_score_subscriber AS bounce_score, bounce_address_subscriber AS bounce_address, %s AS \"date\", %s AS update_date, subscribed_subscriber AS subscribed, included_subscriber AS included, include_sources_subscriber AS id, custom_attribute_subscriber AS custom_attribute, SUBSTRING(user_subscriber FROM position('\@' IN user_subscriber) FOR 50) AS dom, suspend_subscriber AS suspend, suspend_start_date_subscriber AS startdate, suspend_end_date_subscriber AS enddate %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY dom",
$statement = sprintf "SELECT user_subscriber AS email, comment_subscriber AS gecos, reception_subscriber AS reception, topics_subscriber AS topics, visibility_subscriber AS visibility, bounce_subscriber AS bounce, bounce_score_subscriber AS bounce_score, bounce_address_subscriber AS bounce_address, %s AS \"date\", %s AS update_date, subscribed_subscriber AS subscribed, included_subscriber AS included, include_sources_subscriber AS id, custom_attribute_subscriber AS custom_attribute, SUBSTRING(user_subscriber FROM position('\@' IN user_subscriber) FOR 50) AS \"dom\", suspend_subscriber AS suspend, suspend_start_date_subscriber AS startdate, suspend_end_date_subscriber AS enddate %s FROM subscriber_table WHERE (list_subscriber = %s AND robot_subscriber = %s) ORDER BY \"dom\"",
$date_field,
$update_field,
$additional,
......@@ -5913,7 +5935,7 @@ sub get_first_list_admin {
## SORT BY
if ($sortby eq 'domain') {
$statement = sprintf "SELECT user_admin \"email\", comment_admin \"gecos\", reception_admin \"reception\", visibility_admin \"visibility\", %s \"date\", %s \"update_date\", info_admin \"info\", profile_admin \"profile\", subscribed_admin \"subscribed\", included_admin \"included\", include_sources_admin \"id\", substr(user_admin,instr(user_admin,'\@')+1) \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s ) ORDER BY dom",
$statement = sprintf "SELECT user_admin \"email\", comment_admin \"gecos\", reception_admin \"reception\", visibility_admin \"visibility\", %s \"date\", %s \"update_date\", info_admin \"info\", profile_admin \"profile\", subscribed_admin \"subscribed\", included_admin \"included\", include_sources_admin \"id\", substr(user_admin,instr(user_admin,'\@')+1) \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s ) ORDER BY \"dom\"",
$date_field,
$update_field,
$dbh->quote($name),
......@@ -5945,7 +5967,7 @@ sub get_first_list_admin {
$dbh->quote($role);
## SORT BY
if ($sortby eq 'domain') {
$statement = sprintf "SELECT user_admin \"email\", comment_admin \"gecos\", reception_admin \"reception\", visibility_admin \"visibility\", %s \"date\", %s \"update_date\", info_admin \"info\", profile_admin \"profile\", subscribed_admin \"subscribed\", included_admin \"included\", include_sources_admin \"id\", substring(user_admin,charindex('\@',user_admin)+1,100) \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s) ORDER BY dom",
$statement = sprintf "SELECT user_admin \"email\", comment_admin \"gecos\", reception_admin \"reception\", visibility_admin \"visibility\", %s \"date\", %s \"update_date\", info_admin \"info\", profile_admin \"profile\", subscribed_admin \"subscribed\", included_admin \"included\", include_sources_admin \"id\", substring(user_admin,charindex('\@',user_admin)+1,100) \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s) ORDER BY \"dom\"",
$date_field,
$update_field,
$dbh->quote($name),
......@@ -5981,7 +6003,7 @@ sub get_first_list_admin {
if ($sortby eq 'domain') {
## Redefine query to set "dom"
$statement = sprintf "SELECT user_admin AS email, comment_admin AS gecos, reception_admin AS reception, visibility_admin AS visibility, %s AS \"date\", %s AS update_date, info_admin AS info, profile_admin AS profile, subscribed_admin AS subscribed, included_admin AS included, include_sources_admin AS id, REVERSE(SUBSTRING(user_admin FROM position('\@' IN user_admin) FOR 50)) AS dom FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s ) ORDER BY dom",
$statement = sprintf "SELECT user_admin AS email, comment_admin AS gecos, reception_admin AS reception, visibility_admin AS visibility, %s AS \"date\", %s AS update_date, info_admin AS info, profile_admin AS profile, subscribed_admin AS subscribed, included_admin AS included, include_sources_admin AS id, REVERSE(SUBSTRING(user_admin FROM position('\@' IN user_admin) FOR 50)) AS \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s ) ORDER BY \"dom\"",
$date_field,
$update_field,
$dbh->quote($name),
......@@ -6022,7 +6044,7 @@ sub get_first_list_admin {
if ($sortby eq 'domain') {
## Redefine query to set "dom"
$statement = sprintf "SELECT user_admin AS email, comment_admin AS gecos, reception_admin AS reception, visibility_admin AS visibility, %s AS \"date\", %s AS update_date, info_admin AS info, profile_admin AS profile, subscribed_admin AS subscribed, included_admin AS included, include_sources_admin AS id, substr(user_admin,func_index(user_admin,'\@')+1,50) AS dom FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s ) ORDER BY dom",
$statement = sprintf "SELECT user_admin AS email, comment_admin AS gecos, reception_admin AS reception, visibility_admin AS visibility, %s AS \"date\", %s AS update_date, info_admin AS info, profile_admin AS profile, subscribed_admin AS subscribed, included_admin AS included, include_sources_admin AS id, substr(user_admin,func_index(user_admin,'\@')+1,50) AS \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s ) ORDER BY \"dom\"",
$date_field,
$update_field,
$dbh->quote($name),
......@@ -6063,7 +6085,7 @@ sub get_first_list_admin {
if ($sortby eq 'domain') {
## Redefine query to set "dom"
$statement = sprintf "SELECT user_admin AS email, comment_admin AS gecos, reception_admin AS reception, visibility_admin AS visibility, %s AS \"date\", %s AS update_date, info_admin AS info, profile_admin AS profile, subscribed_admin AS subscribed, included_admin AS included, include_sources_admin AS id, SUBSTRING(user_admin FROM position('\@' IN user_admin) FOR 50) AS dom FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s) ORDER BY dom",
$statement = sprintf "SELECT user_admin AS email, comment_admin AS gecos, reception_admin AS reception, visibility_admin AS visibility, %s AS \"date\", %s AS update_date, info_admin AS info, profile_admin AS profile, subscribed_admin AS subscribed, included_admin AS included, include_sources_admin AS id, SUBSTRING(user_admin FROM position('\@' IN user_admin) FOR 50) AS \"dom\" FROM admin_table WHERE (list_admin = %s AND robot_admin = %s AND role_admin = %s) ORDER BY \"dom\"",
$date_field,
$update_field,
$dbh->quote($name),
......
......@@ -106,7 +106,7 @@
sub _do_toplevel {
my $topent = shift;
if ($topent->effective_type =~ /^text\/plain$/i) {
if ($topent->effective_type =~ /^text\/plain$/i || $topent->effective_type =~ /^text\/enriched/i) {
_do_text_plain($topent);
}
elsif ($topent->effective_type =~ /^text\/html$/i) {
......@@ -133,7 +133,7 @@
# cycle through each part and process accordingly
foreach $subent ($topent->parts) {
if ($subent->effective_type =~ /^text\/plain$/i) {
if ($subent->effective_type =~ /^text\/plain$/i || $subent->effective_type =~ /^text\/enriched/i) {
_do_text_plain($subent);
}
elsif ($subent->effective_type =~ /^multipart\/related$/i){
......
......@@ -1069,7 +1069,7 @@ sub probe_db {
}
## Change DB types if different and if update_db_types enabled
if ($Conf::Conf{'update_db_field_types'} eq 'auto') {
if ($Conf::Conf{'update_db_field_types'} eq 'auto' && $Conf::Conf{'db_type'} ne 'SQLite') {
unless (&check_db_field_type(effective_format => $real_struct{$t}{$f},
required_format => $db_struct{$Conf::Conf{'db_type'}}{$t}{$f})) {
push @report, sprintf('Field \'%s\' (table \'%s\' ; database \'%s\') does NOT have awaited type (%s). Attempting to change it...',
......
......@@ -948,7 +948,7 @@ sub clone_list_as_empty {
}
}
# copy optional files
foreach my $file ('message.footer','message.header','info') {
foreach my $file ('message.footer','message.header','info','homepage') {
if (-f $list->{'dir'}.'/'.$file) {
unless (&File::Copy::copy ($list->{'dir'}.'/'.$file, $new_dir.'/'.$file)) {
&do_log('err','Admin::clone_list_as_empty : failed to copy %s : %s',$new_dir.'/'.$file, $!);
......
......@@ -1859,7 +1859,7 @@ sub DoMessage{
if ($max_size && $message->{'size'} > $max_size) {
&do_log('info', 'sympa::DoMessage(): Message for %s from %s rejected because too large (%d > %d)', $listname, $sender, $message->{'size'}, $max_size);
&report::reject_report_msg('user','message_too_large',$sender,{'message' => $message},$robot,$msg_string,$list);
&report::reject_report_msg('user','message_too_large',$sender,{'msg_size' => int($message->{'size'} / 1024),'max_size' => int($max_size / 1024)},$robot,'',$list);
&Log::db_log({'robot' => $robot,'list' => $list->{'name'},'action' => 'DoMessage','parameters' => "$which,$messageid,$robot",'target_email' => '','msg_id' => $messageid,'status' => 'error','error_type' => 'message_too_large','user_email' => $sender,'client' => $ip,'daemon' => $daemon_name});
return undef;
}
......
<!-- $Id$ -->
<div class="block">
<form action="[% path_cgi %]" method="post">
<fieldset>
<h3 class="block">[%|loc%]Subscriber information[%END%]</h3>
......@@ -78,4 +78,5 @@ END %]
[% END %]
</fieldset>
</form>
</div>
<!-- end editsubscriber.tt2 -->
......@@ -7,6 +7,12 @@
<th><strong>[%|loc%]Most recent message[%END%]</strong></th>
<th><strong>[%|loc%]Listname[%END%]</strong></th>
<th><strong>[%|loc%]Subject[%END%]</strong></th>
<th><strong>[%|loc%]Number of subscribers[%END%]</strong></th>
<th><strong>[%|loc%]Number of messages[%END%]</strong></th>
<th><strong>[%|loc%]Send scenario[%END%]</strong></th>
<th><strong>[%|loc%]Creator[%END%]</strong></th>
<th><strong>[%|loc%]Owners[%END%]</strong></th>
<th><strong>[%|loc%]Editors[%END%]</strong></th>
</tr>
[% FOREACH list = inactive_lists %]
......@@ -25,9 +31,15 @@
</td>
<td><a href="[% path_cgi %]/admin/[% list.name %]">[% list.name %]</a></td>
<td>[% list.subject %]</td>
<td>[% list.subscribers_count %]</td>
<td>[% list.msg_count %]</td>
<td>[% list.send_scenario %]</td>
<td>[% list.creator %]</td>
<td>[% list.owners %]</td>
<td>[% list.editors %]</td>
</tr>
[% END %]
</table>
</div>
<!-- end get_inactive_lists.tt2 -->
\ No newline at end of file
<!-- end get_inactive_lists.tt2 -->
......@@ -450,12 +450,13 @@ sub list_sessions {
sub get_session_cookie {
my $http_cookie = shift;
my %cookies = parse CGI::Cookie($http_cookie);
foreach (keys %cookies) {
my $cookie = $cookies{$_};
next unless ($cookie->name eq 'sympa_session');
return ($cookie->value);
if ($http_cookie =~/\S+/g) {
my %cookies = parse CGI::Cookie($http_cookie);
foreach (keys %cookies) {
my $cookie = $cookies{$_};
next unless ($cookie->name eq 'sympa_session');
return ($cookie->value);
}
}
return (undef);
......
......@@ -743,8 +743,8 @@ while (!$end) {
## Bounce directory
if (! -d $bounce_dir) {
unless (mkdir $bounce_dir, 0777) {
&List::send_notify_to_listmaster('intern_error',$Conf{'domain'},{'error' => "Failed to list create bounce directory $bounce_dir"});
&do_log('err', 'Could not create %s: %s bounced die, check bounce_path in wwsympa.conf', $bounce_dir, $!);
&List::send_notify_to_listmaster('bounce_intern_error',$Conf{'domain'},{'error' => "Failed to list create bounce directory $bounce_dir"});
&do_log('err', 'Could not create %s: %s bounced dir, check bounce_path in wwsympa.conf', $bounce_dir, $!);
exit;
}
}
......
......@@ -146,16 +146,14 @@ sub generic_get_cookie {
my $http_cookie = shift;
my $cookie_name = shift;
my %cookies = parse CGI::Cookie($http_cookie);
foreach (keys %cookies) {
my $cookie = $cookies{$_};
next unless ($cookie->name eq $cookie_name);
return ($cookie->value);
if ($http_cookie =~/\S+/g) {
my %cookies = parse CGI::Cookie($http_cookie);
foreach (keys %cookies) {
my $cookie = $cookies{$_};
next unless ($cookie->name eq $cookie_name);
return ($cookie->value);
}
}
return (undef);
}
......
......@@ -4637,7 +4637,7 @@ sub do_pref {
'status' => 'success',
});
 
return $in{'previous_action'} || 'suboptions';
return $in{'previous_action'} || 'info';
}
 
......@@ -5247,7 +5247,8 @@ sub do_auto_signoff {
 
my $ticket = &Auth::create_one_time_ticket($in{'email'},$robot,'signoff/'.$list->{'name'},$ip);
my $tt2_param = {'type' => 'ticket_to_signoff',
my $tt2_param = {'type' => 'ticket_to_signoff',
'list' => $list,
'one_time_ticket' => $ticket,
'email' => $in{'email'}};
unless (&List::send_global_file('user_notification', $in{'email'}, $robot, $tt2_param)) {
......@@ -8237,13 +8238,20 @@ sub do_get_inactive_lists {
}
 
 
push @unordered_lists, {'name' => $list->{'name'},
'subject' => $list->{'admin'}{'subject'},
'last_message_epoch' => $last_message,
'last_message_date' => (gettext_strftime "%d %b %Y", localtime($last_message*86400)),
'creation_date_epoch' => $list->{'admin'}{'creation'}{'date_epoch'},
'creation_date' => (gettext_strftime "%d %b %Y", localtime($list->{'admin'}{'creation'}{'date_epoch'})),
};
push @unordered_lists, {
'name' => $list->{'name'},
'creator' =>$list->{'admin'}{'creation'}{'email'},
'send_scenario' =>$list->{'admin'}{'send'}{'name'},
'owners' => join(", ", map {$_->{'email'}} @{$list->{'admin'}{'owner'}}),
'editors' => join(", ", map {$_->{'email'}} @{$list->{'admin'}{'editor'}}),
'subscribers_count' => $list->get_total('nocache'),
'subject' => $list->{'admin'}{'subject'},
'msg_count' => $list->get_msg_count(),
'last_message_epoch' => $last_message,
'last_message_date' => (gettext_strftime "%d %b %Y", localtime($last_message*86400)),
'creation_date_epoch' => $list->{'admin'}{'creation'}{'date_epoch'},
'creation_date' => (gettext_strftime "%d %b %Y", localtime($list->{'admin'}{'creation'}{'date_epoch'})),
};
}
 
foreach my $l (sort {$a->{'last_message_epoch'} <=> $b->{'last_message_epoch'}} @unordered_lists) {
......@@ -8537,7 +8545,7 @@ Creates a list using a list template
 
## create liste
if (my $testlist = new List($in{'listname'},$robot)){
&report::reject_report_web('user','create_list : requested list '.$in{'listname'}.' already exist',{},$param->{'action'},'',$param->{'user'}{'email'},$robot);
&report::reject_report_web('user','list_already_exists',{'new_listname'=> $in{'listname'}},$param->{'action'},'',$param->{'user'}{'email'},$robot);
&wwslog('info','do_create_list: requested list %s already exist (from %s)',$in{'listname'},$param->{'user'}{'email'});
&web_db_log({'parameters' => $in{'listname'},
'list' => $in{'listname'},
......@@ -8988,7 +8996,7 @@ sub do_home {
$param->{'prev_page'} = $param->{'page'} - 1;
}
 
$param->{'size'} = $in{'size'};
$param->{'size'} = $size;
 
return 1;
}
......@@ -10070,12 +10078,17 @@ sub _prepare_edit_form {
}
}elsif ($pname eq 'digest') {
foreach my $v (@{$p->{'value'}}) {
next unless ($v->{'name'} eq 'days');
foreach my $day (keys %{$v->{'value'}}) {
$v->{'value'}{$day}{'title'} = gettext_strftime "%A", gmtime(0 + ($day +3) * (3600 * 24));
}
}
next unless ($v->{'name'} eq 'days');
if (ref($v->{'value'}) eq 'ARRAY'){
&tools::do_log('debug2','Empty digest parameter. Putting a dummy value.');
$v->{'value'} = undef;
$v->{'type'} = 'enum';
}else{
foreach my $day (keys %{$v->{'value'}}) {
$v->{'value'}{$day}{'title'} = gettext_strftime "%A", gmtime(0 + ($day +3) * (3600 * 24));
}
}
}
}elsif ($pname eq 'lang') {
my $saved_lang = &Language::GetLang();
......@@ -10454,6 +10467,11 @@ sub do_copy_list {
sub do_rename_list {
my $mode = shift;
 
if ($in{'new_listname'} =~ /[A-Z]/) {
$in{'new_listname'} = lc($in{'new_listname'});
&report::notice_report_web('listname_lowercased',{},$param->{'action'});
}
&wwslog('info', 'do_rename_list(%s,%s, mode = %s)', $in{'new_listname'}, $in{'new_robot'},$mode);
 
my $result = &admin::rename_list(list => $list,
......
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