use warnings; # Write warnings to the HTTP Server Log file.
use utf8;
-use CGI qw(:standard);
+use CGI qw(header);
use CGI::Carp('fatalsToBrowser'); # Output errors to the browser.
use Tie::IxHash;
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{editpagebutton});
$kiriwrite_presmodule->addtext(" | ");
- $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{common}->{clearvalues});
+ $kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{restorecurrent});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $database_name) } );
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
- # If the filters database exists then get the list of filters,
- # otherwise write a message saying that the filters database
+ # If the filter database exists then get the list of filters,
+ # otherwise write a message saying that the filter database
# does not exist and will be created when a filter is added.
if ($filtersdb_notexist eq 0){
if ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
- # A database error has occured with the filters database.
+ # A database error has occured with the filter database.
kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
}
- # Check if there are filters in the filters database and
+ # Check if there are filters in the filter database and
# write a message if there isn't.
if ($filter_count eq 0){
- # There are no filters in the filters database.
+ # There are no filters in the filter database.
$filterswarning = $kiriwrite_lang->{filter}->{nofiltersavailable};
if ($filtersdb_notexist eq 1){
- # The filters database doesn't exist so write
+ # The filter database doesn't exist so write
# a message.
$filterswarning = $kiriwrite_lang->{filter}->{filterdatabasedoesnotexist};
} else {
- # The filters database exists so write out the
+ # The filter database exists so write out the
# list of filters.
if ($blankfindfilter eq 1){
}
- # Connect to the filters database.
+ # Connect to the filter database.
$kiriwrite_dbmodule->connectfilter(1);
$kiriwrite_dbmodule->disconnect();
# Write out a message saying that the filter was added to the
- # filters database.
+ # filter database.
$kiriwrite_presmodule->addtext($kiriwrite_lang->{filter}->{filteradded}, { Style => "pageheader" });
$kiriwrite_presmodule->addlinebreak();
# newfilterpriority, newfilternotes, confirm); #
# #
# filterid Specifies the filter number (line number) in the #
-# filters database. #
+# filter database. #
# newfilterfind Specifies the new word to find. #
# newfilterreplace Specifies the new word to replace. #
# newfilterpriority Specifies the new filter priority. #
}
- # Connect to the filters database.
+ # Connect to the filter database.
$kiriwrite_dbmodule->connectfilter();
} elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
- # A database error has occured while using the filters database
+ # A database error has occured while using the filter database
# so return an error.
kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
}
- # Connect to the filters database.
+ # Connect to the filter database.
$kiriwrite_dbmodule->connectfilter();
$kiriwrite_dbmodule->disconnect();
# Write a message saying that the filter was deleted
- # from the filters database.
+ # from the filter database.
$kiriwrite_presmodule->addtext($kiriwrite_lang->{filter}->{deletedfilter}, { Style => "pageheader" });
$kiriwrite_presmodule->addlinebreak();
}
- # Load the filters database (if the filters skip
+ # Load the filter database (if the filters skip
# value isn't set to 1).
if ($filters_skip eq 0){
if ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
- # A database error has occured with the filters database.
+ # A database error has occured with the filter database.
$kiriwrite_presmodule->addtext($error_prefix . kiriwrite_language($kiriwrite_lang->{compile}->{filterdatabaseerror}, $kiriwrite_dbmodule->geterror(1)));
$kiriwrite_presmodule->addlinebreak();
# Place each template file into the hash.
- $templatefiles{$template_info{"TemplateFilename"}}{template} = $template_info{"TemplateFilename"};
+ $templatefiles{$template_info{"TemplateFilename"}}{template} = $template_info{"TemplateLayout"};
$templatefiles{$template_info{"TemplateFilename"}}{valid} = 1;
}
} else {
- if ($page_content){
-
- $page_final = $templatefiles{$page_template}{template};
- $page_final =~ s/<kiriwrite:pagecontent>/$page_content/g;
+ $page_final = $templatefiles{$page_template}{template};
+ if (!$page_final){
+ $page_final = "";
}
+ $page_final =~ s/<kiriwrite:pagecontent>/$page_content/g;
+
}
# Create the combined page title (if needed).
($page_filename) = $page_filename =~ m/^(.*)$/g;
($kiriwrite_config{"directory_data_output"}) = $kiriwrite_config{"directory_data_output"} =~ m/^(.*)$/g;
open($filehandle_page, ">:utf8 ", $kiriwrite_config{"directory_data_output"} . '/' . $page_filename) or ($kiriwrite_presmodule->addtext($error_prefix . kiriwrite_language($kiriwrite_lang->{compile}->{pagenotwritten}, $page_filename, $!)), $kiriwrite_presmodule->addlinebreak(), $error_count++, next);
+
+ if (!$page_final){
+
+ $page_final = "";
+
+ }
+
binmode $filehandle_page, ':utf8';
print $filehandle_page $page_final;
close($filehandle_page);
# Load the required Perl modules.
- use XML::Simple;
+ use XML::Simple qw(XMLin);
my $xsl = XML::Simple->new();
# Check if the Kiriwrite configuration file exists before using it and
# Load the Encode perl module.
- use Encode;
+ use Encode qw(decode_utf8);
# Convert the string.
if ($http_query_confirm eq 1){
# Value is correct, collect the variables to pass onto the database variable.
- # Load the XML::Simple module.
-
- use XML::Simple;
- my $xsl = XML::Simple->new();
-
# Get the variables from the HTTP query.
my $newdatabasename = $query->param('databasename');
if ($http_query_action eq "add"){
# The action the user requested is to add a filter to the
- # filters database.
+ # filter database.
# Check if there is a value in confirm and if there is
# then pass it on to the new find and replace words
# There is a value in http_query_confirm, so pass on the
# new find and replace words so that they can be added
- # to the filters database.
+ # to the filter database.
my $http_query_findwords = $query->param('findword');
my $http_query_replacewords = $query->param('replaceword');
} elsif ($http_query_action eq "edit"){
# The action the user requested is to edit an filter from
- # the filters database.
+ # the filter database.
my $http_query_number = $query->param('filter');
my $http_query_confirm = $query->param('confirm');
if ($http_query_confirm){
# There is a value in http_query_confirm, so pass on the
- # new find and replace words so that the filters database
+ # new find and replace words so that the filter database
# can be edited.
my $http_query_findwords = $query->param('filterfind');
} elsif ($http_query_action eq "delete"){
# The action the user requested is to delete an filter
- # from the filters database.
+ # from the filter database.
my $http_query_number = $query->param('filter');
my $http_query_confirm = $query->param('confirm');