Commit b33eaffc authored by sikeda's avatar sikeda
Browse files

[-dev] Correct spelling in sources.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@9002 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 5eedd9e8
......@@ -42,7 +42,7 @@ use Robot;
unless (Site->load('no_db' => 1)) {
printf STDERR
"Unable to load sympa configuration, file %s or any of the virtual host robot.conf files contain errors. Exiting.\n",
"Unable to load Sympa configuration, file %s or any of the virtual host robot.conf files contain errors. Exiting.\n",
Conf::get_sympa_conf();
exit 1;
}
......
......@@ -78,7 +78,7 @@ $main::options{'log_to_stderr'} = 1 if ($main::options{'debug'} || $main::option
# Load sympa.conf
unless (Robot::get_robots()) {
print STDERR
"Unable to load sympa configuration, file %s or any of the virtual host robot.conf files contain errors. Exiting.\n",
"Unable to load Sympa configuration, file %s or any of the virtual host robot.conf files contain errors. Exiting.\n",
Conf::get_sympa_conf();
exit 1;
}
......@@ -138,7 +138,7 @@ $< = $> = (getpwnam(Sympa::Constants::USER))[2];
## Check if the UID has correctly been set (usefull on OS X)
unless (($( == (getgrnam(Sympa::Constants::GROUP))[2]) && ($< == (getpwnam(Sympa::Constants::USER))[2])) {
&Log::fatal_err("Failed to change process userID and groupID. Note that on some OS Perl scripts can't change their real UID. In such circumstances Sympa should be run via SUDO.");
Log::fatal_err("Failed to change process user ID and group ID. Note that on some OS Perl scripts can't change their real UID. In such circumstances Sympa should be run via sudo.");
}
## Sets the UMASK
......@@ -234,7 +234,7 @@ while (!$end) {
for my $process_count(1..Site->bulk_max_count-($#remaining_children+1)){
&Log::do_log('info', "Will fork: %s", $process_count);
if ((my $child_pid = fork) != 0) {
&Log::do_log('info', "Starting bulk child daemon, pid %s", $child_pid);
&Log::do_log('info', "Starting bulk child daemon, PID %s", $child_pid);
# Saves the pid number
&tools::write_pid(Site->pidfile_bulk, $child_pid, $options);
$created_children{$child_pid} = 1;
......@@ -246,7 +246,7 @@ while (!$end) {
$date_of_last_activity = time();
$main::daemon_usage = 'DAEMON_SLAVE'; # automatic lists creation
&Log::do_openlog(Site->syslog, Site->log_socket_type, 'bulk');
&Log::do_log('info', "Bulk slave daemon started with pid %s", $$);
&Log::do_log('info', "Bulk slave daemon started with PID %s", $$);
last;
}
}
......@@ -476,8 +476,8 @@ sub trace_smime {
my $status = $?/256 ;
unless ($status == 0) {
&Log::do_log('debug', "signature SMIME NOT OK (%s)",$where);
Log::do_log('debug', "S/MIME signature NOT OK (%s)", $where);
}else{
&Log::do_log('debug', "signature SMIME OK (%s)",$where);
Log::do_log('debug', "S/MIME signature OK (%s)", $where);
}
}
......@@ -196,7 +196,7 @@ sub messageasstring {
}
my $msg = MIME::Base64::decode($messageasstring->{'message'});
unless ($msg){
&Log::do_log('err',"could not decode message $messagekey extrated from spool (base64)");
&Log::do_log('err',"could not decode message $messagekey extracted from spool (base64)");
return undef;
}
return $msg;
......@@ -232,7 +232,7 @@ sub message_from_spool {
# #
# #
# IN : - MIME:Entity #
# - $rcpt : a receipient #
# - $rcpt : a recipient #
# - $bulk : HASH #
# - $data : HASH with user's data #
# OUT : 1 | undef #
......@@ -247,7 +247,7 @@ sub merge_msg {
## Test MIME::Entity
unless (defined $entity && ref($entity) eq 'MIME::Entity') {
&Log::do_log('err', 'echec entity');
&Log::do_log('err', 'false entity');
return undef;
}
......@@ -338,7 +338,7 @@ sub merge_msg {
# It uses the method &tt2::parse_tt2 #
# It uses the method &tools::get_fingerprint #
# #
# IN : - rcpt : the receipient email #
# IN : - rcpt : the recipient email #
# - listname : the name of the list #
# - robot_id : the host #
# - data : HASH with many data #
......@@ -424,7 +424,7 @@ sub store {
# first store the message in spool_table
# because as soon as packet are created bulk.pl may distribute the
# $last_stored_message_key is a global var used in order to detcect if a message as been allready stored
# $last_stored_message_key is a global var used in order to detect if a message as been already stored
my $message_already_on_spool ;
my $bulkspool = new Sympaspool ('bulk');
......@@ -464,7 +464,7 @@ sub store {
my $current_date = int(time);
# second : create each receipient packet in bulkmailer_table
# second : create each recipient packet in bulkmailer_table
my $type = ref $rcpts;
unless (ref $rcpts) {
......@@ -476,7 +476,7 @@ sub store {
my $priority_for_packet;
my $already_tagged = 0;
my $packet_rank = 0; # Initialize counter used to check wether we are copying the last packet.
my $packet_rank = 0; # Initialize counter used to check whether we are copying the last packet.
foreach my $packet (@{$rcpts}) {
$priority_for_packet = $priority_packet;
if($tag_as_last && !$already_tagged){
......
......@@ -386,7 +386,7 @@ sub add_list {
close FIC;
unless (defined $config->createHash()) {
push @{$return->{'string_error'}},
"Error in representation data with these xml data";
"Error in representation data with these XML data";
return $return;
}
......@@ -398,12 +398,12 @@ sub add_list {
$self, $self->{'robot'}, $abort_on_error);
unless (defined $result) {
push @{$return->{'string_error'}},
"Error during list creation, see logs for more informations";
"Error during list creation, see logs for more information";
return $return;
}
unless (defined $result->{'list'}) {
push @{$return->{'string_error'}},
"Errors : no created list, see logs for more informations";
"Errors : no created list, see logs for more information";
return $return;
}
my $list = $result->{'list'};
......@@ -451,7 +451,7 @@ sub add_list {
unless (defined $error) {
$list->set_status_error_config('no_check_rules_family', $self->name);
push @{$return->{'string_error'}},
"Impossible to check parameters constraint, see logs for more informations. The list is set in status error_config";
"Impossible to check parameters constraint, see logs for more information. The list is set in status error_config";
return $return;
}
......@@ -468,7 +468,7 @@ sub add_list {
unless ($self->_copy_files($list->dir, "_new_list.xml")) {
$list->set_status_error_config('error_copy_file', $self->name);
push @{$return->{'string_info'}},
"Impossible to copy the xml file in the list directory, the list is set in status error_config.";
"Impossible to copy the XML file in the list directory, the list is set in status error_config.";
}
}
......@@ -589,7 +589,7 @@ sub modify_list {
close FIC;
unless (defined $config->createHash()) {
push @{$return->{'string_error'}},
"Error in representation data with these xml data";
"Error in representation data with these XML data";
return $return;
}
......@@ -772,7 +772,7 @@ sub modify_list {
unless (defined $error) {
$list->set_status_error_config('no_check_rules_family', $self->name);
push @{$return->{'string_error'}},
"Impossible to check parameters constraint, see logs for more informations. The list is set in status error_config";
"Impossible to check parameters constraint, see logs for more information. The list is set in status error_config";
return $return;
}
......@@ -789,7 +789,7 @@ sub modify_list {
unless ($self->_copy_files($list->dir, "_mod_list.xml")) {
$list->set_status_error_config('error_copy_file', $self->name);
push @{$return->{'string_info'}},
"Impossible to copy the xml file in the list directory, the list is set in status error_config.";
"Impossible to copy the XML file in the list directory, the list is set in status error_config.";
}
## Synchronize list members if required
......@@ -1151,7 +1151,7 @@ sub instantiate {
if ($output && !$main::options{'quiet'}) {
print STDOUT
"There is unread output from the instantiation proccess (aliasmanager messages ...), do you want to see it ? (y or n)";
"There is unread output from the instantiation process (aliasmanager messages ...), do you want to see it ? (y or n)";
my $answer = <STDIN>;
chomp($answer);
$answer ||= 'n';
......@@ -1285,7 +1285,7 @@ sub get_instantiation_results {
unless ($#{$self->{'errors'}{'create_hash'}} < 0) {
push(
@{$result->{'errors'}},
"\nImpossible list generation because errors in xml file for : \n "
"\nImpossible list generation because errors in XML file for : \n "
. join(", ", @{$self->{'errors'}{'create_hash'}}) . "\n"
);
}
......@@ -1301,7 +1301,7 @@ sub get_instantiation_results {
unless ($#{$self->{'errors'}{'listname_already_used'}} < 0) {
push(
@{$result->{'errors'}},
"\nImpossible list creation because listname is already used (orphelan list or in another family) for : \n "
"\nImpossible list creation because list name is already used (orphan list or in another family) for : \n "
. join(", ", @{$self->{'errors'}{'listname_already_used'}})
. "\n"
);
......@@ -1318,7 +1318,7 @@ sub get_instantiation_results {
unless ($#{$self->{'errors'}{'previous_list'}} < 0) {
push(
@{$result->{'errors'}},
"\nExisted lists from the lastest instantiation impossible to get and not anymore defined in the new instantiation : \n "
"\nExisted lists from the latest instantiation impossible to get and not anymore defined in the new instantiation : \n "
. join(", ", @{$self->{'errors'}{'previous_list'}}) . "\n"
);
}
......@@ -3137,7 +3137,7 @@ sub is_allowed_to_create_automatic_lists {
} else {
&Log::do_log(
'err',
'Unconsistent scenario evaluation result for automatic list creation in family %s',
'Inconsistent scenario evaluation result for automatic list creation in family %s',
$self
);
return undef;
......@@ -3276,7 +3276,7 @@ sub state {
$self->{'state'};
}
=head1 Miscelaneous Methods
=head1 Miscellaneous Methods
=head2 get_id
......
This diff is collapsed.
......@@ -968,7 +968,7 @@ sub send_file {
# if the list have it's private_key and cert sign the message
# . used only for the welcome message, could be usefull in other case?
# . a list should have several certificats and use if possible a
# certificat issued by the same CA as the receipient CA if it exists
# certificat issued by the same CA as the recipient CA if it exists
if ($sign_mode and $sign_mode eq 'smime') {
$data->{'fromlist'} = $self->get_address();
$data->{'replyto'} = $self->get_address('owner');
......
......@@ -496,7 +496,7 @@ sub delete_subs_cmd {
return undef;
} else {
unless (my $u = $list->delete_list_member ($email)) {
$self->error ({'task' => $task, 'type' => 'execution', 'message' => "Deletion of $email frome list $list->get_list_id failed"});
$self->error ({'task' => $task, 'type' => 'execution', 'message' => "Deletion of $email from list $list->get_list_id failed"});
}else{
&Log::do_log ('notice', "--> $email deleted");
$selection{$email} = {};
......@@ -1011,7 +1011,7 @@ sub purge_orphan_bounces {
chomp ($date);
unless ($date) {
$self->error ({'task' => $task, 'type' => 'execution', 'message' => "Can't get expiration date for $file crl file by using the crl openssl command"});
$self->error ({'task' => $task, 'type' => 'execution', 'message' => "Can't get expiration date for $file CRL file by using the crl openssl command"});
next;
}
......@@ -1028,7 +1028,7 @@ sub purge_orphan_bounces {
if (&Scenario::verify ($verify_context, $condition) == 1) {
unlink ($file);
&Log::do_log ('notice', "--> updating of the $file crl file");
&Log::do_log ('notice', "--> updating of the $file CRL file");
my $cmd = "wget -O \'$file\' \'$url\'";
open CMD, "| $cmd";
close CMD;
......
......@@ -827,7 +827,7 @@ sub upgrade {
my ($listname, $robot_id, $robot);
my %meta ;
&Log::do_log('notice'," spool : $spooldir, fichier $filename");
&Log::do_log('notice'," spool : $spooldir, file $filename");
if (-d $spooldir.'/'.$filename){
&Log::do_log('notice',"%s/%s est un répertoire",$spooldir,$filename);
next;
......@@ -1333,13 +1333,13 @@ sub to_utf8 {
}
# md5_encode_password : Version later than 5.4 uses md5 fingerprint instead of symetric crypto to store password.
# md5_encode_password : Version later than 5.4 uses MD5 fingerprint instead of symetric crypto to store password.
# This require to rewrite paassword in database. This upgrade IS NOT REVERSIBLE
sub md5_encode_password {
my $total = 0;
&Log::do_log('notice', 'Upgrade::md5_encode_password() recoding password using md5 fingerprint');
&Log::do_log('notice', 'Upgrade::md5_encode_password() recoding password using MD5 fingerprint');
unless (SDM::check_db_connect('just_try')) {
return undef;
......@@ -1360,7 +1360,7 @@ sub md5_encode_password {
my $clear_password ;
if ($user->{'password_user'} =~ /^[0-9a-f]{32}/){
Log::do_log('info',
'password from %s already encoded as md5 fingerprint',
'password from %s already encoded as MD5 fingerprint',
$user->{'email_user'});
$total_md5++ ;
next;
......@@ -1391,9 +1391,9 @@ sub md5_encode_password {
}
$sth->finish();
&Log::do_log('info',"Updating password storage in table user_table using md5 for %d users",$total) ;
&Log::do_log('info',"Updating password storage in table user_table using MD5 for %d users",$total) ;
if ($total_md5) {
&Log::do_log('info',"Found in table user %d password stored using md5, did you run Sympa before upgrading ?", $total_md5 );
&Log::do_log('info',"Found in table user %d password stored using MD5, did you run Sympa before upgrading ?", $total_md5 );
}
return $total;
}
......
......@@ -454,7 +454,7 @@ sub update_global_user {
while (($field, $value) = each %{$values}) {
unless ($map_field{$field}) {
&Log::do_log('error',
"unkown field $field in map_field internal error");
"unknown field $field in map_field internal error");
next;
}
my $set;
......
......@@ -534,7 +534,7 @@ sub reaper {
$opensmtp--;
delete($pid{$i});
}
&Log::do_log('debug2', "Reaper unwaited pids : %s\nOpen = %s\n", join(' ', sort keys %pid), $opensmtp);
&Log::do_log('debug2', "Reaper unwaited PIDs : %s\nOpen = %s\n", join(' ', sort keys %pid), $opensmtp);
return $i;
}
......
......@@ -19,7 +19,7 @@
=head1 NAME
sympa_wizard.pl - help perform sympa initial setup
sympa_wizard.pl - help perform Sympa initial setup
=head1 SYNOPSIS
......@@ -27,7 +27,7 @@ sympa_wizard.pl - help perform sympa initial setup
=item sympa_wizard.pl
Edit current sympa configuration
Edit current Sympa configuration
=item sympa_wizard.pl [--target file] --create
......@@ -35,7 +35,7 @@ Creates a new sympa.conf configuration file
=item sympa_wizard.pl --check
check CPAN modules needed for running sympa
check CPAN modules needed for running Sympa
=item sympa_wizard.pl --help
......@@ -629,14 +629,14 @@ EOF
my $rep = <STDIN>;
### main:
print "******* Check perl for SYMPA ********\n";
print "******* Check Perl for Sympa ********\n";
### REQ perl version
print "\nChecking for PERL version:\n-----------------------------\n";
print "\nChecking for Perl version:\n-----------------------------\n";
my $rpv = $cpan_modules{"perl"}{'required_version'};
if ($] >= $cpan_modules{"perl"}{'required_version'}){
print "your version of perl is OK ($] >= $rpv)\n";
print "your version of Perl is OK ($] >= $rpv)\n";
}else {
print "Your version of perl is TOO OLD ($] < $rpv)\nPlease INSTALL a new one !\n";
print "Your version of Perl is TOO OLD ($] < $rpv)\nPlease INSTALL a new one !\n";
}
print "\nChecking for REQUIRED modules:\n------------------------------------------\n";
......@@ -659,7 +659,7 @@ EOM
sub check_modules {
my($default, $cpan_modules, $type) = @_;
print "perl module from CPAN STATUS\n";
print "Perl module from CPAN STATUS\n";
print "----------- --------- ------\n";
foreach my $mod (sort keys %$cpan_modules) {
......
......@@ -64,7 +64,7 @@ my $adrlist = {};
# Load sympa.conf
unless (Robot::get_robots()) {
printf STDERR
"Unable to load sympa configuration, file %s or any of the virtual host robot.conf files contain errors. Exiting.\n",
"Unable to load Sympa configuration, file %s or any of the virtual host robot.conf files contain errors. Exiting.\n",
Conf::get_sympa_conf();
exit 1;
}
......@@ -99,7 +99,7 @@ unless ($main::options{'debug'} || $main::options{'foreground'}) {
setpgrp(0, 0);
if ((my $child_pid = fork) != 0) {
print STDOUT "Starting task_manager daemon, pid $_\n";
print STDOUT "Starting task_manager daemon, PID $_\n";
exit(0);
}
}
......@@ -122,7 +122,7 @@ $< = $> = (getpwnam(Sympa::Constants::USER))[2];
## Check if the UID has correctly been set (usefull on OS X)
unless (($( == (getgrnam(Sympa::Constants::GROUP))[2]) && ($< == (getpwnam(Sympa::Constants::USER))[2])) {
&Log::fatal_err("Failed to change process userID and groupID. Note that on some OS Perl scripts can't change their real UID. In such circumstances Sympa should be run via SUDO.");
Log::fatal_err("Failed to change process user ID and group ID. Note that on some OS Perl scripts can't change their real UID. In such circumstances Sympa should be run via sudo.");
}
## Sets the UMASK
......
......@@ -4866,7 +4866,7 @@ sub do_search {
 
$param->{'similar_subscribers_occurrence'} = 0;
if($param->{'filter'} !~ /^\@[\w-]+\./) {
foreach my $user (@{&List::get_ressembling_list_members_no_object({'name'=>$list->name,'domain'=>$robot_id,'email'=>$in{'filter'}})}) {
foreach my $user (@{List::get_resembling_list_members_no_object({'name' => $list->name, 'domain' => $robot_id, 'email' => $in{'filter'}})}) {
next if($emails{$user->{'email'}});
push @{$param->{'similar_subscribers'}}, $user;
last if($#{$param->{'similar_subscribers'}} + 1 > $max_select);
......
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