use SL::Template;
use SL::User;
use Template;
+use URI;
use List::Util qw(first max min sum);
use List::MoreUtils qw(any);
my $standard_dbh;
END {
- if ($standard_dbh) {
- $standard_dbh->disconnect();
- undef $standard_dbh;
- }
+ disconnect_standard_dbh();
+}
+
+sub disconnect_standard_dbh {
+ return unless $standard_dbh;
+ $standard_dbh->disconnect();
+ undef $standard_dbh;
}
sub _store_value {
if (any { ref $param eq $_ } qw(Form HASH)) {
foreach my $key (keys %{ $param }) {
if (!ref $param->{$key}) {
- $param->{$key} = $iconv->convert($param->{$key});
+ # Workaround for a bug: converting $param->{$key} directly
+ # leads to 'undef'. I don't know why. Converting a copy works,
+ # though.
+ $param->{$key} = $iconv->convert("" . $param->{$key});
} else {
_recode_recursively($iconv, $param->{$key});
}
} elsif (ref $param eq 'ARRAY') {
foreach my $idx (0 .. scalar(@{ $param }) - 1) {
if (!ref $param->[$idx]) {
- $param->[$idx] = $iconv->convert($param->[$idx]);
+ # Workaround for a bug: converting $param->[$idx] directly
+ # leads to 'undef'. I don't know why. Converting a copy works,
+ # though.
+ $param->[$idx] = $iconv->convert("" . $param->[$idx]);
} else {
_recode_recursively($iconv, $param->[$idx]);
}
tie %{ $self }, 'SL::Watchdog';
}
- read(STDIN, $_, $ENV{CONTENT_LENGTH});
+ bless $self, $type;
- if ($ENV{QUERY_STRING}) {
- $_ = $ENV{QUERY_STRING};
- }
+ $self->_input_to_hash($ENV{QUERY_STRING}) if $ENV{QUERY_STRING};
+ $self->_input_to_hash($ARGV[0]) if @ARGV && $ARGV[0];
- if ($ARGV[0]) {
- $_ = $ARGV[0];
+ if ($ENV{CONTENT_LENGTH}) {
+ my $content;
+ read STDIN, $content, $ENV{CONTENT_LENGTH};
+ $self->_request_to_hash($content);
}
- bless $self, $type;
-
- $self->_request_to_hash($_);
-
my $db_charset = $main::dbcharset;
$db_charset ||= Common::DEFAULT_CHARSET;
$self->{action} = lc $self->{action};
$self->{action} =~ s/( |-|,|\#)/_/g;
- $self->{version} = "2.6.0";
+ $self->{version} = "2.6.1";
$main::lxdebug->leave_sub();
$self->show_generic_error($msg);
} else {
-
- die "Error: $msg\n";
+ print STDERR "Error: $msg\n";
+ ::end_of_request();
}
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
}
+sub _get_request_uri {
+ my $self = shift;
+
+ return URI->new($ENV{HTTP_REFERER})->canonical() if $ENV{HTTP_X_FORWARDED_FOR};
+
+ my $scheme = $ENV{HTTPS} && (lc $ENV{HTTPS} eq 'on') ? 'https' : 'http';
+ my $port = $ENV{SERVER_PORT} || '';
+ $port = undef if (($scheme eq 'http' ) && ($port == 80))
+ || (($scheme eq 'https') && ($port == 443));
+
+ my $uri = URI->new("${scheme}://");
+ $uri->scheme($scheme);
+ $uri->port($port);
+ $uri->host($ENV{HTTP_HOST} || $ENV{SERVER_ADDR});
+ $uri->path_query($ENV{REQUEST_URI});
+ $uri->query('');
+
+ return $uri;
+}
+
sub create_http_response {
$main::lxdebug->enter_sub();
my $cgi = $main::cgi;
$cgi ||= CGI->new('');
- my $base_path;
-
- if ($ENV{HTTP_X_FORWARDED_FOR}) {
- $base_path = $ENV{HTTP_REFERER};
- $base_path =~ s|^.*?://.*?/|/|;
- } else {
- $base_path = $ENV{REQUEST_URI};
- }
- $base_path =~ s|[^/]+$||;
- $base_path =~ s|/$||;
-
my $session_cookie;
if (defined $main::auth) {
+ my $uri = $self->_get_request_uri;
+ my @segments = $uri->path_segments;
+ pop @segments;
+ $uri->path_segments(@segments);
+
my $session_cookie_value = $main::auth->get_session_id();
$session_cookie_value ||= 'NO_SESSION';
$session_cookie = $cgi->cookie('-name' => $main::auth->get_session_cookie_name(),
'-value' => $session_cookie_value,
- '-path' => $base_path,
+ '-path' => $uri->path,
'-secure' => $ENV{HTTPS});
}
$jsscript = qq|
<script type="text/javascript" src="js/jquery.js"></script>
- <script type='text/javascript' src='js/jquery.autocomplete.js'></script>
<script type="text/javascript" src="js/common.js"></script>
<style type="text/css">\@import url(js/jscalendar/calendar-win2k-1.css);</style>
<script type="text/javascript" src="js/jscalendar/calendar.js"></script>
? "$self->{title} - $self->{titlebar}"
: $self->{titlebar};
my $ajax = "";
- foreach my $item (@ { $self->{AJAX} }) {
+ for my $item (@ { $self->{AJAX} || [] }) {
$ajax .= $item->show_javascript();
}
return $output;
}
+sub redirect_header {
+ my $self = shift;
+ my $new_url = shift;
+
+ my $base_uri = $self->_get_request_uri;
+ my $new_uri = URI->new_abs($new_url, $base_uri);
+
+ die "Headers already sent" if $::self->{header};
+ $self->{header} = 1;
+
+ my $cgi = $main::cgi || CGI->new('');
+ return $cgi->redirect($new_uri);
+}
+
+sub set_standard_title {
+ $::lxdebug->enter_sub;
+ my $self = shift;
+
+ $self->{titlebar} = "Lx-Office " . $::locale->text('Version') . " $self->{version}";
+ $self->{titlebar} .= "- $::myconfig{name}" if $::myconfig{name};
+ $self->{titlebar} .= "- $::myconfig{dbname}" if $::myconfig{name};
+
+ $::lxdebug->leave_sub;
+}
+
sub _prepare_html_template {
$main::lxdebug->enter_sub();
my ($self, $file, $additional_params) = @_;
my $language;
- if (!defined(%main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+ if (!%::myconfig || !$::myconfig{"countrycode"}) {
$language = $main::language;
} else {
$language = $main::myconfig{"countrycode"};
}
$language = "de" unless ($language);
- if (-f "templates/webpages/${file}_${language}.html") {
- if ((-f ".developer") &&
- (-f "templates/webpages/${file}_master.html") &&
- ((stat("templates/webpages/${file}_master.html"))[9] >
- (stat("templates/webpages/${file}_${language}.html"))[9])) {
- my $info = "Developer information: templates/webpages/${file}_master.html is newer than the localized version.\n" .
+ if (-f "templates/webpages/${file}.html") {
+ if ((-f ".developer") && ((stat("templates/webpages/${file}.html"))[9] > (stat("locale/${language}/all"))[9])) {
+ my $info = "Developer information: templates/webpages/${file}.html is newer than the translation file locale/${language}/all.\n" .
"Please re-run 'locales.pl' in 'locale/${language}'.";
print(qq|<pre>$info</pre>|);
- die($info);
+ ::end_of_request();
}
- $file = "templates/webpages/${file}_${language}.html";
- } elsif (-f "templates/webpages/${file}.html") {
$file = "templates/webpages/${file}.html";
+
} else {
my $info = "Web page template '${file}' not found.\n" .
"Please re-run 'locales.pl' in 'locale/${language}'.";
print(qq|<pre>$info</pre>|);
- die($info);
+ ::end_of_request();
}
if ($self->{"DEBUG"}) {
$jsc_dateformat =~ s/m+/\%m/gi;
$jsc_dateformat =~ s/y+/\%Y/gi;
$additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat;
+ $additional_params->{"myconfig"} ||= \%::myconfig;
}
$additional_params->{"conf_dbcharset"} = $main::dbcharset;
$additional_params->{"conf_lizenzen"} = $main::lizenzen;
$additional_params->{"conf_latex_templates"} = $main::latex;
$additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
+ $additional_params->{"conf_vertreter"} = $main::vertreter;
+ $additional_params->{"conf_show_best_before"} = $main::show_best_before;
if (%main::debug_options) {
map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
my $input = join('', <$in>);
$in->close();
- if ($main::locale) {
- $input = $main::locale->{iconv}->convert($input);
- }
-
my $output;
if (!$template->process(\$input, $additional_params, \$output)) {
print STDERR $template->error();
$self->header();
print $self->parse_html_template("generic/error", $add_params);
+ print STDERR "Error: $error\n";
+
$main::lxdebug->leave_sub();
- die("Error: $error\n");
+ ::end_of_request();
}
sub show_generic_information {
$main::lxdebug->leave_sub();
- die("Information: $text\n");
+ ::end_of_request();
}
# write Trigger JavaScript-Code ($qty = quantity of Triggers)
my ($self, $msg) = @_;
- if ($self->{callback}) {
-
- my ($script, $argv) = split(/\?/, $self->{callback}, 2);
- $script =~ s|.*/||;
- $script =~ s|[^a-zA-Z0-9_\.]||g;
- exec("perl", "$script", $argv);
-
- } else {
+ if (!$self->{callback}) {
$self->info($msg);
- exit;
+ ::end_of_request();
}
+# my ($script, $argv) = split(/\?/, $self->{callback}, 2);
+# $script =~ s|.*/||;
+# $script =~ s|[^a-zA-Z0-9_\.]||g;
+# exec("perl", "$script", $argv);
+
+ print $::form->redirect_header($self->{callback});
+
$main::lxdebug->leave_sub();
}
my ($self, $amount, $places) = @_;
my $round_amount;
- # Rounding like "Kaufmannsrunden"
- # Descr. http://de.wikipedia.org/wiki/Rundung
- # Inspired by
- # http://www.perl.com/doc/FAQs/FAQ/oldfaq-html/Q4.13.html
- # Solves Bug: 189
- # Udo Spallek
- $amount = $amount * (10**($places));
+ # Rounding like "Kaufmannsrunden" (see http://de.wikipedia.org/wiki/Rundung )
+
+ # Round amounts to eight places before rounding to the requested
+ # number of places. This gets rid of errors due to internal floating
+ # point representation.
+ $amount = $self->round_amount($amount, 8) if $places < 8;
+ $amount = $amount * (10**($places));
$round_amount = int($amount + .5 * ($amount <=> 0)) / (10**($places));
$main::lxdebug->leave_sub(2);
} elsif ( $self->{"format"} =~ /elstertaxbird/i ) {
$template = XMLTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+ } elsif ( $self->{"format"} =~ /excel/i ) {
+ $template = ExcelTemplate->new($self->{"IN"}, $self, $myconfig, $userspath);
+ $ext_for_format = 'xls';
+
} elsif ( defined $self->{'format'}) {
$self->error("Outputformat not defined. This may be a future feature: $self->{'format'}");
$self->{OUT} = ">$self->{tmpfile}";
}
+ my $result;
+
if ($self->{OUT}) {
- open(OUT, "$self->{OUT}") or $self->error("$self->{OUT} : $!");
+ open OUT, "$self->{OUT}" or $self->error("$self->{OUT} : $!");
+ $result = $template->parse(*OUT);
+ close OUT;
+
} else {
- open(OUT, ">-") or $self->error("STDOUT : $!");
$self->header;
+ $result = $template->parse(*STDOUT);
}
- if (!$template->parse(*OUT)) {
+ if (!$result) {
$self->cleanup();
$self->error("$self->{IN} : " . $template->get_error());
}
- close(OUT);
-
if ($template->uses_temp_file() || $self->{media} eq 'email') {
if ($self->{media} eq 'email') {
#print(STDERR "OUT $self->{OUT}\n");
for my $i (1 .. $self->{copies}) {
if ($self->{OUT}) {
- open(OUT, $self->{OUT})
- or $self->error($self->cleanup . "$self->{OUT} : $!");
+ open OUT, $self->{OUT} or $self->error($self->cleanup . "$self->{OUT} : $!");
+ print OUT while <IN>;
+ close OUT;
+ seek IN, 0, 0;
+
} else {
$self->{attachment_filename} = ($self->{attachment_filename})
? $self->{attachment_filename}
|;
- open(OUT, ">-") or $self->error($self->cleanup . "$!: STDOUT");
-
+ $::locale->with_raw_io(\*STDOUT, sub { print while <IN> });
}
-
- while (<IN>) {
- print OUT $_;
-
- }
-
- close(OUT);
-
- seek IN, 0, 0;
}
close(IN);
my $extension = $self->{format} =~ /pdf/i ? ".pdf"
: $self->{format} =~ /postscript/i ? ".ps"
: $self->{format} =~ /opendocument/i ? ".odt"
+ : $self->{format} =~ /excel/i ? ".xls"
: $self->{format} =~ /html/i ? ".html"
: "";
close(FH);
}
- if ($self->{tmpfile}) {
+ if ($self->{tmpfile} && ! $::keep_temp_files) {
$self->{tmpfile} =~ s|.*/||g;
# strip extension
$self->{tmpfile} =~ s/\.\w+$//g;
return $exchangerate;
}
-sub get_default_currency {
+sub get_all_currencies {
$main::lxdebug->enter_sub();
my ($self, $myconfig) = @_;
my $query = qq|SELECT curr FROM defaults|;
- my ($curr) = selectrow_query($self, $dbh, $query);
- my ($defaultcurrency) = split m/:/, $curr;
+ my ($curr) = selectrow_query($self, $dbh, $query);
+ my @currencies = grep { $_ } map { s/\s//g; $_ } split m/:/, $curr;
$main::lxdebug->leave_sub();
- return $defaultcurrency;
+ return @currencies;
}
+sub get_default_currency {
+ $main::lxdebug->enter_sub();
+
+ my ($self, $myconfig) = @_;
+ my @currencies = $self->get_all_currencies($myconfig);
+
+ $main::lxdebug->leave_sub();
+
+ return $currencies[0];
+}
sub set_payment_options {
$main::lxdebug->enter_sub();
$amounts{invtotal} = $self->{invtotal};
$amounts{total} = $self->{total};
}
+ $amounts{skonto_in_percent} = 100.0 * $self->{percent_skonto};
map { $amounts{$_} = $self->parse_amount($myconfig, $amounts{$_}) } keys %amounts;
map { $self->{payment_terms} =~ s/<%${_}%>/$formatted_amounts{$_}/g; } keys %formatted_amounts;
+ $self->{skonto_in_percent} = $formatted_amounts{skonto_in_percent};
+
$main::lxdebug->leave_sub();
}
my ($self, $dbh, $key) = @_;
- $key = "all_business_types" unless ($key);
- $self->{$key} =
- selectall_hashref_query($self, $dbh, qq|SELECT * FROM business|);
+ my $options = ref $key eq 'HASH' ? $key : { key => $key };
+ $options->{key} ||= "all_business_types";
+ my $where = '';
+
+ if (exists $options->{salesman}) {
+ $where = 'WHERE ' . ($options->{salesman} ? '' : 'NOT ') . 'COALESCE(salesman)';
+ }
+
+ $self->{ $options->{key} } = selectall_hashref_query($self, $dbh, qq|SELECT * FROM business $where ORDER BY lower(description)|);
$main::lxdebug->leave_sub();
}
sub _get_customers {
$main::lxdebug->enter_sub();
- my ($self, $dbh, $key, $limit) = @_;
-
- $key = "all_customers" unless ($key);
- my $limit_clause = "LIMIT $limit" if $limit;
+ my ($self, $dbh, $key) = @_;
- my $query = qq|SELECT * FROM customer WHERE NOT obsolete ORDER BY name $limit_clause|;
+ my $options = ref $key eq 'HASH' ? $key : { key => $key };
+ $options->{key} ||= "all_customers";
+ my $limit_clause = "LIMIT $options->{limit}" if $options->{limit};
+ my $where = $options->{business_is_salesman} ? qq| AND business_id IN (SELECT id FROM business WHERE salesman)| : '';
- $self->{$key} = selectall_hashref_query($self, $dbh, $query);
+ my $query = qq|SELECT * FROM customer WHERE NOT obsolete $where ORDER BY name $limit_clause|;
+ $self->{ $options->{key} } = selectall_hashref_query($self, $dbh, $query);
$main::lxdebug->leave_sub();
}
}
if($params{"customers"}) {
- if (ref $params{"customers"} eq 'HASH') {
- $self->_get_customers($dbh, $params{"customers"}{key}, $params{"customers"}{limit});
- } else {
- $self->_get_customers($dbh, $params{"customers"});
- }
+ $self->_get_customers($dbh, $params{"customers"});
}
if($params{"vendors"}) {
my ($count) = selectrow_query($self, $dbh, $query);
# build selection list
- if ($count < $myconfig->{vclimit}) {
+ if ($count <= $myconfig->{vclimit}) {
$query = qq|SELECT id, name, salesman_id
FROM $table WHERE NOT obsolete
ORDER BY name|;
sub current_date {
$main::lxdebug->enter_sub();
- my ($self, $myconfig, $thisdate, $days) = @_;
+ my $self = shift;
+ my $myconfig = shift || \%::myconfig;
+ my ($thisdate, $days) = @_;
my $dbh = $self->get_standard_dbh($myconfig);
my $query;
special behaviour for empty strings in customerinitnumber field:
will in this case not increase the value, and return undef.
+=item redirect_header $url
+
+Generates a HTTP redirection header for the new C<$url>. Constructs an
+absolute URL including scheme, host name and port. If C<$url> is a
+relative URL then it is considered relative to Lx-Office base URL.
+
+This function C<die>s if headers have already been created with
+C<$::form-E<gt>header>.
+
+Examples:
+
+ print $::form->redirect_header('oe.pl?action=edit&id=1234');
+ print $::form->redirect_header('http://www.lx-office.org/');
+
=back
=cut
projects / kivitendo-erp.git / blobdiff