More alterations made.

[kiriwrite/.git] / cgi-files / kiriwrite.cgi

diff --git a/cgi-files/kiriwrite.cgi b/cgi-files/kiriwrite.cgi
index 267277e..85d6a2d 100755 (executable)
--- a/cgi-files/kiriwrite.cgi
+++ b/cgi-files/kiriwrite.cgi
@@ -583,12 +583,14 @@ sub kiriwrite_page_add{
                # 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();
@@ -727,14 +729,17 @@ sub kiriwrite_page_add{
 
                $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 {
@@ -1034,6 +1039,7 @@ sub kiriwrite_page_delete{
 
                $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);
@@ -1046,6 +1052,7 @@ sub kiriwrite_page_delete{
                $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();
@@ -1066,7 +1073,7 @@ sub kiriwrite_page_edit{
 #                                                                              #
 # Usage:                                                                       #
 #                                                                              #
-# kiriwrite_page_edit(database, filename, newname, newfilename, newdescription, #
+# kiriwrite_page_edit(database, filename, newfilename, newname, newdescription, #
 #                      newsection, newtemplate,  newsettings, newpagecontent   #
 #                      confirm);                                               #
 #                                                                              #
@@ -1367,6 +1374,12 @@ sub kiriwrite_page_edit{
 
                        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.
@@ -1618,11 +1631,13 @@ sub kiriwrite_page_edit{
                $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 });
 
@@ -1813,12 +1828,14 @@ sub kiriwrite_page_edit{
                $kiriwrite_presmodule->endrow();
                $kiriwrite_presmodule->endtable();
 
+               $kiriwrite_presmodule->startbox();
                $kiriwrite_presmodule->addlinebreak();
                $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{editpagebutton});
                $kiriwrite_presmodule->addtext(" | ");
                $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();
 
@@ -2087,7 +2104,6 @@ sub kiriwrite_page_multidelete{
                $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();
 
@@ -2232,6 +2248,7 @@ sub kiriwrite_page_multidelete{
 
                $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);
@@ -2272,6 +2289,7 @@ sub kiriwrite_page_multidelete{
                $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();
@@ -2889,6 +2907,7 @@ sub kiriwrite_page_multimove{
 
                $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);
@@ -2937,6 +2956,7 @@ sub kiriwrite_page_multimove{
                $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();
@@ -3358,7 +3378,6 @@ sub kiriwrite_page_multicopy{
                $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();
 
@@ -3573,6 +3592,7 @@ sub kiriwrite_page_multicopy{
 
                $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);
@@ -3623,6 +3643,8 @@ sub kiriwrite_page_multicopy{
                $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();
@@ -4004,6 +4026,12 @@ sub kiriwrite_page_multiedit{
                                $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
@@ -4050,7 +4078,7 @@ sub kiriwrite_page_multiedit{
 
                                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 {
@@ -4330,6 +4358,7 @@ sub kiriwrite_page_multiedit{
                $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);
@@ -4442,6 +4471,7 @@ sub kiriwrite_page_multiedit{
                $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();
@@ -4599,6 +4629,7 @@ sub kiriwrite_page_list{
                $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");
@@ -4610,6 +4641,7 @@ sub kiriwrite_page_list{
                $kiriwrite_presmodule->endselectbox();
                $kiriwrite_presmodule->addtext(" | ");
                $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{viewbutton});
+               $kiriwrite_presmodule->endbox();
                $kiriwrite_presmodule->endform();
 
                return $kiriwrite_presmodule->grab();
@@ -4723,6 +4755,7 @@ sub kiriwrite_page_list{
                        $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");
@@ -4741,6 +4774,7 @@ sub kiriwrite_page_list{
 
                        $kiriwrite_presmodule->addlinebreak();
                        $kiriwrite_presmodule->addlinebreak();
+                       $kiriwrite_presmodule->endbox();
 
                        # Write the table header.
 
@@ -4863,8 +4897,10 @@ sub kiriwrite_page_list{
 
                $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){
@@ -4890,67 +4926,6 @@ sub kiriwrite_page_list{
 
 }
 
-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                        #
@@ -5101,6 +5076,7 @@ sub kiriwrite_template_add{
 
                $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);
@@ -5176,6 +5152,7 @@ sub kiriwrite_template_add{
                $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();
@@ -5399,6 +5376,7 @@ sub kiriwrite_template_edit{
                $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);
@@ -5476,6 +5454,7 @@ sub kiriwrite_template_edit{
                $kiriwrite_presmodule->addtext(" | ");
                $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=template", { Text => $kiriwrite_lang->{template}->{returntemplatelist} });
 
+               $kiriwrite_presmodule->endbox();
                $kiriwrite_presmodule->endform();
 
        }
@@ -5697,6 +5676,7 @@ sub kiriwrite_template_delete{
 
                $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");
@@ -5708,6 +5688,7 @@ sub kiriwrite_template_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();
@@ -5931,7 +5912,6 @@ sub kiriwrite_template_list{
                }
 
                $kiriwrite_presmodule->endtable();
-               $kiriwrite_presmodule->endform();
 
        }
 
@@ -5951,11 +5931,14 @@ sub kiriwrite_database_add{
 #                                                                              #
 # 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.                       #
 #################################################################################
 
@@ -6117,9 +6100,11 @@ sub kiriwrite_database_add{
        $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();
@@ -6179,12 +6164,14 @@ sub kiriwrite_database_add{
        $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.
@@ -6199,12 +6186,10 @@ sub kiriwrite_database_edit{
 #                                                                              #
 # 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.          #
@@ -6215,7 +6200,7 @@ sub kiriwrite_database_edit{
 
        # 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.
@@ -6226,6 +6211,11 @@ sub kiriwrite_database_edit{
 
        }
 
+       # 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).
 
@@ -6245,11 +6235,6 @@ sub kiriwrite_database_edit{
                $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);
@@ -6466,12 +6451,12 @@ sub kiriwrite_database_edit{
                $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();
@@ -6526,14 +6511,14 @@ sub kiriwrite_database_edit{
 
                $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();
@@ -6720,6 +6705,7 @@ sub kiriwrite_database_delete{
 
        $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);
@@ -6731,6 +6717,7 @@ sub kiriwrite_database_delete{
        $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();
@@ -7028,6 +7015,12 @@ sub kiriwrite_filter_list{
 
                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.
@@ -7498,6 +7491,7 @@ sub kiriwrite_filter_add{
        $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);
@@ -7556,6 +7550,7 @@ sub kiriwrite_filter_add{
        $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();
@@ -7785,6 +7780,12 @@ sub kiriwrite_filter_edit{
 
                        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.
@@ -7890,6 +7891,12 @@ sub kiriwrite_filter_edit{
 
                        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.
@@ -7932,6 +7939,7 @@ sub kiriwrite_filter_edit{
 
                $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);
@@ -7992,6 +8000,8 @@ sub kiriwrite_filter_edit{
                $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(); 
 
@@ -8012,9 +8022,9 @@ sub kiriwrite_filter_delete{
 #                                                                              #
 # 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.                   #
 #################################################################################
 
@@ -8122,6 +8132,12 @@ sub kiriwrite_filter_delete{
 
                        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.
@@ -8201,6 +8217,12 @@ sub kiriwrite_filter_delete{
 
                        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).
@@ -8241,6 +8263,7 @@ sub kiriwrite_filter_delete{
                $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);
@@ -8248,6 +8271,7 @@ sub kiriwrite_filter_delete{
                $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 {
@@ -9135,6 +9159,7 @@ sub kiriwrite_compile_makepages{
 
                        $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");
@@ -9148,6 +9173,8 @@ sub kiriwrite_compile_makepages{
                        $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();
 
@@ -9258,6 +9285,7 @@ sub kiriwrite_compile_makepages{
                        $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");
@@ -9302,6 +9330,7 @@ sub kiriwrite_compile_makepages{
                        $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();
@@ -9396,6 +9425,7 @@ sub kiriwrite_compile_all{
        $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");
@@ -9447,6 +9477,8 @@ sub kiriwrite_compile_all{
        $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();
 
@@ -9698,6 +9730,7 @@ sub kiriwrite_compile_list{
        } 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");
@@ -9778,6 +9811,7 @@ sub kiriwrite_compile_list{
                }
 
                $kiriwrite_presmodule->endtable();
+               $kiriwrite_presmodule->endbox();
                $kiriwrite_presmodule->endform();
 
        }
@@ -9889,13 +9923,6 @@ sub kiriwrite_compile_clean{
 
                        $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){
@@ -9937,6 +9964,7 @@ sub kiriwrite_compile_clean{
        $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);
@@ -9946,6 +9974,7 @@ sub kiriwrite_compile_clean{
        $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();
@@ -10587,7 +10616,7 @@ sub kiriwrite_settings_edit{
 
                # 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});
@@ -10936,6 +10965,7 @@ sub kiriwrite_settings_edit{
        $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);
@@ -11250,7 +11280,7 @@ sub kiriwrite_settings_edit{
        $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();
@@ -11511,9 +11541,9 @@ sub kiriwrite_variablecheck{
 #                                                                              #
 # 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   #
@@ -12641,17 +12671,12 @@ sub kiriwrite_output_header{
 #                                                                              #
 # 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;
 }
@@ -12725,7 +12750,7 @@ sub kiriwrite_processfilename{
 
 sub kiriwrite_language{
 #################################################################################
-# kiriwrite_language: Process language strings that need certain text inserted.        #
+# kiriwrite_language: Process language strings that needs certain text inserted.#
 #                                                                              #
 # Usage:                                                                       #
 #                                                                              #
@@ -13091,8 +13116,7 @@ sub kiriwrite_filepermissions{
 
 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:                                                                       #
 #                                                                              #
@@ -13515,8 +13539,6 @@ if ($query->param('mode')){
                                                        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');
@@ -13526,7 +13548,7 @@ if ($query->param('mode')){
        
                                                        # 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");