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;
# write out the form for adding a page.
$kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{addpage}, { Style => "pageheader" });
- $kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");#
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "add");
$kiriwrite_presmodule->addhiddendata("database", $pagedatabase);
$kiriwrite_presmodule->addhiddendata("confirm", "1");
$kiriwrite_presmodule->addlinebreak();
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 });
$kiriwrite_presmodule->startheader();
$kiriwrite_presmodule->endtable();
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{addpagebutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{clearvalues});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $pagedatabase, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $database_name) });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
+
return $kiriwrite_presmodule->grab();
} else {
$kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{deletepage}, $page_name), { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "delete");
$kiriwrite_presmodule->addhiddendata("database", $database);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{deletepagebutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{deletepagesreturnlink}, $database_name)});
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
# #
# Usage: #
# #
-# kiriwrite_page_edit(database, filename, newname, newfilename, newdescription, #
+# kiriwrite_page_edit(database, filename, newfilename, newname, newdescription, #
# newsection, newtemplate, newsettings, newpagecontent #
# confirm); #
# #
kiriwrite_error("pagefilenamedoesnotexist");
+ } elsif ($kiriwrite_dbmodule->geterror eq "PageExists"){
+
+ # A page already exists with the new filename.
+
+ kiriwrite_error("pagefilenameexists");
+
}
# Disconnect from the database server.
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "edit");
$kiriwrite_presmodule->addhiddendata("database", $database);
$kiriwrite_presmodule->addhiddendata("page", $pagefilename);
$kiriwrite_presmodule->addhiddendata("confirm", 1);
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 });
$kiriwrite_presmodule->endrow();
$kiriwrite_presmodule->endtable();
+ $kiriwrite_presmodule->startbox();
$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->endbox();
$kiriwrite_presmodule->endform();
$kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $database_name)});
- $kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{deletemultiplepages}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "multidelete");
$kiriwrite_presmodule->addhiddendata("database", $database);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{deletepagesbutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{deletepagesreturnlink}, $database_name)});
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{movepages}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "multimove");
$kiriwrite_presmodule->addhiddendata("database", $database);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{movepagesbutton});
$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->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $olddatabase_name)});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $newdatabase, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{viewpagelist}, $newdatabase_name)});
- $kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{copypages}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "multicopy");
$kiriwrite_presmodule->addhiddendata("database", $database);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{copypagesbutton});
$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->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$warning_count++;
next;
+ } elsif ($kiriwrite_dbmodule->geterror eq "PageExists"){
+
+ # A page already exists with the new filename.
+
+ kiriwrite_error("pagefilenameexists");
+
}
# The page has been edited so write a message saying that the page
if (!$edited_list{$page}{Name}){
- $kiriwrite_presmodule->additalictext($kiriwrite_lang->{pages}->{noname});
+ $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname});
$kiriwrite_presmodule->addtext(" (" . $edited_list{$page}{Filename} . ")");
} else {
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "multiedit");
$kiriwrite_presmodule->addhiddendata("database", $database);
$kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{clearvalues});
$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->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"});
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("action", "view");
$kiriwrite_presmodule->addselectbox("database");
$kiriwrite_presmodule->endselectbox();
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{viewbutton});
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "page");
$kiriwrite_presmodule->addhiddendata("database", $database_file);
$kiriwrite_presmodule->addhiddendata("type", "multiple");
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
+ $kiriwrite_presmodule->endbox();
# Write the table header.
$kiriwrite_dbmodule->disconnect();
- $kiriwrite_presmodule->addhiddendata("count", $page_count);
$kiriwrite_presmodule->endtable();
+ $kiriwrite_presmodule->startbox();
+ $kiriwrite_presmodule->addhiddendata("count", $page_count);
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
if (!@database_pages || !$page_count){
}
-sub kiriwrite_page_multipleselect{
-#################################################################################
-# kiriwrite_page_multipleselect: Gets the multiple page selections from a #
-# database and processes them into a single which can be used in the #
-# kiriwrite_page_delete. #
-# #
-# Usage: #
-# #
-# kiriwrite_page_multipleselect(); #
-#################################################################################
-
- # Load the required perl modules for this subroutine.
-
- my $query = new CGI;
-
- # Setup some variables that will be used later on.
-
- my $page_select_seek = 1;
- my $page_current_value = "";
- my $selectionlist = "";
-
- # Get the required variables from the HTTP query.
-
- my $page_count = $query->param('count');
-
- do {
-
- # Get the current value of the selected page's checkbox.
-
- $page_current_value = $query->param('name[' . $page_select_seek . ']');
-
- # If page_current_value is undefinied or blank, set page_current_value
- # to off.
-
- if (!$page_current_value){
-
- $page_current_value = "off";
-
- }
-
- # Check if the page_current_value is set to 'on' if it is append the
- # current page seek value to the selection list.
-
- if ($page_current_value eq "on"){
-
- # Append the current seek value to the selection list.
-
- $selectionlist = $selectionlist . $page_select_seek . "|";
-
- }
-
- # Increment the page selection seeking counter.
-
- $page_select_seek++;
-
- } until ($page_select_seek eq $page_count);
-
- return $selectionlist;
-
-}
-
sub kiriwrite_template_add{
#################################################################################
# kiriwrite_template_add: Add a template to the template folder #
$kiriwrite_presmodule->addtext($kiriwrite_lang->{template}->{addtemplate}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "template");
$kiriwrite_presmodule->addhiddendata("action", "add");
$kiriwrite_presmodule->addhiddendata("confirm", 1);
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=template" , { Text => $kiriwrite_lang->{template}->{returntemplatelist} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "template");
$kiriwrite_presmodule->addhiddendata("action", "edit");
$kiriwrite_presmodule->addhiddendata("confirm", 1);
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=template", { Text => $kiriwrite_lang->{template}->{returntemplatelist} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
}
$kiriwrite_presmodule->addtext($kiriwrite_lang->{template}->{deletetemplate}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "template");
$kiriwrite_presmodule->addhiddendata("template", $template_filename);
$kiriwrite_presmodule->addhiddendata("action", "delete");
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{template}->{deletetemplatebutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=template", { Text => $kiriwrite_lang->{template}->{deletetemplatereturntolist} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
}
$kiriwrite_presmodule->endtable();
- $kiriwrite_presmodule->endform();
}
# #
# Usage: #
# #
-# kiriwrite_database_add(filename, name, description, [confirm]); #
+# kiriwrite_database_add(filename, name, description, notes, categories, #
+# [confirm]); #
# #
# filename Specifies the filename for the database. #
# name Specifies a (friendly) name for the database. #
# description Specifies a description for the database. #
+# notes Specifies the notes for the database. #
+# categories Specifies the categories for the database. #
# confirm Confirms the action to create a database. #
#################################################################################
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "db");
$kiriwrite_presmodule->addhiddendata("action", "new");
$kiriwrite_presmodule->addhiddendata("confirm", "1");
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 });
$kiriwrite_presmodule->startheader();
$kiriwrite_presmodule->endrow();
$kiriwrite_presmodule->endtable();
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{database}->{adddatabasebutton});
$kiriwrite_presmodule->addtext("|");
$kiriwrite_presmodule->addreset($kiriwrite_lang->{database}->{clearvaluesbutton});
$kiriwrite_presmodule->addtext("| ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=db", { Text => $kiriwrite_lang->{database}->{databaselistreturnlink} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
# Exit the subroutine taking the data in the pagadata variable with it.
# #
# Usage: #
# #
-# kiriwrite_database_edit(filename, name, description, newfilename, newname, #
-# newdescription, notes, categories, [confirm]); #
+# kiriwrite_database_edit(filename, newfilename, newname, newdescription, #
+# notes, categories, [confirm]); #
# #
# filename Specifies the filename of the database. #
-# name Specifies the name of the database. #
-# description Specifies the description of the database. #
# newfilename Specifies the new filename of the database. #
# newname Specifies the new name of the database. #
# newdescription Specifies the new description of the database. #
# First, get all the variables passed to the subroutine.
- my ($database_shortname, $database_name, $database_description, $database_newfilename, $database_newname, $database_newdescription, $database_notes, $database_categories, $database_confirm) = @_;
+ my ($database_shortname, $database_newfilename, $database_newname, $database_newdescription, $database_notes, $database_categories, $database_confirm) = @_;
# Check if the database confirm value is blank and if it is
# set the confirm value to 0.
}
+ # Check if the database filename given is valid and return an error
+ # if it isn't.
+
+ kiriwrite_variablecheck($database_shortname, "filename", "", 0);
+
# Check if the confirm variable has a value in it, if it has, check again to make sure it really is the correct value (Perl moans
# if $database_confirm was used directly).
$database_notes = kiriwrite_utf8convert($database_notes);
$database_categories = kiriwrite_utf8convert($database_categories);
- # Check if the database filename given is valid and return an error
- # if it isn't.
-
- kiriwrite_variablecheck($database_shortname, "filename", "", 0);
-
# Preform the following tests.
my $database_filename_check_length = kiriwrite_variablecheck($database_newfilename, "maxlength", 32, 1);
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "db");
$kiriwrite_presmodule->addhiddendata("action", "edit");
$kiriwrite_presmodule->addhiddendata("database", $database_shortname);
$kiriwrite_presmodule->addhiddendata("confirm", "1");
- $kiriwrite_presmodule->addhiddendata("olddatabasename", $database_oldname);
- $kiriwrite_presmodule->addhiddendata("olddatabasedescription", $database_olddescription);
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 });
$kiriwrite_presmodule->startheader();
$kiriwrite_presmodule->endtable();
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addlinebreak();
-
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{database}->{editdatabasebutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{restorecurrent});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=db", { Text => $kiriwrite_lang->{database}->{databaselistreturnlink} });
-
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{deletedatabase}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "db");
$kiriwrite_presmodule->addhiddendata("action", "delete");
$kiriwrite_presmodule->addhiddendata("database", $database_filename);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{database}->{deletedatabasebutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=db", { Text => $kiriwrite_lang->{database}->{deletedatabasereturn} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
kiriwrite_error("filtersdbpermissions");
+ } elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
+
+ # A database error has occured with the filter database.
+
+ kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
+
}
# Define some variables required for processing the filters list.
$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();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "filter");
$kiriwrite_presmodule->addhiddendata("action", "add");
$kiriwrite_presmodule->addhiddendata("confirm", 1);
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=filter", { Text => $kiriwrite_lang->{filter}->{returnfilterlist} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
# 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();
kiriwrite_error("filtersdbpermissions");
+ } elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
+
+ # A database error has occured with the filter database.
+
+ kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
+
}
# Edit the selected filter in the filter database.
} 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_error("filtersdbpermissions");
+ } elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
+
+ # A database error has occured with the filter database.
+
+ kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
+
}
# Get information about the filter.
$kiriwrite_presmodule->addtext($kiriwrite_lang->{filter}->{editfilter}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "filter");
$kiriwrite_presmodule->addhiddendata("action", "edit");
$kiriwrite_presmodule->addhiddendata("filter", $filter_id);
$kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{restorecurrent});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=filter", { Text => $kiriwrite_lang->{filter}->{returnfilterlist} });
+ $kiriwrite_presmodule->endbox();
+ $kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
# #
# Usage: #
# #
-# kiriwrite_filter_delete(number, confirm); #
+# kiriwrite_filter_delete(filterid, confirm); #
# #
-# number Specifies the filter line number to delete. #
+# filterid Specifies the filter line number to delete. #
# confirm Confirms the deletion of the selected filter. #
#################################################################################
kiriwrite_error("filtersdbpermissions");
+ } elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
+
+ # A database error has occured with the filter database.
+
+ kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
+
}
# Delete the filter from the filter database.
$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();
kiriwrite_error("filtersdbpermissions");
+ } elsif ($kiriwrite_dbmodule->geterror eq "FilterDatabaseError"){
+
+ # A database error has occured with the filter database.
+
+ kiriwrite_error("filtersdbdatabaseerror", $kiriwrite_dbmodule->geterror(1));
+
}
# Get information about the filter (to check if it exists).
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "filter");
$kiriwrite_presmodule->addhiddendata("action", "delete");
$kiriwrite_presmodule->addhiddendata("filter", $filter_id);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{filter}->{deletefilterbutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=filter", { Text => $kiriwrite_lang->{filter}->{deletefilterreturn} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
} else {
}
- # 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);
+
+ open($filehandle_page, "> ", $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);
$kiriwrite_presmodule->addtext($kiriwrite_lang->{compile}->{compiledatabase}, { Style => "pageheader" });
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "compile");
$kiriwrite_presmodule->addhiddendata("action", "compile");
$kiriwrite_presmodule->addhiddendata("type", "multiple");
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{compile}->{compiledatabasebutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=compile", { Text => $kiriwrite_lang->{compile}->{returncompilelist} });
+ $kiriwrite_presmodule->endbox();
+ $kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "compile");
$kiriwrite_presmodule->addhiddendata("action", "compile");
$kiriwrite_presmodule->addhiddendata("type", "multiple");
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{compile}->{compileselecteddatabasesbutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=compile", { Text => $kiriwrite_lang->{compile}->{returncompilelist} });
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "compile");
$kiriwrite_presmodule->addhiddendata("action", "compile");
$kiriwrite_presmodule->addhiddendata("type", "multiple");
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{compile}->{compilealldatabasesbutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=compile", { Text => $kiriwrite_lang->{compile}->{returncompilelist} });
+ $kiriwrite_presmodule->endbox();
+ $kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
} else {
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "compile");
$kiriwrite_presmodule->addhiddendata("action", "compile");
$kiriwrite_presmodule->addhiddendata("type", "multiple");
}
$kiriwrite_presmodule->endtable();
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
}
$file_permissions = kiriwrite_compile_clean_helper($kiriwrite_config{"directory_data_output"}, 1);
- if ($file_permissions eq 1){
-
- # One of the files or directories has invalid
- # permissions set so write a warning message.
-
- }
-
$kiriwrite_presmodule->addtext($kiriwrite_lang->{compile}->{cleanoutputdirectory}, { Style => "pageheader" });
if ($file_permissions eq 1){
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "compile");
$kiriwrite_presmodule->addhiddendata("action", "clean");
$kiriwrite_presmodule->addhiddendata("confirm", 1);
$kiriwrite_presmodule->addsubmit($kiriwrite_lang->{compile}->{cleanoutputdirectorybutton});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=compile", { Text => $kiriwrite_lang->{compile}->{returncompilelist}});
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
# Write a confirmation message.
- $kiriwrite_presmodule->addtext($kiriwrite_lang->{setting}->{settingsedited}, { Style => "pageheadeR" });
+ $kiriwrite_presmodule->addtext($kiriwrite_lang->{setting}->{settingsedited}, { Style => "pageheader" });
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->addtext($kiriwrite_lang->{setting}->{settingseditedmessage});
$kiriwrite_presmodule->addlinebreak();
$kiriwrite_presmodule->startform($kiriwrite_env{"script_filename"}, "POST");
+ $kiriwrite_presmodule->startbox();
$kiriwrite_presmodule->addhiddendata("mode", "settings");
$kiriwrite_presmodule->addhiddendata("action", "edit");
$kiriwrite_presmodule->addhiddendata("confirm", 1);
$kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{restorecurrent});
$kiriwrite_presmodule->addtext(" | ");
$kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=settings", { Text => $kiriwrite_lang->{setting}->{returnsettingslist} });
-
+ $kiriwrite_presmodule->endbox();
$kiriwrite_presmodule->endform();
return $kiriwrite_presmodule->grab();
# 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
# #
# Usage: #
# #
-# kiriwrite_variablecheck(variablename, type, length, noerror); #
+# kiriwrite_variablecheck(variable, type, length, noerror); #
# #
-# variablename Specifies the variable to be checked. #
+# variable Specifies the variable to be checked. #
# type Specifies what type the variable is. #
# option Specifies the maximum/minimum length of the variable #
# (if minlength/maxlength is used) or if the filename should be #
# #
# Usage: #
# #
-# kiriwrite_output_header(mimetype); #
-# #
-# mimetype Specifies the mime type of the header. #
+# kiriwrite_output_header(); #
#################################################################################
# Print a header saying that the page expires immediately since the
# date is set in the past.
- #print "Expires: Sunday, 01-Jan-06 00:00:00 GMT\n";
- #print "Content-Type: text/html; charset=utf-8\n";
- #print header();
print header(-Expires=>'Sunday, 01-Jan-06 00:00:00 GMT', -charset=>'utf-8');
return;
}
sub kiriwrite_language{
#################################################################################
-# kiriwrite_language: Process language strings that need certain text inserted. #
+# kiriwrite_language: Process language strings that needs certain text inserted.#
# #
# Usage: #
# #
sub kiriwrite_utf8convert{
#################################################################################
-# kiriwrite_utf8convert: Properly converts values into UTF-8 and make sure #
-# that the size of the string is correct when doing input validation. #
+# kiriwrite_utf8convert: Properly converts values into UTF-8 values. #
# #
# Usage: #
# #
# 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');
my $newdatabasedescription = $query->param('databasedescription');
my $newdatabasefilename = $query->param('databasefilename');
- my $databasename = $query->param('olddatabasename');
- my $databasedescription = $query->param('olddatabasedescription');
my $databaseshortname = $query->param('database');
my $databasenotes = $query->param('databasenotes');
my $databasecategories = $query->param('databasecategories');
# Pass the variables to the database editing subroutine.
- my $pagedata = kiriwrite_database_edit($databaseshortname, $databasename, $databasedescription, $newdatabasefilename, $newdatabasename, $newdatabasedescription, $databasenotes, $databasecategories, 1);
+ my $pagedata = kiriwrite_database_edit($databaseshortname, $newdatabasefilename, $newdatabasename, $newdatabasedescription, $databasenotes, $databasecategories, 1);
kiriwrite_output_header;
kiriwrite_output_page($kiriwrite_lang->{database}->{editdatabasetitle}, $pagedata, "database");
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');