diff options
-rwxr-xr-x | LedgerSMB/AM.pm | 10 | ||||
-rwxr-xr-x | LedgerSMB/BP.pm | 4 | ||||
-rwxr-xr-x | LedgerSMB/Form.pm | 22 | ||||
-rwxr-xr-x | LedgerSMB/Inifile.pm | 2 | ||||
-rwxr-xr-x | LedgerSMB/User.pm | 2 | ||||
-rwxr-xr-x | LedgerSMB/locales.pl | 10 | ||||
-rwxr-xr-x | bin/admin.pl | 10 | ||||
-rwxr-xr-x | bin/am.pl | 4 | ||||
-rwxr-xr-x | bin/login.pl | 4 | ||||
-rw-r--r-- | dists/win32/shebang-activeperl.pl | 2 | ||||
-rw-r--r-- | dists/win32/shebang-vanilla.pl | 2 | ||||
-rwxr-xr-x | import_members.pl | 2 | ||||
-rwxr-xr-x | setup.pl | 16 | ||||
-rw-r--r-- | utils/notify_short/listener.pl | 2 |
14 files changed, 46 insertions, 46 deletions
diff --git a/LedgerSMB/AM.pm b/LedgerSMB/AM.pm index 15558597..b3050c05 100755 --- a/LedgerSMB/AM.pm +++ b/LedgerSMB/AM.pm @@ -1278,7 +1278,7 @@ sub load_template { my ($self, $myconfig, $form) = @_; $self->check_template_name(\%$myconfig, \%$form); - open(TEMPLATE, "$form->{file}") or $form->error("$form->{file} : $!"); + open(TEMPLATE, '<', "$form->{file}") or $form->error("$form->{file} : $!"); while (<TEMPLATE>) { $form->{body} .= $_; @@ -1294,7 +1294,7 @@ sub save_template { my ($self, $myconfig, $form) = @_; $self->check_template_name(\%$myconfig, \%$form); - open(TEMPLATE, ">$form->{file}") or $form->error("$form->{file} : $!"); + open(TEMPLATE, '>', "$form->{file}") or $form->error("$form->{file} : $!"); # strip
$form->{body} =~ s/\r//g; @@ -1606,9 +1606,9 @@ sub backup { my $boundary = time; my $tmpfile = "${LedgerSMB::Sysconfig::userspath}/$boundary.$myconfig->{dbname}-$form->{dbversion}-$t[5]$t[4]$t[3].sql"; $tmpfile .= ".gz" if ${LedgerSMB::Sysconfig::gzip}; - $form->{OUT} = ">$tmpfile"; + $form->{OUT} = "$tmpfile"; - open(OUT, "$form->{OUT}") or $form->error("$form->{OUT} : $!"); + open(OUT, '>', "$form->{OUT}") or $form->error("$form->{OUT} : $!"); # get sequences, functions and triggers @@ -1649,7 +1649,7 @@ sub backup { if ($form->{media} eq 'file') { - open(IN, "$tmpfile") or $form->error("$tmpfile : $!"); + open(IN, '<', "$tmpfile") or $form->error("$tmpfile : $!"); open(OUT, ">-") or $form->error("STDOUT : $!"); print OUT qq|Content-Type: application/file;\n| . diff --git a/LedgerSMB/BP.pm b/LedgerSMB/BP.pm index d15dc018..5e43eade 100755 --- a/LedgerSMB/BP.pm +++ b/LedgerSMB/BP.pm @@ -342,13 +342,13 @@ sub print_spool { foreach my $i (1 .. $form->{rowcount}) { if ($form->{"checked_$i"}) { - open(OUT, $form->{OUT}) or $form->error("$form->{OUT} : $!"); + open(OUT, '>', $form->{OUT}) or $form->error("$form->{OUT} : $!"); binmode(OUT); $spoolfile = qq|$spool/$form->{"spoolfile_$i"}|; # send file to printer - open(IN, $spoolfile) or $form->error("$spoolfile : $!"); + open(IN, '<', $spoolfile) or $form->error("$spoolfile : $!"); binmode(IN); while (<IN>) { diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm index 90fb16c9..d66375f6 100755 --- a/LedgerSMB/Form.pm +++ b/LedgerSMB/Form.pm @@ -84,7 +84,7 @@ sub debug { my ($self, $file) = @_; if ($file) { - open(FH, "> $file") or die $!; + open(FH, '>', "$file") or die $!; for (sort keys %$self) { print FH "$_ = $self->{$_}\n" } close(FH); } else { @@ -584,9 +584,9 @@ sub parse_template { if ($self->{language_code}) { if (-f "$self->{templates}/$self->{language_code}/$self->{IN}") { - open(IN, "$self->{templates}/$self->{language_code}/$self->{IN}") or $self->error("$self->{IN} : $!"); + open(IN, '<', "$self->{templates}/$self->{language_code}/$self->{IN}") or $self->error("$self->{IN} : $!"); } else { - open(IN, "$self->{templates}/$self->{IN}") or $self->error("$self->{IN} : $!"); + open(IN, '<', "$self->{templates}/$self->{IN}") or $self->error("$self->{IN} : $!"); } } else { @@ -607,11 +607,11 @@ sub parse_template { if ($self->{format} =~ /(postscript|pdf)/ || $self->{media} eq 'email') { my $out = $self->{OUT}; - $self->{OUT} = ">$self->{tmpfile}"; + $self->{OUT} = "$self->{tmpfile}"; } if ($self->{OUT}) { - open(OUT, "$self->{OUT}") or $self->error("$self->{OUT} : $!"); + open(OUT, '>', "$self->{OUT}") or $self->error("$self->{OUT} : $!"); } else { open(OUT, ">-") or $self->error("STDOUT : $!"); @@ -793,7 +793,7 @@ sub parse_template { # assume loop after 10 includes of the same file next if ($include{$var} > 10); - unless (open(INC, "$self->{templates}/$self->{language_code}/$var")) { + unless (open(INC, '<', "$self->{templates}/$self->{language_code}/$var")) { $err = $!; $self->cleanup; $self->error("$self->{templates}/$self->{language_code}/$var : $err"); @@ -897,7 +897,7 @@ sub parse_template { $myconfig->{signature} =~ s/\\n/$br\n/g; $mail->{message} .= "$br\n-- $br\n$myconfig->{signature}\n$br" if $myconfig->{signature}; - unless (open(IN, $self->{tmpfile})) { + unless (open(IN, '<', $self->{tmpfile})) { $err = $!; $self->cleanup; $self->error("$self->{tmpfile} : $err"); @@ -927,7 +927,7 @@ sub parse_template { $self->{OUT} = $out; - unless (open(IN, $self->{tmpfile})) { + unless (open(IN, '<', $self->{tmpfile})) { $err = $!; $self->cleanup; $self->error("$self->{tmpfile} : $err"); @@ -942,7 +942,7 @@ sub parse_template { for my $i (1 .. $self->{copies}) { if ($self->{OUT}) { - unless (open(OUT, $self->{OUT})) { + unless (open(OUT, '>', $self->{OUT})) { $err = $!; $self->cleanup; $self->error("$self->{OUT} : $err"); @@ -1122,7 +1122,7 @@ sub cleanup { my @err = (); if (-f "$self->{errfile}") { - open(FH, "$self->{errfile}"); + open(FH, '<', "$self->{errfile}"); @err = <FH>; close(FH); } @@ -1147,7 +1147,7 @@ sub rerun_latex { my $a = 0; if (-f "$self->{errfile}") { - open(FH, "$self->{errfile}"); + open(FH, '<', "$self->{errfile}"); $a = grep /(longtable Warning:|Warning:.*?LastPage)/, <FH>; close(FH); } diff --git a/LedgerSMB/Inifile.pm b/LedgerSMB/Inifile.pm index 9922c63c..839c19f3 100755 --- a/LedgerSMB/Inifile.pm +++ b/LedgerSMB/Inifile.pm @@ -57,7 +57,7 @@ sub add_file { for (@{$self->{ORDER}}) { $menuorder{$_} = 1 } - open FH, "$file" or Form->error("$file : $!"); + open FH, '<', "$file" or Form->error("$file : $!"); while (<FH>) { next if /^(#|;|\s)/; diff --git a/LedgerSMB/User.pm b/LedgerSMB/User.pm index 8cc551bc..6e4a872e 100755 --- a/LedgerSMB/User.pm +++ b/LedgerSMB/User.pm @@ -471,7 +471,7 @@ sub dbsources_unused { $form->error(__FILE__.':'.__LINE__.": $memfile locked!") if (-f "${memfile}.LCK"); # open members file - open(FH, "$memfile") or $form->error(__FILE__.':'.__LINE__.": $memfile : $!"); + open(FH, '<', "$memfile") or $form->error(__FILE__.':'.__LINE__.": $memfile : $!"); while (<FH>) { if (/^dbname=/) { diff --git a/LedgerSMB/locales.pl b/LedgerSMB/locales.pl index 91f61015..0bfc2503 100755 --- a/LedgerSMB/locales.pl +++ b/LedgerSMB/locales.pl @@ -110,7 +110,7 @@ foreach $file (@progfiles) { } } - open FH, ">$file" or die "$! : $file"; + open FH, '>', "$file" or die "$! : $file"; if ($charset) { print FH qq|\$self{charset} = '$charset';\n\n|; @@ -179,7 +179,7 @@ $self{subs} = { if (!$noMissing) { if (@missing) { - open FH, ">$file.missing" or die "$! : missing"; + open FH, '>', "$file.missing" or die "$! : missing"; print FH qq|# module $file # add the missing texts and run locales.pl to rebuild @@ -206,7 +206,7 @@ $self{subs} = { # redo the all file if ($buildAll) { - open FH, ">all" or die "$! : all"; + open FH, '>', "all" or die "$! : all"; print FH q|# These are all the texts to build the translations files. # to build unique strings edit the module files instead @@ -255,7 +255,7 @@ sub scanfile { my $fh = new FileHandle; return unless (-e $file or $file !~ /custom/); - open $fh, "$file" or die "$! : $file"; + open $fh, '<', "$file" or die "$! : $file"; $file =~ s/\.pl//; $file =~ s/$bindir\///; @@ -344,7 +344,7 @@ sub scanmenu { my $file = shift; my $fh = new FileHandle; - open $fh, "$file" or die "$! : $file"; + open $fh, '<', "$file" or die "$! : $file"; my @a = grep /^\[/, <$fh>; close($fh); diff --git a/bin/admin.pl b/bin/admin.pl index 47f8c5ae..c93a24fc 100755 --- a/bin/admin.pl +++ b/bin/admin.pl @@ -589,12 +589,12 @@ sub form_header { # access control - open(FH, $menufile) or $form->error(__FILE__.':'.__LINE__.': '."$menufile : $!"); + open(FH, '<', $menufile) or $form->error(__FILE__.':'.__LINE__.': '."$menufile : $!"); # scan for first menu level @a = <FH>; close(FH); - if (open(FH, "custom_$menufile")) { + if (open(FH, '<', "custom_$menufile")) { push @a, <FH>; } @@ -801,10 +801,10 @@ sub save { foreach $file (@templates) { - open(TEMP, "${LedgerSMB::Sysconfig::templates}/$file") or $form->error(__FILE__.':'.__LINE__.': '."$templates/$file : $!"); + open(TEMP, '<', "${LedgerSMB::Sysconfig::templates}/$file") or $form->error(__FILE__.':'.__LINE__.': '."$templates/$file : $!"); $file =~ s/$form->{mastertemplates}-//; - open(NEW, ">$form->{templates}/$file") or $form->error(__FILE__.':'.__LINE__.': '."$form->{templates}/$file : $!"); + open(NEW, '>', "$form->{templates}/$file") or $form->error(__FILE__.':'.__LINE__.': '."$form->{templates}/$file : $!"); while ($line = <TEMP>) { print NEW $line; @@ -1297,7 +1297,7 @@ sub unlock_system { sub lock_system { # This needs to be done with a db tool - #open(FH, ">${LedgerSMB::Sysconfig::userspath}/nologin") or $form->error($locale->text('Cannot create Lock!')); + #open(FH, '>', "${LedgerSMB::Sysconfig::userspath}/nologin") or $form->error($locale->text('Cannot create Lock!')); #close(FH); $form->{callback} = "$form->{script}?action=list_users&path=$form->{path}"; $form->redirect($locale->text('Lockfile created!')); @@ -1407,9 +1407,9 @@ sub save_language { foreach $file (@templates) { if (-f "$myconfig{templates}/$file") { - open(TEMP, "$myconfig{templates}/$file") or $form->error("$myconfig{templates}/$file : $!"); + open(TEMP, '<,', "$myconfig{templates}/$file") or $form->error("$myconfig{templates}/$file : $!"); - open(NEW, ">$myconfig{templates}/$form->{code}/$file") or $form->error("$myconfig{templates}/$form->{code}/$file : $!"); + open(NEW, '>', "$myconfig{templates}/$form->{code}/$file") or $form->error("$myconfig{templates}/$form->{code}/$file : $!"); while ($line = <TEMP>) { print NEW $line; diff --git a/bin/login.pl b/bin/login.pl index 11a5e82a..d1fa5202 100755 --- a/bin/login.pl +++ b/bin/login.pl @@ -238,7 +238,7 @@ sub login { #this needs to be done via db #if (! $form->{beenthere}) { - # open(FH, "${LedgerSMB::Sysconfig::memberfile}") or $form->error(__FILE__.':'.__LINE__.": $memberfile : $!"); + # open(FH, '<', "${LedgerSMB::Sysconfig::memberfile}") or $form->error(__FILE__.':'.__LINE__.": $memberfile : $!"); # @a = <FH>; # close(FH); # @@ -282,7 +282,7 @@ sub login { # upgrade dataset and log in again #locking needs to be done via db function - #open FH, ">${LedgerSMB::Sysconfig::userspath}/nologin" or $form->error($!); + #open FH, '>', "${LedgerSMB::Sysconfig::userspath}/nologin" or $form->error($!); for (qw(dbname dbhost dbport dbdriver dbuser dbpasswd)) { $form->{$_} = $user->{$_} } diff --git a/dists/win32/shebang-activeperl.pl b/dists/win32/shebang-activeperl.pl index 6fce8c24..a0621839 100644 --- a/dists/win32/shebang-activeperl.pl +++ b/dists/win32/shebang-activeperl.pl @@ -7,7 +7,7 @@ closedir DIR; foreach $file (@perlfiles) { - open FH, "+<$file"; + open FH, '+<', "$file"; @file = <FH>; diff --git a/dists/win32/shebang-vanilla.pl b/dists/win32/shebang-vanilla.pl index 73d02590..9921a723 100644 --- a/dists/win32/shebang-vanilla.pl +++ b/dists/win32/shebang-vanilla.pl @@ -7,7 +7,7 @@ closedir DIR; foreach $file (@perlfiles) { - open FH, "+<$file"; + open FH, '+<', "$file"; @file = <FH>; diff --git a/import_members.pl b/import_members.pl index 1cd70d54..d9eb87ae 100755 --- a/import_members.pl +++ b/import_members.pl @@ -50,7 +50,7 @@ if (length($membersfile) < 2){ my @users = (); -open(FH, "$membersfile") || die ("Couldn't open members file!"); +open(FH, '<', "$membersfile") || die ("Couldn't open members file!"); while (<FH>) { @@ -124,7 +124,7 @@ if ($filename) { if (-f "VERSION") { # get installed version from VERSION file - open(FH, "VERSION"); + open(FH, '<', "VERSION"); @a = <FH>; close(FH); $version = $a[0]; @@ -429,13 +429,13 @@ sub install_smb { &decompress; if ($newinstall) { - open(FH, "ledger-smb.conf.default"); + open(FH, '<', "ledger-smb.conf.default"); @f = <FH>; close(FH); unless ($latex) { grep { s/^\$latex.*/\$latex = 0;/ } @f; } - open(FH, ">ledger-smb.conf"); + open(FH, '>', "ledger-smb.conf"); print FH @f; close(FH); @@ -450,12 +450,12 @@ sub install_smb { $filename = "ledger-smb-httpd.conf"; # do we have write permission? - if (!open(FH, ">>$httpddir/$filename")) { - open(FH, ">$filename"); + if (!open(FH, '>>', "$httpddir/$filename")) { + open(FH, '>', "$filename"); $norw = 1; } - open (HTTPD, '< sql-ledger-httpd.conf'); + open (HTTPD, '<', 'sql-ledger-httpd.conf'); while ($line = <HTTPD>){ print FH $line; } @@ -506,7 +506,7 @@ Webserver directives were written to if (!$confd) { if (!(`grep "^# LedgerSMB" $httpd`)) { - open(FH, ">>$httpd"); + open(FH, '>>', "$httpd"); print FH qq| @@ -618,7 +618,7 @@ sub decompress { sub create_lockfile { if (-d "$userspath") { - open(FH, ">$userspath/nologin"); + open(FH, '>', "$userspath/nologin"); close(FH); } diff --git a/utils/notify_short/listener.pl b/utils/notify_short/listener.pl index 37f31d38..dae23d0a 100644 --- a/utils/notify_short/listener.pl +++ b/utils/notify_short/listener.pl @@ -30,7 +30,7 @@ while (1){ # loop infinitely sleep $cycle_delay; } sub on_notify { - open (MAIL, "| $sendmail"); + open (MAIL, "|-", $sendmail); $sth = $dbh->prepare(" SELECT partnumber, description, onhand, rop FROM parts WHERE onhand <= rop |