use SL::Auth::DB;
use SL::Auth::LDAP;
use SL::AM;
+use SL::DB;
use SL::Common;
use SL::DBUtils;
use SL::Mailer;
_recode_recursively(SL::Iconv->new($encoding, $db_charset), $self);
- $self->{action} = lc $self->{action};
- $self->{action} =~ s/( |-|,|\#)/_/g;
-
#$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>;
pop @segments;
$uri->path_segments(@segments);
- my $session_cookie_value = $main::auth->get_session_id();
- $session_cookie_value ||= 'NO_SESSION';
+ my $session_cookie_value = $main::auth->get_session_id();
- $session_cookie = $cgi->cookie('-name' => $main::auth->get_session_cookie_name(),
- '-value' => $session_cookie_value,
- '-path' => $uri->path,
- '-secure' => $ENV{HTTPS});
+ if ($session_cookie_value) {
+ $session_cookie = $cgi->cookie('-name' => $main::auth->get_session_cookie_name(),
+ '-value' => $session_cookie_value,
+ '-path' => $uri->path,
+ '-secure' => $ENV{HTTPS});
+ }
}
my %cgi_params = ('-type' => $params{content_type});
$cgi_params{'-charset'} = $params{charset} if ($params{charset});
+ $cgi_params{'-cookie'} = $session_cookie if ($session_cookie);
- my $output = $cgi->header('-cookie' => $session_cookie,
- %cgi_params);
+ my $output = $cgi->header(%cgi_params);
$main::lxdebug->leave_sub();
print <<EOT;
<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">
$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>|);
+ my $info = "Web page template '${file}' not found.\n";
+ print qq|<pre>$info</pre>|;
::end_of_request();
}
map { $additional_params->{"myconfig_${_}"} = $main::myconfig{$_}; } keys %::myconfig;
}
- $additional_params->{"conf_dbcharset"} = $main::dbcharset;
- $additional_params->{"conf_webdav"} = $main::webdav;
- $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;
+ $additional_params->{"conf_dbcharset"} = $::dbcharset;
+ $additional_params->{"conf_webdav"} = $::webdav;
+ $additional_params->{"conf_lizenzen"} = $::lizenzen;
+ $additional_params->{"conf_latex_templates"} = $::latex;
+ $additional_params->{"conf_opendocument_templates"} = $::opendocument_templates;
+ $additional_params->{"conf_vertreter"} = $::vertreter;
+ $additional_params->{"conf_show_best_before"} = $::show_best_before;
+ $additional_params->{"conf_parts_image_css"} = $::parts_image_css;
+ $additional_params->{"conf_parts_listing_images"} = $::parts_listing_images;
+ $additional_params->{"conf_parts_show_image"} = $::parts_show_image;
if (%main::debug_options) {
map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
$ext_for_format = 'xml';
} elsif ( $self->{"format"} =~ /elster(?:winston|taxbird)/i ) {
- $template_type = 'xml';
+ $template_type = 'XML';
} elsif ( $self->{"format"} =~ /excel/i ) {
$template_type = 'Excel';
undef $standard_dbh;
}
- $standard_dbh ||= $self->dbconnect_noauto($myconfig);
+ $standard_dbh ||= SL::DB::create->dbh;
$main::lxdebug->leave_sub(2);