projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Steuerzone darf nicht leer sein
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
2647cec
..
f02c25a
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-42,6
+42,7
@@
use Data::Dumper;
use CGI;
use CGI::Ajax;
use Cwd;
use CGI;
use CGI::Ajax;
use Cwd;
+use Encode;
use IO::File;
use SL::Auth;
use SL::Auth::DB;
use IO::File;
use SL::Auth;
use SL::Auth::DB;
@@
-56,7
+57,7
@@
use SL::User;
use Template;
use URI;
use List::Util qw(first max min sum);
use Template;
use URI;
use List::Util qw(first max min sum);
-use List::MoreUtils qw(any);
+use List::MoreUtils qw(any
apply
);
use strict;
use strict;
@@
-268,7
+269,7
@@
sub new {
#$self->{version} = "2.6.1"; # Old hardcoded but secure style
open VERSION_FILE, "VERSION"; # New but flexible code reads version from VERSION-file
$self->{version} = <VERSION_FILE>;
#$self->{version} = "2.6.1"; # Old hardcoded but secure style
open VERSION_FILE, "VERSION"; # New but flexible code reads version from VERSION-file
$self->{version} = <VERSION_FILE>;
- close VERSION_FILE;
+ close VERSION_FILE;
$self->{version} =~ s/[^0-9A-Za-z\.\_\-]//g; # only allow numbers, letters, points, underscores and dashes. Prevents injecting of malicious code.
$main::lxdebug->leave_sub();
$self->{version} =~ s/[^0-9A-Za-z\.\_\-]//g; # only allow numbers, letters, points, underscores and dashes. Prevents injecting of malicious code.
$main::lxdebug->leave_sub();
@@
-379,6
+380,7
@@
sub escape {
my ($self, $str) = @_;
my ($self, $str) = @_;
+ $str = Encode::encode('utf-8-strict', $str) if $::locale->is_utf8;
$str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge;
$main::lxdebug->leave_sub(2);
$str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge;
$main::lxdebug->leave_sub(2);
@@
-475,7
+477,7
@@
sub info {
print qq|
<p class="message_ok"><b>$msg</b></p>
print qq|
<p class="message_ok"><b>$msg</b></p>
-
+
<script type="text/javascript">
<!--
// If JavaScript is enabled, the whole thing will be reloaded.
<script type="text/javascript">
<!--
// If JavaScript is enabled, the whole thing will be reloaded.
@@
-484,7
+486,7
@@
sub info {
setTimeout("top.frames.location.href='login.pl'",500);
//-->
</script>
setTimeout("top.frames.location.href='login.pl'",500);
//-->
</script>
-
+
</body>
|;
</body>
|;
@@
-672,9
+674,9
@@
sub header {
</script>
| if $self->{"fokus"};
</script>
| if $self->{"fokus"};
- # if there is a title, we put some JavaScript in to the page, wich writes a
+ # if there is a title, we put some JavaScript in to the page, wich writes a
# meaningful title-tag for our frameset.
# meaningful title-tag for our frameset.
- my $title_hack;
+ my $title_hack;
if ($self->{"title"}){
$title_hack = qq|
<script type="text/javascript">
if ($self->{"title"}){
$title_hack = qq|
<script type="text/javascript">
@@
-685,7
+687,7
@@
sub header {
</script>
|;
}
</script>
|;
}
-
+
#Set Calendar
my $jsscript = "";
if ($self->{jsscript} == 1) {
#Set Calendar
my $jsscript = "";
if ($self->{jsscript} == 1) {
@@
-723,11
+725,10
@@
sub header {
$ajax
$fokus
$title_hack
$ajax
$fokus
$title_hack
-
+
<link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css" />
<meta name="robots" content="noindex,nofollow" />
<link rel="stylesheet" href="css/jquery.autocomplete.css" type="text/css" />
<meta name="robots" content="noindex,nofollow" />
- <script type="text/javascript" src="js/highlight_input.js"></script>
<link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
<script type="text/javascript" src="js/tabcontent.js">
<link rel="stylesheet" type="text/css" href="css/tabcontent.css" />
<script type="text/javascript" src="js/tabcontent.js">
@@
-829,13
+830,13
@@
sub _prepare_html_template {
}
if (%main::myconfig) {
}
if (%main::myconfig) {
- map({ $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys(%main::myconfig));
- my $jsc_dateformat = $main::myconfig{"dateformat"};
- $jsc_dateformat =~ s/d+/\%d/gi;
- $jsc_dateformat =~ s/m+/\%m/gi;
- $jsc_dateformat =~ s/y+/\%Y/gi;
- $additional_params->{"myconfig_jsc_dateformat"} = $jsc_dateformat;
+ $::myconfig{jsc_dateformat} = apply {
+ s/d+/\%d/gi;
+ s/m+/\%m/gi;
+ s/y+/\%Y/gi;
+ } $::myconfig{"dateformat"};
$additional_params->{"myconfig"} ||= \%::myconfig;
$additional_params->{"myconfig"} ||= \%::myconfig;
+ map { $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys %::myconfig;
}
$additional_params->{"conf_dbcharset"} = $main::dbcharset;
}
$additional_params->{"conf_dbcharset"} = $main::dbcharset;
@@
-2019,7
+2020,7
@@
sub add_shipto {
my @values;
foreach my $item (qw(name department_1 department_2 street zipcode city country
my @values;
foreach my $item (qw(name department_1 department_2 street zipcode city country
- contact phone fax email)) {
+ contact
cp_gender
phone fax email)) {
if ($self->{"shipto$item"}) {
$shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
}
if ($self->{"shipto$item"}) {
$shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
}
@@
-2037,6
+2038,7
@@
sub add_shipto {
shiptocity = ?,
shiptocountry = ?,
shiptocontact = ?,
shiptocity = ?,
shiptocountry = ?,
shiptocontact = ?,
+ shiptocp_gender = ?,
shiptophone = ?,
shiptofax = ?,
shiptoemail = ?
shiptophone = ?,
shiptofax = ?,
shiptoemail = ?
@@
-2052,6
+2054,7
@@
sub add_shipto {
shiptocity = ? AND
shiptocountry = ? AND
shiptocontact = ? AND
shiptocity = ? AND
shiptocountry = ? AND
shiptocontact = ? AND
+ shiptocp_gender = ? AND
shiptophone = ? AND
shiptofax = ? AND
shiptoemail = ? AND
shiptophone = ? AND
shiptofax = ? AND
shiptoemail = ? AND
@@
-2062,8
+2065,8
@@
sub add_shipto {
$query =
qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
shiptostreet, shiptozipcode, shiptocity, shiptocountry,
$query =
qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
shiptostreet, shiptozipcode, shiptocity, shiptocountry,
- shiptocontact, shiptophone, shiptofax, shiptoemail, module)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+ shiptocontact, shipto
cp_gender, shipto
phone, shiptofax, shiptoemail, module)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
, ?
)|;
do_query($self, $dbh, $query, $id, @values, $module);
}
}
do_query($self, $dbh, $query, $id, @values, $module);
}
}